diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-01-14 12:33:20 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-01-14 12:43:48 +0900 |
| commit | 3b3f9ec8f31978030c17309fae48335bea5c1587 (patch) | |
| tree | 0b493383a1501860371aacd792ec6fc08d595824 | |
| parent | 99e6e1d1f43610c3573e9824a2a8a38f69930cd0 (diff) | |
| download | tdepim-3b3f9ec8f31978030c17309fae48335bea5c1587.tar.gz tdepim-3b3f9ec8f31978030c17309fae48335bea5c1587.zip | |
Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
639 files changed, 8035 insertions, 8035 deletions
diff --git a/akregator/src/actionmanagerimpl.cpp b/akregator/src/actionmanagerimpl.cpp index 9376024f..6c7b3cee 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 24dc8b49..a7b88a11 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 d7ca0d44..b69d0736 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 89bb190a..d22f2f61 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 645b42c1..bcda5d16 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 48114f97..7731c768 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 8067b732..8da54096 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 7e7f59e8..53b38f65 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 61d2ad82..513f845f 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 f0a37363..34aa6825 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 c78d9a48..0bc7b38e 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 739b0cf1..57105f4f 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 6e27b915..64e0e37f 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 174a105b..65aaf539 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 8e2967b7..5cc6aa22 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 c9d3eb09..ea81a0a6 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 bef989c6..4515cf7e 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 1920a5ff..8349f28a 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 95ee2408..aa10eb70 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 c028b156..09b4c2de 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 1e104bd3..0331e0f1 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 8a4123dc..40a8d622 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 5a144681..23a3a3a8 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 859bb1a3..1962824f 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 dd27fbe9..1e205c8e 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 b8d318e8..7bea6f53 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 ff163993..9e705ec5 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 7a849ff9..44106cfa 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 a4f1d4be..ddb54505 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 eadab090..b1cbf9c5 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 f987409c..728bf0ab 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 1f5743fd..af64e546 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 6d60da63..288ecc77 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 4f73467e..b21f1d03 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 202175dc..603f4efc 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() diff --git a/certmanager/certificateinfowidgetimpl.cpp b/certmanager/certificateinfowidgetimpl.cpp index eb28c1a6..9ff6b15a 100644 --- a/certmanager/certificateinfowidgetimpl.cpp +++ b/certmanager/certificateinfowidgetimpl.cpp @@ -84,17 +84,17 @@ CertificateInfoWidgetImpl::CertificateInfoWidgetImpl( const GpgME::Key & key, bo listView->header()->setClickEnabled( false ); listView->setSorting( -1 ); - connect( listView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), - this, TQT_SLOT( slotShowInfo( TQListViewItem* ) ) ); + connect( listView, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ), + this, TQ_SLOT( slotShowInfo( TQListViewItem* ) ) ); pathView->setColumnWidthMode( 0, TQListView::Maximum ); pathView->header()->hide(); - connect( pathView, TQT_SIGNAL( doubleClicked( TQListViewItem* ) ), - this, TQT_SLOT( slotShowCertPathDetails( TQListViewItem* ) ) ); - connect( pathView, TQT_SIGNAL( returnPressed( TQListViewItem* ) ), - this, TQT_SLOT( slotShowCertPathDetails( TQListViewItem* ) ) ); - connect( importButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotImportCertificate() ) ); + connect( pathView, TQ_SIGNAL( doubleClicked( TQListViewItem* ) ), + this, TQ_SLOT( slotShowCertPathDetails( TQListViewItem* ) ) ); + connect( pathView, TQ_SIGNAL( returnPressed( TQListViewItem* ) ), + this, TQ_SLOT( slotShowCertPathDetails( TQListViewItem* ) ) ); + connect( importButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotImportCertificate() ) ); dumpView->setFont( TDEGlobalSettings::fixedFont() ); @@ -232,10 +232,10 @@ void CertificateInfoWidgetImpl::startCertificateChainListing() { Kleo::CryptoBackendFactory::instance()->smime()->keyListJob( false ); assert( job ); - connect( job, TQT_SIGNAL(result(const GpgME::KeyListResult&)), - TQT_SLOT(slotCertificateChainListingResult(const GpgME::KeyListResult&)) ); - connect( job, TQT_SIGNAL(nextKey(const GpgME::Key&)), - TQT_SLOT(slotNextKey(const GpgME::Key&)) ); + connect( job, TQ_SIGNAL(result(const GpgME::KeyListResult&)), + TQ_SLOT(slotCertificateChainListingResult(const GpgME::KeyListResult&)) ); + connect( job, TQ_SIGNAL(nextKey(const GpgME::Key&)), + TQ_SLOT(slotNextKey(const GpgME::Key&)) ); kdDebug() << "Going to fetch" << endl << " issuer : \"" << mChain.front().issuerName() << "\"" << endl @@ -258,12 +258,12 @@ void CertificateInfoWidgetImpl::startCertificateDump() { (*proc) << "--dump-keys"; (*proc) << mChain.front().primaryFingerprint(); - TQObject::connect( proc, TQT_SIGNAL( receivedStdout(TDEProcess *, char *, int) ), - this, TQT_SLOT( slotCollectStdout(TDEProcess *, char *, int) ) ); - TQObject::connect( proc, TQT_SIGNAL( receivedStderr(TDEProcess *, char *, int) ), - this, TQT_SLOT( slotCollectStderr(TDEProcess *, char *, int) ) ); - TQObject::connect( proc, TQT_SIGNAL( processExited(TDEProcess*) ), - this, TQT_SLOT( slotDumpProcessExited(TDEProcess*) ) ); + TQObject::connect( proc, TQ_SIGNAL( receivedStdout(TDEProcess *, char *, int) ), + this, TQ_SLOT( slotCollectStdout(TDEProcess *, char *, int) ) ); + TQObject::connect( proc, TQ_SIGNAL( receivedStderr(TDEProcess *, char *, int) ), + this, TQ_SLOT( slotCollectStderr(TDEProcess *, char *, int) ) ); + TQObject::connect( proc, TQ_SIGNAL( processExited(TDEProcess*) ), + this, TQ_SLOT( slotDumpProcessExited(TDEProcess*) ) ); if ( !proc->start( TDEProcess::NotifyOnExit, (TDEProcess::Communication)(TDEProcess::Stdout | TDEProcess::Stderr) ) ) { TQString wmsg = i18n("Failed to execute gpgsm:\n%1").arg( i18n( "program not found" ) ); @@ -383,8 +383,8 @@ void CertificateInfoWidgetImpl::slotShowCertPathDetails( TQListViewItem * item ) new CertificateInfoWidgetImpl( mChain[itemIndex], mExternal, dialog ); dialog->setMainWidget( top ); // proxy the signal to our receiver: - connect( top, TQT_SIGNAL(requestCertificateDownload(const TQString&, const TQString&)), - TQT_SIGNAL(requestCertificateDownload(const TQString&, const TQString&)) ); + connect( top, TQ_SIGNAL(requestCertificateDownload(const TQString&, const TQString&)), + TQ_SIGNAL(requestCertificateDownload(const TQString&, const TQString&)) ); dialog->show(); } @@ -415,10 +415,10 @@ void CertificateInfoWidgetImpl::startKeyExistanceCheck() { Kleo::CryptoBackendFactory::instance()->smime()->keyListJob( false ); assert( job ); - connect( job, TQT_SIGNAL(nextKey(const GpgME::Key&)), - TQT_SLOT(slotKeyExistanceCheckNextCandidate(const GpgME::Key&)) ); - connect( job, TQT_SIGNAL(result(const GpgME::KeyListResult&)), - TQT_SLOT(slotKeyExistanceCheckFinished()) ); + connect( job, TQ_SIGNAL(nextKey(const GpgME::Key&)), + TQ_SLOT(slotKeyExistanceCheckNextCandidate(const GpgME::Key&)) ); + connect( job, TQ_SIGNAL(result(const GpgME::KeyListResult&)), + TQ_SLOT(slotKeyExistanceCheckFinished()) ); // nor to check for errors: job->start( fingerprint ); } diff --git a/certmanager/certificatewizardimpl.cpp b/certmanager/certificatewizardimpl.cpp index 38352db9..f5dd08ad 100644 --- a/certmanager/certificatewizardimpl.cpp +++ b/certmanager/certificatewizardimpl.cpp @@ -126,16 +126,16 @@ CertificateWizardImpl::CertificateWizardImpl( TQWidget* parent, const char* nam // Allow to select remote URLs storeUR->setMode( KFile::File ); storeUR->setFilter( "application/pkcs10" ); - connect( storeUR, TQT_SIGNAL( urlSelected( const TQString& ) ), - this, TQT_SLOT( slotURLSelected( const TQString& ) ) ); + connect( storeUR, TQ_SIGNAL( urlSelected( const TQString& ) ), + this, TQ_SLOT( slotURLSelected( const TQString& ) ) ); const TDEConfigGroup config( TDEGlobal::config(), "CertificateCreationWizard" ); caEmailED->setText( config.readEntry( "CAEmailAddress" ) ); - connect( this, TQT_SIGNAL( helpClicked() ), - this, TQT_SLOT( slotHelpClicked() ) ); - connect( insertAddressButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotSetValuesFromWhoAmI() ) ); + connect( this, TQ_SIGNAL( helpClicked() ), + this, TQ_SLOT( slotHelpClicked() ) ); + connect( insertAddressButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotSetValuesFromWhoAmI() ) ); for ( unsigned int i = 0 ; i < numKeyLengths ; ++i ) keyLengthCB->insertItem( i18n("%n bit", "%n bits", keyLengths[i] ) ); @@ -246,8 +246,8 @@ void CertificateWizardImpl::slotGenerateCertificate() Kleo::CryptoBackendFactory::instance()->smime()->keyGenerationJob(); assert( job ); - connect( job, TQT_SIGNAL(result(const GpgME::KeyGenerationResult&,const TQByteArray&)), - TQT_SLOT(slotResult(const GpgME::KeyGenerationResult&,const TQByteArray&)) ); + connect( job, TQ_SIGNAL(result(const GpgME::KeyGenerationResult&,const TQByteArray&)), + TQ_SLOT(slotResult(const GpgME::KeyGenerationResult&,const TQByteArray&)) ); certificateTE->setText( certParms ); @@ -364,8 +364,8 @@ void CertificateWizardImpl::createPersonalDataPage() _attrPairList.append(qMakePair(key, le)); - connect( le, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(slotEnablePersonalDataPageExit()) ); + connect( le, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(slotEnablePersonalDataPageExit()) ); } // enable button only if administrator wants to allow it @@ -490,8 +490,8 @@ void CertificateWizardImpl::accept() TDEIO::Job* uploadJob = TDEIOext::put( _keyData, url, -1, overwrite, false /*resume*/ ); uploadJob->setWindow( this ); - connect( uploadJob, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( slotUploadResult( TDEIO::Job* ) ) ); + connect( uploadJob, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( slotUploadResult( TDEIO::Job* ) ) ); // Can't press finish again during the upload setFinishEnabled( finishPage, false ); } diff --git a/certmanager/certmanager.cpp b/certmanager/certmanager.cpp index 6dfd3d74..ddcdb8a4 100644 --- a/certmanager/certmanager.cpp +++ b/certmanager/certmanager.cpp @@ -187,17 +187,17 @@ CertManager::CertManager( bool remote, const TQString& query, const TQString & i mKeyListView->setSelectionMode( TQListView::Extended ); setCentralWidget( mKeyListView ); - connect( mKeyListView, TQT_SIGNAL(doubleClicked(Kleo::KeyListViewItem*,const TQPoint&,int)), - TQT_SLOT(slotViewDetails(Kleo::KeyListViewItem*)) ); - connect( mKeyListView, TQT_SIGNAL(returnPressed(Kleo::KeyListViewItem*)), - TQT_SLOT(slotViewDetails(Kleo::KeyListViewItem*)) ); - connect( mKeyListView, TQT_SIGNAL(selectionChanged()), - TQT_SLOT(slotSelectionChanged()) ); - connect( mKeyListView, TQT_SIGNAL(contextMenu(Kleo::KeyListViewItem*, const TQPoint&)), - TQT_SLOT(slotContextMenu(Kleo::KeyListViewItem*, const TQPoint&)) ); - - connect( mKeyListView, TQT_SIGNAL(dropped(const KURL::List&) ), - TQT_SLOT( slotDropped(const KURL::List&) ) ); + connect( mKeyListView, TQ_SIGNAL(doubleClicked(Kleo::KeyListViewItem*,const TQPoint&,int)), + TQ_SLOT(slotViewDetails(Kleo::KeyListViewItem*)) ); + connect( mKeyListView, TQ_SIGNAL(returnPressed(Kleo::KeyListViewItem*)), + TQ_SLOT(slotViewDetails(Kleo::KeyListViewItem*)) ); + connect( mKeyListView, TQ_SIGNAL(selectionChanged()), + TQ_SLOT(slotSelectionChanged()) ); + connect( mKeyListView, TQ_SIGNAL(contextMenu(Kleo::KeyListViewItem*, const TQPoint&)), + TQ_SLOT(slotContextMenu(Kleo::KeyListViewItem*, const TQPoint&)) ); + + connect( mKeyListView, TQ_SIGNAL(dropped(const KURL::List&) ), + TQ_SLOT( slotDropped(const KURL::List&) ) ); mLineEditAction->setText(query); if ( !mRemote && !mNextFindRemote || !query.isEmpty() ) @@ -244,17 +244,17 @@ void CertManager::createStatusBar() { } static inline void connectEnableOperationSignal( TQObject * s, TQObject * d ) { - TQObject::connect( s, TQT_SIGNAL(enableOperations(bool)), - d, TQT_SLOT(setEnabled(bool)) ); + TQObject::connect( s, TQ_SIGNAL(enableOperations(bool)), + d, TQ_SLOT(setEnabled(bool)) ); } void CertManager::createActions() { TDEAction * action = 0; - (void)KStdAction::quit( this, TQT_SLOT(close()), actionCollection() ); + (void)KStdAction::quit( this, TQ_SLOT(close()), actionCollection() ); - action = KStdAction::redisplay( this, TQT_SLOT(slotRedisplay()), actionCollection() ); + action = KStdAction::redisplay( this, TQ_SLOT(slotRedisplay()), actionCollection() ); // work around the fact that the stdaction has no shortcut TDEShortcut reloadShortcut = TDEStdAccel::shortcut(TDEStdAccel::Reload); reloadShortcut.append(KKey(CTRL + Key_R)); @@ -263,113 +263,113 @@ void CertManager::createActions() { connectEnableOperationSignal( this, action ); action = new TDEAction( i18n("Stop Operation"), "process-stop", Key_Escape, - this, TQT_SIGNAL(stopOperations()), + this, TQ_SIGNAL(stopOperations()), actionCollection(), "view_stop_operations" ); action->setEnabled( false ); (void) new TDEAction( i18n("New Key Pair..."), "document-new", 0, - this, TQT_SLOT(newCertificate()), + this, TQ_SLOT(newCertificate()), actionCollection(), "file_new_certificate" ); connect( new TDEToggleAction( i18n("Hierarchical Key List"), 0, actionCollection(), "view_hierarchical" ), - TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggleHierarchicalView(bool)) ); + TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotToggleHierarchicalView(bool)) ); action = new TDEAction( i18n("Expand All"), 0, CTRL+Key_Period, - this, TQT_SLOT(slotExpandAll()), + this, TQ_SLOT(slotExpandAll()), actionCollection(), "view_expandall" ); action = new TDEAction( i18n("Collapse All"), 0, CTRL+Key_Comma, - this, TQT_SLOT(slotCollapseAll()), + this, TQ_SLOT(slotCollapseAll()), actionCollection(), "view_collapseall" ); (void) new TDEAction( i18n("Refresh CRLs"), 0, 0, - this, TQT_SLOT(slotRefreshKeys()), + this, TQ_SLOT(slotRefreshKeys()), actionCollection(), "certificates_refresh_clr" ); #ifdef NOT_IMPLEMENTED_ANYWAY mRevokeCertificateAction = new TDEAction( i18n("Revoke"), 0, - this, TQT_SLOT(revokeCertificate()), + this, TQ_SLOT(revokeCertificate()), actionCollection(), "edit_revoke_certificate" ); connectEnableOperationSignal( this, mRevokeCertificateAction ); mExtendCertificateAction = new TDEAction( i18n("Extend"), 0, - this, TQT_SLOT(extendCertificate()), + this, TQ_SLOT(extendCertificate()), actionCollection(), "edit_extend_certificate" ); connectEnableOperationSignal( this, mExtendCertificateAction ); #endif mDeleteCertificateAction = new TDEAction( i18n("Delete"), "edit-delete", Key_Delete, - this, TQT_SLOT(slotDeleteCertificate()), + this, TQ_SLOT(slotDeleteCertificate()), actionCollection(), "edit_delete_certificate" ); connectEnableOperationSignal( this, mDeleteCertificateAction ); mValidateCertificateAction = new TDEAction( i18n("Validate"), "reload", SHIFT + Key_F5, - this, TQT_SLOT(slotValidate()), + this, TQ_SLOT(slotValidate()), actionCollection(), "certificates_validate" ); connectEnableOperationSignal( this, mValidateCertificateAction ); mImportCertFromFileAction = new TDEAction( i18n("Import Certificates..."), 0, - this, TQT_SLOT(slotImportCertFromFile()), + this, TQ_SLOT(slotImportCertFromFile()), actionCollection(), "file_import_certificates" ); connectEnableOperationSignal( this, mImportCertFromFileAction ); mImportCRLFromFileAction = new TDEAction( i18n("Import CRLs..."), 0, - this, TQT_SLOT(importCRLFromFile()), + this, TQ_SLOT(importCRLFromFile()), actionCollection(), "file_import_crls" ); connectEnableOperationSignal( this, mImportCRLFromFileAction ); mExportCertificateAction = new TDEAction( i18n("Export Certificates..."), "export", 0, - this, TQT_SLOT(slotExportCertificate()), + this, TQ_SLOT(slotExportCertificate()), actionCollection(), "file_export_certificate" ); mExportSecretKeyAction = new TDEAction( i18n("Export Secret Key..."), "export", 0, - this, TQT_SLOT(slotExportSecretKey()), + this, TQ_SLOT(slotExportSecretKey()), actionCollection(), "file_export_secret_keys" ); connectEnableOperationSignal( this, mExportSecretKeyAction ); mViewCertDetailsAction = new TDEAction( i18n("Certificate Details..."), 0, 0, - this, TQT_SLOT(slotViewDetails()), actionCollection(), + this, TQ_SLOT(slotViewDetails()), actionCollection(), "view_certificate_details" ); mDownloadCertificateAction = new TDEAction( i18n( "Download"), 0, 0, - this, TQT_SLOT(slotDownloadCertificate()), actionCollection(), + this, TQ_SLOT(slotDownloadCertificate()), actionCollection(), "download_certificate" ); const TQString dirmngr = TDEStandardDirs::findExe( "gpgsm" ); mDirMngrFound = !dirmngr.isEmpty(); action = new TDEAction( i18n("Dump CRL Cache..."), 0, - this, TQT_SLOT(slotViewCRLs()), + this, TQ_SLOT(slotViewCRLs()), actionCollection(), "crl_dump_crl_cache" ); action->setEnabled( mDirMngrFound ); // we also need dirmngr for this action = new TDEAction( i18n("Clear CRL Cache..."), 0, - this, TQT_SLOT(slotClearCRLs()), + this, TQ_SLOT(slotClearCRLs()), actionCollection(), "crl_clear_crl_cache" ); action->setEnabled( mDirMngrFound ); // we also need dirmngr for this action = new TDEAction( i18n("GnuPG Log Viewer..."), "pgp-keys", 0, this, - TQT_SLOT(slotStartWatchGnuPG()), actionCollection(), "tools_start_kwatchgnupg"); + TQ_SLOT(slotStartWatchGnuPG()), actionCollection(), "tools_start_kwatchgnupg"); // disable action if no kwatchgnupg binary is around if (TDEStandardDirs::findExe("kwatchgnupg").isEmpty()) action->setEnabled(false); (void)new LabelAction( i18n("Search:"), actionCollection(), "label_action" ); mLineEditAction = new LineEditAction( TQString(), actionCollection(), this, - TQT_SLOT(slotSearch()), + TQ_SLOT(slotSearch()), "query_lineedit_action"); TQStringList lst; lst << i18n("In Local Certificates") << i18n("In External Certificates"); - mComboAction = new ComboAction( lst, actionCollection(), this, TQT_SLOT( slotToggleRemote(int) ), + mComboAction = new ComboAction( lst, actionCollection(), this, TQ_SLOT( slotToggleRemote(int) ), "location_combo_action", mNextFindRemote? 1 : 0 ); - mFindAction = new TDEAction( i18n("Find"), "edit-find", 0, this, TQT_SLOT(slotSearch()), + mFindAction = new TDEAction( i18n("Find"), "edit-find", 0, this, TQ_SLOT(slotSearch()), actionCollection(), "find" ); - KStdAction::keyBindings( this, TQT_SLOT(slotEditKeybindings()), actionCollection() ); - KStdAction::preferences( this, TQT_SLOT(slotShowConfigurationDialog()), actionCollection() ); + KStdAction::keyBindings( this, TQ_SLOT(slotEditKeybindings()), actionCollection() ); + KStdAction::preferences( this, TQ_SLOT(slotShowConfigurationDialog()), actionCollection() ); - new TDEAction( i18n( "Configure &GpgME Backend" ), 0, 0, this, TQT_SLOT(slotConfigureGpgME()), + new TDEAction( i18n( "Configure &GpgME Backend" ), 0, 0, this, TQ_SLOT(slotConfigureGpgME()), actionCollection(), "configure_gpgme" ); createStandardStatusBarAction(); @@ -387,7 +387,7 @@ void CertManager::slotEditKeybindings() { void CertManager::slotShowConfigurationDialog() { ConfigureDialog dlg( this ); - connect( &dlg, TQT_SIGNAL( configCommitted() ), TQT_SLOT( slotRepaint() ) ); + connect( &dlg, TQ_SIGNAL( configCommitted() ), TQ_SLOT( slotRepaint() ) ); dlg.exec(); } @@ -451,10 +451,10 @@ void CertManager::connectJobToStatusBarProgress( Kleo::Job * job, const TQString return; if ( !initialText.isEmpty() ) statusBar()->message( initialText ); - connect( job, TQT_SIGNAL(progress(const TQString&,int,int)), - mProgressBar, TQT_SLOT(slotProgress(const TQString&,int,int)) ); - connect( job, TQT_SIGNAL(done()), mProgressBar, TQT_SLOT(reset()) ); - connect( this, TQT_SIGNAL(stopOperations()), job, TQT_SLOT(slotCancel()) ); + connect( job, TQ_SIGNAL(progress(const TQString&,int,int)), + mProgressBar, TQ_SLOT(slotProgress(const TQString&,int,int)) ); + connect( job, TQ_SIGNAL(done()), mProgressBar, TQ_SLOT(reset()) ); + connect( this, TQ_SIGNAL(stopOperations()), job, TQ_SLOT(slotCancel()) ); action("view_stop_operations")->setEnabled( true ); emit enableOperations( false ); @@ -509,8 +509,8 @@ void CertManager::slotRefreshKeys() { Kleo::RefreshKeysJob * job = Kleo::CryptoBackendFactory::instance()->smime()->refreshKeysJob(); assert( job ); - connect( job, TQT_SIGNAL(result(const GpgME::Error&)), - this, TQT_SLOT(slotRefreshKeysResult(const GpgME::Error&)) ); + connect( job, TQ_SIGNAL(result(const GpgME::Error&)), + this, TQ_SLOT(slotRefreshKeysResult(const GpgME::Error&)) ); connectJobToStatusBarProgress( job, i18n("Refreshing keys...") ); if ( const GpgME::Error err = job->start( keys ) ) @@ -571,10 +571,10 @@ void CertManager::startKeyListing( bool validating, bool refresh, const TQString job = Kleo::CryptoBackendFactory::instance()->smime()->keyListJob( mRemote, false, validating ); assert( job ); - connect( job, TQT_SIGNAL(nextKey(const GpgME::Key&)), - mKeyListView, refresh ? TQT_SLOT(slotRefreshKey(const GpgME::Key&)) : TQT_SLOT(slotAddKey(const GpgME::Key&)) ); - connect( job, TQT_SIGNAL(result(const GpgME::KeyListResult&)), - this, TQT_SLOT(slotKeyListResult(const GpgME::KeyListResult&)) ); + connect( job, TQ_SIGNAL(nextKey(const GpgME::Key&)), + mKeyListView, refresh ? TQ_SLOT(slotRefreshKey(const GpgME::Key&)) : TQ_SLOT(slotAddKey(const GpgME::Key&)) ); + connect( job, TQ_SIGNAL(result(const GpgME::KeyListResult&)), + this, TQ_SLOT(slotKeyListResult(const GpgME::KeyListResult&)) ); connectJobToStatusBarProgress( job, i18n("Fetching keys...") ); @@ -685,7 +685,7 @@ void CertManager::slotImportCertFromFile( const KURL & certURL ) // Download the cert TDEIOext::StoredTransferJob* importJob = TDEIOext::storedGet( certURL ); importJob->setWindow( this ); - connect( importJob, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotImportResult(TDEIO::Job*)) ); + connect( importJob, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotImportResult(TDEIO::Job*)) ); } void CertManager::slotImportResult( TDEIO::Job* job ) @@ -729,8 +729,8 @@ void CertManager::slotStartCertificateDownload( const TQString& fingerprint, con Kleo::CryptoBackendFactory::instance()->smime()->downloadJob( false /* no armor */ ); assert( job ); - connect( job, TQT_SIGNAL(result(const GpgME::Error&,const TQByteArray&)), - TQT_SLOT(slotCertificateDownloadResult(const GpgME::Error&,const TQByteArray&)) ); + connect( job, TQ_SIGNAL(result(const GpgME::Error&,const TQByteArray&)), + TQ_SLOT(slotCertificateDownloadResult(const GpgME::Error&,const TQByteArray&)) ); connectJobToStatusBarProgress( job, i18n("Fetching certificate from server...") ); @@ -782,8 +782,8 @@ void CertManager::startCertificateImport( const TQByteArray & keyData, const TQS Kleo::ImportJob * job = Kleo::CryptoBackendFactory::instance()->smime()->importJob(); assert( job ); - connect( job, TQT_SIGNAL(result(const GpgME::ImportResult&)), - TQT_SLOT(slotCertificateImportResult(const GpgME::ImportResult&)) ); + connect( job, TQ_SIGNAL(result(const GpgME::ImportResult&)), + TQ_SLOT(slotCertificateImportResult(const GpgME::ImportResult&)) ); connectJobToStatusBarProgress( job, i18n("Importing certificates...") ); @@ -906,8 +906,8 @@ void CertManager::importCRLFromFile() { destURL.setPath( tempFile.name() ); TDEIO::Job* copyJob = TDEIO::file_copy( url, destURL, 0600, true, false ); copyJob->setWindow( this ); - connect( copyJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotImportCRLJobFinished( TDEIO::Job * ) ) ); + connect( copyJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotImportCRLJobFinished( TDEIO::Job * ) ) ); } } } @@ -930,9 +930,9 @@ bool CertManager::connectAndStartDirmngr( const char * slot, const char * proces assert( processname ); assert( mDirmngrProc ); mErrorbuffer = TQString(); - connect( mDirmngrProc, TQT_SIGNAL(processExited(TDEProcess*)), slot ); - connect( mDirmngrProc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int) ), - this, TQT_SLOT(slotStderr(TDEProcess*,char*,int)) ); + connect( mDirmngrProc, TQ_SIGNAL(processExited(TDEProcess*)), slot ); + connect( mDirmngrProc, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int) ), + this, TQ_SLOT(slotStderr(TDEProcess*,char*,int)) ); if( !mDirmngrProc->start( TDEProcess::NotifyOnExit, TDEProcess::Stderr ) ) { delete mDirmngrProc; mDirmngrProc = 0; KMessageBox::error( this, i18n( "Unable to start %1 process. Please check your installation." ).arg( processname ), i18n( "Certificate Manager Error" ) ); @@ -947,7 +947,7 @@ void CertManager::startImportCRL( const TQString& filename, bool isTempFile ) mImportCRLTempFile = isTempFile ? filename : TQString(); mDirmngrProc = new TDEProcess(); *mDirmngrProc << "gpgsm" << "--call-dirmngr" << "loadcrl" << filename; - if ( !connectAndStartDirmngr( TQT_SLOT(slotDirmngrExited()), "gpgsm" ) ) { + if ( !connectAndStartDirmngr( TQ_SLOT(slotDirmngrExited()), "gpgsm" ) ) { updateImportActions( true ); if ( isTempFile ) TQFile::remove( mImportCRLTempFile ); // unlink tempfile @@ -959,7 +959,7 @@ void CertManager::startClearCRLs() { mDirmngrProc = new TDEProcess(); *mDirmngrProc << "dirmngr" << "--flush"; //*mDirmngrProc << "gpgsm" << "--call-dimngr" << "flush"; // use this once it's implemented! - connectAndStartDirmngr( TQT_SLOT(slotClearCRLsResult()), "dirmngr" ); + connectAndStartDirmngr( TQ_SLOT(slotClearCRLsResult()), "dirmngr" ); } void CertManager::slotStderr( TDEProcess*, char* buf, int len ) { @@ -1034,10 +1034,10 @@ void CertManager::slotDeleteCertificate() { mHierarchyAnalyser = new HierarchyAnalyser( this, "mHierarchyAnalyser" ); Kleo::KeyListJob * job = Kleo::CryptoBackendFactory::instance()->smime()->keyListJob(); assert( job ); - connect( job, TQT_SIGNAL(nextKey(const GpgME::Key&)), - mHierarchyAnalyser, TQT_SLOT(slotNextKey(const GpgME::Key&)) ); - connect( job, TQT_SIGNAL(result(const GpgME::KeyListResult&)), - this, TQT_SLOT(slotDeleteCertificate()) ); + connect( job, TQ_SIGNAL(nextKey(const GpgME::Key&)), + mHierarchyAnalyser, TQ_SLOT(slotNextKey(const GpgME::Key&)) ); + connect( job, TQ_SIGNAL(result(const GpgME::KeyListResult&)), + this, TQ_SLOT(slotDeleteCertificate()) ); connectJobToStatusBarProgress( job, i18n("Checking key dependencies...") ); if ( const GpgME::Error error = job->start( TQStringList() ) ) { showKeyListError( this, error ); @@ -1110,8 +1110,8 @@ void CertManager::slotDeleteCertificate() { Kleo::MultiDeleteJob * job = new Kleo::MultiDeleteJob( Kleo::CryptoBackendFactory::instance()->smime() ); assert( job ); - connect( job, TQT_SIGNAL(result(const GpgME::Error&,const GpgME::Key&)), - TQT_SLOT(slotDeleteResult(const GpgME::Error&,const GpgME::Key&)) ); + connect( job, TQ_SIGNAL(result(const GpgME::Error&,const GpgME::Key&)), + TQ_SLOT(slotDeleteResult(const GpgME::Error&,const GpgME::Key&)) ); connectJobToStatusBarProgress( job, i18n("Deleting keys...") ); @@ -1156,8 +1156,8 @@ void CertManager::slotViewDetails( Kleo::KeyListViewItem * item ) { CertificateInfoWidgetImpl * top = new CertificateInfoWidgetImpl( item->key(), isRemote(), dialog ); dialog->setMainWidget( top ); // </UGH> - connect( top, TQT_SIGNAL(requestCertificateDownload(const TQString&, const TQString&)), - TQT_SLOT(slotStartCertificateDownload(const TQString&, const TQString&)) ); + connect( top, TQ_SIGNAL(requestCertificateDownload(const TQString&, const TQString&)), + TQ_SLOT(slotStartCertificateDownload(const TQString&, const TQString&)) ); dialog->show(); } @@ -1219,8 +1219,8 @@ void CertManager::startCertificateExport( const TQStringList & fingerprints ) { Kleo::ExportJob * job = Kleo::CryptoBackendFactory::instance()->smime()->publicKeyExportJob( true ); assert( job ); - connect( job, TQT_SIGNAL(result(const GpgME::Error&,const TQByteArray&)), - TQT_SLOT(slotCertificateExportResult(const GpgME::Error&,const TQByteArray&)) ); + connect( job, TQ_SIGNAL(result(const GpgME::Error&,const TQByteArray&)), + TQ_SLOT(slotCertificateExportResult(const GpgME::Error&,const TQByteArray&)) ); connectJobToStatusBarProgress( job, i18n("Exporting certificate...") ); @@ -1271,8 +1271,8 @@ void CertManager::slotCertificateExportResult( const GpgME::Error & err, const T TDEIO::Job* uploadJob = TDEIOext::put( data, url, -1, overwrite, false /*resume*/ ); uploadJob->setWindow( this ); - connect( uploadJob, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( slotUploadResult( TDEIO::Job* ) ) ); + connect( uploadJob, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( slotUploadResult( TDEIO::Job* ) ) ); } @@ -1356,8 +1356,8 @@ void CertManager::startSecretKeyExport( const TQString & fingerprint ) { Kleo::ExportJob * job = Kleo::CryptoBackendFactory::instance()->smime()->secretKeyExportJob( false, charset ); assert( job ); - connect( job, TQT_SIGNAL(result(const GpgME::Error&,const TQByteArray&)), - TQT_SLOT(slotSecretKeyExportResult(const GpgME::Error&,const TQByteArray&)) ); + connect( job, TQ_SIGNAL(result(const GpgME::Error&,const TQByteArray&)), + TQ_SLOT(slotSecretKeyExportResult(const GpgME::Error&,const TQByteArray&)) ); connectJobToStatusBarProgress( job, i18n("Exporting secret key...") ); @@ -1390,8 +1390,8 @@ void CertManager::slotSecretKeyExportResult( const GpgME::Error & err, const TQB TDEIO::Job* uploadJob = TDEIOext::put( data, url, -1, overwrite, false /*resume*/ ); uploadJob->setWindow( this ); - connect( uploadJob, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( slotUploadResult( TDEIO::Job* ) ) ); + connect( uploadJob, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( slotUploadResult( TDEIO::Job* ) ) ); } void CertManager::slotUploadResult( TDEIO::Job* job ) diff --git a/certmanager/conf/appearanceconfigpage.cpp b/certmanager/conf/appearanceconfigpage.cpp index 087e237e..49723f4d 100644 --- a/certmanager/conf/appearanceconfigpage.cpp +++ b/certmanager/conf/appearanceconfigpage.cpp @@ -44,7 +44,7 @@ AppearanceConfigurationPage::AppearanceConfigurationPage( TQWidget * parent, con TQVBoxLayout* lay = new TQVBoxLayout( this ); mWidget = new Kleo::AppearanceConfigWidget( this ); lay->addWidget( mWidget ); - connect( mWidget, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotChanged() ) ); + connect( mWidget, TQ_SIGNAL( changed() ), this, TQ_SLOT( slotChanged() ) ); #ifndef HAVE_UNBROKEN_KCMULTIDIALOG load(); diff --git a/certmanager/conf/dirservconfigpage.cpp b/certmanager/conf/dirservconfigpage.cpp index 43373e72..ad2e6099 100644 --- a/certmanager/conf/dirservconfigpage.cpp +++ b/certmanager/conf/dirservconfigpage.cpp @@ -146,7 +146,7 @@ DirectoryServicesConfigurationPage::DirectoryServicesConfigurationPage( TQWidget Kleo::CryptoConfigEntry::ArgType_LDAPURL, true ); mWidget = new Kleo::DirectoryServicesWidget( entry, this ); lay->addWidget( mWidget ); - connect( mWidget, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotChanged() ) ); + connect( mWidget, TQ_SIGNAL( changed() ), this, TQ_SLOT( slotChanged() ) ); // LDAP timeout TQHBox* box = new TQHBox( this ); @@ -155,7 +155,7 @@ DirectoryServicesConfigurationPage::DirectoryServicesConfigurationPage( TQWidget TQLabel* label = new TQLabel( i18n( "LDAP &timeout (minutes:seconds)" ), box ); mTimeout = new TQTimeEdit( box ); mTimeout->setDisplay( TQTimeEdit::Minutes | TQTimeEdit::Seconds ); - connect( mTimeout, TQT_SIGNAL( valueChanged( const TQTime& ) ), this, TQT_SLOT( slotChanged() ) ); + connect( mTimeout, TQ_SIGNAL( valueChanged( const TQTime& ) ), this, TQ_SLOT( slotChanged() ) ); label->setBuddy( mTimeout ); TQWidget* stretch = new TQWidget( box ); box->setStretchFactor( stretch, 2 ); @@ -167,13 +167,13 @@ DirectoryServicesConfigurationPage::DirectoryServicesConfigurationPage( TQWidget mMaxItems = new KIntNumInput( box ); mMaxItems->setLabel( i18n( "&Maximum number of items returned by query" ), TQt::AlignLeft | TQt::AlignVCenter ); mMaxItems->setMinValue( 0 ); - connect( mMaxItems, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( slotChanged() ) ); + connect( mMaxItems, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( slotChanged() ) ); stretch = new TQWidget( box ); box->setStretchFactor( stretch, 2 ); #ifdef NOT_USEFUL_CURRENTLY mAddNewServersCB = new TQCheckBox( i18n( "Automatically add &new servers discovered in CRL distribution points" ), this ); - connect( mAddNewServersCB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChanged() ) ); + connect( mAddNewServersCB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotChanged() ) ); lay->addWidget( mAddNewServersCB ); #endif diff --git a/certmanager/conf/dnorderconfigpage.cpp b/certmanager/conf/dnorderconfigpage.cpp index 18668684..5c2d6c20 100644 --- a/certmanager/conf/dnorderconfigpage.cpp +++ b/certmanager/conf/dnorderconfigpage.cpp @@ -45,7 +45,7 @@ DNOrderConfigPage::DNOrderConfigPage( TQWidget * parent, const char * name ) mWidget = Kleo::DNAttributeMapper::instance()->configWidget( this, "mWidget" ); vlay->addWidget( mWidget ); - connect( mWidget, TQT_SIGNAL(changed()), TQT_SLOT(slotChanged()) ); + connect( mWidget, TQ_SIGNAL(changed()), TQ_SLOT(slotChanged()) ); #ifndef HAVE_UNBROKEN_KCMULTIDIALOG load(); diff --git a/certmanager/crlview.cpp b/certmanager/crlview.cpp index f94a4557..2cefe045 100644 --- a/certmanager/crlview.cpp +++ b/certmanager/crlview.cpp @@ -71,16 +71,16 @@ CRLView::CRLView( TQWidget* parent, const char* name, bool modal ) hbLayout->addWidget( _closeButton ); // connections: - connect( _updateButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotUpdateView() ) ); - connect( _closeButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( close() ) ); + connect( _updateButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotUpdateView() ) ); + connect( _closeButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( close() ) ); resize( _textView->fontMetrics().width( 'M' ) * 80, _textView->fontMetrics().lineSpacing() * 25 ); _timer = new TQTimer( this ); - connect( _timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotAppendBuffer()) ); + connect( _timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotAppendBuffer()) ); } CRLView::~CRLView() @@ -101,10 +101,10 @@ void CRLView::slotUpdateView() if( _process == 0 ) { _process = new TDEProcess(); *_process << "gpgsm" << "--call-dirmngr" << "listcrls"; - connect( _process, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int) ), - this, TQT_SLOT( slotReadStdout( TDEProcess*, char*, int ) ) ); - connect( _process, TQT_SIGNAL( processExited( TDEProcess* ) ), - this, TQT_SLOT( slotProcessExited() ) ); + connect( _process, TQ_SIGNAL( receivedStdout( TDEProcess*, char*, int) ), + this, TQ_SLOT( slotReadStdout( TDEProcess*, char*, int ) ) ); + connect( _process, TQ_SIGNAL( processExited( TDEProcess* ) ), + this, TQ_SLOT( slotProcessExited() ) ); } if( _process->isRunning() ) _process->kill(); if( !_process->start( TDEProcess::NotifyOnExit, TDEProcess::Stdout ) ) { diff --git a/certmanager/customactions.cpp b/certmanager/customactions.cpp index bf637538..9c88491e 100644 --- a/certmanager/customactions.cpp +++ b/certmanager/customactions.cpp @@ -55,7 +55,7 @@ int LabelAction::plug( TQWidget * widget, int index ) { TQLabel* label = new TQLabel( text(), bar, "tde toolbar widget" ); bar->insertWidget( id_, label->width(), label, index ); addContainer( bar, id_ ); - connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); return containerCount() - 1; } @@ -82,8 +82,8 @@ int LineEditAction::plug( TQWidget * widget, int index ) { bar->insertWidget( id_, _le->width(), _le, index ); bar->setStretchableWidget( _le ); addContainer( bar, id_ ); - connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); - connect( _le, TQT_SIGNAL( returnPressed() ), _receiver, _member ); + connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); + connect( _le, TQ_SIGNAL( returnPressed() ), _receiver, _member ); return containerCount() - 1; } @@ -123,10 +123,10 @@ int ComboAction::plug( TQWidget * widget, int index ) { if ( widget->inherits( "TDEToolBar" ) ) { TDEToolBar *bar = (TDEToolBar *)widget; int id_ = getToolButtonID(); - bar->insertCombo( _lst, id_, false, TQT_SIGNAL( highlighted(int) ), _receiver, _member ); + bar->insertCombo( _lst, id_, false, TQ_SIGNAL( highlighted(int) ), _receiver, _member ); bar->setCurrentComboItem( id_,_selectedId ); addContainer( bar, id_ ); - connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); return containerCount() - 1; } diff --git a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp index 6b186178..25b7dc06 100644 --- a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp +++ b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp @@ -93,13 +93,13 @@ KWatchGnuPGConfig::KWatchGnuPGConfig( TQWidget* parent, const char* name ) mExeED = new KURLRequester( w ); glay->addWidget( new TQLabel( mExeED, i18n("&Executable:"), w ), row, 0 ); glay->addWidget( mExeED, row, 1 ); - connect( mExeED, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged()) ); + connect( mExeED, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged()) ); ++row; mSocketED = new KURLRequester( w ); glay->addWidget( new TQLabel( mSocketED, i18n("&Socket:"), w ), row, 0 ); glay->addWidget( mSocketED, row, 1 ); - connect( mSocketED, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged()) ); + connect( mSocketED, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged()) ); ++row; mLogLevelCB = new TQComboBox( false, w ); @@ -110,7 +110,7 @@ KWatchGnuPGConfig::KWatchGnuPGConfig( TQWidget* parent, const char* name ) mLogLevelCB->insertItem( i18n("Guru") ); glay->addWidget( new TQLabel( mLogLevelCB, i18n("Default &log level:"), w ), row, 0 ); glay->addWidget( mLogLevelCB, row, 1 ); - connect( mLogLevelCB, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChanged()) ); + connect( mLogLevelCB, TQ_SIGNAL(activated(int)), TQ_SLOT(slotChanged()) ); vlay->addWidget( group ); @@ -134,21 +134,21 @@ KWatchGnuPGConfig::KWatchGnuPGConfig( TQWidget* parent, const char* name ) TQPushButton * button = new TQPushButton( i18n("Set &Unlimited"), w ); glay->addWidget( button, row, 2 ); - connect( mLoglenSB, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotChanged()) ); - connect( button, TQT_SIGNAL(clicked()), TQT_SLOT(slotSetHistorySizeUnlimited()) ); + connect( mLoglenSB, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotChanged()) ); + connect( button, TQ_SIGNAL(clicked()), TQ_SLOT(slotSetHistorySizeUnlimited()) ); ++row; mWordWrapCB = new TQCheckBox( i18n("Enable &word wrapping"), w ); mWordWrapCB->hide(); // TQTextEdit doesn't support word wrapping in LogText mode glay->addMultiCellWidget( mWordWrapCB, row, row, 0, 2 ); - connect( mWordWrapCB, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()) ); + connect( mWordWrapCB, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged()) ); vlay->addWidget( group ); vlay->addStretch( 1 ); - connect( this, TQT_SIGNAL(applyClicked()), TQT_SLOT(slotSave()) ); - connect( this, TQT_SIGNAL(okClicked()), TQT_SLOT(slotSave()) ); + connect( this, TQ_SIGNAL(applyClicked()), TQ_SLOT(slotSave()) ); + connect( this, TQ_SIGNAL(okClicked()), TQ_SLOT(slotSave()) ); } void KWatchGnuPGConfig::slotSetHistorySizeUnlimited() { diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp index d3b262b3..ef189a6e 100644 --- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp +++ b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp @@ -69,16 +69,16 @@ KWatchGnuPGMainWindow::KWatchGnuPGMainWindow( TQWidget* parent, const char* name setCentralWidget( mCentralWidget ); mWatcher = new KProcIO( TQTextCodec::codecForMib( 106 /*utf-8*/ ) ); - connect( mWatcher, TQT_SIGNAL( processExited(TDEProcess*) ), - this, TQT_SLOT( slotWatcherExited() ) ); - connect( mWatcher, TQT_SIGNAL( readReady(KProcIO*) ), - this, TQT_SLOT( slotReadStdout() ) ); + connect( mWatcher, TQ_SIGNAL( processExited(TDEProcess*) ), + this, TQ_SLOT( slotWatcherExited() ) ); + connect( mWatcher, TQ_SIGNAL( readReady(KProcIO*) ), + this, TQ_SLOT( slotReadStdout() ) ); slotReadConfig(); mSysTray = new KWatchGnuPGTray( this ); mSysTray->show(); - connect( mSysTray, TQT_SIGNAL( quitSelected() ), - this, TQT_SLOT( slotQuit() ) ); + connect( mSysTray, TQ_SIGNAL( quitSelected() ), + this, TQ_SLOT( slotQuit() ) ); setAutoSaveSettings(); } @@ -96,18 +96,18 @@ void KWatchGnuPGMainWindow::slotClear() void KWatchGnuPGMainWindow::createActions() { (void)new TDEAction( i18n("C&lear History"), "history_clear", CTRL+Key_L, - this, TQT_SLOT( slotClear() ), + this, TQ_SLOT( slotClear() ), actionCollection(), "clear_log" ); - (void)KStdAction::saveAs( this, TQT_SLOT(slotSaveAs()), actionCollection() ); - (void)KStdAction::close( this, TQT_SLOT(close()), actionCollection() ); - (void)KStdAction::quit( this, TQT_SLOT(slotQuit()), actionCollection() ); - (void)KStdAction::preferences( this, TQT_SLOT(slotConfigure()), actionCollection() ); - (void)KStdAction::keyBindings(this, TQT_SLOT(configureShortcuts()), actionCollection()); - (void)KStdAction::configureToolbars(this, TQT_SLOT(slotConfigureToolbars()), actionCollection()); + (void)KStdAction::saveAs( this, TQ_SLOT(slotSaveAs()), actionCollection() ); + (void)KStdAction::close( this, TQ_SLOT(close()), actionCollection() ); + (void)KStdAction::quit( this, TQ_SLOT(slotQuit()), actionCollection() ); + (void)KStdAction::preferences( this, TQ_SLOT(slotConfigure()), actionCollection() ); + (void)KStdAction::keyBindings(this, TQ_SLOT(configureShortcuts()), actionCollection()); + (void)KStdAction::configureToolbars(this, TQ_SLOT(slotConfigureToolbars()), actionCollection()); #if 0 (void)new TDEAction( i18n("Configure KWatchGnuPG..."), TQString::fromLatin1("configure"), - 0, this, TQT_SLOT( slotConfigure() ), + 0, this, TQ_SLOT( slotConfigure() ), actionCollection(), "configure" ); #endif @@ -127,8 +127,8 @@ void KWatchGnuPGMainWindow::slotConfigureToolbars() void KWatchGnuPGMainWindow::startWatcher() { - disconnect( mWatcher, TQT_SIGNAL( processExited(TDEProcess*) ), - this, TQT_SLOT( slotWatcherExited() ) ); + disconnect( mWatcher, TQ_SIGNAL( processExited(TDEProcess*) ), + this, TQ_SLOT( slotWatcherExited() ) ); if( mWatcher->isRunning() ) { mWatcher->kill(); while( mWatcher->isRunning() ) { @@ -150,8 +150,8 @@ void KWatchGnuPGMainWindow::startWatcher() mCentralWidget->append( i18n("[%1] Log started") .arg( TQDateTime::currentDateTime().toString(TQt::ISODate) ) ); } - connect( mWatcher, TQT_SIGNAL( processExited(TDEProcess*) ), - this, TQT_SLOT( slotWatcherExited() ) ); + connect( mWatcher, TQ_SIGNAL( processExited(TDEProcess*) ), + this, TQ_SLOT( slotWatcherExited() ) ); } void KWatchGnuPGMainWindow::setGnuPGConfig() @@ -213,7 +213,7 @@ void KWatchGnuPGMainWindow::slotReadStdout() mSysTray->setAttention(true); } } - TQTimer::singleShot( 0, this, TQT_SLOT(slotAckRead()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotAckRead()) ); } void KWatchGnuPGMainWindow::slotAckRead() { @@ -251,8 +251,8 @@ void KWatchGnuPGMainWindow::slotSaveAs() void KWatchGnuPGMainWindow::slotQuit() { - disconnect( mWatcher, TQT_SIGNAL( processExited(TDEProcess*) ), - this, TQT_SLOT( slotWatcherExited() ) ); + disconnect( mWatcher, TQ_SIGNAL( processExited(TDEProcess*) ), + this, TQ_SLOT( slotWatcherExited() ) ); mWatcher->kill(); kapp->quit(); } @@ -261,8 +261,8 @@ void KWatchGnuPGMainWindow::slotConfigure() { if( !mConfig ) { mConfig = new KWatchGnuPGConfig( this, "config dialog" ); - connect( mConfig, TQT_SIGNAL( reconfigure() ), - this, TQT_SLOT( slotReadConfig() ) ); + connect( mConfig, TQ_SIGNAL( reconfigure() ), + this, TQ_SLOT( slotReadConfig() ) ); } mConfig->loadConfig(); mConfig->exec(); diff --git a/certmanager/lib/backends/chiasmus/chiasmusjob.cpp b/certmanager/lib/backends/chiasmus/chiasmusjob.cpp index 265d759b..5c49478e 100644 --- a/certmanager/lib/backends/chiasmus/chiasmusjob.cpp +++ b/certmanager/lib/backends/chiasmus/chiasmusjob.cpp @@ -90,7 +90,7 @@ GpgME::Error Kleo::ChiasmusJob::setup() { : SymCryptRunProcessBase::Decrypt, this, "symcryptrun" ); TQTimer::singleShot( timeoutEntry->uintValue() * 1000, this, - TQT_SLOT( slotTimeout() ) ); + TQ_SLOT( slotTimeout() ) ); return 0; } @@ -110,8 +110,8 @@ GpgME::Error Kleo::ChiasmusJob::start() { if ( const GpgME::Error err = setup() ) return mError = err; - connect( mSymCryptRun, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotProcessExited(TDEProcess*)) ); + connect( mSymCryptRun, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotProcessExited(TDEProcess*)) ); if ( !mSymCryptRun->launch( mInput ) ) return mError = gpg_error( GPG_ERR_ENOENT ); // what else? diff --git a/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp b/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp index d7ae22c1..90f51243 100644 --- a/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp +++ b/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp @@ -70,7 +70,7 @@ Kleo::ObtainKeysJob::ObtainKeysJob() Kleo::ObtainKeysJob::~ObtainKeysJob() {} GpgME::Error Kleo::ObtainKeysJob::start() { - TQTimer::singleShot( 0, this, TQT_SLOT(slotPerform()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotPerform()) ); return mError = 0; } @@ -109,7 +109,7 @@ void Kleo::ObtainKeysJob::slotPerform( bool async ) { ++mIndex; if ( async ) - TQTimer::singleShot( 0, this, TQT_SLOT(slotPerform()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotPerform()) ); else slotPerform( false ); } diff --git a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp index 9391f023..34ac1d66 100644 --- a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp +++ b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp @@ -58,10 +58,10 @@ Kleo::SymCryptRunProcessBase::SymCryptRunProcessBase( const TQString & class_, c Kleo::SymCryptRunProcessBase::~SymCryptRunProcessBase() {} bool Kleo::SymCryptRunProcessBase::launch( const TQByteArray & input, RunMode rm ) { - connect( this, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), - this, TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int)) ); - connect( this, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), - this, TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int)) ); + connect( this, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + this, TQ_SLOT(slotReceivedStdout(TDEProcess*,char*,int)) ); + connect( this, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + this, TQ_SLOT(slotReceivedStderr(TDEProcess*,char*,int)) ); if ( rm == Block ) { KTempFile tempfile; tempfile.setAutoDelete( true ); @@ -80,7 +80,7 @@ bool Kleo::SymCryptRunProcessBase::launch( const TQByteArray & input, RunMode rm return ok; mInput = input.copy(); writeStdin( mInput.begin(), mInput.size() ); - connect( this, TQT_SIGNAL(wroteStdin(TDEProcess*)), this, TQT_SLOT(closeStdin()) ); + connect( this, TQ_SIGNAL(wroteStdin(TDEProcess*)), this, TQ_SLOT(closeStdin()) ); return true; } } diff --git a/certmanager/lib/backends/kpgp/kpgpkeylistjob.cpp b/certmanager/lib/backends/kpgp/kpgpkeylistjob.cpp index 3d28ac4b..5ab83715 100644 --- a/certmanager/lib/backends/kpgp/kpgpkeylistjob.cpp +++ b/certmanager/lib/backends/kpgp/kpgpkeylistjob.cpp @@ -264,7 +264,7 @@ GpgME::Error Kleo::KpgpKeyListJob::start( const TQStringList & patterns, bool secretOnly ) { mPatterns = patterns; mSecretOnly = secretOnly; - TQTimer::singleShot( 0, this, TQT_SLOT( slotDoIt() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotDoIt() ) ); return GpgME::Error( 0 ); } diff --git a/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp b/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp index bfd00ac9..e0da7eca 100644 --- a/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp +++ b/certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp @@ -113,7 +113,7 @@ int Kleo::GnuPGProcessBase::commSetupDoneP() { if ( d->usetStatusFD ) { ::close( d->statusFD[1] ); // close the input end of the pipe, we're the reader d->statnot = new TQSocketNotifier( d->statusFD[0], TQSocketNotifier::Read, this ); - connect( d->statnot, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChildStatus(int)) ); + connect( d->statnot, TQ_SIGNAL(activated(int)), TQ_SLOT(slotChildStatus(int)) ); } return TDEProcess::commSetupDoneP(); } diff --git a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp index e73b4363..2b81c6b1 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp @@ -75,8 +75,8 @@ void QGpgMECryptoConfig::runGpgConf( bool showErrors ) proc << "gpgconf"; // must be in the PATH proc << "--list-components"; - TQObject::connect( &proc, TQT_SIGNAL( readReady(KProcIO*) ), - this, TQT_SLOT( slotCollectStdOut(KProcIO*) ) ); + TQObject::connect( &proc, TQ_SIGNAL( readReady(KProcIO*) ), + this, TQ_SLOT( slotCollectStdOut(KProcIO*) ) ); // run the process: int rc = 0; @@ -173,8 +173,8 @@ void QGpgMECryptoConfigComponent::runGpgConf() //kdDebug(5150) << "Running gpgconf --list-options " << mName << endl; - TQObject::connect( &proc, TQT_SIGNAL( readReady(KProcIO*) ), - this, TQT_SLOT( slotCollectStdOut(KProcIO*) ) ); + TQObject::connect( &proc, TQ_SIGNAL( readReady(KProcIO*) ), + this, TQ_SLOT( slotCollectStdOut(KProcIO*) ) ); mCurrentGroup = 0; // run the process: diff --git a/certmanager/lib/backends/qgpgme/qgpgmejob.cpp b/certmanager/lib/backends/qgpgme/qgpgmejob.cpp index 947a5258..71fe0b57 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmejob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmejob.cpp @@ -96,8 +96,8 @@ Kleo::QGpgMEJob::QGpgMEJob( Kleo::Job * _this, GpgME::Context * context ) { InvarianceChecker check( this ); assert( context ); - TQObject::connect( QGpgME::EventLoopInteractor::instance(), TQT_SIGNAL(aboutToDestroy()), - _this, TQT_SLOT(slotCancel()) ); + TQObject::connect( QGpgME::EventLoopInteractor::instance(), TQ_SIGNAL(aboutToDestroy()), + _this, TQ_SLOT(slotCancel()) ); context->setProgressProvider( this ); // (mmutz) work around a gpgme bug in versions at least <= 0.9.0. // These versions will return GPG_ERR_NOT_IMPLEMENTED from @@ -153,8 +153,8 @@ void Kleo::QGpgMEJob::deleteAllPatterns() { void Kleo::QGpgMEJob::hookupContextToEventLoopInteractor() { mCtx->setManagedByEventLoopInteractor( true ); TQObject::connect( QGpgME::EventLoopInteractor::instance(), - TQT_SIGNAL(operationDoneEventSignal(GpgME::Context*,const GpgME::Error&)), - mThis, TQT_SLOT(slotOperationDoneEvent(GpgME::Context*,const GpgME::Error&)) ); + TQ_SIGNAL(operationDoneEventSignal(GpgME::Context*,const GpgME::Error&)), + mThis, TQ_SLOT(slotOperationDoneEvent(GpgME::Context*,const GpgME::Error&)) ); } void Kleo::QGpgMEJob::setPatterns( const TQStringList & sl, bool allowEmpty ) { diff --git a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp index 5561625c..25edaf84 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp @@ -79,8 +79,8 @@ GpgME::Error Kleo::QGpgMEKeyListJob::start( const TQStringList & pats, bool secr hookupContextToEventLoopInteractor(); connect( QGpgME::EventLoopInteractor::instance(), - TQT_SIGNAL(nextKeyEventSignal(GpgME::Context*,const GpgME::Key&)), - TQT_SLOT(slotNextKeyEvent(GpgME::Context*,const GpgME::Key&)) ); + TQ_SIGNAL(nextKeyEventSignal(GpgME::Context*,const GpgME::Key&)), + TQ_SLOT(slotNextKeyEvent(GpgME::Context*,const GpgME::Key&)) ); // The communication channel between gpgme and gpgsm is limited in // the number of patterns that can be transported, but they won't @@ -100,7 +100,7 @@ GpgME::Error Kleo::QGpgMEKeyListJob::start( const TQStringList & pats, bool secr } } else if ( err.code() == GPG_ERR_EOF ) { kdDebug(5150) << "QGpgMEKeyListJob::start(): early end of keylisting, trying to fake an empty result" << endl; - TQTimer::singleShot( 10, this, TQT_SLOT(slotFakeOperationDoneEvent()) ); + TQTimer::singleShot( 10, this, TQ_SLOT(slotFakeOperationDoneEvent()) ); return GpgME::Error(); } deleteLater(); diff --git a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp index 6d05e1ec..8088d28a 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp @@ -107,12 +107,12 @@ GpgME::Error Kleo::QGpgMERefreshKeysJob::startAProcess() { mProcess->setUsetStatusFD( true ); - connect( mProcess, TQT_SIGNAL(processExited(TDEProcess*)), - TQT_SLOT(slotProcessExited(TDEProcess*)) ); - connect( mProcess, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), - TQT_SLOT(slotStderr(TDEProcess*,char*,int)) ); - connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)), - TQT_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) ); + connect( mProcess, TQ_SIGNAL(processExited(TDEProcess*)), + TQ_SLOT(slotProcessExited(TDEProcess*)) ); + connect( mProcess, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + TQ_SLOT(slotStderr(TDEProcess*,char*,int)) ); + connect( mProcess, TQ_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)), + TQ_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) ); if ( !mProcess->start( TDEProcess::NotifyOnExit, TDEProcess::Stderr ) ) { mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_ENOENT ); // what else? diff --git a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp index f553c703..af72a539 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp @@ -88,14 +88,14 @@ GpgME::Error Kleo::QGpgMESecretKeyExportJob::start( const TQStringList & pattern mProcess->setUsetStatusFD( true ); - connect( mProcess, TQT_SIGNAL(processExited(TDEProcess*)), - TQT_SLOT(slotProcessExited(TDEProcess*)) ); - connect( mProcess, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), - TQT_SLOT(slotStdout(TDEProcess*,char*,int)) ); - connect( mProcess, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), - TQT_SLOT(slotStderr(TDEProcess*,char*,int)) ); - connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)), - TQT_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) ); + connect( mProcess, TQ_SIGNAL(processExited(TDEProcess*)), + TQ_SLOT(slotProcessExited(TDEProcess*)) ); + connect( mProcess, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + TQ_SLOT(slotStdout(TDEProcess*,char*,int)) ); + connect( mProcess, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + TQ_SLOT(slotStderr(TDEProcess*,char*,int)) ); + connect( mProcess, TQ_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)), + TQ_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) ); if ( !mProcess->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_ENOENT ); // what else? diff --git a/certmanager/lib/kleo/hierarchicalkeylistjob.cpp b/certmanager/lib/kleo/hierarchicalkeylistjob.cpp index 65b59725..03bb267f 100644 --- a/certmanager/lib/kleo/hierarchicalkeylistjob.cpp +++ b/certmanager/lib/kleo/hierarchicalkeylistjob.cpp @@ -142,8 +142,8 @@ GpgME::Error Kleo::HierarchicalKeyListJob::startAJob() { assert( mJob ); // FIXME: we need a way to generate errors ourselves, // but I don't like the dependency on gpg-error :/ - connect( mJob, TQT_SIGNAL(nextKey(const GpgME::Key&)), TQT_SLOT(slotNextKey(const GpgME::Key&)) ); - connect( mJob, TQT_SIGNAL(result(const GpgME::KeyListResult&)), TQT_SLOT(slotResult(const GpgME::KeyListResult&)) ); + connect( mJob, TQ_SIGNAL(nextKey(const GpgME::Key&)), TQ_SLOT(slotNextKey(const GpgME::Key&)) ); + connect( mJob, TQ_SIGNAL(result(const GpgME::KeyListResult&)), TQ_SLOT(slotResult(const GpgME::KeyListResult&)) ); TQStringList patterns; for ( std::set<TQString>::const_iterator it = mNextSet.begin() ; it != mNextSet.end() ; ++it ) diff --git a/certmanager/lib/kleo/job.cpp b/certmanager/lib/kleo/job.cpp index 907a7448..eb638592 100644 --- a/certmanager/lib/kleo/job.cpp +++ b/certmanager/lib/kleo/job.cpp @@ -63,7 +63,7 @@ Kleo::Job::Job( TQObject * parent, const char * name ) : TQObject( parent, name ) { if ( tqApp ) - connect( tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(slotCancel()) ); + connect( tqApp, TQ_SIGNAL(aboutToQuit()), TQ_SLOT(slotCancel()) ); } Kleo::Job::~Job() { diff --git a/certmanager/lib/kleo/keyfiltermanager.cpp b/certmanager/lib/kleo/keyfiltermanager.cpp index 1aa2b170..2c5b5a35 100644 --- a/certmanager/lib/kleo/keyfiltermanager.cpp +++ b/certmanager/lib/kleo/keyfiltermanager.cpp @@ -73,7 +73,7 @@ Kleo::KeyFilterManager::KeyFilterManager( TQObject * parent, const char * name ) d = new Private(); // ### DF: doesn't a KStaticDeleter work more reliably? if ( tqApp ) - connect( tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(deleteLater()) ); + connect( tqApp, TQ_SIGNAL(aboutToQuit()), TQ_SLOT(deleteLater()) ); reload(); } diff --git a/certmanager/lib/kleo/multideletejob.cpp b/certmanager/lib/kleo/multideletejob.cpp index 7c83c24b..9aafdd79 100644 --- a/certmanager/lib/kleo/multideletejob.cpp +++ b/certmanager/lib/kleo/multideletejob.cpp @@ -102,7 +102,7 @@ GpgME::Error Kleo::MultiDeleteJob::startAJob() { assert( mJob ); // FIXME: we need a way to generate errors ourselves, // but I don't like the dependency on gpg-error :/ - connect( mJob, TQT_SIGNAL(result(const GpgME::Error&)), TQT_SLOT(slotResult(const GpgME::Error&)) ); + connect( mJob, TQ_SIGNAL(result(const GpgME::Error&)), TQ_SLOT(slotResult(const GpgME::Error&)) ); return mJob->start( *mIt, mAllowSecretKeyDeletion ); } diff --git a/certmanager/lib/tests/test_gnupgprocessbase.cpp b/certmanager/lib/tests/test_gnupgprocessbase.cpp index 01e5d109..3fdc9938 100644 --- a/certmanager/lib/tests/test_gnupgprocessbase.cpp +++ b/certmanager/lib/tests/test_gnupgprocessbase.cpp @@ -62,14 +62,14 @@ void GnuPGViewer::setProcess( Kleo::GnuPGProcessBase * process ) { if ( !process ) return; mProcess = process; - connect( mProcess, TQT_SIGNAL(processExited(TDEProcess*)), - TQT_SLOT(slotProcessExited(TDEProcess*)) ); - connect( mProcess, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), - TQT_SLOT(slotStdout(TDEProcess*,char*,int)) ); - connect( mProcess, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), - TQT_SLOT(slotStderr(TDEProcess*,char*,int)) ); - connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)), - TQT_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) ); + connect( mProcess, TQ_SIGNAL(processExited(TDEProcess*)), + TQ_SLOT(slotProcessExited(TDEProcess*)) ); + connect( mProcess, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + TQ_SLOT(slotStdout(TDEProcess*,char*,int)) ); + connect( mProcess, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + TQ_SLOT(slotStderr(TDEProcess*,char*,int)) ); + connect( mProcess, TQ_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)), + TQ_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) ); } static TQStringList split( char * buffer, int buflen, TQString & old ) { diff --git a/certmanager/lib/tests/test_keygen.cpp b/certmanager/lib/tests/test_keygen.cpp index b678e29d..ef8f8878 100644 --- a/certmanager/lib/tests/test_keygen.cpp +++ b/certmanager/lib/tests/test_keygen.cpp @@ -96,7 +96,7 @@ KeyGenerator::KeyGenerator( TQWidget * parent, const char * name, WFlags ) glay->setRowStretch( row, 1 ); glay->setColStretch( 1, 1 ); - connect( this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(slotStartKeyGeneration()) ); + connect( this, TQ_SIGNAL(user1Clicked()), TQ_SLOT(slotStartKeyGeneration()) ); } KeyGenerator::~KeyGenerator() {} @@ -118,8 +118,8 @@ void KeyGenerator::slotStartKeyGeneration() { Kleo::KeyGenerationJob * job = proto->keyGenerationJob(); assert( job ); - connect( job, TQT_SIGNAL(result(const GpgME::KeyGenerationResult&,const TQByteArray&)), - TQT_SLOT(slotResult(const GpgME::KeyGenerationResult&,const TQByteArray&)) ); + connect( job, TQ_SIGNAL(result(const GpgME::KeyGenerationResult&,const TQByteArray&)), + TQ_SLOT(slotResult(const GpgME::KeyGenerationResult&,const TQByteArray&)) ); const GpgME::Error err = job->start( params ); if ( err ) diff --git a/certmanager/lib/tests/test_keylister.cpp b/certmanager/lib/tests/test_keylister.cpp index 0e357b59..38b9085b 100644 --- a/certmanager/lib/tests/test_keylister.cpp +++ b/certmanager/lib/tests/test_keylister.cpp @@ -115,10 +115,10 @@ void CertListView::slotStart() { kdDebug() << "CertListView::slotStart()" << endl; Kleo::KeyListJob * job = Kleo::CryptoBackendFactory::instance()->smime()->keyListJob( false ); assert( job ); - TQObject::connect( job, TQT_SIGNAL(nextKey(const GpgME::Key&)), - this, TQT_SLOT(slotAddKey(const GpgME::Key&)) ); - TQObject::connect( job, TQT_SIGNAL(result(const GpgME::KeyListResult&)), - this, TQT_SLOT(slotResult(const GpgME::KeyListResult&)) ); + TQObject::connect( job, TQ_SIGNAL(nextKey(const GpgME::Key&)), + this, TQ_SLOT(slotAddKey(const GpgME::Key&)) ); + TQObject::connect( job, TQ_SIGNAL(result(const GpgME::KeyListResult&)), + this, TQ_SLOT(slotResult(const GpgME::KeyListResult&)) ); #if 0 TQStringList l; l << "Marc"; @@ -138,7 +138,7 @@ int main( int argc, char** argv ) { app.setMainWidget( clv ); clv->show(); - TQTimer::singleShot( 5000, clv, TQT_SLOT(slotStart()) ); + TQTimer::singleShot( 5000, clv, TQ_SLOT(slotStart()) ); return app.exec(); } diff --git a/certmanager/lib/ui/backendconfigwidget.cpp b/certmanager/lib/ui/backendconfigwidget.cpp index 9d8f4d40..82db7d7a 100644 --- a/certmanager/lib/ui/backendconfigwidget.cpp +++ b/certmanager/lib/ui/backendconfigwidget.cpp @@ -215,8 +215,8 @@ Kleo::BackendConfigWidget::BackendConfigWidget( CryptoBackendFactory * factory, hlay->addWidget( d->listView, 1 ); - connect( d->listView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - TQT_SLOT(slotSelectionChanged(TQListViewItem*)) ); + connect( d->listView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + TQ_SLOT(slotSelectionChanged(TQListViewItem*)) ); TQVBoxLayout * vlay = new TQVBoxLayout( hlay ); // inherits spacing @@ -224,15 +224,15 @@ Kleo::BackendConfigWidget::BackendConfigWidget( CryptoBackendFactory * factory, d->configureButton->setAutoDefault( false ); vlay->addWidget( d->configureButton ); - connect( d->configureButton, TQT_SIGNAL(clicked()), - TQT_SLOT(slotConfigureButtonClicked()) ); + connect( d->configureButton, TQ_SIGNAL(clicked()), + TQ_SLOT(slotConfigureButtonClicked()) ); d->rescanButton = new TQPushButton( i18n("Rescan"), this ); d->rescanButton->setAutoDefault( false ); vlay->addWidget( d->rescanButton ); - connect( d->rescanButton, TQT_SIGNAL(clicked()), - TQT_SLOT(slotRescanButtonClicked()) ); + connect( d->rescanButton, TQ_SIGNAL(clicked()), + TQ_SLOT(slotRescanButtonClicked()) ); vlay->addStretch( 1 ); } @@ -306,7 +306,7 @@ void Kleo::BackendConfigWidget::slotConfigureButtonClicked() { // Tell other users of gpgconf (e.g. the s/mime page) that the gpgconf data might have changed kapp->dcopClient()->emitDCOPSignal( "KPIM::CryptoConfig", "changed()", TQByteArray() ); // and schedule a rescan, in case the updates make a backend valid - TQTimer::singleShot( 0, this, TQT_SLOT(slotRescanButtonClicked()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotRescanButtonClicked()) ); } } else // shouldn't happen, button is disabled diff --git a/certmanager/lib/ui/cryptoconfigdialog.cpp b/certmanager/lib/ui/cryptoconfigdialog.cpp index 4ec32cbb..40608ee1 100644 --- a/certmanager/lib/ui/cryptoconfigdialog.cpp +++ b/certmanager/lib/ui/cryptoconfigdialog.cpp @@ -44,7 +44,7 @@ Kleo::CryptoConfigDialog::CryptoConfigDialog( Kleo::CryptoConfig* config, TQWidg { mMainWidget = new CryptoConfigModule( config, this ); setMainWidget( mMainWidget ); - connect( mMainWidget, TQT_SIGNAL( changed() ), TQT_SLOT( slotChanged() ) ); + connect( mMainWidget, TQ_SIGNAL( changed() ), TQ_SLOT( slotChanged() ) ); enableButton( Apply, false ); if ( mMainWidget->hasError() ) { showButton( Default, false ); diff --git a/certmanager/lib/ui/cryptoconfigmodule.cpp b/certmanager/lib/ui/cryptoconfigmodule.cpp index cfe15442..c6e5594f 100644 --- a/certmanager/lib/ui/cryptoconfigmodule.cpp +++ b/certmanager/lib/ui/cryptoconfigmodule.cpp @@ -353,7 +353,7 @@ Kleo::CryptoConfigEntryGUI::CryptoConfigEntryGUI( const char* name ) : TQObject( module, name ), mEntry( entry ), mName( entryName ), mChanged( false ) { - connect( this, TQT_SIGNAL( changed() ), module, TQT_SIGNAL( changed() ) ); + connect( this, TQ_SIGNAL( changed() ), module, TQ_SIGNAL( changed() ) ); } TQString Kleo::CryptoConfigEntryGUI::description() const @@ -387,7 +387,7 @@ Kleo::CryptoConfigEntryLineEdit::CryptoConfigEntryLineEdit( label->setEnabled( false ); mLineEdit->setEnabled( false ); } else { - connect( mLineEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotChanged() ) ); + connect( mLineEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotChanged() ) ); } } @@ -419,7 +419,7 @@ Kleo::CryptoConfigEntryPath::CryptoConfigEntryPath( label->setEnabled( false ); mUrlRequester->setEnabled( false ); } else { - connect( mUrlRequester, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotChanged() ) ); + connect( mUrlRequester, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotChanged() ) ); } } @@ -453,7 +453,7 @@ Kleo::CryptoConfigEntryDirPath::CryptoConfigEntryDirPath( label->setEnabled( false ); mUrlRequester->setEnabled( false ); } else { - connect( mUrlRequester, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotChanged() ) ); + connect( mUrlRequester, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotChanged() ) ); } } @@ -488,7 +488,7 @@ Kleo::CryptoConfigEntryURL::CryptoConfigEntryURL( label->setEnabled( false ); mUrlRequester->setEnabled( false ); } else { - connect( mUrlRequester, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotChanged() ) ); + connect( mUrlRequester, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotChanged() ) ); } } @@ -532,7 +532,7 @@ Kleo::CryptoConfigEntrySpinBox::CryptoConfigEntrySpinBox( } else { if ( mKind == UInt || mKind == ListOfNone ) mNumInput->setMinValue( 0 ); - connect( mNumInput, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( slotChanged() ) ); + connect( mNumInput, TQ_SIGNAL( valueChanged(int) ), TQ_SLOT( slotChanged() ) ); } } @@ -584,7 +584,7 @@ Kleo::CryptoConfigEntryCheckBox::CryptoConfigEntryCheckBox( if ( entry->isReadOnly() ) { mCheckBox->setEnabled( false ); } else { - connect( mCheckBox, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotChanged() ) ); + connect( mCheckBox, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( slotChanged() ) ); } } @@ -619,7 +619,7 @@ Kleo::CryptoConfigEntryLDAPURL::CryptoConfigEntryLDAPURL( mLabel->setEnabled( false ); mPushButton->hide(); } else { - connect( mPushButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotOpenDialog() ) ); + connect( mPushButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotOpenDialog() ) ); } } @@ -644,7 +644,7 @@ void Kleo::CryptoConfigEntryLDAPURL::slotOpenDialog() DirectoryServicesWidget* dirserv = new DirectoryServicesWidget( mEntry, &dialog ); dirserv->load(); dialog.setMainWidget( dirserv ); - connect( &dialog, TQT_SIGNAL( defaultClicked() ), dirserv, TQT_SLOT( defaults() ) ); + connect( &dialog, TQ_SIGNAL( defaultClicked() ), dirserv, TQ_SLOT( defaults() ) ); if ( dialog.exec() ) { // Note that we just grab the urls from the dialog, we don't call its save method, // since the user hasn't confirmed the big config dialog yet. diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp index 874ba0fa..38c4df9d 100644 --- a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp +++ b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp @@ -105,10 +105,10 @@ Kleo::DNAttributeOrderConfigWidget::DNAttributeOrderConfigWidget( DNAttributeMap d->currentLV->setSorting( -1 ); glay->addWidget( d->currentLV, row, 2 ); - connect( d->availableLV, TQT_SIGNAL(clicked( TQListViewItem * )), - TQT_SLOT(slotAvailableSelectionChanged(TQListViewItem*)) ); - connect( d->currentLV, TQT_SIGNAL(clicked(TQListViewItem*)), - TQT_SLOT(slotCurrentOrderSelectionChanged(TQListViewItem*)) ); + connect( d->availableLV, TQ_SIGNAL(clicked( TQListViewItem * )), + TQ_SLOT(slotAvailableSelectionChanged(TQListViewItem*)) ); + connect( d->currentLV, TQ_SIGNAL(clicked(TQListViewItem*)), + TQ_SLOT(slotCurrentOrderSelectionChanged(TQListViewItem*)) ); d->placeHolderItem = new TQListViewItem( d->availableLV, "_X_", i18n("All others") ); @@ -123,12 +123,12 @@ Kleo::DNAttributeOrderConfigWidget::DNAttributeOrderConfigWidget( DNAttributeMap const char * tooltip; const char * slot; } navButtons[] = { - { "2uparrow", 0, 1, I18N_NOOP( "Move to top" ), TQT_SLOT(slotDoubleUpButtonClicked()) }, - { "1uparrow", 1, 1, I18N_NOOP( "Move one up" ), TQT_SLOT(slotUpButtonClicked()) }, - { "1leftarrow", 2, 0, I18N_NOOP( "Remove from current attribute order" ), TQT_SLOT(slotLeftButtonClicked()) }, - { "1rightarrow", 2, 2, I18N_NOOP( "Add to current attribute order" ), TQT_SLOT(slotRightButtonClicked()) }, - { "1downarrow", 3, 1, I18N_NOOP( "Move one down" ), TQT_SLOT(slotDownButtonClicked()) }, - { "2downarrow", 4, 1, I18N_NOOP( "Move to bottom" ), TQT_SLOT(slotDoubleDownButtonClicked()) } + { "2uparrow", 0, 1, I18N_NOOP( "Move to top" ), TQ_SLOT(slotDoubleUpButtonClicked()) }, + { "1uparrow", 1, 1, I18N_NOOP( "Move one up" ), TQ_SLOT(slotUpButtonClicked()) }, + { "1leftarrow", 2, 0, I18N_NOOP( "Remove from current attribute order" ), TQ_SLOT(slotLeftButtonClicked()) }, + { "1rightarrow", 2, 2, I18N_NOOP( "Add to current attribute order" ), TQ_SLOT(slotRightButtonClicked()) }, + { "1downarrow", 3, 1, I18N_NOOP( "Move one down" ), TQ_SLOT(slotDownButtonClicked()) }, + { "2downarrow", 4, 1, I18N_NOOP( "Move to bottom" ), TQ_SLOT(slotDoubleDownButtonClicked()) } }; for ( unsigned int i = 0 ; i < sizeof navButtons / sizeof *navButtons ; ++i ) { @@ -137,7 +137,7 @@ Kleo::DNAttributeOrderConfigWidget::DNAttributeOrderConfigWidget( DNAttributeMap tb->setEnabled( false ); TQToolTip::add( tb, i18n( navButtons[i].tooltip ) ); xlay->addWidget( tb, navButtons[i].row, navButtons[i].col ); - connect( tb, TQT_SIGNAL(clicked()), navButtons[i].slot ); + connect( tb, TQ_SIGNAL(clicked()), navButtons[i].slot ); } glay->addLayout( xlay, row, 1 ); diff --git a/certmanager/lib/ui/keyapprovaldialog.cpp b/certmanager/lib/ui/keyapprovaldialog.cpp index 6b873c0b..fd796b8d 100644 --- a/certmanager/lib/ui/keyapprovaldialog.cpp +++ b/certmanager/lib/ui/keyapprovaldialog.cpp @@ -163,7 +163,7 @@ Kleo::KeyApprovalDialog::KeyApprovalDialog( const std::vector<Item> & recipients cb->insertStringList( prefs ); glay->addWidget( cb, row, 1 ); cb->setCurrentItem( pref2cb( it->pref ) ); - connect( cb, TQT_SIGNAL(activated(int)), TQT_SLOT(slotPrefsChanged()) ); + connect( cb, TQ_SIGNAL(activated(int)), TQ_SLOT(slotPrefsChanged()) ); d->preferences.push_back( cb ); } diff --git a/certmanager/lib/ui/keylistview.cpp b/certmanager/lib/ui/keylistview.cpp index 00f69500..af067b1e 100644 --- a/certmanager/lib/ui/keylistview.cpp +++ b/certmanager/lib/ui/keylistview.cpp @@ -123,14 +123,14 @@ static const struct { const char * source; const char * target; } signalReplacements[] = { - { TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)), - TQT_SLOT(slotEmitDoubleClicked(TQListViewItem*,const TQPoint&,int)) }, - { TQT_SIGNAL(returnPressed(TQListViewItem*)), - TQT_SLOT(slotEmitReturnPressed(TQListViewItem*)) }, - { TQT_SIGNAL(selectionChanged(TQListViewItem*)), - TQT_SLOT(slotEmitSelectionChanged(TQListViewItem*)) }, - { TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*,const TQPoint&)), - TQT_SLOT(slotEmitContextMenu(TDEListView*, TQListViewItem*,const TQPoint&)) }, + { TQ_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)), + TQ_SLOT(slotEmitDoubleClicked(TQListViewItem*,const TQPoint&,int)) }, + { TQ_SIGNAL(returnPressed(TQListViewItem*)), + TQ_SLOT(slotEmitReturnPressed(TQListViewItem*)) }, + { TQ_SIGNAL(selectionChanged(TQListViewItem*)), + TQ_SLOT(slotEmitSelectionChanged(TQListViewItem*)) }, + { TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*,const TQPoint&)), + TQ_SLOT(slotEmitContextMenu(TDEListView*, TQListViewItem*,const TQPoint&)) }, }; static const int numSignalReplacements = sizeof signalReplacements / sizeof *signalReplacements; @@ -146,7 +146,7 @@ Kleo::KeyListView::KeyListView( const ColumnStrategy * columnStrategy, const Dis d = new Private(); d->updateTimer = new TQTimer( this ); - connect( d->updateTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotUpdateTimeout()) ); + connect( d->updateTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotUpdateTimeout()) ); if ( !columnStrategy ) { kdWarning(5150) << "Kleo::KeyListView: need a column strategy to work with!" << endl; diff --git a/certmanager/lib/ui/keyrequester.cpp b/certmanager/lib/ui/keyrequester.cpp index e245898e..6dd1b05e 100644 --- a/certmanager/lib/ui/keyrequester.cpp +++ b/certmanager/lib/ui/keyrequester.cpp @@ -130,8 +130,8 @@ void Kleo::KeyRequester::init() hlay->addWidget( mEraseButton ); hlay->addWidget( mDialogButton ); - connect( mEraseButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEraseButtonClicked()) ); - connect( mDialogButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotDialogButtonClicked()) ); + connect( mEraseButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotEraseButtonClicked()) ); + connect( mDialogButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotDialogButtonClicked()) ); setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed ) ); @@ -264,10 +264,10 @@ void Kleo::KeyRequester::startKeyListJob( const TQStringList & fingerprints ) { "Check your installation."), i18n("Key Listing Failed") ); } else { - connect( job, TQT_SIGNAL(result(const GpgME::KeyListResult&)), - TQT_SLOT(slotKeyListResult(const GpgME::KeyListResult&)) ); - connect( job, TQT_SIGNAL(nextKey(const GpgME::Key&)), - TQT_SLOT(slotNextKey(const GpgME::Key&)) ); + connect( job, TQ_SIGNAL(result(const GpgME::KeyListResult&)), + TQ_SLOT(slotKeyListResult(const GpgME::KeyListResult&)) ); + connect( job, TQ_SIGNAL(nextKey(const GpgME::Key&)), + TQ_SLOT(slotNextKey(const GpgME::Key&)) ); const GpgME::Error err = job->start( fingerprints, mKeyUsage & Kleo::KeySelectionDialog::SecretKeys && @@ -288,10 +288,10 @@ void Kleo::KeyRequester::startKeyListJob( const TQStringList & fingerprints ) { "Check your installation."), i18n("Key Listing Failed") ); } else { - connect( job, TQT_SIGNAL(result(const GpgME::KeyListResult&)), - TQT_SLOT(slotKeyListResult(const GpgME::KeyListResult&)) ); - connect( job, TQT_SIGNAL(nextKey(const GpgME::Key&)), - TQT_SLOT(slotNextKey(const GpgME::Key&)) ); + connect( job, TQ_SIGNAL(result(const GpgME::KeyListResult&)), + TQ_SLOT(slotKeyListResult(const GpgME::KeyListResult&)) ); + connect( job, TQ_SIGNAL(nextKey(const GpgME::Key&)), + TQ_SLOT(slotNextKey(const GpgME::Key&)) ); const GpgME::Error err = job->start( fingerprints, mKeyUsage & Kleo::KeySelectionDialog::SecretKeys && diff --git a/certmanager/lib/ui/keyselectiondialog.cpp b/certmanager/lib/ui/keyselectiondialog.cpp index 25a1a225..1de21dc0 100644 --- a/certmanager/lib/ui/keyselectiondialog.cpp +++ b/certmanager/lib/ui/keyselectiondialog.cpp @@ -377,8 +377,8 @@ void Kleo::KeySelectionDialog::init( bool rememberChoice, bool extendedSelection if ( !text.isEmpty() ) { if ( text.startsWith( "<qt>" ) ) { KActiveLabel *textLabel = new KActiveLabel( text, page ); - disconnect( textLabel, TQT_SIGNAL(linkClicked(const TQString&)), textLabel, TQT_SLOT(openLink(const TQString&)) ); - connect( textLabel, TQT_SIGNAL(linkClicked(const TQString&)), TQT_SLOT(slotStartCertificateManager(const TQString&)) ); + disconnect( textLabel, TQ_SIGNAL(linkClicked(const TQString&)), textLabel, TQ_SLOT(openLink(const TQString&)) ); + connect( textLabel, TQ_SIGNAL(linkClicked(const TQString&)), TQ_SLOT(slotStartCertificateManager(const TQString&)) ); textLabel->setAlignment( textLabel->alignment() | TQt::WordBreak ); mTopLayout->addWidget( textLabel ); } else { @@ -391,7 +391,7 @@ void Kleo::KeySelectionDialog::init( bool rememberChoice, bool extendedSelection TQPushButton * const searchExternalPB = new TQPushButton( i18n("Search for &External Certificates"), page ); mTopLayout->addWidget( searchExternalPB, 0, TQt::AlignLeft ); - connect( searchExternalPB, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStartSearchForExternalCertificates()) ); + connect( searchExternalPB, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStartSearchForExternalCertificates()) ); if ( initialQuery.isEmpty() ) searchExternalPB->hide(); @@ -406,10 +406,10 @@ void Kleo::KeySelectionDialog::init( bool rememberChoice, bool extendedSelection hlay->addWidget( le, 1 ); le->setFocus(); - connect( clearButton, TQT_SIGNAL( clicked() ), le, TQT_SLOT( clear() ) ); - connect( le, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotSearch(const TQString&)) ); - connect( mStartSearchTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotFilter()) ); + connect( clearButton, TQ_SIGNAL( clicked() ), le, TQ_SLOT( clear() ) ); + connect( le, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotSearch(const TQString&)) ); + connect( mStartSearchTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotFilter()) ); mKeyListView = new KeyListView( new ColumnStrategy( mKeyUsage ), 0, page, "mKeyListView" ); mKeyListView->setResizeMode( TQListView::LastColumn ); @@ -430,21 +430,21 @@ void Kleo::KeySelectionDialog::init( bool rememberChoice, bool extendedSelection "</p></qt>") ); } - connect( mCheckSelectionTimer, TQT_SIGNAL(timeout()), - TQT_SLOT(slotCheckSelection()) ); + connect( mCheckSelectionTimer, TQ_SIGNAL(timeout()), + TQ_SLOT(slotCheckSelection()) ); connectSignals(); connect( mKeyListView, - TQT_SIGNAL(doubleClicked(Kleo::KeyListViewItem*,const TQPoint&,int)), - TQT_SLOT(slotTryOk()) ); + TQ_SIGNAL(doubleClicked(Kleo::KeyListViewItem*,const TQPoint&,int)), + TQ_SLOT(slotTryOk()) ); connect( mKeyListView, - TQT_SIGNAL(contextMenu(Kleo::KeyListViewItem*,const TQPoint&)), - TQT_SLOT(slotRMB(Kleo::KeyListViewItem*,const TQPoint&)) ); + TQ_SIGNAL(contextMenu(Kleo::KeyListViewItem*,const TQPoint&)), + TQ_SLOT(slotRMB(Kleo::KeyListViewItem*,const TQPoint&)) ); setButtonText( KDialogBase::Default, i18n("&Reread Keys") ); setButtonGuiItem( KDialogBase::Help, i18n("&Start Certificate Manager") ); - connect( this, TQT_SIGNAL(defaultClicked()), this, TQT_SLOT(slotRereadKeys()) ); - connect( this, TQT_SIGNAL(helpClicked()), this, TQT_SLOT(slotStartCertificateManager()) ); + connect( this, TQ_SIGNAL(defaultClicked()), this, TQ_SLOT(slotRereadKeys()) ); + connect( this, TQ_SIGNAL(helpClicked()), this, TQ_SLOT(slotStartCertificateManager()) ); slotRereadKeys(); mTopLayout->activate(); @@ -468,20 +468,20 @@ Kleo::KeySelectionDialog::~KeySelectionDialog() { void Kleo::KeySelectionDialog::connectSignals() { if ( mKeyListView->isMultiSelection() ) - connect( mKeyListView, TQT_SIGNAL(selectionChanged()), - TQT_SLOT(slotSelectionChanged()) ); + connect( mKeyListView, TQ_SIGNAL(selectionChanged()), + TQ_SLOT(slotSelectionChanged()) ); else - connect( mKeyListView, TQT_SIGNAL(selectionChanged(Kleo::KeyListViewItem*)), - TQT_SLOT(slotCheckSelection(Kleo::KeyListViewItem*)) ); + connect( mKeyListView, TQ_SIGNAL(selectionChanged(Kleo::KeyListViewItem*)), + TQ_SLOT(slotCheckSelection(Kleo::KeyListViewItem*)) ); } void Kleo::KeySelectionDialog::disconnectSignals() { if ( mKeyListView->isMultiSelection() ) - disconnect( mKeyListView, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotSelectionChanged()) ); + disconnect( mKeyListView, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotSelectionChanged()) ); else - disconnect( mKeyListView, TQT_SIGNAL(selectionChanged(Kleo::KeyListViewItem*)), - this, TQT_SLOT(slotCheckSelection(Kleo::KeyListViewItem*)) ); + disconnect( mKeyListView, TQ_SIGNAL(selectionChanged(Kleo::KeyListViewItem*)), + this, TQ_SLOT(slotCheckSelection(Kleo::KeyListViewItem*)) ); } const GpgME::Key & Kleo::KeySelectionDialog::selectedKey() const { @@ -593,12 +593,12 @@ void Kleo::KeySelectionDialog::startKeyListJobForBackend( const CryptoBackend::P return; } - connect( job, TQT_SIGNAL(result(const GpgME::KeyListResult&)), - TQT_SLOT(slotKeyListResult(const GpgME::KeyListResult&)) ); - connect( job, TQT_SIGNAL(nextKey(const GpgME::Key&)), + connect( job, TQ_SIGNAL(result(const GpgME::KeyListResult&)), + TQ_SLOT(slotKeyListResult(const GpgME::KeyListResult&)) ); + connect( job, TQ_SIGNAL(nextKey(const GpgME::Key&)), mKeyListView, validate ? - TQT_SLOT(slotRefreshKey(const GpgME::Key&)) : - TQT_SLOT(slotAddKey(const GpgME::Key&)) ); + TQ_SLOT(slotRefreshKey(const GpgME::Key&)) : + TQ_SLOT(slotAddKey(const GpgME::Key&)) ); TQStringList fprs; std::transform( keys.begin(), keys.end(), std::back_inserter( fprs ), ExtractFingerprint() ); @@ -756,7 +756,7 @@ void Kleo::KeySelectionDialog::slotRMB( Kleo::KeyListViewItem * item, const TQPo mCurrentContextMenuItem = item; TQPopupMenu menu; - menu.insertItem( i18n( "Recheck Key" ), this, TQT_SLOT(slotRecheckKey()) ); + menu.insertItem( i18n( "Recheck Key" ), this, TQ_SLOT(slotRecheckKey()) ); menu.exec( p ); } diff --git a/certmanager/lib/ui/passphrasedialog.cpp b/certmanager/lib/ui/passphrasedialog.cpp index f2771201..68837d38 100644 --- a/certmanager/lib/ui/passphrasedialog.cpp +++ b/certmanager/lib/ui/passphrasedialog.cpp @@ -90,7 +90,7 @@ Kleo::PassphraseDialog::PassphraseDialog( const TQString & msg, const TQString & vlay->addWidget( d->lineedit ); - connect( d->lineedit, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotOk()) ); + connect( d->lineedit, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotOk()) ); disableResize(); } diff --git a/certmanager/lib/ui/progressbar.cpp b/certmanager/lib/ui/progressbar.cpp index 6fe2f531..8c530a56 100644 --- a/certmanager/lib/ui/progressbar.cpp +++ b/certmanager/lib/ui/progressbar.cpp @@ -44,7 +44,7 @@ Kleo::ProgressBar::ProgressBar( TQWidget * parent, const char * name, WFlags f ) mRealProgress( -1 ) { mBusyTimer = new TQTimer( this ); - connect( mBusyTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotBusyTimerTick()) ); + connect( mBusyTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotBusyTimerTick()) ); fixup( true ); } diff --git a/certmanager/lib/ui/progressdialog.cpp b/certmanager/lib/ui/progressdialog.cpp index 692ee4cb..b99db7cb 100644 --- a/certmanager/lib/ui/progressdialog.cpp +++ b/certmanager/lib/ui/progressdialog.cpp @@ -56,13 +56,13 @@ Kleo::ProgressDialog::ProgressDialog( Job * job, const TQString & baseText, setLabelText( baseText ); setProgress( 0, 0 ); // activate busy indicator - connect( job, TQT_SIGNAL(progress(const TQString&,int,int)), - TQT_SLOT(slotProgress(const TQString&,int,int)) ); - connect( job, TQT_SIGNAL(done()), TQT_SLOT(slotDone()) ); - connect( this, TQT_SIGNAL(canceled()), - job, TQT_SLOT(slotCancel()) ); + connect( job, TQ_SIGNAL(progress(const TQString&,int,int)), + TQ_SLOT(slotProgress(const TQString&,int,int)) ); + connect( job, TQ_SIGNAL(done()), TQ_SLOT(slotDone()) ); + connect( this, TQ_SIGNAL(canceled()), + job, TQ_SLOT(slotCancel()) ); - TQTimer::singleShot( minimumDuration(), this, TQT_SLOT(forceShow()) ); + TQTimer::singleShot( minimumDuration(), this, TQ_SLOT(forceShow()) ); } Kleo::ProgressDialog::~ProgressDialog() { @@ -71,7 +71,7 @@ Kleo::ProgressDialog::~ProgressDialog() { void Kleo::ProgressDialog::setMinimumDuration( int ms ) { if ( 0 < ms && ms < minimumDuration() ) - TQTimer::singleShot( ms, this, TQT_SLOT(forceShow()) ); + TQTimer::singleShot( ms, this, TQ_SLOT(forceShow()) ); TQProgressDialog::setMinimumDuration( ms ); } diff --git a/certmanager/storedtransferjob.cpp b/certmanager/storedtransferjob.cpp index b9816c89..3803502d 100644 --- a/certmanager/storedtransferjob.cpp +++ b/certmanager/storedtransferjob.cpp @@ -30,10 +30,10 @@ StoredTransferJob::StoredTransferJob(const KURL& url, int command, : TDEIO::TransferJob( url, command, packedArgs, _staticData, showProgressInfo ), m_uploadOffset( 0 ) { - connect( this, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); - connect( this, TQT_SIGNAL( dataReq( TDEIO::Job *, TQByteArray & ) ), - TQT_SLOT( slotDataReq( TDEIO::Job *, TQByteArray & ) ) ); + connect( this, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQ_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( this, TQ_SIGNAL( dataReq( TDEIO::Job *, TQByteArray & ) ), + TQ_SLOT( slotDataReq( TDEIO::Job *, TQByteArray & ) ) ); } void StoredTransferJob::setData( const TQByteArray& arr ) diff --git a/kaddressbook/addresseditwidget.cpp b/kaddressbook/addresseditwidget.cpp index 8918534f..97b01d08 100644 --- a/kaddressbook/addresseditwidget.cpp +++ b/kaddressbook/addresseditwidget.cpp @@ -86,8 +86,8 @@ AddressEditWidget::AddressEditWidget( TQWidget *parent, const char *name ) layout->setSpacing( KDialog::spacingHint() ); mTypeCombo = new AddressTypeCombo( mAddressList, this ); - connect( mTypeCombo, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( updateAddressEdit() ) ); + connect( mTypeCombo, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( updateAddressEdit() ) ); layout->addWidget( mTypeCombo ); mAddressField = new KActiveLabel( this ); @@ -98,7 +98,7 @@ AddressEditWidget::AddressEditWidget( TQWidget *parent, const char *name ) layout->addWidget( mAddressField ); mEditButton = new TQPushButton( i18n( "street/postal", "&Edit Addresses..." ), this ); - connect( mEditButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( edit() ) ); + connect( mEditButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( edit() ) ); layout->addWidget( mEditButton ); } @@ -317,7 +317,7 @@ AddressEditDialog::AddressEditDialog( const TDEABC::Address::List &list, #if KDE_IS_VERSION(3,3,0) TQPushButton *labelButton = new TQPushButton( i18n( "Edit Label..." ), page ); topLayout->addMultiCellWidget( labelButton, 7, 7, 0, 1 ); - connect( labelButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editLabel() ) ); + connect( labelButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editLabel() ) ); #endif fillCountryCombo(); @@ -335,28 +335,28 @@ AddressEditDialog::AddressEditDialog( const TDEABC::Address::List &list, topLayout->addMultiCellWidget( buttonBox, 10, 10, 0, 1 ); TQPushButton *addButton = new TQPushButton( i18n( "New..." ), buttonBox ); - connect( addButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addAddress() ) ); + connect( addButton, TQ_SIGNAL( clicked() ), TQ_SLOT( addAddress() ) ); mRemoveButton = new TQPushButton( i18n( "Remove" ), buttonBox ); - connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeAddress() ) ); + connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeAddress() ) ); mChangeTypeButton = new TQPushButton( i18n( "Change Type..." ), buttonBox ); - connect( mChangeTypeButton, TQT_SIGNAL( clicked() ), TQT_SLOT( changeType() ) ); + connect( mChangeTypeButton, TQ_SIGNAL( clicked() ), TQ_SLOT( changeType() ) ); mTypeCombo->updateTypes(); mTypeCombo->setCurrentItem( selected ); updateAddressEdits(); - connect( mTypeCombo, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( updateAddressEdits() ) ); - connect( mStreetTextEdit, TQT_SIGNAL( textChanged() ), TQT_SLOT( modified() ) ); - connect( mPOBoxEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( modified() ) ); - connect( mLocalityEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( modified() ) ); - connect( mRegionEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( modified() ) ); - connect( mPostalCodeEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( modified() ) ); - connect( mCountryCombo, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( modified() ) ); - connect( mPreferredCheckBox, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) ); + connect( mTypeCombo, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( updateAddressEdits() ) ); + connect( mStreetTextEdit, TQ_SIGNAL( textChanged() ), TQ_SLOT( modified() ) ); + connect( mPOBoxEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( modified() ) ); + connect( mLocalityEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( modified() ) ); + connect( mRegionEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( modified() ) ); + connect( mPostalCodeEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( modified() ) ); + connect( mCountryCombo, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( modified() ) ); + connect( mPreferredCheckBox, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( modified() ) ); TDEAcceleratorManager::manage( this ); diff --git a/kaddressbook/addresseeeditordialog.cpp b/kaddressbook/addresseeeditordialog.cpp index 77d7bcbe..202dd9f1 100644 --- a/kaddressbook/addresseeeditordialog.cpp +++ b/kaddressbook/addresseeeditordialog.cpp @@ -55,7 +55,7 @@ AddresseeEditorDialog::AddresseeEditorDialog( KAB::Core *core, } else { mEditorWidget = new AddresseeEditorWidget( page ); } - connect( mEditorWidget, TQT_SIGNAL( modified() ), TQT_SLOT( widgetModified() ) ); + connect( mEditorWidget, TQ_SIGNAL( modified() ), TQ_SLOT( widgetModified() ) ); layout->addWidget( mEditorWidget ); enableButton( KDialogBase::Apply, false ); diff --git a/kaddressbook/addresseeeditorextension.cpp b/kaddressbook/addresseeeditorextension.cpp index 5ff8a3f1..d271399d 100644 --- a/kaddressbook/addresseeeditorextension.cpp +++ b/kaddressbook/addresseeeditorextension.cpp @@ -58,7 +58,7 @@ void AddresseeEditorExtension::contactsSelectionChanged() mAddresseeEditor->save(); addressees.append( mAddresseeEditor->addressee() ); modifiedAddress = addressees; - TQTimer::singleShot(0, this, TQT_SLOT(emitModifiedAddresses())); + TQTimer::singleShot(0, this, TQ_SLOT(emitModifiedAddresses())); } mAddresseeEditor->setAddressee( selectedAddressees[ 0 ] ); diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp index b83e0ad7..16489cf2 100644 --- a/kaddressbook/addresseeeditorwidget.cpp +++ b/kaddressbook/addresseeeditorwidget.cpp @@ -135,8 +135,8 @@ void AddresseeEditorWidget::initGUI() setupAdditionalTabs(); setupCustomFieldsTabs(); - connect( mTabWidget, TQT_SIGNAL( currentChanged(TQWidget*) ), - TQT_SLOT( pageChanged(TQWidget*) ) ); + connect( mTabWidget, TQ_SIGNAL( currentChanged(TQWidget*) ), + TQ_SLOT( pageChanged(TQWidget*) ) ); } void AddresseeEditorWidget::setupTab1() @@ -165,9 +165,9 @@ void AddresseeEditorWidget::setupTab1() button = new TQPushButton( i18n( "Edit Name..." ), tab1 ); TQToolTip::add( button, i18n( "Edit the contact's name" ) ); mNameEdit = new KLineEdit( tab1, "mNameEdit" ); - connect( mNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( nameTextChanged( const TQString& ) ) ); - connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( nameButtonClicked() ) ); + connect( mNameEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( nameTextChanged( const TQString& ) ) ); + connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( nameButtonClicked() ) ); mNameLabel = new KSqueezedTextLabel( tab1 ); if ( KABPrefs::instance()->automaticNameParsing() ) { @@ -183,8 +183,8 @@ void AddresseeEditorWidget::setupTab1() layout->addWidget( mNameLabel, 0, 2 ); label = new TQLabel( i18n( "<roleLabel>:", "%1:" ).arg( TDEABC::Addressee::roleLabel() ), tab1 ); mRoleEdit = new KLineEdit( tab1 ); - connect( mRoleEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( textChanged( const TQString& ) ) ); + connect( mRoleEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mRoleEdit ); layout->addWidget( label, 1, 1 ); layout->addWidget( mRoleEdit, 1, 2 ); @@ -193,8 +193,8 @@ void AddresseeEditorWidget::setupTab1() label = new TQLabel( i18n( "<organizationLabel>:", "%1:" ).arg( TDEABC::Addressee::organizationLabel() ), tab1 ); mOrgEdit = new KLineEdit( tab1 ); label->setBuddy( mOrgEdit ); - connect( mOrgEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( organizationTextChanged( const TQString& ) ) ); + connect( mOrgEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( organizationTextChanged( const TQString& ) ) ); layout->addWidget( label, 2, 1 ); layout->addWidget( mOrgEdit, 2, 2 ); @@ -217,7 +217,7 @@ void AddresseeEditorWidget::setupTab1() layout->addMultiCellWidget( label, 0, 1, 3, 3 ); mPhoneEditWidget = new PhoneEditWidget( tab1 ); - connect( mPhoneEditWidget, TQT_SIGNAL( modified() ), TQT_SLOT( emitModified() ) ); + connect( mPhoneEditWidget, TQ_SIGNAL( modified() ), TQ_SLOT( emitModified() ) ); layout->addMultiCellWidget( mPhoneEditWidget, 0, 3, 4, 6 ); bar = new KSeparator( KSeparator::HLine, tab1 ); @@ -231,7 +231,7 @@ void AddresseeEditorWidget::setupTab1() layout->addMultiCellWidget( label, 5, 6, 0, 0 ); mAddressEditWidget = new AddressEditWidget( tab1 ); - connect( mAddressEditWidget, TQT_SIGNAL( modified() ), TQT_SLOT( emitModified() ) ); + connect( mAddressEditWidget, TQ_SIGNAL( modified() ), TQ_SLOT( emitModified() ) ); layout->addMultiCellWidget( mAddressEditWidget, 5, 10, 1, 2 ); ////////////////////////////////////// @@ -242,7 +242,7 @@ void AddresseeEditorWidget::setupTab1() layout->addMultiCellWidget( label, 5, 6, 3, 3 ); mEmailWidget = new EmailEditWidget( tab1 ); - connect( mEmailWidget, TQT_SIGNAL( modified() ), TQT_SLOT( emitModified() ) ); + connect( mEmailWidget, TQ_SIGNAL( modified() ), TQ_SLOT( emitModified() ) ); layout->addMultiCellWidget( mEmailWidget, 5, 6, 4, 6 ); // add the separator @@ -258,8 +258,8 @@ void AddresseeEditorWidget::setupTab1() label = new TQLabel( i18n( "<urlLabel>:", "%1:" ).arg( TDEABC::Addressee::urlLabel() ), tab1 ); mURLEdit = new KLineEdit( tab1 ); - connect( mURLEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( textChanged( const TQString& ) ) ); + connect( mURLEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mURLEdit ); homePageLayout->addWidget( label ); homePageLayout->addWidget( mURLEdit ); @@ -270,13 +270,13 @@ void AddresseeEditorWidget::setupTab1() blogLayout->addWidget( label ); mBlogEdit = new KLineEdit( tab1 ); blogLayout->addWidget( mBlogEdit ); - connect( mBlogEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SLOT( textChanged( const TQString & ) ) ); + connect( mBlogEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SLOT( textChanged( const TQString & ) ) ); label->setBuddy( mBlogEdit ); layout->addMultiCellLayout( blogLayout, 9, 9, 4, 6 ); mIMWidget = new IMEditWidget( tab1, mAddressee ); - connect( mIMWidget, TQT_SIGNAL( modified() ), TQT_SLOT( emitModified() ) ); + connect( mIMWidget, TQ_SIGNAL( modified() ), TQ_SLOT( emitModified() ) ); layout->addMultiCellWidget( mIMWidget, 10, 10, 4, 6 ); layout->addColSpacing( 6, 50 ); @@ -290,15 +290,15 @@ void AddresseeEditorWidget::setupTab1() // Categories mCategoryButton = new TQPushButton( i18n( "Select Categories..." ), categoryBox ); - connect( mCategoryButton, TQT_SIGNAL( clicked() ), TQT_SLOT( selectCategories() ) ); + connect( mCategoryButton, TQ_SIGNAL( clicked() ), TQ_SLOT( selectCategories() ) ); mCategoryEdit = new KLineEdit( categoryBox ); mCategoryEdit->setReadOnly( true ); - connect( mCategoryEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( textChanged( const TQString& ) ) ); + connect( mCategoryEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( textChanged( const TQString& ) ) ); mSecrecyWidget = new SecrecyWidget( categoryBox ); - connect( mSecrecyWidget, TQT_SIGNAL( changed() ), TQT_SLOT( emitModified() ) ); + connect( mSecrecyWidget, TQ_SIGNAL( changed() ), TQ_SLOT( emitModified() ) ); layout->addMultiCellWidget( categoryBox, 12, 12, 0, 6 ); @@ -332,48 +332,48 @@ void AddresseeEditorWidget::setupTab2() label = new TQLabel( i18n( "Department:" ), tab2 ); layout->addWidget( label, 0, 1 ); mDepartmentEdit = new KLineEdit( tab2 ); - connect( mDepartmentEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( textChanged( const TQString& ) ) ); + connect( mDepartmentEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mDepartmentEdit ); layout->addWidget( mDepartmentEdit, 0, 2 ); label = new TQLabel( i18n( "Office:" ), tab2 ); layout->addWidget( label, 1, 1 ); mOfficeEdit = new KLineEdit( tab2 ); - connect( mOfficeEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( textChanged( const TQString& ) ) ); + connect( mOfficeEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mOfficeEdit ); layout->addWidget( mOfficeEdit, 1, 2 ); label = new TQLabel( i18n( "Profession:" ), tab2 ); layout->addWidget( label, 2, 1 ); mProfessionEdit = new KLineEdit( tab2 ); - connect( mProfessionEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( textChanged( const TQString& ) ) ); + connect( mProfessionEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mProfessionEdit ); layout->addWidget( mProfessionEdit, 2, 2 ); label = new TQLabel( i18n( "Manager\'s name:" ), tab2 ); layout->addWidget( label, 0, 3 ); mManagerEdit = new KPIM::AddresseeLineEdit( tab2 ); - connect( mManagerEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( textChanged( const TQString& ) ) ); + connect( mManagerEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mManagerEdit ); layout->addMultiCellWidget( mManagerEdit, 0, 0, 4, 5 ); label = new TQLabel( i18n( "Assistant's name:" ), tab2 ); layout->addWidget( label, 1, 3 ); mAssistantEdit = new KPIM::AddresseeLineEdit( tab2 ); - connect( mAssistantEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( textChanged( const TQString& ) ) ); + connect( mAssistantEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mAssistantEdit ); layout->addMultiCellWidget( mAssistantEdit, 1, 1, 4, 5 ); label = new TQLabel( i18n( "<titleLabel>:", "%1:" ).arg( TDEABC::Addressee::titleLabel() ), tab2 ); layout->addWidget( label, 2, 3 ); mTitleEdit = new KLineEdit( tab2 ); - connect( mTitleEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( textChanged( const TQString& ) ) ); + connect( mTitleEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mTitleEdit ); layout->addMultiCellWidget( mTitleEdit, 2, 2, 4, 5 ); @@ -391,36 +391,36 @@ void AddresseeEditorWidget::setupTab2() label = new TQLabel( i18n( "Nickname:" ), tab2 ); layout->addWidget( label, 4, 1 ); mNicknameEdit = new KLineEdit( tab2 ); - connect( mNicknameEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( textChanged( const TQString& ) ) ); + connect( mNicknameEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mNicknameEdit ); layout->addWidget( mNicknameEdit, 4, 2 ); label = new TQLabel( i18n( "Partner's name:" ), tab2 ); layout->addWidget( label, 5, 1 ); mSpouseEdit = new KPIM::AddresseeLineEdit( tab2 ); - connect( mSpouseEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( textChanged( const TQString& ) ) ); + connect( mSpouseEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( textChanged( const TQString& ) ) ); label->setBuddy( mSpouseEdit ); layout->addWidget( mSpouseEdit, 5, 2 ); label = new TQLabel( i18n( "Birthdate:" ), tab2 ); layout->addWidget( label, 4, 3 ); mBirthdayPicker = new KDateEdit( tab2 ); - connect( mBirthdayPicker, TQT_SIGNAL( dateChanged( const TQDate& ) ), - TQT_SLOT( dateChanged( const TQDate& ) ) ); - connect( mBirthdayPicker, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( emitModified() ) ); + connect( mBirthdayPicker, TQ_SIGNAL( dateChanged( const TQDate& ) ), + TQ_SLOT( dateChanged( const TQDate& ) ) ); + connect( mBirthdayPicker, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( emitModified() ) ); label->setBuddy( mBirthdayPicker ); layout->addWidget( mBirthdayPicker, 4, 4 ); label = new TQLabel( i18n( "Anniversary:" ), tab2 ); layout->addWidget( label, 5, 3 ); mAnniversaryPicker = new KDateEdit( tab2 ); - connect( mAnniversaryPicker, TQT_SIGNAL( dateChanged( const TQDate& ) ), - TQT_SLOT( dateChanged( const TQDate& ) ) ); - connect( mAnniversaryPicker, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( emitModified() ) ); + connect( mAnniversaryPicker, TQ_SIGNAL( dateChanged( const TQDate& ) ), + TQ_SLOT( dateChanged( const TQDate& ) ) ); + connect( mAnniversaryPicker, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( emitModified() ) ); label->setBuddy( mAnniversaryPicker ); layout->addWidget( mAnniversaryPicker, 5, 4 ); @@ -435,7 +435,7 @@ void AddresseeEditorWidget::setupTab2() mNoteEdit = new TQTextEdit( tab2 ); mNoteEdit->setWordWrap( TQTextEdit::WidgetWidth ); mNoteEdit->setMinimumSize( mNoteEdit->sizeHint() ); - connect( mNoteEdit, TQT_SIGNAL( textChanged() ), TQT_SLOT( emitModified() ) ); + connect( mNoteEdit, TQ_SIGNAL( textChanged() ), TQ_SLOT( emitModified() ) ); label->setBuddy( mNoteEdit ); layout->addMultiCellWidget( mNoteEdit, 7, 7, 1, 5 ); @@ -464,7 +464,7 @@ void AddresseeEditorWidget::setupAdditionalTabs() mTabWidget->addTab( page, pageTitle ); - connect( page, TQT_SIGNAL( changed() ), TQT_SLOT( emitModified() ) ); + connect( page, TQ_SIGNAL( changed() ), TQ_SLOT( emitModified() ) ); } KAB::ContactEditorWidget *widget @@ -498,7 +498,7 @@ void AddresseeEditorWidget::setupCustomFieldsTabs() page->addWidget( wdg ); page->updateLayout(); - connect( page, TQT_SIGNAL( changed() ), TQT_SLOT( emitModified() ) ); + connect( page, TQ_SIGNAL( changed() ), TQ_SLOT( emitModified() ) ); } else delete page; } @@ -798,10 +798,10 @@ void AddresseeEditorWidget::selectCategories() // Show the category dialog if ( mCategorySelectDialog == 0 ) { mCategorySelectDialog = new KPIM::CategorySelectDialog( KABPrefs::instance(), this ); - connect( mCategorySelectDialog, TQT_SIGNAL( categoriesSelected( const TQStringList& ) ), - this, TQT_SLOT( categoriesSelected( const TQStringList& ) ) ); - connect( mCategorySelectDialog, TQT_SIGNAL( editCategories() ), - this, TQT_SLOT( editCategories() ) ); + connect( mCategorySelectDialog, TQ_SIGNAL( categoriesSelected( const TQStringList& ) ), + this, TQ_SLOT( categoriesSelected( const TQStringList& ) ) ); + connect( mCategorySelectDialog, TQ_SIGNAL( editCategories() ), + this, TQ_SLOT( editCategories() ) ); } mCategorySelectDialog->setSelected( TQStringList::split( ",", mCategoryEdit->text() ) ); @@ -817,8 +817,8 @@ void AddresseeEditorWidget::editCategories() { if ( mCategoryEditDialog == 0 ) { mCategoryEditDialog = new KPIM::CategoryEditDialog( KABPrefs::instance(), this ); - connect( mCategoryEditDialog, TQT_SIGNAL( categoryConfigChanged() ), - mCategorySelectDialog, TQT_SLOT( updateCategoryConfig() ) ); + connect( mCategoryEditDialog, TQ_SIGNAL( categoryConfigChanged() ), + mCategorySelectDialog, TQ_SLOT( updateCategoryConfig() ) ); } mCategoryEditDialog->exec(); diff --git a/kaddressbook/addviewdialog.cpp b/kaddressbook/addviewdialog.cpp index 010ac72f..70841834 100644 --- a/kaddressbook/addviewdialog.cpp +++ b/kaddressbook/addviewdialog.cpp @@ -53,12 +53,12 @@ AddViewDialog::AddViewDialog( TQDict<ViewFactory> *viewFactoryDict, layout->addWidget( label, 0, 0 ); mViewNameEdit = new TQLineEdit( page ); - connect( mViewNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( textChanged( const TQString& ) ) ); + connect( mViewNameEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( textChanged( const TQString& ) ) ); layout->addWidget( mViewNameEdit, 0, 1 ); mTypeGroup = new TQButtonGroup( 0, TQt::Horizontal, i18n( "View Type" ), page ); - connect( mTypeGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( clicked( int ) ) ); + connect( mTypeGroup, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( clicked( int ) ) ); layout->addMultiCellWidget( mTypeGroup, 1, 1, 0, 1 ); TQGridLayout *groupLayout = new TQGridLayout( mTypeGroup->layout(), 3, 2 ); groupLayout->setSpacing( spacingHint() ); diff --git a/kaddressbook/advancedcustomfields.cpp b/kaddressbook/advancedcustomfields.cpp index d5b53479..3f4a477d 100644 --- a/kaddressbook/advancedcustomfields.cpp +++ b/kaddressbook/advancedcustomfields.cpp @@ -132,7 +132,7 @@ void AdvancedCustomFields::initGUI( const TQString &uiFile ) mFields = new KPIM::DesignerFields( uiFile, this ); layout->addWidget( mFields ); - connect( mFields, TQT_SIGNAL( modified() ), TQT_SLOT( setModified() ) ); + connect( mFields, TQ_SIGNAL( modified() ), TQ_SLOT( setModified() ) ); } TQString AdvancedCustomFields::pageIdentifier() const diff --git a/kaddressbook/contacteditorwidgetmanager.cpp b/kaddressbook/contacteditorwidgetmanager.cpp index a88a9554..beedc3b6 100644 --- a/kaddressbook/contacteditorwidgetmanager.cpp +++ b/kaddressbook/contacteditorwidgetmanager.cpp @@ -118,7 +118,7 @@ void ContactEditorTabPage::addWidget( KAB::ContactEditorWidget *widget ) { if ( widget->logicalWidth() == 2 ) { mWidgets.prepend( widget ); - connect( widget, TQT_SIGNAL( changed() ), TQT_SIGNAL( changed() ) ); + connect( widget, TQ_SIGNAL( changed() ), TQ_SIGNAL( changed() ) ); return; } @@ -133,7 +133,7 @@ void ContactEditorTabPage::addWidget( KAB::ContactEditorWidget *widget ) } mWidgets.insert( ++it, widget ); - connect( widget, TQT_SIGNAL( changed() ), TQT_SIGNAL( changed() ) ); + connect( widget, TQ_SIGNAL( changed() ), TQ_SIGNAL( changed() ) ); } void ContactEditorTabPage::loadContact( TDEABC::Addressee *addr ) diff --git a/kaddressbook/customfieldswidget.cpp b/kaddressbook/customfieldswidget.cpp index 18a10677..39867b0e 100644 --- a/kaddressbook/customfieldswidget.cpp +++ b/kaddressbook/customfieldswidget.cpp @@ -69,8 +69,8 @@ AddFieldDialog::AddFieldDialog( TQWidget *parent, const char *name ) mGlobal->setChecked( true ); layout->addMultiCellWidget( mGlobal, 2, 2, 0, 1 ); - connect( mTitle, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( nameChanged( const TQString& ) ) ); + connect( mTitle, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( nameChanged( const TQString& ) ) ); TDEAcceleratorManager::manage( this ); @@ -151,33 +151,33 @@ void FieldWidget::addField( const TQString &identifier, const TQString &title, if ( type == "integer" ) { TQSpinBox *wdg = new TQSpinBox( 0, 1000, 1, this ); record.mWidget = wdg; - connect( wdg, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SIGNAL( changed() ) ); + connect( wdg, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SIGNAL( changed() ) ); } else if ( type == "boolean" ) { TQCheckBox *wdg = new TQCheckBox( this ); record.mWidget = wdg; - connect( wdg, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed() ) ); + connect( wdg, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed() ) ); } else if ( type == "date" ) { TQDateEdit *wdg = new TQDateEdit( this ); record.mWidget = wdg; - connect( wdg, TQT_SIGNAL( valueChanged( const TQDate& ) ), - this, TQT_SIGNAL( changed() ) ); + connect( wdg, TQ_SIGNAL( valueChanged( const TQDate& ) ), + this, TQ_SIGNAL( changed() ) ); } else if ( type == "time" ) { TQTimeEdit *wdg = new TQTimeEdit( this ); record.mWidget = wdg; - connect( wdg, TQT_SIGNAL( valueChanged( const TQTime& ) ), - this, TQT_SIGNAL( changed() ) ); + connect( wdg, TQ_SIGNAL( valueChanged( const TQTime& ) ), + this, TQ_SIGNAL( changed() ) ); } else if ( type == "datetime" ) { TQDateTimeEdit *wdg = new TQDateTimeEdit( this ); record.mWidget = wdg; - connect( wdg, TQT_SIGNAL( valueChanged( const TQDateTime& ) ), - this, TQT_SIGNAL( changed() ) ); + connect( wdg, TQ_SIGNAL( valueChanged( const TQDateTime& ) ), + this, TQ_SIGNAL( changed() ) ); } else if ( type == "text" ) { TQLineEdit *wdg = new TQLineEdit( this ); record.mWidget = wdg; - connect( wdg, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SIGNAL( changed() ) ); + connect( wdg, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SIGNAL( changed() ) ); } record.mLabel->show(); @@ -382,10 +382,10 @@ CustomFieldsWidget::CustomFieldsWidget( TDEABC::AddressBook *ab, { initGUI(); - connect( mAddButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( addField() ) ); - connect( mRemoveButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( removeField() ) ); + connect( mAddButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( addField() ) ); + connect( mRemoveButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( removeField() ) ); - connect( mFieldWidget, TQT_SIGNAL( changed() ), this, TQT_SLOT( setModified() ) ); + connect( mFieldWidget, TQ_SIGNAL( changed() ), this, TQ_SLOT( setModified() ) ); } void CustomFieldsWidget::loadContact( TDEABC::Addressee *addr ) diff --git a/kaddressbook/distributionlisteditor.cpp b/kaddressbook/distributionlisteditor.cpp index 6a046461..e0711b64 100644 --- a/kaddressbook/distributionlisteditor.cpp +++ b/kaddressbook/distributionlisteditor.cpp @@ -70,14 +70,14 @@ KPIM::DistributionListEditor::Line::Line( TDEABC::AddressBook* book, TQWidget* p TQBoxLayout* layout = new TQHBoxLayout( this ); layout->setSpacing( KDialog::spacingHint() ); m_lineEdit = new KPIM::DistributionListEditor::LineEdit( this ); - connect( m_lineEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( textChanged( const TQString& ) ) ); + connect( m_lineEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( textChanged( const TQString& ) ) ); layout->addWidget( m_lineEdit ); m_clearButton = new TQToolButton( this ); m_clearButton->setIconSet( TDEApplication::reverseLayout() ? SmallIconSet("locationbar_erase") : SmallIconSet( "clear_left" ) ); m_clearButton->setEnabled( false ); layout->addWidget( m_clearButton ); - connect( m_clearButton, TQT_SIGNAL( clicked() ), m_lineEdit, TQT_SLOT( clear() ) ); + connect( m_clearButton, TQ_SIGNAL( clicked() ), m_lineEdit, TQ_SLOT( clear() ) ); } void KPIM::DistributionListEditor::Line::textChanged( const TQString& text ) @@ -160,8 +160,8 @@ KPIM::DistributionListEditor::EditorWidget::EditorWidget( TDEABC::AddressBook* b Q_ASSERT( d->addressBook ); d->lastLineId = 0; d->mapper = new TQSignalMapper( this ); - connect( d->mapper, TQT_SIGNAL( mapped( int ) ), - this, TQT_SLOT( lineTextChanged( int ) ) ); + connect( d->mapper, TQ_SIGNAL( mapped( int ) ), + this, TQ_SLOT( lineTextChanged( int ) ) ); setCaption( i18n( "Edit Distribution List" ) ); TQWidget* main = new TQWidget( this ); TQVBoxLayout* mainLayout = new TQVBoxLayout( main ); @@ -248,8 +248,8 @@ KPIM::DistributionListEditor::Line* KPIM::DistributionListEditor::EditorWidgetPr line->setEntry( entry ); addresseeLayout->addWidget( line ); addressees.append( line ); - TQObject::connect( line, TQT_SIGNAL( textChanged() ), - mapper, TQT_SLOT( map() ) ); + TQObject::connect( line, TQ_SIGNAL( textChanged() ), + mapper, TQ_SLOT( map() ) ); mapper->setMapping( line, ++lastLineId ); line->setShown( true ); return line; diff --git a/kaddressbook/distributionlistentryview.cpp b/kaddressbook/distributionlistentryview.cpp index b09d8c97..811e5167 100644 --- a/kaddressbook/distributionlistentryview.cpp +++ b/kaddressbook/distributionlistentryview.cpp @@ -49,8 +49,8 @@ KAB::DistributionListEntryView::DistributionListEntryView( KAB::Core* core, TQWi m_distListLabel = new KURLLabel( this ); distLabel->setBuddy( m_distListLabel ); - connect( m_distListLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ), - this, TQT_SIGNAL( distributionListClicked( const TQString& ) ) ); + connect( m_distListLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ), + this, TQ_SIGNAL( distributionListClicked( const TQString& ) ) ); distLayout->addWidget( m_distListLabel ); distLayout->addStretch(); m_mainLayout->addItem( distLayout ); @@ -129,8 +129,8 @@ void KAB::DistributionListEntryView::setEntry( const KPIM::DistributionList& lis button->setChecked( true ); button->setShown( true ); } - connect( m_emailGroup, TQT_SIGNAL( clicked( int ) ), - this, TQT_SLOT( emailButtonClicked( int ) ) ); + connect( m_emailGroup, TQ_SIGNAL( clicked( int ) ), + this, TQ_SLOT( emailButtonClicked( int ) ) ); m_radioLayout->addWidget( m_emailGroup, 0, 0 ); m_emailGroup->setShown( true ); m_mainLayout->invalidate(); diff --git a/kaddressbook/distributionlistpicker.cpp b/kaddressbook/distributionlistpicker.cpp index 272a6200..b7295ad8 100644 --- a/kaddressbook/distributionlistpicker.cpp +++ b/kaddressbook/distributionlistpicker.cpp @@ -54,10 +54,10 @@ KPIM::DistributionListPickerDialog::DistributionListPickerDialog( TDEABC::Addres layout->addWidget( m_label, 0, 0 ); m_listBox = new TDEListBox( main ); layout->addWidget( m_listBox, 1, 0 ); - connect( m_listBox, TQT_SIGNAL( highlighted( const TQString& ) ), - this, TQT_SLOT( entrySelected( const TQString& ) ) ); - connect( m_listBox, TQT_SIGNAL( selected( const TQString& ) ), - this, TQT_SLOT( entrySelected( const TQString& ) ) ); + connect( m_listBox, TQ_SIGNAL( highlighted( const TQString& ) ), + this, TQ_SLOT( entrySelected( const TQString& ) ) ); + connect( m_listBox, TQ_SIGNAL( selected( const TQString& ) ), + this, TQ_SLOT( entrySelected( const TQString& ) ) ); setMainWidget( main ); #ifdef TDEPIM_NEW_DISTRLISTS typedef TQValueList<KPIM::DistributionList> DistListList; diff --git a/kaddressbook/editors/cryptowidget.cpp b/kaddressbook/editors/cryptowidget.cpp index fc7bef17..f7849d7c 100644 --- a/kaddressbook/editors/cryptowidget.cpp +++ b/kaddressbook/editors/cryptowidget.cpp @@ -83,7 +83,7 @@ CryptoWidget::CryptoWidget( TDEABC::AddressBook *ab, TQWidget *parent, const cha for ( uint i = 0 ; i < NumberOfProtocols ; ++i ) { Kleo::CryptoMessageFormat f = static_cast<Kleo::CryptoMessageFormat>( msgFormat ); mProtocolCB[ i ] = new TQCheckBox( Kleo::cryptoMessageFormatToLabel( f ), protGB ); - connect( mProtocolCB[i], TQT_SIGNAL( clicked() ), this, TQT_SLOT( setModified() ) ); + connect( mProtocolCB[i], TQ_SIGNAL( clicked() ), this, TQ_SLOT( setModified() ) ); // Iterating over a bitfield means *2 every time msgFormat *= 2; @@ -126,13 +126,13 @@ CryptoWidget::CryptoWidget( TDEABC::AddressBook *ab, TQWidget *parent, const cha static_cast<Kleo::EncryptionPreference>( i ) ) ); // Emit "changed()" signal - connect( mSignPref, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( setModified() ) ); - connect( mCryptPref, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( setModified() ) ); + connect( mSignPref, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( setModified() ) ); + connect( mCryptPref, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( setModified() ) ); // Not optimal, but KeyRequester doesn't emit any signals when the key changes - connect( mPgpKey->eraseButton(), TQT_SIGNAL( clicked() ), this, TQT_SLOT( setModified() ) ); - connect( mPgpKey->dialogButton(), TQT_SIGNAL( clicked() ), this, TQT_SLOT( setModified() ) ); - connect( mSmimeCert->eraseButton(), TQT_SIGNAL( clicked() ), this, TQT_SLOT( setModified() ) ); - connect( mSmimeCert->dialogButton(), TQT_SIGNAL( clicked() ), this, TQT_SLOT( setModified() ) ); + connect( mPgpKey->eraseButton(), TQ_SIGNAL( clicked() ), this, TQ_SLOT( setModified() ) ); + connect( mPgpKey->dialogButton(), TQ_SIGNAL( clicked() ), this, TQ_SLOT( setModified() ) ); + connect( mSmimeCert->eraseButton(), TQ_SIGNAL( clicked() ), this, TQ_SLOT( setModified() ) ); + connect( mSmimeCert->dialogButton(), TQ_SIGNAL( clicked() ), this, TQ_SLOT( setModified() ) ); } CryptoWidget::~CryptoWidget() diff --git a/kaddressbook/editors/imaddresswidget.cpp b/kaddressbook/editors/imaddresswidget.cpp index 0a3336d6..4cd7813d 100644 --- a/kaddressbook/editors/imaddresswidget.cpp +++ b/kaddressbook/editors/imaddresswidget.cpp @@ -60,10 +60,10 @@ IMAddressWidget::IMAddressWidget( TQWidget *parent, TQValueList<KPluginInfo *> p void IMAddressWidget::init() { - connect( cmbProtocol, TQT_SIGNAL( activated( const TQString& ) ), - this, TQT_SLOT( slotProtocolChanged() ) ); - connect( edtAddress, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( slotAddressChanged( const TQString& ) ) ); + connect( cmbProtocol, TQ_SIGNAL( activated( const TQString& ) ), + this, TQ_SLOT( slotProtocolChanged() ) ); + connect( edtAddress, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( slotAddressChanged( const TQString& ) ) ); slotProtocolChanged(); } diff --git a/kaddressbook/editors/imeditorwidget.cpp b/kaddressbook/editors/imeditorwidget.cpp index 38d641c4..9db30d9c 100644 --- a/kaddressbook/editors/imeditorwidget.cpp +++ b/kaddressbook/editors/imeditorwidget.cpp @@ -148,14 +148,14 @@ IMEditorWidget::IMEditorWidget( TQWidget *parent, const TQString &preferredIM, c mWidget = new IMEditorBase( this ); setMainWidget( mWidget ); - connect( mWidget->btnAdd, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAdd() ) ); - connect( mWidget->btnEdit, TQT_SIGNAL( clicked() ), TQT_SLOT( slotEdit() ) ); - connect( mWidget->btnDelete, TQT_SIGNAL( clicked() ), TQT_SLOT( slotDelete() ) ); - connect( mWidget->btnSetStandard, TQT_SIGNAL( clicked()), TQT_SLOT( slotSetStandard() ) ); - connect( mWidget->lvAddresses, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( slotUpdateButtons() ) ); + connect( mWidget->btnAdd, TQ_SIGNAL( clicked() ), TQ_SLOT( slotAdd() ) ); + connect( mWidget->btnEdit, TQ_SIGNAL( clicked() ), TQ_SLOT( slotEdit() ) ); + connect( mWidget->btnDelete, TQ_SIGNAL( clicked() ), TQ_SLOT( slotDelete() ) ); + connect( mWidget->btnSetStandard, TQ_SIGNAL( clicked()), TQ_SLOT( slotSetStandard() ) ); + connect( mWidget->lvAddresses, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( slotUpdateButtons() ) ); - connect( mWidget->lvAddresses, TQT_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ), - TQT_SLOT( slotEdit() ) ); + connect( mWidget->lvAddresses, TQ_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ), + TQ_SLOT( slotEdit() ) ); setHelp( "managing-contacts-im-addresses" ); @@ -336,8 +336,8 @@ void IMEditorWidget::slotAdd() IMAddressWidget *addressWid = new IMAddressWidget( &addDialog, mProtocols ); addDialog.enableButtonOK( false ); - connect( addressWid, TQT_SIGNAL( inValidState( bool ) ), - &addDialog, TQT_SLOT( enableButtonOK( bool ) ) ); + connect( addressWid, TQ_SIGNAL( inValidState( bool ) ), + &addDialog, TQ_SLOT( enableButtonOK( bool ) ) ); addDialog.setMainWidget( addressWid ); if ( addDialog.exec() == TQDialog::Accepted ) { @@ -372,8 +372,8 @@ void IMEditorWidget::slotEdit() KDialogBase::Ok | KDialogBase::Cancel ); IMAddressWidget *addressWid = new IMAddressWidget( &editDialog, mProtocols, current->protocol(), current->address(), current->context() ) ; - connect( addressWid, TQT_SIGNAL( inValidState( bool ) ), - &editDialog, TQT_SLOT( enableButtonOK( bool ) ) ); + connect( addressWid, TQ_SIGNAL( inValidState( bool ) ), + &editDialog, TQ_SLOT( enableButtonOK( bool ) ) ); editDialog.setMainWidget( addressWid ); if ( editDialog.exec() == TQDialog::Accepted ) { diff --git a/kaddressbook/emaileditwidget.cpp b/kaddressbook/emaileditwidget.cpp index d517f0b6..ead36a0c 100644 --- a/kaddressbook/emaileditwidget.cpp +++ b/kaddressbook/emaileditwidget.cpp @@ -97,15 +97,15 @@ EmailEditWidget::EmailEditWidget( TQWidget *parent, const char *name ) mEmailEdit = new KLineEdit( this ); mEmailEdit->setValidator( new EmailValidator ); - connect( mEmailEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( textChanged( const TQString& ) ) ); - connect( mEmailEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SIGNAL( modified() ) ); + connect( mEmailEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( textChanged( const TQString& ) ) ); + connect( mEmailEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SIGNAL( modified() ) ); label->setBuddy( mEmailEdit ); topLayout->addWidget( mEmailEdit, 0, 1 ); mEditButton = new TQPushButton( i18n( "Edit Email Addresses..." ), this); - connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( edit() ) ); + connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( edit() ) ); topLayout->addMultiCellWidget( mEditButton, 1, 1, 0, 1 ); topLayout->activate(); @@ -185,26 +185,26 @@ EmailEditDialog::EmailEditDialog( const TQStringList &list, TQWidget *parent, // Make sure there is room for the scrollbar mEmailListBox->setMinimumHeight( mEmailListBox->sizeHint().height() + 30 ); - connect( mEmailListBox, TQT_SIGNAL( highlighted( int ) ), - TQT_SLOT( selectionChanged( int ) ) ); - connect( mEmailListBox, TQT_SIGNAL( selected( int ) ), - TQT_SLOT( edit() ) ); + connect( mEmailListBox, TQ_SIGNAL( highlighted( int ) ), + TQ_SLOT( selectionChanged( int ) ) ); + connect( mEmailListBox, TQ_SIGNAL( selected( int ) ), + TQ_SLOT( edit() ) ); topLayout->addMultiCellWidget( mEmailListBox, 0, 3, 0, 1 ); mAddButton = new TQPushButton( i18n( "Add..." ), page ); - connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( add() ) ); + connect( mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( add() ) ); topLayout->addWidget( mAddButton, 0, 2 ); mEditButton = new TQPushButton( i18n( "Edit..." ), page ); - connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( edit() ) ); + connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( edit() ) ); topLayout->addWidget( mEditButton, 1, 2 ); mRemoveButton = new TQPushButton( i18n( "Remove" ), page ); - connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( remove() ) ); + connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( remove() ) ); topLayout->addWidget( mRemoveButton, 2, 2 ); mStandardButton = new TQPushButton( i18n( "Set Standard" ), page ); - connect( mStandardButton, TQT_SIGNAL( clicked() ), TQT_SLOT( standard() ) ); + connect( mStandardButton, TQ_SIGNAL( clicked() ), TQ_SLOT( standard() ) ); topLayout->addWidget( mStandardButton, 3, 2 ); topLayout->activate(); diff --git a/kaddressbook/extensionmanager.cpp b/kaddressbook/extensionmanager.cpp index 735ebe0c..bdc0801d 100644 --- a/kaddressbook/extensionmanager.cpp +++ b/kaddressbook/extensionmanager.cpp @@ -60,7 +60,7 @@ ExtensionManager::ExtensionManager( TQWidget* extensionBar, TQWidgetStack* detai mActionCollection = new TDEActionCollection( this, "ActionCollection" ); extensionBar->setShown( false ); - TQTimer::singleShot( 0, this, TQT_SLOT( createActions() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( createActions() ) ); } ExtensionManager::~ExtensionManager() @@ -162,13 +162,13 @@ void ExtensionManager::createActions() delete mMapper; mMapper = new TQSignalMapper( this, "SignalMapper" ); - connect( mMapper, TQT_SIGNAL( mapped( const TQString& ) ), - this, TQT_SLOT( activationToggled( const TQString& ) ) ); + connect( mMapper, TQ_SIGNAL( mapped( const TQString& ) ), + this, TQ_SLOT( activationToggled( const TQString& ) ) ); ExtensionData::List::ConstIterator it; for ( TQMap<TQString, ExtensionData>::Iterator it = mExtensionMap.begin(), end = mExtensionMap.end(); it != end; ++it ) { ExtensionData& data = it.data(); - data.action = new TDEToggleAction( data.title, 0, mMapper, TQT_SLOT( map() ), + data.action = new TDEToggleAction( data.title, 0, mMapper, TQ_SLOT( map() ), mActionCollection, TQString( data.identifier + "_extension" ).latin1() ); mMapper->setMapping( data.action, data.identifier ); @@ -202,10 +202,10 @@ void ExtensionManager::createExtensionWidgets() wdg = new AddresseeEditorExtension( mCore, mDetailsStack ); wdg->hide(); - connect( wdg, TQT_SIGNAL( modified( const TDEABC::Addressee::List& ) ), - TQT_SIGNAL( modified( const TDEABC::Addressee::List& ) ) ); - connect( wdg, TQT_SIGNAL( deleted( const TQStringList& ) ), - TQT_SIGNAL( deleted( const TQStringList& ) ) ); + connect( wdg, TQ_SIGNAL( modified( const TDEABC::Addressee::List& ) ), + TQ_SIGNAL( modified( const TDEABC::Addressee::List& ) ) ); + connect( wdg, TQ_SIGNAL( deleted( const TQStringList& ) ), + TQ_SIGNAL( deleted( const TQStringList& ) ) ); ExtensionData data; data.identifier = wdg->identifier(); @@ -239,10 +239,10 @@ void ExtensionManager::createExtensionWidgets() if ( wdg->identifier() == "distribution_list_editor_ng" ) mSplitter->moveToFirst( wdg ); wdg->hide(); - connect( wdg, TQT_SIGNAL( modified( const TDEABC::Addressee::List& ) ), - TQT_SIGNAL( modified( const TDEABC::Addressee::List& ) ) ); - connect( wdg, TQT_SIGNAL( deleted( const TQStringList& ) ), - TQT_SIGNAL( deleted( const TQStringList& ) ) ); + connect( wdg, TQ_SIGNAL( modified( const TDEABC::Addressee::List& ) ), + TQ_SIGNAL( modified( const TDEABC::Addressee::List& ) ) ); + connect( wdg, TQ_SIGNAL( deleted( const TQStringList& ) ), + TQ_SIGNAL( deleted( const TQStringList& ) ) ); ExtensionData data; data.identifier = wdg->identifier(); diff --git a/kaddressbook/features/distributionlistngwidget.cpp b/kaddressbook/features/distributionlistngwidget.cpp index 4a4a20a2..181744ad 100644 --- a/kaddressbook/features/distributionlistngwidget.cpp +++ b/kaddressbook/features/distributionlistngwidget.cpp @@ -131,51 +131,51 @@ KAB::DistributionListNg::MainWidget::MainWidget( KAB::Core *core, TQWidget *pare mAddButton = new TQPushButton( this ); mAddButton->setIconSet( SmallIconSet( "add" ) ); TQToolTip::add( mAddButton, i18n( "Add distribution list" ) ); - connect( mAddButton, TQT_SIGNAL(clicked()), core, TQT_SLOT(newDistributionList()) ); + connect( mAddButton, TQ_SIGNAL(clicked()), core, TQ_SLOT(newDistributionList()) ); buttonLayout->addWidget( mAddButton ); mEditButton = new TQPushButton( this ); mEditButton->setIconSet( SmallIconSet( "edit" ) ); TQToolTip::add( mEditButton, i18n( "Edit distribution list" ) ); - connect( mEditButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(editSelectedDistributionList()) ); + connect( mEditButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(editSelectedDistributionList()) ); buttonLayout->addWidget( mEditButton ); mRemoveButton = new TQPushButton( this ); mRemoveButton->setIconSet( SmallIconSet( "remove" ) ); TQToolTip::add( mRemoveButton, i18n( "Remove distribution list" ) ); - connect( mRemoveButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteSelectedDistributionList()) ); + connect( mRemoveButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteSelectedDistributionList()) ); buttonLayout->addWidget( mRemoveButton ); mListBox = new ListBox( this ); - connect( mListBox, TQT_SIGNAL( contextMenuRequested( TQListBoxItem*, const TQPoint& ) ), - this, TQT_SLOT( contextMenuRequested( TQListBoxItem*, const TQPoint& ) ) ); - connect( mListBox, TQT_SIGNAL( dropped( const TQString &, const TDEABC::Addressee::List & ) ), - this, TQT_SLOT( contactsDropped( const TQString &, const TDEABC::Addressee::List & ) ) ); - connect( mListBox, TQT_SIGNAL( highlighted( int ) ), - this, TQT_SLOT( itemSelected( int ) ) ); - connect( mListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), TQT_SLOT(editSelectedDistributionList()) ); + connect( mListBox, TQ_SIGNAL( contextMenuRequested( TQListBoxItem*, const TQPoint& ) ), + this, TQ_SLOT( contextMenuRequested( TQListBoxItem*, const TQPoint& ) ) ); + connect( mListBox, TQ_SIGNAL( dropped( const TQString &, const TDEABC::Addressee::List & ) ), + this, TQ_SLOT( contactsDropped( const TQString &, const TDEABC::Addressee::List & ) ) ); + connect( mListBox, TQ_SIGNAL( highlighted( int ) ), + this, TQ_SLOT( itemSelected( int ) ) ); + connect( mListBox, TQ_SIGNAL(doubleClicked(TQListBoxItem*)), TQ_SLOT(editSelectedDistributionList()) ); layout->addWidget( mListBox ); - connect( core, TQT_SIGNAL( contactsUpdated() ), - this, TQT_SLOT( updateEntries() ) ); - connect( core->addressBook(), TQT_SIGNAL( addressBookChanged( AddressBook* ) ), - this, TQT_SLOT( updateEntries() ) ); + connect( core, TQ_SIGNAL( contactsUpdated() ), + this, TQ_SLOT( updateEntries() ) ); + connect( core->addressBook(), TQ_SIGNAL( addressBookChanged( AddressBook* ) ), + this, TQ_SLOT( updateEntries() ) ); // When contacts are changed, update both distr list combo and contents of displayed distr list - connect( core, TQT_SIGNAL( contactsUpdated() ), - this, TQT_SLOT( updateEntries() ) ); + connect( core, TQ_SIGNAL( contactsUpdated() ), + this, TQ_SLOT( updateEntries() ) ); - TQTimer::singleShot( 0, this, TQT_SLOT( updateEntries() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( updateEntries() ) ); } void KAB::DistributionListNg::MainWidget::contextMenuRequested( TQListBoxItem *item, const TQPoint &point ) { TQGuardedPtr<TDEPopupMenu> menu = new TDEPopupMenu( this ); - menu->insertItem( i18n( "New Distribution List..." ), core(), TQT_SLOT( newDistributionList() ) ); + menu->insertItem( i18n( "New Distribution List..." ), core(), TQ_SLOT( newDistributionList() ) ); if ( item && ( item->text() !=i18n( "All Contacts" ) ) ) { - menu->insertItem( i18n( "Edit..." ), this, TQT_SLOT( editSelectedDistributionList() ) ); - menu->insertItem( i18n( "Delete" ), this, TQT_SLOT( deleteSelectedDistributionList() ) ); + menu->insertItem( i18n( "Edit..." ), this, TQ_SLOT( editSelectedDistributionList() ) ); + menu->insertItem( i18n( "Delete" ), this, TQ_SLOT( deleteSelectedDistributionList() ) ); } menu->exec( point ); delete menu; diff --git a/kaddressbook/features/distributionlistwidget.cpp b/kaddressbook/features/distributionlistwidget.cpp index 28a6f8ff..76324853 100644 --- a/kaddressbook/features/distributionlistwidget.cpp +++ b/kaddressbook/features/distributionlistwidget.cpp @@ -158,19 +158,19 @@ DistributionListWidget::DistributionListWidget( KAB::Core *core, TQWidget *paren mNameCombo = new TQComboBox( this ); topLayout->addWidget( mNameCombo, 0, 0 ); - connect( mNameCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( updateContactView() ) ); + connect( mNameCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( updateContactView() ) ); mCreateListButton = new TQPushButton( i18n( "New List..." ), this ); topLayout->addWidget( mCreateListButton, 0, 1 ); - connect( mCreateListButton, TQT_SIGNAL( clicked() ), TQT_SLOT( createList() ) ); + connect( mCreateListButton, TQ_SIGNAL( clicked() ), TQ_SLOT( createList() ) ); mEditListButton = new TQPushButton( i18n( "Rename List..." ), this ); topLayout->addWidget( mEditListButton, 0, 2 ); - connect( mEditListButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editList() ) ); + connect( mEditListButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editList() ) ); mRemoveListButton = new TQPushButton( i18n( "Remove List" ), this ); topLayout->addWidget( mRemoveListButton, 0, 3 ); - connect( mRemoveListButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeList() ) ); + connect( mRemoveListButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeList() ) ); mContactView = new DistributionListView( this ); mContactView->addColumn( i18n( "Name" ) ); @@ -180,40 +180,40 @@ DistributionListWidget::DistributionListWidget( KAB::Core *core, TQWidget *paren mContactView->setAllColumnsShowFocus( true ); mContactView->setFullWidth( true ); topLayout->addMultiCellWidget( mContactView, 1, 1, 0, 3 ); - connect( mContactView, TQT_SIGNAL( selectionChanged() ), - TQT_SLOT( selectionContactViewChanged() ) ); - connect( mContactView, TQT_SIGNAL( dropped( TQDropEvent*, TQListViewItem* ) ), - TQT_SLOT( dropped( TQDropEvent*, TQListViewItem* ) ) ); + connect( mContactView, TQ_SIGNAL( selectionChanged() ), + TQ_SLOT( selectionContactViewChanged() ) ); + connect( mContactView, TQ_SIGNAL( dropped( TQDropEvent*, TQListViewItem* ) ), + TQ_SLOT( dropped( TQDropEvent*, TQListViewItem* ) ) ); mAddContactButton = new TQPushButton( i18n( "Add Contact" ), this ); mAddContactButton->setEnabled( false ); topLayout->addWidget( mAddContactButton, 2, 0 ); - connect( mAddContactButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addContact() ) ); + connect( mAddContactButton, TQ_SIGNAL( clicked() ), TQ_SLOT( addContact() ) ); mEntryCountLabel = new TQLabel( this ); topLayout->addWidget( mEntryCountLabel, 2, 1 ); mChangeEmailButton = new TQPushButton( i18n( "Change Email..." ), this ); topLayout->addWidget( mChangeEmailButton, 2, 2 ); - connect( mChangeEmailButton, TQT_SIGNAL( clicked() ), TQT_SLOT( changeEmail() ) ); + connect( mChangeEmailButton, TQ_SIGNAL( clicked() ), TQ_SLOT( changeEmail() ) ); mRemoveContactButton = new TQPushButton( i18n( "Remove Contact" ), this ); topLayout->addWidget( mRemoveContactButton, 2, 3 ); - connect( mRemoveContactButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeContact() ) ); + connect( mRemoveContactButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeContact() ) ); #ifdef TDEPIM_NEW_DISTRLISTS // When contacts are changed, update both distr list combo and contents of displayed distr list - connect( core, TQT_SIGNAL( contactsUpdated() ), - this, TQT_SLOT( updateNameCombo() ) ); + connect( core, TQ_SIGNAL( contactsUpdated() ), + this, TQ_SLOT( updateNameCombo() ) ); #else mManager = new TDEABC::DistributionListManager( core->addressBook() ); - connect( TDEABC::DistributionListWatcher::self(), TQT_SIGNAL( changed() ), - this, TQT_SLOT( updateNameCombo() ) ); + connect( TDEABC::DistributionListWatcher::self(), TQ_SIGNAL( changed() ), + this, TQ_SLOT( updateNameCombo() ) ); #endif - connect( core->addressBook(), TQT_SIGNAL( addressBookChanged( AddressBook* ) ), - this, TQT_SLOT( updateNameCombo() ) ); + connect( core->addressBook(), TQ_SIGNAL( addressBookChanged( AddressBook* ) ), + this, TQ_SLOT( updateNameCombo() ) ); updateNameCombo(); diff --git a/kaddressbook/features/resourceselection.cpp b/kaddressbook/features/resourceselection.cpp index 1d80c915..4a16c598 100644 --- a/kaddressbook/features/resourceselection.cpp +++ b/kaddressbook/features/resourceselection.cpp @@ -142,19 +142,19 @@ ResourceSelection::ResourceSelection( KAB::Core *core, TQWidget *parent, const c AddressBookWrapper *wrapper = static_cast<AddressBookWrapper*>( core->addressBook() ); mManager = wrapper->getResourceManager(); - connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( add() ) ); - connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( edit() ) ); - connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( remove() ) ); + connect( mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( add() ) ); + connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( edit() ) ); + connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( remove() ) ); - connect( mListView, TQT_SIGNAL( clicked( TQListViewItem* ) ), - TQT_SLOT( currentChanged( TQListViewItem* ) ) ); + connect( mListView, TQ_SIGNAL( clicked( TQListViewItem* ) ), + TQ_SLOT( currentChanged( TQListViewItem* ) ) ); - connect( mListView, TQT_SIGNAL( contextMenuRequested ( TQListViewItem *, + connect( mListView, TQ_SIGNAL( contextMenuRequested ( TQListViewItem *, const TQPoint &, int ) ), - TQT_SLOT( contextMenuRequested( TQListViewItem *, const TQPoint &, + TQ_SLOT( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ) ); - TQTimer::singleShot( 0, this, TQT_SLOT( updateView() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( updateView() ) ); } ResourceSelection::~ResourceSelection() @@ -167,24 +167,24 @@ void ResourceSelection::contextMenuRequested ( TQListViewItem *i, ResourceItem *item = static_cast<ResourceItem *>( i ); TQPopupMenu *menu = new TQPopupMenu( this ); - connect( menu, TQT_SIGNAL( aboutToHide() ), menu, TQT_SLOT( deleteLater() ) ); + connect( menu, TQ_SIGNAL( aboutToHide() ), menu, TQ_SLOT( deleteLater() ) ); if ( item ) { int reloadId = menu->insertItem( i18n("Re&load"), this, - TQT_SLOT( reloadResource() ) ); + TQ_SLOT( reloadResource() ) ); menu->setItemEnabled( reloadId, item->resource()->isActive() ); int saveId = menu->insertItem( i18n("&Save"), this, - TQT_SLOT( saveResource() ) ); + TQ_SLOT( saveResource() ) ); menu->setItemEnabled( saveId, item->resource()->isActive() ); menu->insertSeparator(); -// menu->insertItem( i18n("Show &Info"), this, TQT_SLOT( showInfo() ) ); +// menu->insertItem( i18n("Show &Info"), this, TQ_SLOT( showInfo() ) ); - menu->insertItem( i18n("&Edit..."), this, TQT_SLOT( edit() ) ); - menu->insertItem( i18n("&Remove"), this, TQT_SLOT( remove() ) ); + menu->insertItem( i18n("&Edit..."), this, TQ_SLOT( edit() ) ); + menu->insertItem( i18n("&Remove"), this, TQ_SLOT( remove() ) ); menu->insertSeparator(); } - menu->insertItem( i18n("&Add..."), this, TQT_SLOT( add() ) ); + menu->insertItem( i18n("&Add..."), this, TQ_SLOT( add() ) ); menu->popup( pos ); } @@ -368,23 +368,23 @@ void ResourceSelection::updateView() KPIM::ResourceABC* resource = dynamic_cast<KPIM::ResourceABC *>( *it ); if ( resource ) { disconnect( resource, 0, this, 0 ); - connect( resource, TQT_SIGNAL( signalSubresourceAdded( KPIM::ResourceABC *, + connect( resource, TQ_SIGNAL( signalSubresourceAdded( KPIM::ResourceABC *, const TQString &, const TQString & ) ), - TQT_SLOT( slotSubresourceAdded( KPIM::ResourceABC *, + TQ_SLOT( slotSubresourceAdded( KPIM::ResourceABC *, const TQString &, const TQString & ) ) ); - connect( resource, TQT_SIGNAL( signalSubresourceRemoved( KPIM::ResourceABC *, + connect( resource, TQ_SIGNAL( signalSubresourceRemoved( KPIM::ResourceABC *, const TQString &, const TQString & ) ), - TQT_SLOT( slotSubresourceRemoved( KPIM::ResourceABC *, + TQ_SLOT( slotSubresourceRemoved( KPIM::ResourceABC *, const TQString &, const TQString & ) ) ); - connect( resource, TQT_SIGNAL( signalSubresourceChanged( KPIM::ResourceABC *, + connect( resource, TQ_SIGNAL( signalSubresourceChanged( KPIM::ResourceABC *, const TQString &, const TQString & ) ), - TQT_SLOT( slotSubresourceChanged( KPIM::ResourceABC *, + TQ_SLOT( slotSubresourceChanged( KPIM::ResourceABC *, const TQString &, const TQString & ) ) ); - //connect( resource, TQT_SIGNAL( resourceSaved( KPIM::ResourceABC * ) ), - // TQT_SLOT( closeResource( KPIM::ResourceABC * ) ) ); + //connect( resource, TQ_SIGNAL( resourceSaved( KPIM::ResourceABC * ) ), + // TQ_SLOT( closeResource( KPIM::ResourceABC * ) ) ); item->createSubresourceItems(); } } diff --git a/kaddressbook/filtereditdialog.cpp b/kaddressbook/filtereditdialog.cpp index 2fc87246..684fe1e6 100644 --- a/kaddressbook/filtereditdialog.cpp +++ b/kaddressbook/filtereditdialog.cpp @@ -124,8 +124,8 @@ void FilterEditDialog::initGUI() mNameEdit->setFocus(); topLayout->addWidget( label, 0, 0 ); topLayout->addWidget( mNameEdit, 0, 1 ); - connect( mNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( filterNameTextChanged( const TQString&) ) ); + connect( mNameEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( filterNameTextChanged( const TQString&) ) ); mCategoriesView = new TDEListView( page ); mCategoriesView->addColumn( i18n( "Category" ) ); @@ -260,16 +260,16 @@ void FilterDialog::initGUI() mFilterListBox = new TDEListBox( page ); topLayout->addWidget( mFilterListBox, 0, 0 ); - connect( mFilterListBox, TQT_SIGNAL( selectionChanged( TQListBoxItem * ) ), - TQT_SLOT( selectionChanged( TQListBoxItem * ) ) ); - connect( mFilterListBox, TQT_SIGNAL( doubleClicked ( TQListBoxItem * ) ), - TQT_SLOT( edit() ) ); + connect( mFilterListBox, TQ_SIGNAL( selectionChanged( TQListBoxItem * ) ), + TQ_SLOT( selectionChanged( TQListBoxItem * ) ) ); + connect( mFilterListBox, TQ_SIGNAL( doubleClicked ( TQListBoxItem * ) ), + TQ_SLOT( edit() ) ); KButtonBox *buttonBox = new KButtonBox( page, TQt::Vertical ); - buttonBox->addButton( i18n( "&Add..." ), this, TQT_SLOT( add() ) ); - mEditButton = buttonBox->addButton( i18n( "&Edit..." ), this, TQT_SLOT( edit() ) ); + buttonBox->addButton( i18n( "&Add..." ), this, TQ_SLOT( add() ) ); + mEditButton = buttonBox->addButton( i18n( "&Edit..." ), this, TQ_SLOT( edit() ) ); mEditButton->setEnabled( false ); - mRemoveButton = buttonBox->addButton( i18n( "&Remove" ), this, TQT_SLOT( remove() ) ); + mRemoveButton = buttonBox->addButton( i18n( "&Remove" ), this, TQ_SLOT( remove() ) ); mRemoveButton->setEnabled( false ); buttonBox->layout(); diff --git a/kaddressbook/filterselectionwidget.cpp b/kaddressbook/filterselectionwidget.cpp index 7daca0a4..41619cc5 100644 --- a/kaddressbook/filterselectionwidget.cpp +++ b/kaddressbook/filterselectionwidget.cpp @@ -38,8 +38,8 @@ FilterSelectionWidget::FilterSelectionWidget( TQWidget *parent, const char *name mFilterCombo = new KComboBox( this ); label->setBuddy( mFilterCombo ); - connect( mFilterCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SIGNAL( filterActivated( int ) ) ); + connect( mFilterCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SIGNAL( filterActivated( int ) ) ); } FilterSelectionWidget::~FilterSelectionWidget() diff --git a/kaddressbook/freebusywidget.cpp b/kaddressbook/freebusywidget.cpp index 491a9465..f1d11f0b 100644 --- a/kaddressbook/freebusywidget.cpp +++ b/kaddressbook/freebusywidget.cpp @@ -45,8 +45,8 @@ FreeBusyWidget::FreeBusyWidget( TDEABC::AddressBook *ab, TQWidget *parent, const label->setBuddy( mURL ); layout->addWidget( mURL ); - connect( mURL, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( setModified() ) ); + connect( mURL, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( setModified() ) ); } FreeBusyWidget::~FreeBusyWidget() diff --git a/kaddressbook/geowidget.cpp b/kaddressbook/geowidget.cpp index b77a34f9..b364202e 100644 --- a/kaddressbook/geowidget.cpp +++ b/kaddressbook/geowidget.cpp @@ -84,21 +84,21 @@ GeoWidget::GeoWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *nam mExtendedButton->setEnabled( false ); topLayout->addMultiCellWidget( mExtendedButton, 3, 3, 1, 2 ); - connect( mLatitudeBox, TQT_SIGNAL( valueChanged( double ) ), - TQT_SLOT( setModified() ) ); - connect( mLongitudeBox, TQT_SIGNAL( valueChanged( double ) ), - TQT_SLOT( setModified() ) ); - connect( mExtendedButton, TQT_SIGNAL( clicked() ), - TQT_SLOT( editGeoData() ) ); - - connect( mGeoIsValid, TQT_SIGNAL( toggled( bool ) ), - mLatitudeBox, TQT_SLOT( setEnabled( bool ) ) ); - connect( mGeoIsValid, TQT_SIGNAL( toggled( bool ) ), - mLongitudeBox, TQT_SLOT( setEnabled( bool ) ) ); - connect( mGeoIsValid, TQT_SIGNAL( toggled( bool ) ), - mExtendedButton, TQT_SLOT( setEnabled( bool ) ) ); - connect( mGeoIsValid, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( setModified() ) ); + connect( mLatitudeBox, TQ_SIGNAL( valueChanged( double ) ), + TQ_SLOT( setModified() ) ); + connect( mLongitudeBox, TQ_SIGNAL( valueChanged( double ) ), + TQ_SLOT( setModified() ) ); + connect( mExtendedButton, TQ_SIGNAL( clicked() ), + TQ_SLOT( editGeoData() ) ); + + connect( mGeoIsValid, TQ_SIGNAL( toggled( bool ) ), + mLatitudeBox, TQ_SLOT( setEnabled( bool ) ) ); + connect( mGeoIsValid, TQ_SIGNAL( toggled( bool ) ), + mLongitudeBox, TQ_SLOT( setEnabled( bool ) ) ); + connect( mGeoIsValid, TQ_SIGNAL( toggled( bool ) ), + mExtendedButton, TQ_SLOT( setEnabled( bool ) ) ); + connect( mGeoIsValid, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( setModified() ) ); } GeoWidget::~GeoWidget() @@ -225,26 +225,26 @@ GeoDialog::GeoDialog( TQWidget *parent, const char *name ) loadCityList(); - connect( mMapWidget, TQT_SIGNAL( changed() ), - TQT_SLOT( geoMapChanged() ) ); - connect( mCityCombo, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( cityInputChanged() ) ); - connect( mLatDegrees, TQT_SIGNAL( valueChanged( int ) ), - TQT_SLOT( sexagesimalInputChanged() ) ); - connect( mLatMinutes, TQT_SIGNAL( valueChanged( int ) ), - TQT_SLOT( sexagesimalInputChanged() ) ); - connect( mLatSeconds, TQT_SIGNAL( valueChanged( int ) ), - TQT_SLOT( sexagesimalInputChanged() ) ); - connect( mLatDirection, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( sexagesimalInputChanged() ) ); - connect( mLongDegrees, TQT_SIGNAL( valueChanged( int ) ), - TQT_SLOT( sexagesimalInputChanged() ) ); - connect( mLongMinutes, TQT_SIGNAL( valueChanged( int ) ), - TQT_SLOT( sexagesimalInputChanged() ) ); - connect( mLongSeconds, TQT_SIGNAL( valueChanged( int ) ), - TQT_SLOT( sexagesimalInputChanged() ) ); - connect( mLongDirection, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( sexagesimalInputChanged() ) ); + connect( mMapWidget, TQ_SIGNAL( changed() ), + TQ_SLOT( geoMapChanged() ) ); + connect( mCityCombo, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( cityInputChanged() ) ); + connect( mLatDegrees, TQ_SIGNAL( valueChanged( int ) ), + TQ_SLOT( sexagesimalInputChanged() ) ); + connect( mLatMinutes, TQ_SIGNAL( valueChanged( int ) ), + TQ_SLOT( sexagesimalInputChanged() ) ); + connect( mLatSeconds, TQ_SIGNAL( valueChanged( int ) ), + TQ_SLOT( sexagesimalInputChanged() ) ); + connect( mLatDirection, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( sexagesimalInputChanged() ) ); + connect( mLongDegrees, TQ_SIGNAL( valueChanged( int ) ), + TQ_SLOT( sexagesimalInputChanged() ) ); + connect( mLongMinutes, TQ_SIGNAL( valueChanged( int ) ), + TQ_SLOT( sexagesimalInputChanged() ) ); + connect( mLongSeconds, TQ_SIGNAL( valueChanged( int ) ), + TQ_SLOT( sexagesimalInputChanged() ) ); + connect( mLongDirection, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( sexagesimalInputChanged() ) ); TDEAcceleratorManager::manage( this ); } diff --git a/kaddressbook/imagewidget.cpp b/kaddressbook/imagewidget.cpp index b20fbfd4..2ff5bdef 100644 --- a/kaddressbook/imagewidget.cpp +++ b/kaddressbook/imagewidget.cpp @@ -109,7 +109,7 @@ ImageButton::ImageButton( const TQString &title, TQWidget *parent ) { setAcceptDrops( true ); - connect( this, TQT_SIGNAL( clicked() ), TQT_SLOT( load() ) ); + connect( this, TQ_SIGNAL( clicked() ), TQ_SLOT( load() ) ); } void ImageButton::setReadOnly( bool readOnly ) @@ -216,7 +216,7 @@ void ImageButton::mouseMoveEvent( TQMouseEvent *event ) void ImageButton::contextMenuEvent( TQContextMenuEvent *event ) { TQPopupMenu menu( this ); - menu.insertItem( i18n( "Reset" ), this, TQT_SLOT( clear() ) ); + menu.insertItem( i18n( "Reset" ), this, TQ_SLOT( clear() ) ); menu.exec( event->globalPos() ); } @@ -264,7 +264,7 @@ ImageBaseWidget::ImageBaseWidget( const TQString &title, topLayout->addWidget( box ); - connect( mImageButton, TQT_SIGNAL( changed() ), TQT_SIGNAL( changed() ) ); + connect( mImageButton, TQ_SIGNAL( changed() ), TQ_SIGNAL( changed() ) ); } ImageBaseWidget::~ImageBaseWidget() @@ -302,8 +302,8 @@ ImageWidget::ImageWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char mLogoWidget = new ImageBaseWidget( TDEABC::Addressee::logoLabel(), this ); layout->addWidget( mLogoWidget ); - connect( mPhotoWidget, TQT_SIGNAL( changed() ), TQT_SLOT( setModified() ) ); - connect( mLogoWidget, TQT_SIGNAL( changed() ), TQT_SLOT( setModified() ) ); + connect( mPhotoWidget, TQ_SIGNAL( changed() ), TQ_SLOT( setModified() ) ); + connect( mLogoWidget, TQ_SIGNAL( changed() ), TQ_SLOT( setModified() ) ); } void ImageWidget::loadContact( TDEABC::Addressee *addr ) diff --git a/kaddressbook/imeditwidget.cpp b/kaddressbook/imeditwidget.cpp index b7f812db..6f7ebf29 100644 --- a/kaddressbook/imeditwidget.cpp +++ b/kaddressbook/imeditwidget.cpp @@ -53,15 +53,15 @@ IMEditWidget::IMEditWidget( TQWidget *parent, TDEABC::Addressee &addr, const cha topLayout->addWidget( label, 0, 0 ); mIMEdit = new KLineEdit( this ); - connect( mIMEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( textChanged( const TQString& ) ) ); - connect( mIMEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SIGNAL( modified() ) ); + connect( mIMEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( textChanged( const TQString& ) ) ); + connect( mIMEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SIGNAL( modified() ) ); label->setBuddy( mIMEdit ); topLayout->addWidget( mIMEdit, 0, 1 ); mEditButton = new TQPushButton( i18n( "Edit IM Addresses..." ), this); - connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( edit() ) ); + connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( edit() ) ); topLayout->addMultiCellWidget( mEditButton, 1, 1, 0, 1 ); topLayout->activate(); diff --git a/kaddressbook/incsearchwidget.cpp b/kaddressbook/incsearchwidget.cpp index efd68ebd..96b655b4 100644 --- a/kaddressbook/incsearchwidget.cpp +++ b/kaddressbook/incsearchwidget.cpp @@ -73,18 +73,18 @@ IncSearchWidget::IncSearchWidget( TQWidget *parent, const char *name ) mInputTimer = new TQTimer( this ); - connect( mInputTimer, TQT_SIGNAL( timeout() ), - TQT_SLOT( timeout() ) ); - connect( mSearchText, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( announceDoSearch() ) ); - connect( mSearchText, TQT_SIGNAL( returnPressed() ), - TQT_SLOT( announceDoSearch() ) ); - connect( mFieldCombo, TQT_SIGNAL( activated( const TQString& ) ), - TQT_SLOT( announceDoSearch() ) ); - connect( button, TQT_SIGNAL( clicked() ), - mSearchText, TQT_SLOT( clear() ) ); - connect( button, TQT_SIGNAL( clicked() ), - TQT_SLOT( announceDoSearch() ) ); + connect( mInputTimer, TQ_SIGNAL( timeout() ), + TQ_SLOT( timeout() ) ); + connect( mSearchText, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( announceDoSearch() ) ); + connect( mSearchText, TQ_SIGNAL( returnPressed() ), + TQ_SLOT( announceDoSearch() ) ); + connect( mFieldCombo, TQ_SIGNAL( activated( const TQString& ) ), + TQ_SLOT( announceDoSearch() ) ); + connect( button, TQ_SIGNAL( clicked() ), + mSearchText, TQ_SLOT( clear() ) ); + connect( button, TQ_SIGNAL( clicked() ), + TQ_SLOT( announceDoSearch() ) ); initFields(); diff --git a/kaddressbook/interfaces/core.h b/kaddressbook/interfaces/core.h index 05ab8d91..1c578e23 100644 --- a/kaddressbook/interfaces/core.h +++ b/kaddressbook/interfaces/core.h @@ -155,32 +155,32 @@ class KDE_EXPORT Core : public TQObject virtual void setContactSelected( const TQString &uid ) = 0; /** - DCOP METHOD: Adds the given email address to address book. + DCOP method: Adds the given email address to address book. */ virtual void addEmail( const TQString& addr ) = 0; /** - DCOP METHOD: Imports the vCard, located at the given url. + DCOP method: Imports the vCard, located at the given url. */ virtual void importVCard( const KURL& url ) = 0; /** - DCOP METHOD: Imports the given vCard. + DCOP method: Imports the given vCard. */ virtual void importVCardFromData( const TQString& vCard ) = 0; /** - DCOP METHOD: Opens contact editor to input a new contact. + DCOP method: Opens contact editor to input a new contact. */ virtual void newContact() = 0; /** - DCOP METHOD: Opens distribution list editor to input a new distribution list. + DCOP method: Opens distribution list editor to input a new distribution list. */ virtual void newDistributionList() = 0; /** - DCOP METHOD: Returns the name of the contact, that matches the given + DCOP method: Returns the name of the contact, that matches the given phone number. */ virtual TQString getNameByPhone( const TQString& phone ) = 0; diff --git a/kaddressbook/interfaces/xxport.cpp b/kaddressbook/interfaces/xxport.cpp index a2874e8c..ca7da285 100644 --- a/kaddressbook/interfaces/xxport.cpp +++ b/kaddressbook/interfaces/xxport.cpp @@ -50,10 +50,10 @@ XXPort::XXPort( TDEABC::AddressBook *ab, TQWidget *parent, d->mExportMapper = new TQSignalMapper( this ); d->mImportMapper = new TQSignalMapper( this ); - connect( d->mExportMapper, TQT_SIGNAL( mapped( const TQString& ) ), - TQT_SLOT( slotExportActivated( const TQString& ) ) ); - connect( d->mImportMapper, TQT_SIGNAL( mapped( const TQString& ) ), - TQT_SLOT( slotImportActivated( const TQString& ) ) ); + connect( d->mExportMapper, TQ_SIGNAL( mapped( const TQString& ) ), + TQ_SLOT( slotExportActivated( const TQString& ) ) ); + connect( d->mImportMapper, TQ_SIGNAL( mapped( const TQString& ) ), + TQ_SLOT( slotImportActivated( const TQString& ) ) ); } XXPort::~XXPort() @@ -77,7 +77,7 @@ TDEABC::AddresseeList XXPort::importContacts( const TQString& ) const void XXPort::createImportAction( const TQString &label, const TQString &data ) { TQString id = "file_import_" + identifier() + ( data.isEmpty() ? TQString( "" ) : "_" + data ); - TDEAction *action = new TDEAction( label, 0, d->mImportMapper, TQT_SLOT( map() ), actionCollection(), id.latin1() ); + TDEAction *action = new TDEAction( label, 0, d->mImportMapper, TQ_SLOT( map() ), actionCollection(), id.latin1() ); d->mImportMapper->setMapping( action, ( data.isEmpty() ? TQString( "<empty>" ) : data ) ); @@ -87,7 +87,7 @@ void XXPort::createImportAction( const TQString &label, const TQString &data ) void XXPort::createExportAction( const TQString &label, const TQString &data ) { TQString id = "file_export_" + identifier() + ( data.isEmpty() ? TQString( "" ) : "_" + data ); - TDEAction *action = new TDEAction( label, 0, d->mExportMapper, TQT_SLOT( map() ), actionCollection(), id.latin1() ); + TDEAction *action = new TDEAction( label, 0, d->mExportMapper, TQ_SLOT( map() ), actionCollection(), id.latin1() ); d->mExportMapper->setMapping( action, ( data.isEmpty() ? TQString( "<empty>" ) : data ) ); diff --git a/kaddressbook/jumpbuttonbar.cpp b/kaddressbook/jumpbuttonbar.cpp index 1a1d249c..f58546ca 100644 --- a/kaddressbook/jumpbuttonbar.cpp +++ b/kaddressbook/jumpbuttonbar.cpp @@ -132,7 +132,7 @@ void JumpButtonBar::updateButtons() for ( uint i = 0; i < characters.count(); ++i ) { JumpButton *button = new JumpButton( characters[ i ], TQString(), mGroupBox ); - connect( button, TQT_SIGNAL( clicked() ), this, TQT_SLOT( letterClicked() ) ); + connect( button, TQ_SIGNAL( clicked() ), this, TQ_SLOT( letterClicked() ) ); mButtons.append( button ); button->show(); } @@ -151,7 +151,7 @@ void JumpButtonBar::updateButtons() if ( characters.count() - current <= possibleButtons - i ) { JumpButton *button = new JumpButton( characters[ current ], TQString(), mGroupBox ); - connect( button, TQT_SIGNAL( clicked() ), this, TQT_SLOT( letterClicked() ) ); + connect( button, TQ_SIGNAL( clicked() ), this, TQ_SLOT( letterClicked() ) ); mButtons.append( button ); button->show(); current++; @@ -163,7 +163,7 @@ void JumpButtonBar::updateButtons() range.append( characters[ j ] ); JumpButton *button = new JumpButton( characters[ current ], characters[ pos ], mGroupBox ); - connect( button, TQT_SIGNAL( clicked() ), this, TQT_SLOT( letterClicked() ) ); + connect( button, TQ_SIGNAL( clicked() ), this, TQ_SLOT( letterClicked() ) ); mButtons.append( button ); button->show(); current = ( i + 1 ) * offset; diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 63436315..85b08976 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -104,8 +104,8 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *parent, mIsPart = !parent->isA( "KAddressBookMain" ); mAddressBookChangedTimer = new TQTimer( this ); - connect( mAddressBookChangedTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( addressBookChanged() ) ); + connect( mAddressBookChangedTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( addressBookChanged() ) ); if ( file.isEmpty() ) { mAddressBook = TDEABC::StdAddressBook::self( true ); @@ -142,49 +142,49 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *parent, mSearchManager = new KAB::SearchManager( mAddressBook, parent ); - connect( mSearchManager, TQT_SIGNAL( contactsUpdated() ), - this, TQT_SLOT( slotContactsUpdated() ) ); + connect( mSearchManager, TQ_SIGNAL( contactsUpdated() ), + this, TQ_SLOT( slotContactsUpdated() ) ); initGUI(); - connect( mAddressBook, TQT_SIGNAL( addressBookChanged( AddressBook* ) ), - TQT_SLOT( delayedAddressBookChanged() ) ); - connect( mAddressBook, TQT_SIGNAL( loadingFinished( Resource* ) ), - TQT_SLOT( delayedAddressBookChanged() ) ); + connect( mAddressBook, TQ_SIGNAL( addressBookChanged( AddressBook* ) ), + TQ_SLOT( delayedAddressBookChanged() ) ); + connect( mAddressBook, TQ_SIGNAL( loadingFinished( Resource* ) ), + TQ_SLOT( delayedAddressBookChanged() ) ); mIncSearchWidget->setFocus(); - connect( mViewManager, TQT_SIGNAL( selected( const TQString& ) ), - TQT_SLOT( setContactSelected( const TQString& ) ) ); - connect( mViewManager, TQT_SIGNAL( executed( const TQString& ) ), - TQT_SLOT( editContact( const TQString& ) ) ); - connect( mViewManager, TQT_SIGNAL( modified() ), - TQT_SLOT( setModified() ) ); - connect( mViewManager, TQT_SIGNAL( urlDropped( const KURL& ) ), - mXXPortManager, TQT_SLOT( importVCard( const KURL& ) ) ); - connect( mViewManager, TQT_SIGNAL( viewFieldsChanged() ), - TQT_SLOT( updateIncSearchWidget() ) ); - connect( mExtensionManager, TQT_SIGNAL( modified( const TDEABC::Addressee::List& ) ), - this, TQT_SLOT( extensionModified( const TDEABC::Addressee::List& ) ) ); - connect( mExtensionManager, TQT_SIGNAL( deleted( const TQStringList& ) ), - this, TQT_SLOT( extensionDeleted( const TQStringList& ) ) ); - - connect( mXXPortManager, TQT_SIGNAL( modified() ), - TQT_SLOT( setModified() ) ); - - connect( mDetailsViewer, TQT_SIGNAL( highlightedMessage( const TQString& ) ), - TQT_SLOT( detailsHighlighted( const TQString& ) ) ); - - connect( mIncSearchWidget, TQT_SIGNAL( scrollUp() ), - mViewManager, TQT_SLOT( scrollUp() ) ); - connect( mIncSearchWidget, TQT_SIGNAL( scrollDown() ), - mViewManager, TQT_SLOT( scrollDown() ) ); + connect( mViewManager, TQ_SIGNAL( selected( const TQString& ) ), + TQ_SLOT( setContactSelected( const TQString& ) ) ); + connect( mViewManager, TQ_SIGNAL( executed( const TQString& ) ), + TQ_SLOT( editContact( const TQString& ) ) ); + connect( mViewManager, TQ_SIGNAL( modified() ), + TQ_SLOT( setModified() ) ); + connect( mViewManager, TQ_SIGNAL( urlDropped( const KURL& ) ), + mXXPortManager, TQ_SLOT( importVCard( const KURL& ) ) ); + connect( mViewManager, TQ_SIGNAL( viewFieldsChanged() ), + TQ_SLOT( updateIncSearchWidget() ) ); + connect( mExtensionManager, TQ_SIGNAL( modified( const TDEABC::Addressee::List& ) ), + this, TQ_SLOT( extensionModified( const TDEABC::Addressee::List& ) ) ); + connect( mExtensionManager, TQ_SIGNAL( deleted( const TQStringList& ) ), + this, TQ_SLOT( extensionDeleted( const TQStringList& ) ) ); + + connect( mXXPortManager, TQ_SIGNAL( modified() ), + TQ_SLOT( setModified() ) ); + + connect( mDetailsViewer, TQ_SIGNAL( highlightedMessage( const TQString& ) ), + TQ_SLOT( detailsHighlighted( const TQString& ) ) ); + + connect( mIncSearchWidget, TQ_SIGNAL( scrollUp() ), + mViewManager, TQ_SLOT( scrollUp() ) ); + connect( mIncSearchWidget, TQ_SIGNAL( scrollDown() ), + mViewManager, TQ_SLOT( scrollDown() ) ); mAddressBookService = new KAddressBookService( this ); mCommandHistory = new KCommandHistory( actionCollection(), true ); - connect( mCommandHistory, TQT_SIGNAL( commandExecuted() ), - mSearchManager, TQT_SLOT( reload() ) ); + connect( mCommandHistory, TQ_SIGNAL( commandExecuted() ), + mSearchManager, TQ_SLOT( reload() ) ); mSearchManager->reload(); @@ -1026,10 +1026,10 @@ void KABCore::openLDAPDialog() if ( !mLdapSearchDialog ) { mLdapSearchDialog = new LDAPSearchDialog( mAddressBook, this, mWidget ); - connect( mLdapSearchDialog, TQT_SIGNAL( addresseesAdded() ), - TQT_SLOT( addressBookChanged() ) ); - connect( mLdapSearchDialog, TQT_SIGNAL( addresseesAdded() ), - TQT_SLOT( setModified() ) ); + connect( mLdapSearchDialog, TQ_SIGNAL( addresseesAdded() ), + TQ_SLOT( addressBookChanged() ) ); + connect( mLdapSearchDialog, TQ_SIGNAL( addresseesAdded() ), + TQ_SLOT( setModified() ) ); } else mLdapSearchDialog->restoreSettings(); @@ -1043,8 +1043,8 @@ void KABCore::configure() saveSettings(); KCMultiDialog dlg( mWidget, "", true ); - connect( &dlg, TQT_SIGNAL( configCommitted() ), - this, TQT_SLOT( configurationChanged() ) ); + connect( &dlg, TQ_SIGNAL( configCommitted() ), + this, TQ_SLOT( configurationChanged() ) ); dlg.addModule( "kabconfig.desktop" ); dlg.addModule( "kabldapconfig.desktop" ); @@ -1157,10 +1157,10 @@ AddresseeEditorDialog *KABCore::createAddresseeEditorDialog( TQWidget *parent, { AddresseeEditorDialog *dialog = new AddresseeEditorDialog( this, parent, name ? name : "editorDialog" ); - connect( dialog, TQT_SIGNAL( contactModified( const TDEABC::Addressee& ) ), - TQT_SLOT( contactModified( const TDEABC::Addressee& ) ) ); - connect( dialog, TQT_SIGNAL( editorDestroyed( const TQString& ) ), - TQT_SLOT( slotEditorDestroyed( const TQString& ) ) ); + connect( dialog, TQ_SIGNAL( contactModified( const TDEABC::Addressee& ) ), + TQ_SLOT( contactModified( const TDEABC::Addressee& ) ) ); + connect( dialog, TQ_SIGNAL( editorDestroyed( const TQString& ) ), + TQ_SLOT( slotEditorDestroyed( const TQString& ) ) ); return dialog; } @@ -1199,8 +1199,8 @@ void KABCore::initGUI() searchTB->boxLayout()->setSpacing( KDialog::spacingHint() ); mIncSearchWidget = new IncSearchWidget( searchTB, "tde toolbar widget"); searchTB->setStretchableWidget( mIncSearchWidget ); - connect( mIncSearchWidget, TQT_SIGNAL( doSearch( const TQString& ) ), - TQT_SLOT( incrementalTextSearch( const TQString& ) ) ); + connect( mIncSearchWidget, TQ_SIGNAL( doSearch( const TQString& ) ), + TQ_SLOT( incrementalTextSearch( const TQString& ) ) ); mDetailsSplitter = new TQSplitter( mWidget ); @@ -1212,10 +1212,10 @@ void KABCore::initGUI() mDetailsStack = new TQWidgetStack( mDetailsSplitter ); mExtensionManager = new ExtensionManager( new TQWidget( mLeftSplitter ), mDetailsStack, this, this ); - connect( mExtensionManager, TQT_SIGNAL( detailsWidgetDeactivated( TQWidget* ) ), - this, TQT_SLOT( deactivateDetailsWidget( TQWidget* ) ) ); - connect( mExtensionManager, TQT_SIGNAL( detailsWidgetActivated( TQWidget* ) ), - this, TQT_SLOT( activateDetailsWidget( TQWidget* ) ) ); + connect( mExtensionManager, TQ_SIGNAL( detailsWidgetDeactivated( TQWidget* ) ), + this, TQ_SLOT( deactivateDetailsWidget( TQWidget* ) ) ); + connect( mExtensionManager, TQ_SIGNAL( detailsWidgetActivated( TQWidget* ) ), + this, TQ_SLOT( activateDetailsWidget( TQWidget* ) ) ); TQWidget *viewWidget = new TQWidget( mLeftSplitter ); if ( KABPrefs::instance()->contactListAboveExtensions() ) @@ -1244,8 +1244,8 @@ void KABCore::initGUI() i18n( "Click this button if you want to add more contacts to " "the current distribution list. You will be shown a dialog that allows " "to enter a list of existing contacts to this distribution list." ) ); - connect( mAddDistListButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( editSelectedDistributionList() ) ); + connect( mAddDistListButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( editSelectedDistributionList() ) ); buttonLayout->addWidget( mAddDistListButton ); mDistListButtonWidget->setShown( false ); viewLayout->addWidget( mDistListButtonWidget ); @@ -1257,16 +1257,16 @@ void KABCore::initGUI() TQWhatsThis::add( mRemoveDistListButton, i18n( "Click this button if you want to remove the selected contacts from " "the current distribution list." ) ); - connect( mRemoveDistListButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( removeSelectedContactsFromDistList() ) ); + connect( mRemoveDistListButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( removeSelectedContactsFromDistList() ) ); buttonLayout->addWidget( mRemoveDistListButton ); #endif mFilterSelectionWidget = new FilterSelectionWidget( searchTB , "tde toolbar widget" ); mViewManager->setFilterSelectionWidget( mFilterSelectionWidget ); - connect( mFilterSelectionWidget, TQT_SIGNAL( filterActivated( int ) ), - mViewManager, TQT_SLOT( setActiveFilter( int ) ) ); + connect( mFilterSelectionWidget, TQ_SIGNAL( filterActivated( int ) ), + mViewManager, TQ_SLOT( setActiveFilter( int ) ) ); mDetailsWidget = new TQWidget( mDetailsSplitter ); mDetailsLayout = new TQHBoxLayout( mDetailsWidget ); @@ -1280,15 +1280,15 @@ void KABCore::initGUI() detailsPageLayout->addWidget( mDetailsViewer ); mDistListEntryView = new KAB::DistributionListEntryView( this, mWidget ); - connect( mDistListEntryView, TQT_SIGNAL( distributionListClicked( const TQString& ) ), - this, TQT_SLOT( sendMailToDistributionList( const TQString& ) ) ); + connect( mDistListEntryView, TQ_SIGNAL( distributionListClicked( const TQString& ) ), + this, TQ_SLOT( sendMailToDistributionList( const TQString& ) ) ); mDetailsStack->addWidget( mDistListEntryView ); mDetailsStack->addWidget( mDetailsWidget ); mDetailsStack->raiseWidget( mDetailsWidget ); mDetailsSplitter->moveToLast( mDetailsStack ); - connect( mDetailsViewer, TQT_SIGNAL( addressClicked( const TQString&) ), - this, TQT_SLOT( showContactsAddress( const TQString& ) ) ); + connect( mDetailsViewer, TQ_SIGNAL( addressClicked( const TQString&) ), + this, TQ_SLOT( showContactsAddress( const TQString& ) ) ); topLayout->setStretchFactor( mDetailsSplitter, 1 ); @@ -1303,62 +1303,62 @@ void KABCore::createJumpButtonBar() mDetailsLayout->addWidget( mJumpButtonBar ); mDetailsLayout->setStretchFactor( mJumpButtonBar, 1 ); - connect( mJumpButtonBar, TQT_SIGNAL( jumpToLetter( const TQString& ) ), - TQT_SLOT( incrementalJumpButtonSearch( const TQString& ) ) ); - connect( mViewManager, TQT_SIGNAL( sortFieldChanged() ), - mJumpButtonBar, TQT_SLOT( updateButtons() ) ); + connect( mJumpButtonBar, TQ_SIGNAL( jumpToLetter( const TQString& ) ), + TQ_SLOT( incrementalJumpButtonSearch( const TQString& ) ) ); + connect( mViewManager, TQ_SIGNAL( sortFieldChanged() ), + mJumpButtonBar, TQ_SLOT( updateButtons() ) ); } void KABCore::initActions() { - connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ), - TQT_SLOT( clipboardDataChanged() ) ); + connect( TQApplication::clipboard(), TQ_SIGNAL( dataChanged() ), + TQ_SLOT( clipboardDataChanged() ) ); TDEAction *action; // file menu mActionMail = new TDEAction( i18n( "&Send Email to Contact..." ), "mail-send", 0, - this, TQT_SLOT( sendMail() ), actionCollection(), "file_mail" ); - action = KStdAction::print( this, TQT_SLOT( print() ), actionCollection() ); + this, TQ_SLOT( sendMail() ), actionCollection(), "file_mail" ); + action = KStdAction::print( this, TQ_SLOT( print() ), actionCollection() ); mActionMail->setWhatsThis( i18n( "Send a mail to all selected contacts." ) ); action->setWhatsThis( i18n( "Print a special number of contacts." ) ); mActionSave = KStdAction::save( this, - TQT_SLOT( save() ), actionCollection(), "file_sync" ); + TQ_SLOT( save() ), actionCollection(), "file_sync" ); mActionSave->setWhatsThis( i18n( "Save all changes of the address book to the storage backend." ) ); action = new TDEAction( i18n( "&New Contact..." ), "identity", CTRL+Key_N, this, - TQT_SLOT( newContact() ), actionCollection(), "file_new_contact" ); + TQ_SLOT( newContact() ), actionCollection(), "file_new_contact" ); action->setWhatsThis( i18n( "Create a new contact<p>You will be presented with a dialog where you can add all data about a person, including addresses and phone numbers." ) ); action = new TDEAction( i18n( "&New Distribution List..." ), "kontact_contacts", 0, this, - TQT_SLOT( newDistributionList() ), actionCollection(), "file_new_distributionlist" ); + TQ_SLOT( newDistributionList() ), actionCollection(), "file_new_distributionlist" ); action->setWhatsThis( i18n( "Create a new distribution list<p>You will be presented with a dialog where you can create a new distribution list." ) ); mActionMailVCard = new TDEAction( i18n("Send &Contact..."), "mail_post_to", 0, - this, TQT_SLOT( mailVCard() ), + this, TQ_SLOT( mailVCard() ), actionCollection(), "file_mail_vcard" ); mActionMailVCard->setWhatsThis( i18n( "Send a mail with the selected contact as attachment." ) ); mActionChat = new TDEAction( i18n("Chat &With..."), 0, - this, TQT_SLOT( startChat() ), + this, TQ_SLOT( startChat() ), actionCollection(), "file_chat" ); mActionChat->setWhatsThis( i18n( "Start a chat with the selected contact." ) ); mActionEditAddressee = new TDEAction( i18n( "&Edit Contact..." ), "edit", 0, - this, TQT_SLOT( editContact() ), + this, TQ_SLOT( editContact() ), actionCollection(), "file_properties" ); mActionEditAddressee->setWhatsThis( i18n( "Edit a contact<p>You will be presented with a dialog where you can change all data about a person, including addresses and phone numbers." ) ); mActionMerge = new TDEAction( i18n( "&Merge Contacts" ), "", 0, - this, TQT_SLOT( mergeContacts() ), + this, TQ_SLOT( mergeContacts() ), actionCollection(), "edit_merge" ); // edit menu - mActionCopy = KStdAction::copy( this, TQT_SLOT( copyContacts() ), actionCollection() ); - mActionCut = KStdAction::cut( this, TQT_SLOT( cutContacts() ), actionCollection() ); - mActionPaste = KStdAction::paste( this, TQT_SLOT( pasteContacts() ), actionCollection() ); - action = KStdAction::selectAll( this, TQT_SLOT( selectAllContacts() ), actionCollection() ); + mActionCopy = KStdAction::copy( this, TQ_SLOT( copyContacts() ), actionCollection() ); + mActionCut = KStdAction::cut( this, TQ_SLOT( cutContacts() ), actionCollection() ); + mActionPaste = KStdAction::paste( this, TQ_SLOT( pasteContacts() ), actionCollection() ); + action = KStdAction::selectAll( this, TQ_SLOT( selectAllContacts() ), actionCollection() ); mActionCopy->setWhatsThis( i18n( "Copy the currently selected contact(s) to system clipboard in vCard format." ) ); mActionCut->setWhatsThis( i18n( "Cuts the currently selected contact(s) to system clipboard in vCard format." ) ); mActionPaste->setWhatsThis( i18n( "Paste the previously cut or copied contacts from clipboard." ) ); @@ -1367,19 +1367,19 @@ void KABCore::initActions() // mActionRedo->setWhatsThis( i18n( "Redoes the last <b>Cut</b>, <b>Copy</b> or <b>Paste</b>." ) ); mActionDelete = new TDEAction( i18n( "&Delete Contact" ), "edit-delete", - Key_Delete, this, TQT_SLOT( deleteContacts() ), + Key_Delete, this, TQ_SLOT( deleteContacts() ), actionCollection(), "edit_delete" ); mActionDelete->setWhatsThis( i18n( "Delete all selected contacts." ) ); mActionCopyAddresseeTo = new TDEAction( i18n( "&Copy Contact To..." ), "", 0, - this, TQT_SLOT( copySelectedContactToResource() ), + this, TQ_SLOT( copySelectedContactToResource() ), actionCollection(), "copy_contact_to" ); const TQString copyMoveWhatsThis = i18n( "Store a contact in a different Addressbook<p>You will be presented with a dialog where you can select a new storage place for this contact." ); mActionCopyAddresseeTo->setWhatsThis( copyMoveWhatsThis ); mActionMoveAddresseeTo = new TDEAction( i18n( "M&ove Contact To..." ), "", 0, - this, TQT_SLOT( moveSelectedContactToResource() ), + this, TQ_SLOT( moveSelectedContactToResource() ), actionCollection(), "move_contact_to" ); mActionMoveAddresseeTo->setWhatsThis( copyMoveWhatsThis ); @@ -1388,41 +1388,41 @@ void KABCore::initActions() actionCollection(), "options_show_jump_bar" ); mActionJumpBar->setWhatsThis( i18n( "Toggle whether the jump button bar shall be visible." ) ); mActionJumpBar->setCheckedState( i18n( "Hide Jump Bar") ); - connect( mActionJumpBar, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( setJumpButtonBarVisible( bool ) ) ); + connect( mActionJumpBar, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( setJumpButtonBarVisible( bool ) ) ); mActionDetails = new TDEToggleAction( i18n( "Show Details" ), 0, 0, actionCollection(), "options_show_details" ); mActionDetails->setWhatsThis( i18n( "Toggle whether the details page shall be visible." ) ); mActionDetails->setCheckedState( i18n( "Hide Details") ); - connect( mActionDetails, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( setDetailsVisible( bool ) ) ); + connect( mActionDetails, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( setDetailsVisible( bool ) ) ); if ( mIsPart ) action = new TDEAction( i18n( "&Configure Address Book..." ), "configure", 0, - this, TQT_SLOT( configure() ), actionCollection(), + this, TQ_SLOT( configure() ), actionCollection(), "kaddressbook_configure" ); else - action = KStdAction::preferences( this, TQT_SLOT( configure() ), actionCollection() ); + action = KStdAction::preferences( this, TQ_SLOT( configure() ), actionCollection() ); action->setWhatsThis( i18n( "You will be presented with a dialog, that offers you all possibilities to configure KAddressBook." ) ); // misc action = new TDEAction( i18n( "&Lookup Addresses in LDAP Directory..." ), "edit-find", 0, - this, TQT_SLOT( openLDAPDialog() ), actionCollection(), "ldap_lookup" ); + this, TQ_SLOT( openLDAPDialog() ), actionCollection(), "ldap_lookup" ); action->setWhatsThis( i18n( "Search for contacts on a LDAP server<p>You will be presented with a dialog, where you can search for contacts and select the ones you want to add to your local address book." ) ); mActionWhoAmI = new TDEAction( i18n( "Set as Personal Contact Data" ), "preferences-desktop-personal", 0, this, - TQT_SLOT( setWhoAmI() ), actionCollection(), + TQ_SLOT( setWhoAmI() ), actionCollection(), "edit_set_personal" ); mActionWhoAmI->setWhatsThis( i18n( "Set the personal contact<p>The data of this contact will be used in many other TDE applications, so you do not have to input your personal data several times." ) ); mActionCategories = new TDEAction( i18n( "Select Categories..." ), 0, this, - TQT_SLOT( setCategories() ), actionCollection(), + TQ_SLOT( setCategories() ), actionCollection(), "edit_set_categories" ); mActionCategories->setWhatsThis( i18n( "Set the categories for all selected contacts." ) ); TDEAction *clearLocation = new TDEAction( i18n( "Clear Search Bar" ), TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", - CTRL+Key_L, this, TQT_SLOT( slotClearSearchBar() ), actionCollection(), "clear_search" ); + CTRL+Key_L, this, TQ_SLOT( slotClearSearchBar() ), actionCollection(), "clear_search" ); clearLocation->setWhatsThis( i18n( "Clear Search Bar<p>" "Clears the content of the quick search bar." ) ); @@ -1490,9 +1490,9 @@ void KABCore::setCategories() // Show the category dialog if ( mCategorySelectDialog == 0 ) { mCategorySelectDialog = new KPIM::CategorySelectDialog( KABPrefs::instance(), mWidget ); - connect( mCategorySelectDialog, TQT_SIGNAL( categoriesSelected( const TQStringList& ) ), - TQT_SLOT( categoriesSelected( const TQStringList& ) ) ); - connect( mCategorySelectDialog, TQT_SIGNAL( editCategories() ), TQT_SLOT( editCategories() ) ); + connect( mCategorySelectDialog, TQ_SIGNAL( categoriesSelected( const TQStringList& ) ), + TQ_SLOT( categoriesSelected( const TQStringList& ) ) ); + connect( mCategorySelectDialog, TQ_SIGNAL( editCategories() ), TQ_SLOT( editCategories() ) ); } mCategorySelectDialog->show(); @@ -1537,8 +1537,8 @@ void KABCore::editCategories() { if ( mCategoryEditDialog == 0 ) { mCategoryEditDialog = new KPIM::CategoryEditDialog( KABPrefs::instance(), mWidget ); - connect( mCategoryEditDialog, TQT_SIGNAL( categoryConfigChanged() ), - mCategorySelectDialog, TQT_SLOT( updateCategoryConfig() ) ); + connect( mCategoryEditDialog, TQ_SIGNAL( categoryConfigChanged() ), + mCategorySelectDialog, TQ_SLOT( updateCategoryConfig() ) ); } mCategoryEditDialog->show(); diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h index 8661251a..43ce8bb3 100644 --- a/kaddressbook/kabcore.h +++ b/kaddressbook/kabcore.h @@ -293,38 +293,38 @@ class KDE_EXPORT KABCore : public KAB::Core void contactModified( const TDEABC::Addressee &addr ); /** - DCOP METHOD: Adds the given email address to address book. + DCOP method: Adds the given email address to address book. */ virtual void addEmail( const TQString& addr ); /** - DCOP METHOD: Imports the vCard, located at the given url. + DCOP method: Imports the vCard, located at the given url. */ virtual void importVCard( const KURL& url ); /** - DCOP METHOD: Imports the given vCard. + DCOP method: Imports the given vCard. */ virtual void importVCardFromData( const TQString& vCard ); /** - DCOP METHOD: Opens contact editor to input a new contact. + DCOP method: Opens contact editor to input a new contact. */ virtual void newContact(); /** - DCOP METHOD: Opens distribution list editor to create a new distribution list + DCOP method: Opens distribution list editor to create a new distribution list */ virtual void newDistributionList(); /** - DCOP METHOD: Returns the name of the contact, that matches the given + DCOP method: Returns the name of the contact, that matches the given phone number. */ virtual TQString getNameByPhone( const TQString& phone ); /** - DCOP METHOD: Handle command line arguments, return true if handled + DCOP method: Handle command line arguments, return true if handled and false if no args was given. The iface is either the mainwin or the part. */ bool handleCommandLine( KAddressBookIface* iface ); diff --git a/kaddressbook/kaddressbookmain.cpp b/kaddressbook/kaddressbookmain.cpp index fce5fd8c..ca6df18b 100644 --- a/kaddressbook/kaddressbookmain.cpp +++ b/kaddressbook/kaddressbookmain.cpp @@ -150,13 +150,13 @@ bool KAddressBookMain::queryClose() void KAddressBookMain::initActions() { - KStdAction::quit( this, TQT_SLOT( close() ), actionCollection() ); + KStdAction::quit( this, TQ_SLOT( close() ), actionCollection() ); TDEAction *action; - action = KStdAction::keyBindings( this, TQT_SLOT( configureKeyBindings() ), actionCollection() ); + action = KStdAction::keyBindings( this, TQ_SLOT( configureKeyBindings() ), actionCollection() ); action->setWhatsThis( i18n( "You will be presented with a dialog, where you can configure the application wide shortcuts." ) ); - KStdAction::configureToolbars( this, TQT_SLOT( configureToolbars() ), actionCollection() ); + KStdAction::configureToolbars( this, TQ_SLOT( configureToolbars() ), actionCollection() ); } void KAddressBookMain::configureKeyBindings() @@ -177,8 +177,8 @@ void KAddressBookMain::configureToolbars() saveMainWindowSettings( TDEGlobal::config(), "MainWindow" ); KEditToolbar edit( factory() ); - connect( &edit, TQT_SIGNAL( newToolbarConfig() ), - this, TQT_SLOT( newToolbarConfig() ) ); + connect( &edit, TQ_SIGNAL( newToolbarConfig() ), + this, TQ_SLOT( newToolbarConfig() ) ); edit.exec(); } diff --git a/kaddressbook/kaddressbookview.cpp b/kaddressbook/kaddressbookview.cpp index d86103db..07df33b6 100644 --- a/kaddressbook/kaddressbookview.cpp +++ b/kaddressbook/kaddressbookview.cpp @@ -43,8 +43,8 @@ KAddressBookView::KAddressBookView( KAB::Core *core, TQWidget *parent, { initGUI(); - connect( mCore->searchManager(), TQT_SIGNAL( contactsUpdated() ), - TQT_SLOT( updateView() ) ); + connect( mCore->searchManager(), TQ_SIGNAL( contactsUpdated() ), + TQ_SLOT( updateView() ) ); } KAddressBookView::~KAddressBookView() diff --git a/kaddressbook/kcmconfigs/addresseewidget.cpp b/kaddressbook/kcmconfigs/addresseewidget.cpp index c083a029..35bc17a1 100644 --- a/kaddressbook/kcmconfigs/addresseewidget.cpp +++ b/kaddressbook/kcmconfigs/addresseewidget.cpp @@ -51,15 +51,15 @@ NamePartWidget::NamePartWidget( const TQString &title, const TQString &label, KDialog::spacingHint() ); mBox = new TQListBox( group ); - connect( mBox, TQT_SIGNAL( selectionChanged( TQListBoxItem* ) ), - TQT_SLOT( selectionChanged( TQListBoxItem* ) ) ); + connect( mBox, TQ_SIGNAL( selectionChanged( TQListBoxItem* ) ), + TQ_SLOT( selectionChanged( TQListBoxItem* ) ) ); groupLayout->addWidget( mBox, 0, 0 ); KButtonBox *bbox = new KButtonBox( group, TQt::Vertical ); - mAddButton = bbox->addButton( i18n( "Add..." ), this, TQT_SLOT( add() ) ); - mEditButton = bbox->addButton( i18n( "Edit..." ), this, TQT_SLOT( edit() ) ); + mAddButton = bbox->addButton( i18n( "Add..." ), this, TQ_SLOT( add() ) ); + mEditButton = bbox->addButton( i18n( "Edit..." ), this, TQ_SLOT( edit() ) ); mEditButton->setEnabled( false ); - mRemoveButton = bbox->addButton( i18n( "Remove" ), this, TQT_SLOT( remove() ) ); + mRemoveButton = bbox->addButton( i18n( "Remove" ), this, TQ_SLOT( remove() ) ); mRemoveButton->setEnabled( false ); bbox->layout(); groupLayout->addWidget( bbox, 0, 1 ); @@ -157,10 +157,10 @@ AddresseeWidget::AddresseeWidget( TQWidget *parent, const char *name ) mFormattedNameCombo->insertItem( i18n( "Reverse Name" ) ); layout->addMultiCellWidget( mFormattedNameCombo, 1, 1, 1, 2 ); - connect( mPrefix, TQT_SIGNAL( modified() ), TQT_SIGNAL( modified() ) ); - connect( mInclusion, TQT_SIGNAL( modified() ), TQT_SIGNAL( modified() ) ); - connect( mSuffix, TQT_SIGNAL( modified() ), TQT_SIGNAL( modified() ) ); - connect( mFormattedNameCombo, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( modified() ) ); + connect( mPrefix, TQ_SIGNAL( modified() ), TQ_SIGNAL( modified() ) ); + connect( mInclusion, TQ_SIGNAL( modified() ), TQ_SIGNAL( modified() ) ); + connect( mSuffix, TQ_SIGNAL( modified() ), TQ_SIGNAL( modified() ) ); + connect( mFormattedNameCombo, TQ_SIGNAL( activated( int ) ), TQ_SIGNAL( modified() ) ); } AddresseeWidget::~AddresseeWidget() diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp index 97e5c119..07574e56 100644 --- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp +++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp @@ -141,22 +141,22 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name ) boxLayout->addWidget( mLocationMapURL ); layout->addWidget( groupBox ); - connect( mNameParsing, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) ); - connect( mViewsSingleClickBox, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) ); - connect( mTradeAsFamilyName, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) ); - connect( mLimitContactDisplay, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) ); - connect( mPhoneHook, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( modified() ) ); - connect( mSMSHook, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( modified() ) ); - connect( mFaxHook, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( modified() ) ); - connect( mLocationMapURL, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( modified() ) ); - connect( mEditorCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( modified() ) ); + connect( mNameParsing, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( modified() ) ); + connect( mViewsSingleClickBox, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( modified() ) ); + connect( mTradeAsFamilyName, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( modified() ) ); + connect( mLimitContactDisplay, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( modified() ) ); + connect( mPhoneHook, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( modified() ) ); + connect( mSMSHook, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( modified() ) ); + connect( mFaxHook, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( modified() ) ); + connect( mLocationMapURL, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( modified() ) ); + connect( mEditorCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( modified() ) ); tabWidget->addTab( generalPage, i18n( "General" ) ); // Addressee page mAddresseeWidget = new AddresseeWidget( this ); tabWidget->addTab( mAddresseeWidget, i18n( "Contact" ) ); - connect( mAddresseeWidget, TQT_SIGNAL( modified() ), TQT_SLOT( modified() ) ); + connect( mAddresseeWidget, TQ_SIGNAL( modified() ), TQ_SLOT( modified() ) ); } void KABConfigWidget::restoreSettings() diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.cpp b/kaddressbook/kcmconfigs/kcmkabconfig.cpp index ce2c9973..7bc6abd6 100644 --- a/kaddressbook/kcmconfigs/kcmkabconfig.cpp +++ b/kaddressbook/kcmconfigs/kcmkabconfig.cpp @@ -47,7 +47,7 @@ KCMKabConfig::KCMKabConfig( TQWidget *parent, const char *name ) mConfigWidget = new KABConfigWidget( this, "mConfigWidget" ); layout->addWidget( mConfigWidget ); - connect( mConfigWidget, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ) ) ); + connect( mConfigWidget, TQ_SIGNAL( changed( bool ) ), TQ_SIGNAL( changed( bool ) ) ); load(); diff --git a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp index 0731ae57..da6bf49b 100644 --- a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp +++ b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp @@ -48,7 +48,7 @@ KCMKabLdapConfig::KCMKabLdapConfig( TQWidget *parent, const char *name ) mConfigWidget = new LDAPOptionsWidget( this ); layout->addWidget( mConfigWidget ); - connect( mConfigWidget, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ) ) ); + connect( mConfigWidget, TQ_SIGNAL( changed( bool ) ), TQ_SIGNAL( changed( bool ) ) ); load(); diff --git a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp index db8bbef7..f8bcfdb9 100644 --- a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp +++ b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp @@ -80,14 +80,14 @@ LDAPOptionsWidget::LDAPOptionsWidget( TQWidget* parent, const char* name ) mHostListView->addColumn( TQString() ); mHostListView->header()->hide(); - connect( mHostListView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), - TQT_SLOT( slotSelectionChanged( TQListViewItem* ) ) ); - connect( mHostListView, TQT_SIGNAL(doubleClicked( TQListViewItem *, const TQPoint &, int )), this, TQT_SLOT(slotEditHost())); - connect( mHostListView, TQT_SIGNAL( clicked( TQListViewItem* ) ), - TQT_SLOT( slotItemClicked( TQListViewItem* ) ) ); - - connect( mUpButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotMoveUp() ) ); - connect( mDownButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotMoveDown() ) ); + connect( mHostListView, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ), + TQ_SLOT( slotSelectionChanged( TQListViewItem* ) ) ); + connect( mHostListView, TQ_SIGNAL(doubleClicked( TQListViewItem *, const TQPoint &, int )), this, TQ_SLOT(slotEditHost())); + connect( mHostListView, TQ_SIGNAL( clicked( TQListViewItem* ) ), + TQ_SLOT( slotItemClicked( TQListViewItem* ) ) ); + + connect( mUpButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveUp() ) ); + connect( mDownButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveDown() ) ); } LDAPOptionsWidget::~LDAPOptionsWidget() @@ -288,10 +288,10 @@ void LDAPOptionsWidget::initGUI() layout->addWidget( groupBox ); KButtonBox *buttons = new KButtonBox( this ); - buttons->addButton( i18n( "&Add Host..." ), this, TQT_SLOT( slotAddHost() ) ); - mEditButton = buttons->addButton( i18n( "&Edit Host..." ), this, TQT_SLOT( slotEditHost() ) ); + buttons->addButton( i18n( "&Add Host..." ), this, TQ_SLOT( slotAddHost() ) ); + mEditButton = buttons->addButton( i18n( "&Edit Host..." ), this, TQ_SLOT( slotEditHost() ) ); mEditButton->setEnabled( false ); - mRemoveButton = buttons->addButton( i18n( "&Remove Host" ), this, TQT_SLOT( slotRemoveHost() ) ); + mRemoveButton = buttons->addButton( i18n( "&Remove Host" ), this, TQ_SLOT( slotRemoveHost() ) ); mRemoveButton->setEnabled( false ); buttons->layout(); diff --git a/kaddressbook/keywidget.cpp b/kaddressbook/keywidget.cpp index c0417b7e..890bf644 100644 --- a/kaddressbook/keywidget.cpp +++ b/kaddressbook/keywidget.cpp @@ -61,9 +61,9 @@ KeyWidget::KeyWidget( TQWidget *parent, const char *name ) mExportButton->setEnabled( false ); layout->addMultiCellWidget( mExportButton, 3, 3, 0, 1 ); - connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addKey() ) ); - connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeKey() ) ); - connect( mExportButton, TQT_SIGNAL( clicked() ), TQT_SLOT( exportKey() ) ); + connect( mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( addKey() ) ); + connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeKey() ) ); + connect( mExportButton, TQ_SIGNAL( clicked() ), TQ_SLOT( exportKey() ) ); } KeyWidget::~KeyWidget() diff --git a/kaddressbook/ldapsearchdialog.cpp b/kaddressbook/ldapsearchdialog.cpp index 7e5c1a6c..07668b71 100644 --- a/kaddressbook/ldapsearchdialog.cpp +++ b/kaddressbook/ldapsearchdialog.cpp @@ -203,8 +203,8 @@ LDAPSearchDialog::LDAPSearchDialog( TDEABC::AddressBook *ab, KABCore *core, topLayout->addWidget( mResultListView ); KButtonBox *buttons = new KButtonBox( page, TQt::Horizontal ); - buttons->addButton( i18n( "Select All" ), this, TQT_SLOT( slotSelectAll() ) ); - buttons->addButton( i18n( "Unselect All" ), this, TQT_SLOT( slotUnselectAll() ) ); + buttons->addButton( i18n( "Select All" ), this, TQ_SLOT( slotSelectAll() ) ); + buttons->addButton( i18n( "Unselect All" ), this, TQ_SLOT( slotUnselectAll() ) ); topLayout->addWidget( buttons ); @@ -222,10 +222,10 @@ LDAPSearchDialog::LDAPSearchDialog( TDEABC::AddressBook *ab, KABCore *core, mNumHosts = 0; mIsOK = false; - connect( mRecursiveCheckbox, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotSetScope( bool ) ) ); - connect( mSearchButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotStartSearch() ) ); + connect( mRecursiveCheckbox, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotSetScope( bool ) ) ); + connect( mSearchButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotStartSearch() ) ); setTabOrder(mSearchEdit, mFilterCombo); setTabOrder(mFilterCombo, mSearchButton); @@ -275,12 +275,12 @@ void LDAPSearchDialog::restoreSettings() ldapClient->setAttrs( attrs ); - connect( ldapClient, TQT_SIGNAL( result( const KPIM::LdapObject& ) ), - this, TQT_SLOT( slotAddResult( const KPIM::LdapObject& ) ) ); - connect( ldapClient, TQT_SIGNAL( done() ), - this, TQT_SLOT( slotSearchDone() ) ); - connect( ldapClient, TQT_SIGNAL( error( const TQString& ) ), - this, TQT_SLOT( slotError( const TQString& ) ) ); + connect( ldapClient, TQ_SIGNAL( result( const KPIM::LdapObject& ) ), + this, TQ_SLOT( slotAddResult( const KPIM::LdapObject& ) ) ); + connect( ldapClient, TQ_SIGNAL( done() ), + this, TQ_SLOT( slotSearchDone() ) ); + connect( ldapClient, TQ_SIGNAL( error( const TQString& ) ), + this, TQ_SLOT( slotError( const TQString& ) ) ); mLdapClientList.append( ldapClient ); } @@ -387,10 +387,10 @@ void LDAPSearchDialog::slotStartSearch() TQApplication::setOverrideCursor( TQt::waitCursor ); mSearchButton->setText( i18n( "Stop" ) ); - disconnect( mSearchButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotStartSearch() ) ); - connect( mSearchButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotStopSearch() ) ); + disconnect( mSearchButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotStartSearch() ) ); + connect( mSearchButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotStopSearch() ) ); bool startsWith = (mSearchType->currentItem() == 1); @@ -419,10 +419,10 @@ void LDAPSearchDialog::slotSearchDone() return; } - disconnect( mSearchButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotStopSearch() ) ); - connect( mSearchButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotStartSearch() ) ); + disconnect( mSearchButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotStopSearch() ) ); + connect( mSearchButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotStartSearch() ) ); mSearchButton->setText( i18n( "&Search" ) ); TQApplication::restoreOverrideCursor(); diff --git a/kaddressbook/nameeditdialog.cpp b/kaddressbook/nameeditdialog.cpp index 0d350ae7..6d90324a 100644 --- a/kaddressbook/nameeditdialog.cpp +++ b/kaddressbook/nameeditdialog.cpp @@ -105,7 +105,7 @@ NameEditDialog::NameEditDialog( const TDEABC::Addressee &addr, int type, mFormattedNameCombo = new KComboBox( page ); mFormattedNameCombo->setEnabled( !readOnly ); layout->addWidget( mFormattedNameCombo, 5, 1 ); - connect( mFormattedNameCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( typeChanged( int ) ) ); + connect( mFormattedNameCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( typeChanged( int ) ) ); mFormattedNameEdit = new KLineEdit( page ); mFormattedNameEdit->setEnabled( type == CustomName && !readOnly ); @@ -113,8 +113,8 @@ NameEditDialog::NameEditDialog( const TDEABC::Addressee &addr, int type, mParseBox = new TQCheckBox( i18n( "Parse name automatically" ), page ); mParseBox->setEnabled( !readOnly ); - connect( mParseBox, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( parseBoxChanged(bool) ) ); - connect( mParseBox, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( modified() ) ); + connect( mParseBox, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( parseBoxChanged(bool) ) ); + connect( mParseBox, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( modified() ) ); layout->addMultiCellWidget( mParseBox, 6, 6, 0, 1 ); // Fill in the values @@ -159,24 +159,24 @@ NameEditDialog::NameEditDialog( const TDEABC::Addressee &addr, int type, TDEAcceleratorManager::manage( this ); - connect( mPrefixCombo, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( modified() ) ); - connect( mGivenNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( modified() ) ); - connect( mAdditionalNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( modified() ) ); - connect( mFamilyNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( modified() ) ); - connect( mSuffixCombo, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( modified() ) ); - connect( mFormattedNameCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( modified() ) ); - connect( mFormattedNameCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( formattedNameTypeChanged() ) ); - connect( mFormattedNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( modified() ) ); - connect( mFormattedNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( formattedNameChanged( const TQString& ) ) ); + connect( mPrefixCombo, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( modified() ) ); + connect( mGivenNameEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( modified() ) ); + connect( mAdditionalNameEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( modified() ) ); + connect( mFamilyNameEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( modified() ) ); + connect( mSuffixCombo, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( modified() ) ); + connect( mFormattedNameCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( modified() ) ); + connect( mFormattedNameCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( formattedNameTypeChanged() ) ); + connect( mFormattedNameEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( modified() ) ); + connect( mFormattedNameEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( formattedNameChanged( const TQString& ) ) ); initTypeCombo(); mFormattedNameCombo->setCurrentItem( type ); diff --git a/kaddressbook/phoneeditwidget.cpp b/kaddressbook/phoneeditwidget.cpp index b1d87f41..e4857ae7 100644 --- a/kaddressbook/phoneeditwidget.cpp +++ b/kaddressbook/phoneeditwidget.cpp @@ -56,10 +56,10 @@ PhoneTypeCombo::PhoneTypeCombo( TQWidget *parent ) update(); - connect( this, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( selected( int ) ) ); - connect( this, TQT_SIGNAL( activated( int ) ), - this, TQT_SIGNAL( modified() ) ); + connect( this, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( selected( int ) ) ); + connect( this, TQ_SIGNAL( activated( int ) ), + this, TQ_SIGNAL( modified() ) ); } PhoneTypeCombo::~PhoneTypeCombo() @@ -137,8 +137,8 @@ PhoneNumberWidget::PhoneNumberWidget( TQWidget *parent ) layout->addWidget( mTypeCombo ); layout->addWidget( mNumberEdit ); - connect( mTypeCombo, TQT_SIGNAL( modified() ), TQT_SIGNAL( modified() ) ); - connect( mNumberEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SIGNAL( modified() ) ); + connect( mTypeCombo, TQ_SIGNAL( modified() ), TQ_SIGNAL( modified() ) ); + connect( mNumberEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SIGNAL( modified() ) ); } void PhoneNumberWidget::setNumber( const TDEABC::PhoneNumber &number ) @@ -184,10 +184,10 @@ PhoneEditWidget::PhoneEditWidget( TQWidget *parent, const char *name ) layout->addWidget( mRemoveButton, 1, 1 ); mMapper = new TQSignalMapper( this ); - connect( mMapper, TQT_SIGNAL( mapped( int ) ), TQT_SLOT( changed( int ) ) ); + connect( mMapper, TQ_SIGNAL( mapped( int ) ), TQ_SLOT( changed( int ) ) ); - connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( add() ) ); - connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( remove() ) ); + connect( mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( add() ) ); + connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( remove() ) ); } PhoneEditWidget::~PhoneEditWidget() @@ -272,7 +272,7 @@ void PhoneEditWidget::recreateNumberWidgets() wdg->setNumber( *it ); mMapper->setMapping( wdg, counter ); - connect( wdg, TQT_SIGNAL( modified() ), mMapper, TQT_SLOT( map() ) ); + connect( wdg, TQ_SIGNAL( modified() ), mMapper, TQ_SLOT( map() ) ); mWidgetLayout->addWidget( wdg ); mWidgets.append( wdg ); diff --git a/kaddressbook/printing/printingwizard.cpp b/kaddressbook/printing/printingwizard.cpp index eecf434c..a9375e3c 100644 --- a/kaddressbook/printing/printingwizard.cpp +++ b/kaddressbook/printing/printingwizard.cpp @@ -75,7 +75,7 @@ PrintingWizard::PrintingWizard( KPrinter *printer, TDEABC::AddressBook* ab, mStylePage = new StylePage( mAddressBook, this ); - connect( mStylePage, TQT_SIGNAL( styleChanged(int) ), TQT_SLOT( slotStyleSelected(int) ) ); + connect( mStylePage, TQ_SIGNAL( styleChanged(int) ), TQ_SLOT( slotStyleSelected(int) ) ); insertPage( mStylePage, i18n("Choose Printing Style"), -1 ); registerStyles(); diff --git a/kaddressbook/printing/selectionpage.cpp b/kaddressbook/printing/selectionpage.cpp index 060f839c..5a42444b 100644 --- a/kaddressbook/printing/selectionpage.cpp +++ b/kaddressbook/printing/selectionpage.cpp @@ -90,8 +90,8 @@ SelectionPage::SelectionPage( TQWidget* parent, const char* name ) topLayout->addWidget( mButtonGroup ); - connect( mFiltersCombo, TQT_SIGNAL( activated(int) ), TQT_SLOT( filterChanged(int) ) ); - connect( mCategoriesView, TQT_SIGNAL( clicked(TQListViewItem*) ), TQT_SLOT( categoryClicked(TQListViewItem*) ) ); + connect( mFiltersCombo, TQ_SIGNAL( activated(int) ), TQ_SLOT( filterChanged(int) ) ); + connect( mCategoriesView, TQ_SIGNAL( clicked(TQListViewItem*) ), TQ_SLOT( categoryClicked(TQListViewItem*) ) ); } SelectionPage::~SelectionPage() diff --git a/kaddressbook/printing/stylepage.cpp b/kaddressbook/printing/stylepage.cpp index fc66e147..2278b6b4 100644 --- a/kaddressbook/printing/stylepage.cpp +++ b/kaddressbook/printing/stylepage.cpp @@ -44,7 +44,7 @@ StylePage::StylePage( TDEABC::AddressBook *ab, TQWidget* parent, const char* na mSortTypeCombo->insertItem( i18n( "Ascending" ) ); mSortTypeCombo->insertItem( i18n( "Descending" ) ); - connect( mStyleCombo, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( styleChanged( int ) ) ); + connect( mStyleCombo, TQ_SIGNAL( activated( int ) ), TQ_SIGNAL( styleChanged( int ) ) ); } StylePage::~StylePage() diff --git a/kaddressbook/secrecywidget.cpp b/kaddressbook/secrecywidget.cpp index ae2b9c49..56b888ca 100644 --- a/kaddressbook/secrecywidget.cpp +++ b/kaddressbook/secrecywidget.cpp @@ -42,8 +42,8 @@ SecrecyWidget::SecrecyWidget( TQWidget *parent, const char *name ) for ( it = list.begin(); it != list.end(); ++it ) mSecrecyCombo->insertItem( TDEABC::Secrecy::typeLabel( *it ), *it ); - connect( mSecrecyCombo, TQT_SIGNAL( activated( const TQString& ) ), - TQT_SIGNAL( changed() ) ); + connect( mSecrecyCombo, TQ_SIGNAL( activated( const TQString& ) ), + TQ_SIGNAL( changed() ) ); } SecrecyWidget::~SecrecyWidget() diff --git a/kaddressbook/simpleaddresseeeditor.cpp b/kaddressbook/simpleaddresseeeditor.cpp index 7d7914b9..3cfce3f8 100644 --- a/kaddressbook/simpleaddresseeeditor.cpp +++ b/kaddressbook/simpleaddresseeeditor.cpp @@ -72,16 +72,16 @@ void SimpleAddresseeEditor::initGui() mNameEdit = new KLineEdit( this ); topLayout->addWidget( mNameEdit, 0, 1 ); - connect( mNameEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SLOT( emitModified() ) ); + connect( mNameEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SLOT( emitModified() ) ); label = new TQLabel( i18n( "Email:" ), this ); topLayout->addWidget( label, 1, 0 ); mEmailEdit = new KLineEdit( this ); topLayout->addWidget( mEmailEdit, 1, 1 ); - connect( mEmailEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SLOT( emitModified() ) ); + connect( mEmailEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SLOT( emitModified() ) ); } void SimpleAddresseeEditor::load() diff --git a/kaddressbook/soundwidget.cpp b/kaddressbook/soundwidget.cpp index dd10e211..ff2c2b38 100644 --- a/kaddressbook/soundwidget.cpp +++ b/kaddressbook/soundwidget.cpp @@ -62,20 +62,20 @@ SoundWidget::SoundWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char mUseSoundUrl->setEnabled( false ); topLayout->addWidget( mUseSoundUrl, 1, 2 ); - connect( mSoundUrl, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( setModified() ) ); - connect( mSoundUrl, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( urlChanged( const TQString& ) ) ); - connect( mUseSoundUrl, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( setModified() ) ); - connect( mUseSoundUrl, TQT_SIGNAL( toggled( bool ) ), - mPlayButton, TQT_SLOT( setDisabled( bool ) ) ); - connect( mSoundUrl, TQT_SIGNAL( urlSelected( const TQString& ) ), - TQT_SLOT( loadSound() ) ); - connect( mSoundUrl, TQT_SIGNAL( urlSelected( const TQString& ) ), - TQT_SLOT( updateGUI() ) ); - connect( mPlayButton, TQT_SIGNAL( clicked() ), - TQT_SLOT( playSound() ) ); + connect( mSoundUrl, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( setModified() ) ); + connect( mSoundUrl, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( urlChanged( const TQString& ) ) ); + connect( mUseSoundUrl, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( setModified() ) ); + connect( mUseSoundUrl, TQ_SIGNAL( toggled( bool ) ), + mPlayButton, TQ_SLOT( setDisabled( bool ) ) ); + connect( mSoundUrl, TQ_SIGNAL( urlSelected( const TQString& ) ), + TQ_SLOT( loadSound() ) ); + connect( mSoundUrl, TQ_SIGNAL( urlSelected( const TQString& ) ), + TQ_SLOT( updateGUI() ) ); + connect( mPlayButton, TQ_SIGNAL( clicked() ), + TQ_SLOT( playSound() ) ); TQWhatsThis::add( this, i18n( "This field stores a sound file which contains the name of the contact to clarify the pronunciation." ) ); TQWhatsThis::add( mUseSoundUrl, i18n( "Save only the URL to the sound file, not the whole object." ) ); diff --git a/kaddressbook/viewconfigurefieldspage.cpp b/kaddressbook/viewconfigurefieldspage.cpp index 828825fa..537e2ced 100644 --- a/kaddressbook/viewconfigurefieldspage.cpp +++ b/kaddressbook/viewconfigurefieldspage.cpp @@ -214,7 +214,7 @@ void ViewConfigureFieldsPage::initGUI() mCategoryCombo->insertItem( TDEABC::Field::categoryLabel( TDEABC::Field::Personal ) ); mCategoryCombo->insertItem( TDEABC::Field::categoryLabel( TDEABC::Field::Organization ) ); mCategoryCombo->insertItem( TDEABC::Field::categoryLabel( TDEABC::Field::CustomCategory ) ); - connect( mCategoryCombo, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotShowFields(int) ) ); + connect( mCategoryCombo, TQ_SIGNAL( activated(int) ), TQ_SLOT( slotShowFields(int) ) ); gl->addWidget( mCategoryCombo, 0, 0 ); TQLabel *label = new TQLabel( i18n( "&Selected fields:" ), this ); @@ -235,12 +235,12 @@ void ViewConfigureFieldsPage::initGUI() mAddButton = new TQToolButton( this ); mAddButton->setIconSet( TQApplication::reverseLayout() ? SmallIconSet( "1leftarrow" ) : SmallIconSet( "1rightarrow" ) ); - connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSelect() ) ); + connect( mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotSelect() ) ); vb1->addWidget( mAddButton ); mRemoveButton = new TQToolButton( this ); mRemoveButton->setIconSet( TQApplication::reverseLayout() ? SmallIconSet( "1rightarrow" ) : SmallIconSet( "1leftarrow" ) ); - connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotUnSelect() ) ); + connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotUnSelect() ) ); vb1->addWidget( mRemoveButton ); vb1->addStretch(); @@ -251,12 +251,12 @@ void ViewConfigureFieldsPage::initGUI() mUpButton = new TQToolButton( this ); mUpButton->setIconSet( SmallIconSet( "1uparrow" ) ); - connect( mUpButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotMoveUp() ) ); + connect( mUpButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotMoveUp() ) ); vb2->addWidget( mUpButton ); mDownButton = new TQToolButton( this ); mDownButton->setIconSet( SmallIconSet( "1downarrow" ) ); - connect( mDownButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotMoveDown() ) ); + connect( mDownButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotMoveDown() ) ); vb2->addWidget( mDownButton ); vb2->addStretch(); @@ -275,9 +275,9 @@ void ViewConfigureFieldsPage::initGUI() gl->activate(); - connect( mUnSelectedBox, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( slotButtonsEnabled() ) ); - connect( mSelectedBox, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( slotButtonsEnabled() ) ); - connect( mSelectedBox, TQT_SIGNAL( currentChanged( TQListBoxItem * ) ), TQT_SLOT( slotButtonsEnabled() ) ); + connect( mUnSelectedBox, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( slotButtonsEnabled() ) ); + connect( mSelectedBox, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( slotButtonsEnabled() ) ); + connect( mSelectedBox, TQ_SIGNAL( currentChanged( TQListBoxItem * ) ), TQ_SLOT( slotButtonsEnabled() ) ); slotButtonsEnabled(); } diff --git a/kaddressbook/viewconfigurefilterpage.cpp b/kaddressbook/viewconfigurefilterpage.cpp index c0d7fa7c..76a355ee 100644 --- a/kaddressbook/viewconfigurefilterpage.cpp +++ b/kaddressbook/viewconfigurefilterpage.cpp @@ -41,7 +41,7 @@ ViewConfigureFilterPage::ViewConfigureFilterPage( TQWidget *parent, TQBoxLayout *topLayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); mFilterGroup = new TQButtonGroup(); - connect( mFilterGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( buttonClicked( int ) ) ); + connect( mFilterGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( buttonClicked( int ) ) ); TQLabel *label = new TQLabel( i18n( "The default filter will be activated whenever" " this view is displayed. This feature allows you to configure views that only" diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp index bbda5341..125b95c7 100644 --- a/kaddressbook/viewmanager.cpp +++ b/kaddressbook/viewmanager.cpp @@ -216,15 +216,15 @@ void ViewManager::setActiveView( const TQString &name ) view->readConfig( config ); // The manager just relays the signals - connect( view, TQT_SIGNAL( selected( const TQString& ) ), - TQT_SIGNAL( selected( const TQString & ) ) ); - connect( view, TQT_SIGNAL( executed( const TQString& ) ), - TQT_SIGNAL( executed( const TQString& ) ) ); - connect( view, TQT_SIGNAL( modified() ), TQT_SIGNAL( modified() ) ); - connect( view, TQT_SIGNAL( dropped( TQDropEvent* ) ), - TQT_SLOT( dropped( TQDropEvent* ) ) ); - connect( view, TQT_SIGNAL( startDrag() ), TQT_SLOT( startDrag() ) ); - connect( view, TQT_SIGNAL( sortFieldChanged() ), TQT_SIGNAL( sortFieldChanged() ) ); + connect( view, TQ_SIGNAL( selected( const TQString& ) ), + TQ_SIGNAL( selected( const TQString & ) ) ); + connect( view, TQ_SIGNAL( executed( const TQString& ) ), + TQ_SIGNAL( executed( const TQString& ) ) ); + connect( view, TQ_SIGNAL( modified() ), TQ_SIGNAL( modified() ) ); + connect( view, TQ_SIGNAL( dropped( TQDropEvent* ) ), + TQ_SLOT( dropped( TQDropEvent* ) ) ); + connect( view, TQ_SIGNAL( startDrag() ), TQ_SLOT( startDrag() ) ); + connect( view, TQ_SIGNAL( sortFieldChanged() ), TQ_SIGNAL( sortFieldChanged() ) ); } } @@ -568,33 +568,33 @@ void ViewManager::initActions() #if TDE_VERSION >= 309 mActionSelectView->setMenuAccelsEnabled( false ); #endif - connect( mActionSelectView, TQT_SIGNAL( activated( const TQString& ) ), - TQT_SLOT( setActiveView( const TQString& ) ) ); + connect( mActionSelectView, TQ_SIGNAL( activated( const TQString& ) ), + TQ_SLOT( setActiveView( const TQString& ) ) ); TDEAction *action; action = new TDEAction( i18n( "Modify View..." ), "configure", 0, this, - TQT_SLOT( editView() ), mCore->actionCollection(), + TQ_SLOT( editView() ), mCore->actionCollection(), "view_modify" ); action->setWhatsThis( i18n( "By pressing this button a dialog opens that allows you to modify the view of the addressbook. There you can add or remove fields that you want to be shown or hidden in the addressbook like the name for example." ) ); action = new TDEAction( i18n( "Add View..." ), "window-new", 0, this, - TQT_SLOT( addView() ), mCore->actionCollection(), + TQ_SLOT( addView() ), mCore->actionCollection(), "view_add" ); action->setWhatsThis( i18n( "You can add a new view by choosing one from the dialog that appears after pressing the button. You have to give the view a name, so that you can distinguish between the different views." ) ); mActionDeleteView = new TDEAction( i18n( "Delete View" ), "view_remove", 0, - this, TQT_SLOT( deleteView() ), + this, TQ_SLOT( deleteView() ), mCore->actionCollection(), "view_delete" ); mActionDeleteView->setWhatsThis( i18n( "By pressing this button you can delete the actual view, which you have added before." ) ); action = new TDEAction( i18n( "Refresh View" ), "reload", 0, this, - TQT_SLOT( refreshView() ), mCore->actionCollection(), + TQ_SLOT( refreshView() ), mCore->actionCollection(), "view_refresh" ); action->setWhatsThis( i18n( "The view will be refreshed by pressing this button." ) ); action = new TDEAction( i18n( "Edit &Filters..." ), "filter", 0, this, - TQT_SLOT( configureFilters() ), mCore->actionCollection(), + TQ_SLOT( configureFilters() ), mCore->actionCollection(), "options_edit_filters" ); action->setWhatsThis( i18n( "Edit the contact filters<p>You will be presented with a dialog, where you can add, remove and edit filters." ) ); } diff --git a/kaddressbook/views/cardview.cpp b/kaddressbook/views/cardview.cpp index e77d66e0..749dc13f 100644 --- a/kaddressbook/views/cardview.cpp +++ b/kaddressbook/views/cardview.cpp @@ -590,7 +590,7 @@ CardView::CardView( TQWidget *parent, const char *name ) viewport()->setFocusPolicy(TQWidget::WheelFocus ); viewport()->setBackgroundMode( PaletteBase ); - connect( d->mTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( tryShowFullText() ) ); + connect( d->mTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( tryShowFullText() ) ); setBackgroundMode( PaletteBackground, PaletteBase ); diff --git a/kaddressbook/views/colorlistbox.cpp b/kaddressbook/views/colorlistbox.cpp index 54ad38b3..a72a644b 100644 --- a/kaddressbook/views/colorlistbox.cpp +++ b/kaddressbook/views/colorlistbox.cpp @@ -28,7 +28,7 @@ ColorListBox::ColorListBox( TQWidget *parent, const char *name, WFlags f ) :TDEListBox( parent, name, f ), mCurrentOnDragEnter(-1) { - connect( this, TQT_SIGNAL(selected(int)), this, TQT_SLOT(newColor(int)) ); + connect( this, TQ_SIGNAL(selected(int)), this, TQ_SLOT(newColor(int)) ); setAcceptDrops( true); } diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp index 30925303..cbe70109 100644 --- a/kaddressbook/views/configurecardviewdialog.cpp +++ b/kaddressbook/views/configurecardviewdialog.cpp @@ -246,7 +246,7 @@ void CardViewLookNFeelPage::initGUI() colorTab->setSpacing( spacing ); colorTab->setMargin( spacing ); cbEnableCustomColors = new TQCheckBox( i18n("&Enable custom colors"), colorTab ); - connect( cbEnableCustomColors, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableColors()) ); + connect( cbEnableCustomColors, TQ_SIGNAL(clicked()), this, TQ_SLOT(enableColors()) ); lbColors = new ColorListBox( colorTab ); tabs->addTab( colorTab, i18n("&Colors") ); @@ -265,7 +265,7 @@ void CardViewLookNFeelPage::initGUI() fntTab->setMargin( spacing ); cbEnableCustomFonts = new TQCheckBox( i18n("&Enable custom fonts"), fntTab ); - connect( cbEnableCustomFonts, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableFonts()) ); + connect( cbEnableCustomFonts, TQ_SIGNAL(clicked()), this, TQ_SLOT(enableFonts()) ); vbFonts = new TQWidget( fntTab ); TQGridLayout *gFnts = new TQGridLayout( vbFonts, 2, 3 ); @@ -277,14 +277,14 @@ void CardViewLookNFeelPage::initGUI() lTextFont->setFrameStyle( TQFrame::Panel|TQFrame::Sunken ); btnFont = new KPushButton( i18n("Choose..."), vbFonts ); lTFnt->setBuddy( btnFont ); - connect( btnFont, TQT_SIGNAL(clicked()), this, TQT_SLOT(setTextFont()) ); + connect( btnFont, TQ_SIGNAL(clicked()), this, TQ_SLOT(setTextFont()) ); TQLabel *lHFnt = new TQLabel( i18n("&Header font:"), vbFonts ); lHeaderFont = new TQLabel( vbFonts ); lHeaderFont->setFrameStyle( TQFrame::Panel|TQFrame::Sunken ); btnHeaderFont = new KPushButton( i18n("Choose..."), vbFonts ); lHFnt->setBuddy( btnHeaderFont ); - connect( btnHeaderFont, TQT_SIGNAL(clicked()), this, TQT_SLOT(setHeaderFont()) ); + connect( btnHeaderFont, TQ_SIGNAL(clicked()), this, TQ_SLOT(setHeaderFont()) ); fntTab->setStretchFactor( new TQWidget( fntTab ), 1 ); diff --git a/kaddressbook/views/configuretableviewdialog.cpp b/kaddressbook/views/configuretableviewdialog.cpp index c4e6cf7b..eb508b3d 100644 --- a/kaddressbook/views/configuretableviewdialog.cpp +++ b/kaddressbook/views/configuretableviewdialog.cpp @@ -128,8 +128,8 @@ void LookAndFeelPage::initGUI() mBackgroundBox = new TQCheckBox(i18n("Enable background image:"), this, "mBackgroundBox"); - connect(mBackgroundBox, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(enableBackgroundToggled(bool))); + connect(mBackgroundBox, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(enableBackgroundToggled(bool))); backgroundLayout->addWidget(mBackgroundBox); mBackgroundName = new KURLRequester(this, "mBackgroundName"); diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp index 715757e8..b23f415c 100644 --- a/kaddressbook/views/contactlistview.cpp +++ b/kaddressbook/views/contactlistview.cpp @@ -278,8 +278,8 @@ ContactListView::ContactListView(KAddressBookTableView *view, setSelectionModeExt( TDEListView::Extended ); setDropVisualizer(false); - connect(this, TQT_SIGNAL(dropped(TQDropEvent*)), - this, TQT_SLOT(itemDropped(TQDropEvent*))); + connect(this, TQ_SIGNAL(dropped(TQDropEvent*)), + this, TQ_SLOT(itemDropped(TQDropEvent*))); new DynamicTip( this ); } diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp index 9f169e24..a61ba3a9 100644 --- a/kaddressbook/views/kaddressbookcardview.cpp +++ b/kaddressbook/views/kaddressbookcardview.cpp @@ -156,16 +156,16 @@ KAddressBookCardView::KAddressBookCardView( KAB::Core *core, layout->addWidget( mCardView ); // Connect up the signals - connect( mCardView, TQT_SIGNAL( executed( CardViewItem* ) ), - this, TQT_SLOT( addresseeExecuted( CardViewItem* ) ) ); - connect( mCardView, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( addresseeSelected() ) ); - connect( mCardView, TQT_SIGNAL( addresseeDropped( TQDropEvent* ) ), - this, TQT_SIGNAL( dropped( TQDropEvent* ) ) ); - connect( mCardView, TQT_SIGNAL( startAddresseeDrag() ), - this, TQT_SIGNAL( startDrag() ) ); - connect( mCardView, TQT_SIGNAL( contextMenuRequested( CardViewItem*, const TQPoint& ) ), - this, TQT_SLOT( rmbClicked( CardViewItem*, const TQPoint& ) ) ); + connect( mCardView, TQ_SIGNAL( executed( CardViewItem* ) ), + this, TQ_SLOT( addresseeExecuted( CardViewItem* ) ) ); + connect( mCardView, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( addresseeSelected() ) ); + connect( mCardView, TQ_SIGNAL( addresseeDropped( TQDropEvent* ) ), + this, TQ_SIGNAL( dropped( TQDropEvent* ) ) ); + connect( mCardView, TQ_SIGNAL( startAddresseeDrag() ), + this, TQ_SIGNAL( startDrag() ) ); + connect( mCardView, TQ_SIGNAL( contextMenuRequested( CardViewItem*, const TQPoint& ) ), + this, TQ_SLOT( rmbClicked( CardViewItem*, const TQPoint& ) ) ); } KAddressBookCardView::~KAddressBookCardView() @@ -227,15 +227,15 @@ void KAddressBookCardView::readConfig( TDEConfig *config ) mCardView->setItemSpacing( config->readNumEntry( "ItemSpacing", 10 ) ); mCardView->setSeparatorWidth( config->readNumEntry( "SeparatorWidth", 2 ) ); - disconnect( mCardView, TQT_SIGNAL( executed( CardViewItem* ) ), - this, TQT_SLOT( addresseeExecuted( CardViewItem* ) ) ); + disconnect( mCardView, TQ_SIGNAL( executed( CardViewItem* ) ), + this, TQ_SLOT( addresseeExecuted( CardViewItem* ) ) ); if ( KABPrefs::instance()->honorSingleClick() ) - connect( mCardView, TQT_SIGNAL( executed( CardViewItem* ) ), - this, TQT_SLOT( addresseeExecuted( CardViewItem* ) ) ); + connect( mCardView, TQ_SIGNAL( executed( CardViewItem* ) ), + this, TQ_SLOT( addresseeExecuted( CardViewItem* ) ) ); else - connect( mCardView, TQT_SIGNAL( doubleClicked( CardViewItem* ) ), - this, TQT_SLOT( addresseeExecuted( CardViewItem* ) ) ); + connect( mCardView, TQ_SIGNAL( doubleClicked( CardViewItem* ) ), + this, TQ_SLOT( addresseeExecuted( CardViewItem* ) ) ); } void KAddressBookCardView::writeConfig( TDEConfig *config ) diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp index 3021f692..66aff6d1 100644 --- a/kaddressbook/views/kaddressbookiconview.cpp +++ b/kaddressbook/views/kaddressbookiconview.cpp @@ -70,8 +70,8 @@ AddresseeIconView::AddresseeIconView( TQWidget *parent, const char *name ) setSorting( true, true ); setMode( TDEIconView::Select ); - connect( this, TQT_SIGNAL( dropped( TQDropEvent*, const TQValueList<TQIconDragItem>& ) ), - this, TQT_SLOT( itemDropped( TQDropEvent*, const TQValueList<TQIconDragItem>& ) ) ); + connect( this, TQ_SIGNAL( dropped( TQDropEvent*, const TQValueList<TQIconDragItem>& ) ), + this, TQ_SLOT( itemDropped( TQDropEvent*, const TQValueList<TQIconDragItem>& ) ) ); } AddresseeIconView::~AddresseeIconView() @@ -145,16 +145,16 @@ KAddressBookIconView::KAddressBookIconView( KAB::Core *core, layout->addWidget( mIconView ); // Connect up the signals - connect( mIconView, TQT_SIGNAL( executed( TQIconViewItem* ) ), - this, TQT_SLOT( addresseeExecuted( TQIconViewItem* ) ) ); - connect( mIconView, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( addresseeSelected() ) ); - connect( mIconView, TQT_SIGNAL( addresseeDropped( TQDropEvent* ) ), - this, TQT_SIGNAL( dropped( TQDropEvent* ) ) ); - connect( mIconView, TQT_SIGNAL( startAddresseeDrag() ), - this, TQT_SIGNAL( startDrag() ) ); - connect( mIconView, TQT_SIGNAL( contextMenuRequested( TQIconViewItem*, const TQPoint& ) ), - this, TQT_SLOT( rmbClicked( TQIconViewItem*, const TQPoint& ) ) ); + connect( mIconView, TQ_SIGNAL( executed( TQIconViewItem* ) ), + this, TQ_SLOT( addresseeExecuted( TQIconViewItem* ) ) ); + connect( mIconView, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( addresseeSelected() ) ); + connect( mIconView, TQ_SIGNAL( addresseeDropped( TQDropEvent* ) ), + this, TQ_SIGNAL( dropped( TQDropEvent* ) ) ); + connect( mIconView, TQ_SIGNAL( startAddresseeDrag() ), + this, TQ_SIGNAL( startDrag() ) ); + connect( mIconView, TQ_SIGNAL( contextMenuRequested( TQIconViewItem*, const TQPoint& ) ), + this, TQ_SLOT( rmbClicked( TQIconViewItem*, const TQPoint& ) ) ); } KAddressBookIconView::~KAddressBookIconView() @@ -171,15 +171,15 @@ void KAddressBookIconView::readConfig( TDEConfig *config ) { KAddressBookView::readConfig( config ); - disconnect( mIconView, TQT_SIGNAL( executed( TQIconViewItem* ) ), - this, TQT_SLOT( addresseeExecuted( TQIconViewItem* ) ) ); + disconnect( mIconView, TQ_SIGNAL( executed( TQIconViewItem* ) ), + this, TQ_SLOT( addresseeExecuted( TQIconViewItem* ) ) ); if ( KABPrefs::instance()->honorSingleClick() ) - connect( mIconView, TQT_SIGNAL( executed( TQIconViewItem* ) ), - this, TQT_SLOT( addresseeExecuted( TQIconViewItem* ) ) ); + connect( mIconView, TQ_SIGNAL( executed( TQIconViewItem* ) ), + this, TQ_SLOT( addresseeExecuted( TQIconViewItem* ) ) ); else - connect( mIconView, TQT_SIGNAL( doubleClicked( TQIconViewItem* ) ), - this, TQT_SLOT( addresseeExecuted( TQIconViewItem* ) ) ); + connect( mIconView, TQ_SIGNAL( doubleClicked( TQIconViewItem* ) ), + this, TQ_SLOT( addresseeExecuted( TQIconViewItem* ) ) ); } TQStringList KAddressBookIconView::selectedUids() diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp index ad39eb64..6b633303 100644 --- a/kaddressbook/views/kaddressbooktableview.cpp +++ b/kaddressbook/views/kaddressbooktableview.cpp @@ -103,16 +103,16 @@ KAddressBookTableView::~KAddressBookTableView() void KAddressBookTableView::reconstructListView() { if ( mListView ) { - disconnect( mListView, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( addresseeSelected() ) ); - disconnect( mListView, TQT_SIGNAL( executed( TQListViewItem* ) ), - this, TQT_SLOT( addresseeExecuted( TQListViewItem* ) ) ); - disconnect( mListView, TQT_SIGNAL( doubleClicked( TQListViewItem* ) ), - this, TQT_SLOT( addresseeExecuted( TQListViewItem* ) ) ); - disconnect( mListView, TQT_SIGNAL( startAddresseeDrag() ), - this, TQT_SIGNAL( startDrag() ) ); - disconnect( mListView, TQT_SIGNAL( addresseeDropped( TQDropEvent* ) ), - this, TQT_SIGNAL( dropped( TQDropEvent* ) ) ); + disconnect( mListView, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( addresseeSelected() ) ); + disconnect( mListView, TQ_SIGNAL( executed( TQListViewItem* ) ), + this, TQ_SLOT( addresseeExecuted( TQListViewItem* ) ) ); + disconnect( mListView, TQ_SIGNAL( doubleClicked( TQListViewItem* ) ), + this, TQ_SLOT( addresseeExecuted( TQListViewItem* ) ) ); + disconnect( mListView, TQ_SIGNAL( startAddresseeDrag() ), + this, TQ_SIGNAL( startDrag() ) ); + disconnect( mListView, TQ_SIGNAL( addresseeDropped( TQDropEvent* ) ), + this, TQ_SIGNAL( dropped( TQDropEvent* ) ) ); delete mListView; } @@ -141,23 +141,23 @@ void KAddressBookTableView::reconstructListView() mListView->setFullWidth( true ); - connect( mListView, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( addresseeSelected() ) ); - connect( mListView, TQT_SIGNAL( startAddresseeDrag() ), - this, TQT_SIGNAL( startDrag() ) ); - connect( mListView, TQT_SIGNAL( addresseeDropped( TQDropEvent* ) ), - this, TQT_SIGNAL( dropped( TQDropEvent* ) ) ); - connect( mListView, TQT_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ), - this, TQT_SLOT( rmbClicked( TDEListView*, TQListViewItem*, const TQPoint& ) ) ); - connect( mListView->header(), TQT_SIGNAL( clicked( int ) ), - this, TQT_SIGNAL( sortFieldChanged() ) ); + connect( mListView, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( addresseeSelected() ) ); + connect( mListView, TQ_SIGNAL( startAddresseeDrag() ), + this, TQ_SIGNAL( startDrag() ) ); + connect( mListView, TQ_SIGNAL( addresseeDropped( TQDropEvent* ) ), + this, TQ_SIGNAL( dropped( TQDropEvent* ) ) ); + connect( mListView, TQ_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ), + this, TQ_SLOT( rmbClicked( TDEListView*, TQListViewItem*, const TQPoint& ) ) ); + connect( mListView->header(), TQ_SIGNAL( clicked( int ) ), + this, TQ_SIGNAL( sortFieldChanged() ) ); if ( KABPrefs::instance()->honorSingleClick() ) - connect( mListView, TQT_SIGNAL( executed( TQListViewItem* ) ), - this, TQT_SLOT( addresseeExecuted( TQListViewItem* ) ) ); + connect( mListView, TQ_SIGNAL( executed( TQListViewItem* ) ), + this, TQ_SLOT( addresseeExecuted( TQListViewItem* ) ) ); else - connect( mListView, TQT_SIGNAL( doubleClicked( TQListViewItem* ) ), - this, TQT_SLOT( addresseeExecuted( TQListViewItem* ) ) ); + connect( mListView, TQ_SIGNAL( doubleClicked( TQListViewItem* ) ), + this, TQ_SLOT( addresseeExecuted( TQListViewItem* ) ) ); refresh(); @@ -187,13 +187,13 @@ void KAddressBookTableView::readConfig( TDEConfig *config ) if ( config->readBoolEntry( "InstantMessagingPresence", false ) ) { if ( !mIMProxy ) { mIMProxy = KIMProxy::instance( kapp->dcopClient() ); - connect( mIMProxy, TQT_SIGNAL( sigContactPresenceChanged( const TQString& ) ), - this, TQT_SLOT( updatePresence( const TQString& ) ) ); + connect( mIMProxy, TQ_SIGNAL( sigContactPresenceChanged( const TQString& ) ), + this, TQ_SLOT( updatePresence( const TQString& ) ) ); } } else { if ( mIMProxy ) { - disconnect( mIMProxy, TQT_SIGNAL( sigContactPresenceChanged( const TQString& ) ), - this, TQT_SLOT( updatePresence( const TQString& ) ) ); + disconnect( mIMProxy, TQ_SIGNAL( sigContactPresenceChanged( const TQString& ) ), + this, TQ_SLOT( updatePresence( const TQString& ) ) ); mIMProxy = 0; } } diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp index 63989199..589bfb24 100644 --- a/kaddressbook/xxport/csvimportdialog.cpp +++ b/kaddressbook/xxport/csvimportdialog.cpp @@ -121,33 +121,33 @@ CSVImportDialog::CSVImportDialog( TDEABC::AddressBook *ab, TQWidget *parent, reloadCodecs(); - connect( mDelimiterBox, TQT_SIGNAL( clicked( int ) ), - this, TQT_SLOT( delimiterClicked( int ) ) ); - connect( mDelimiterEdit, TQT_SIGNAL( returnPressed() ), - this, TQT_SLOT( returnPressed() ) ); - connect( mDelimiterEdit, TQT_SIGNAL( textChanged ( const TQString& ) ), - this, TQT_SLOT( textChanged ( const TQString& ) ) ); - connect( mComboLine, TQT_SIGNAL( activated( const TQString& ) ), - this, TQT_SLOT( lineSelected( const TQString& ) ) ); - connect( mComboQuote, TQT_SIGNAL( activated( const TQString& ) ), - this, TQT_SLOT( textquoteSelected( const TQString& ) ) ); - connect( mIgnoreDuplicates, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( ignoreDuplicatesChanged( int ) ) ); - connect( mCodecCombo, TQT_SIGNAL( activated( const TQString& ) ), - this, TQT_SLOT( codecChanged() ) ); - - connect( mUrlRequester, TQT_SIGNAL( returnPressed( const TQString& ) ), - this, TQT_SLOT( setFile( const TQString& ) ) ); - connect( mUrlRequester, TQT_SIGNAL( urlSelected( const TQString& ) ), - this, TQT_SLOT( setFile( const TQString& ) ) ); - connect( mUrlRequester->lineEdit(), TQT_SIGNAL( textChanged ( const TQString& ) ), - this, TQT_SLOT( urlChanged( const TQString& ) ) ); - - connect( this, TQT_SIGNAL( user1Clicked() ), - this, TQT_SLOT( applyTemplate() ) ); - - connect( this, TQT_SIGNAL( user2Clicked() ), - this, TQT_SLOT( saveTemplate() ) ); + connect( mDelimiterBox, TQ_SIGNAL( clicked( int ) ), + this, TQ_SLOT( delimiterClicked( int ) ) ); + connect( mDelimiterEdit, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( returnPressed() ) ); + connect( mDelimiterEdit, TQ_SIGNAL( textChanged ( const TQString& ) ), + this, TQ_SLOT( textChanged ( const TQString& ) ) ); + connect( mComboLine, TQ_SIGNAL( activated( const TQString& ) ), + this, TQ_SLOT( lineSelected( const TQString& ) ) ); + connect( mComboQuote, TQ_SIGNAL( activated( const TQString& ) ), + this, TQ_SLOT( textquoteSelected( const TQString& ) ) ); + connect( mIgnoreDuplicates, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( ignoreDuplicatesChanged( int ) ) ); + connect( mCodecCombo, TQ_SIGNAL( activated( const TQString& ) ), + this, TQ_SLOT( codecChanged() ) ); + + connect( mUrlRequester, TQ_SIGNAL( returnPressed( const TQString& ) ), + this, TQ_SLOT( setFile( const TQString& ) ) ); + connect( mUrlRequester, TQ_SIGNAL( urlSelected( const TQString& ) ), + this, TQ_SLOT( setFile( const TQString& ) ) ); + connect( mUrlRequester->lineEdit(), TQ_SIGNAL( textChanged ( const TQString& ) ), + this, TQ_SLOT( urlChanged( const TQString& ) ) ); + + connect( this, TQ_SIGNAL( user1Clicked() ), + this, TQ_SLOT( applyTemplate() ) ); + + connect( this, TQ_SIGNAL( user2Clicked() ), + this, TQ_SLOT( saveTemplate() ) ); } CSVImportDialog::~CSVImportDialog() diff --git a/kaddressbook/xxportmanager.cpp b/kaddressbook/xxportmanager.cpp index bdc48f6b..3424e98e 100644 --- a/kaddressbook/xxportmanager.cpp +++ b/kaddressbook/xxportmanager.cpp @@ -146,10 +146,10 @@ void XXPortManager::loadPlugins() mCore->guiClient()->insertChildClient( obj ); mXXPortObjects.insert( obj->identifier(), obj ); - connect( obj, TQT_SIGNAL( exportActivated( const TQString&, const TQString& ) ), - this, TQT_SLOT( slotExport( const TQString&, const TQString& ) ) ); - connect( obj, TQT_SIGNAL( importActivated( const TQString&, const TQString& ) ), - this, TQT_SLOT( slotImport( const TQString&, const TQString& ) ) ); + connect( obj, TQ_SIGNAL( exportActivated( const TQString&, const TQString& ) ), + this, TQ_SLOT( slotExport( const TQString&, const TQString& ) ) ); + connect( obj, TQ_SIGNAL( importActivated( const TQString&, const TQString& ) ), + this, TQ_SLOT( slotImport( const TQString&, const TQString& ) ) ); obj->setTDEApplication( kapp ); } diff --git a/kaddressbook/xxportselectdialog.cpp b/kaddressbook/xxportselectdialog.cpp index b52b41ad..449ea60d 100644 --- a/kaddressbook/xxportselectdialog.cpp +++ b/kaddressbook/xxportselectdialog.cpp @@ -51,10 +51,10 @@ XXPortSelectDialog::XXPortSelectDialog( KAB::Core *core, bool sort, { initGUI(); - connect( mFiltersCombo, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( filterChanged( int ) ) ); - connect( mCategoriesView, TQT_SIGNAL( clicked( TQListViewItem* ) ), - TQT_SLOT( categoryClicked( TQListViewItem* ) ) ); + connect( mFiltersCombo, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( filterChanged( int ) ) ); + connect( mCategoriesView, TQ_SIGNAL( clicked( TQListViewItem* ) ), + TQ_SLOT( categoryClicked( TQListViewItem* ) ) ); // setup filters mFilters = Filter::restore( kapp->config(), "Filter" ); diff --git a/kalarm/alarmcalendar.cpp b/kalarm/alarmcalendar.cpp index d0150d00..f47e962c 100644 --- a/kalarm/alarmcalendar.cpp +++ b/kalarm/alarmcalendar.cpp @@ -717,7 +717,7 @@ void AlarmCalendar::purgeIfQueued() void AlarmCalendar::startPurgeTimer() { if (mPurgeDays > 0) - StartOfDayTimer::connect(this, TQT_SLOT(slotPurge())); + StartOfDayTimer::connect(this, TQ_SLOT(slotPurge())); } /****************************************************************************** diff --git a/kalarm/alarmtimewidget.cpp b/kalarm/alarmtimewidget.cpp index fc2d1635..6586b896 100644 --- a/kalarm/alarmtimewidget.cpp +++ b/kalarm/alarmtimewidget.cpp @@ -83,7 +83,7 @@ void AlarmTimeWidget::init(int mode) "If a recurrence is configured, the start date/time will be adjusted " "to the first recurrence on or after the entered date/time."); - connect(this, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(slotButtonSet(int))); + connect(this, TQ_SIGNAL(buttonSet(int)), TQ_SLOT(slotButtonSet(int))); TQBoxLayout* topLayout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); if (!title().isEmpty()) { @@ -101,7 +101,7 @@ void AlarmTimeWidget::init(int mode) // Date edit box mDateEdit = new DateEdit(this); mDateEdit->setFixedSize(mDateEdit->sizeHint()); - connect(mDateEdit, TQT_SIGNAL(dateEntered(const TQDate&)), TQT_SLOT(dateTimeChanged())); + connect(mDateEdit, TQ_SIGNAL(dateEntered(const TQDate&)), TQ_SLOT(dateTimeChanged())); static const TQString enterDateText = i18n("Enter the date to schedule the alarm."); TQWhatsThis::add(mDateEdit, ((mode & DEFER_TIME) ? enterDateText : TQString("%1\n%2").arg(enterDateText).arg(recurText))); @@ -112,7 +112,7 @@ void AlarmTimeWidget::init(int mode) timeBox->setSpacing(2*KDialog::spacingHint()); mTimeEdit = new TimeEdit(timeBox); mTimeEdit->setFixedSize(mTimeEdit->sizeHint()); - connect(mTimeEdit, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(dateTimeChanged())); + connect(mTimeEdit, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(dateTimeChanged())); static const TQString enterTimeText = i18n("Enter the time to schedule the alarm."); TQWhatsThis::add(mTimeEdit, ((mode & DEFER_TIME) ? TQString("%1\n\n%2").arg(enterTimeText).arg(TimeSpinBox::shiftWhatsThis()) @@ -129,7 +129,7 @@ void AlarmTimeWidget::init(int mode) mAnyTimeAllowed = true; mAnyTimeCheckBox = new CheckBox(i18n("An&y time"), timeBox); mAnyTimeCheckBox->setFixedSize(mAnyTimeCheckBox->sizeHint()); - connect(mAnyTimeCheckBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotAnyTimeToggled(bool))); + connect(mAnyTimeCheckBox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotAnyTimeToggled(bool))); TQWhatsThis::add(mAnyTimeCheckBox, i18n("Schedule the alarm for any time during the day")); } @@ -145,7 +145,7 @@ void AlarmTimeWidget::init(int mode) mDelayTimeEdit = new TimeSpinBox(1, maxDelayTime, this); mDelayTimeEdit->setValue(maxDelayTime); mDelayTimeEdit->setFixedSize(mDelayTimeEdit->sizeHint()); - connect(mDelayTimeEdit, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(delayTimeChanged(int))); + connect(mDelayTimeEdit, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(delayTimeChanged(int))); TQWhatsThis::add(mDelayTimeEdit, ((mode & DEFER_TIME) ? TQString("%1\n\n%2").arg(i18n_TimeAfterPeriod()).arg(TimeSpinBox::shiftWhatsThis()) : TQString("%1\n%2\n\n%3").arg(i18n_TimeAfterPeriod()).arg(recurText).arg(TimeSpinBox::shiftWhatsThis()))); @@ -182,7 +182,7 @@ void AlarmTimeWidget::init(int mode) setButton(id(mAtTimeRadio)); // Timeout every minute to update alarm time fields. - MinuteTimer::connect(this, TQT_SLOT(slotTimer())); + MinuteTimer::connect(this, TQ_SLOT(slotTimer())); } /****************************************************************************** diff --git a/kalarm/birthdaydlg.cpp b/kalarm/birthdaydlg.cpp index 51a86e94..0a1cd157 100644 --- a/kalarm/birthdaydlg.cpp +++ b/kalarm/birthdaydlg.cpp @@ -91,7 +91,7 @@ BirthdayDlg::BirthdayDlg(TQWidget* parent) mPrefix = new BLineEdit(mPrefixText, textGroup); mPrefix->setMinimumSize(mPrefix->sizeHint()); label->setBuddy(mPrefix); - connect(mPrefix, TQT_SIGNAL(focusLost()), TQT_SLOT(slotTextLostFocus())); + connect(mPrefix, TQ_SIGNAL(focusLost()), TQ_SLOT(slotTextLostFocus())); TQWhatsThis::add(mPrefix, i18n("Enter text to appear before the person's name in the alarm message, " "including any necessary trailing spaces.")); @@ -100,7 +100,7 @@ BirthdayDlg::BirthdayDlg(TQWidget* parent) mSuffix = new BLineEdit(mSuffixText, textGroup); mSuffix->setMinimumSize(mSuffix->sizeHint()); label->setBuddy(mSuffix); - connect(mSuffix, TQT_SIGNAL(focusLost()), TQT_SLOT(slotTextLostFocus())); + connect(mSuffix, TQ_SIGNAL(focusLost()), TQ_SLOT(slotTextLostFocus())); TQWhatsThis::add(mSuffix, i18n("Enter text to appear after the person's name in the alarm message, " "including any necessary leading spaces.")); @@ -114,7 +114,7 @@ BirthdayDlg::BirthdayDlg(TQWidget* parent) mAddresseeList->setFullWidth(true); mAddresseeList->addColumn(i18n("Name")); mAddresseeList->addColumn(i18n("Birthday")); - connect(mAddresseeList, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged())); + connect(mAddresseeList, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectionChanged())); TQWhatsThis::add(mAddresseeList, i18n("Select birthdays to set alarms for.\n" "This list shows all birthdays in KAddressBook except those for which alarms already exist.\n\n" @@ -198,7 +198,7 @@ void BirthdayDlg::loadAddressBook() #if KDE_IS_VERSION(3,1,90) mAddressBook = TDEABC::StdAddressBook::self(true); if (mAddressBook) - connect(mAddressBook, TQT_SIGNAL(addressBookChanged(AddressBook*)), TQT_SLOT(updateSelectionList())); + connect(mAddressBook, TQ_SIGNAL(addressBookChanged(AddressBook*)), TQ_SLOT(updateSelectionList())); #else mAddressBook = TDEABC::StdAddressBook::self(); if (mAddressBook) @@ -421,7 +421,7 @@ BListView::BListView(TQWidget* parent, const char* name) : TDEListView(parent, name) { TDEAccel* accel = new TDEAccel(this); - accel->insert(TDEStdAccel::SelectAll, this, TQT_SLOT(slotSelectAll())); - accel->insert(TDEStdAccel::Deselect, this, TQT_SLOT(slotDeselect())); + accel->insert(TDEStdAccel::SelectAll, this, TQ_SLOT(slotSelectAll())); + accel->insert(TDEStdAccel::Deselect, this, TQ_SLOT(slotDeselect())); accel->readSettings(); } diff --git a/kalarm/daemon.cpp b/kalarm/daemon.cpp index 842514d9..fd099632 100644 --- a/kalarm/daemon.cpp +++ b/kalarm/daemon.cpp @@ -95,7 +95,7 @@ void Daemon::initialise() { if (!mInstance) mInstance = new Daemon(); - connect(AlarmCalendar::activeCalendar(), TQT_SIGNAL(calendarSaved(AlarmCalendar*)), mInstance, TQT_SLOT(slotCalendarSaved(AlarmCalendar*))); + connect(AlarmCalendar::activeCalendar(), TQ_SIGNAL(calendarSaved(AlarmCalendar*)), mInstance, TQ_SLOT(slotCalendarSaved(AlarmCalendar*))); } /****************************************************************************** @@ -111,10 +111,10 @@ void Daemon::createDcopHandler() mRunning = isRunning(false); mStatusTimerInterval = Preferences::daemonTrayCheckInterval(); - Preferences::connect(TQT_SIGNAL(preferencesChanged()), mInstance, TQT_SLOT(slotPreferencesChanged())); + Preferences::connect(TQ_SIGNAL(preferencesChanged()), mInstance, TQ_SLOT(slotPreferencesChanged())); mStatusTimer = new TQTimer(mInstance); - connect(mStatusTimer, TQT_SIGNAL(timeout()), mInstance, TQT_SLOT(timerCheckIfRunning())); + connect(mStatusTimer, TQ_SIGNAL(timeout()), mInstance, TQ_SLOT(timerCheckIfRunning())); mStatusTimer->start(mStatusTimerInterval * 1000); // check regularly if daemon is running } @@ -145,7 +145,7 @@ bool Daemon::start() kdDebug(5950) << "Daemon::start(): Alarm daemon started" << endl; mStartTimeout = 5000/startCheckInterval + 1; // check daemon status for 5 seconds before giving up mStartTimer = new TQTimer(mInstance); - connect(mStartTimer, TQT_SIGNAL(timeout()), mInstance, TQT_SLOT(checkIfStarted())); + connect(mStartTimer, TQ_SIGNAL(timeout()), mInstance, TQ_SLOT(checkIfStarted())); mStartTimer->start(startCheckInterval); mInstance->checkIfStarted(); return true; @@ -201,7 +201,7 @@ bool Daemon::registerWith(bool reregister) return false; } mRegisterTimer = new TQTimer(mInstance); - connect(mRegisterTimer, TQT_SIGNAL(timeout()), mInstance, TQT_SLOT(registerTimerExpired())); + connect(mRegisterTimer, TQ_SIGNAL(timeout()), mInstance, TQ_SLOT(registerTimerExpired())); mRegisterTimer->start(REGISTER_TIMEOUT * 1000); // wait for the reply return true; } @@ -327,7 +327,7 @@ void Daemon::updateRegisteredStatus(bool timeout) // The daemon has newly been detected as registered with DCOP. // Wait for a short time to ensure that it is ready for DCOP calls. mStatus = RUNNING; - TQTimer::singleShot(startCheckInterval, mInstance, TQT_SLOT(slotStarted())); + TQTimer::singleShot(startCheckInterval, mInstance, TQ_SLOT(slotStarted())); break; case RUNNING: if (timeout) @@ -569,8 +569,8 @@ void Daemon::slotPreferencesChanged() AlarmEnableAction* Daemon::createAlarmEnableAction(TDEActionCollection* actions, const char* name) { AlarmEnableAction* a = new AlarmEnableAction(0, actions, name); - connect(a, TQT_SIGNAL(userClicked(bool)), mInstance, TQT_SLOT(setAlarmsEnabled(bool))); - connect(mInstance, TQT_SIGNAL(daemonRunning(bool)), a, TQT_SLOT(setCheckedActual(bool))); + connect(a, TQ_SIGNAL(userClicked(bool)), mInstance, TQ_SLOT(setAlarmsEnabled(bool))); + connect(mInstance, TQ_SIGNAL(daemonRunning(bool)), a, TQ_SLOT(setCheckedActual(bool))); return a; } diff --git a/kalarm/deferdlg.cpp b/kalarm/deferdlg.cpp index c5fab880..7a37f3f9 100644 --- a/kalarm/deferdlg.cpp +++ b/kalarm/deferdlg.cpp @@ -53,7 +53,7 @@ DeferAlarmDlg::DeferAlarmDlg(const TQString& caption, const DateTime& initialDT, mTimeWidget = new AlarmTimeWidget(AlarmTimeWidget::DEFER_TIME, page, "timeGroup"); mTimeWidget->setDateTime(initialDT); mTimeWidget->setMinDateTimeIsCurrent(); - connect(mTimeWidget, TQT_SIGNAL(pastMax()), TQT_SLOT(slotPastLimit())); + connect(mTimeWidget, TQ_SIGNAL(pastMax()), TQ_SLOT(slotPastLimit())); layout->addWidget(mTimeWidget); layout->addSpacing(spacingHint()); diff --git a/kalarm/editdlg.cpp b/kalarm/editdlg.cpp index 5ceb16e1..a95b35db 100644 --- a/kalarm/editdlg.cpp +++ b/kalarm/editdlg.cpp @@ -211,7 +211,7 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par mTabs->addTab(mainPageBox, i18n("&Alarm")); mMainPageIndex = 0; PageFrame* mainPage = new PageFrame(mainPageBox); - connect(mainPage, TQT_SIGNAL(shown()), TQT_SLOT(slotShowMainPage())); + connect(mainPage, TQ_SIGNAL(shown()), TQ_SLOT(slotShowMainPage())); TQVBoxLayout* topLayout = new TQVBoxLayout(mainPage, 0, spacingHint()); // Recurrence tab @@ -220,15 +220,15 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par mTabs->addTab(recurTab, TQString()); mRecurPageIndex = 1; mRecurrenceEdit = new RecurrenceEdit(readOnly, recurTab, "recurPage"); - connect(mRecurrenceEdit, TQT_SIGNAL(shown()), TQT_SLOT(slotShowRecurrenceEdit())); - connect(mRecurrenceEdit, TQT_SIGNAL(typeChanged(int)), TQT_SLOT(slotRecurTypeChange(int))); - connect(mRecurrenceEdit, TQT_SIGNAL(frequencyChanged()), TQT_SLOT(slotRecurFrequencyChange())); - connect(mRecurrenceEdit, TQT_SIGNAL(repeatNeedsInitialisation()), TQT_SLOT(slotSetSubRepetition())); + connect(mRecurrenceEdit, TQ_SIGNAL(shown()), TQ_SLOT(slotShowRecurrenceEdit())); + connect(mRecurrenceEdit, TQ_SIGNAL(typeChanged(int)), TQ_SLOT(slotRecurTypeChange(int))); + connect(mRecurrenceEdit, TQ_SIGNAL(frequencyChanged()), TQ_SLOT(slotRecurFrequencyChange())); + connect(mRecurrenceEdit, TQ_SIGNAL(repeatNeedsInitialisation()), TQ_SLOT(slotSetSubRepetition())); // Alarm action mActionGroup = new ButtonGroup(i18n("Action"), mainPage, "actionGroup"); - connect(mActionGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(slotAlarmTypeChanged(int))); + connect(mActionGroup, TQ_SIGNAL(buttonSet(int)), TQ_SLOT(slotAlarmTypeChanged(int))); topLayout->addWidget(mActionGroup, 1); TQBoxLayout* layout = new TQVBoxLayout(mActionGroup, marginHint(), spacingHint()); layout->addSpacing(fontMetrics().lineSpacing()/2); @@ -281,7 +281,7 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par mDeferChangeButton = new TQPushButton(i18n("C&hange..."), mDeferGroup); mDeferChangeButton->setFixedSize(mDeferChangeButton->sizeHint()); - connect(mDeferChangeButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEditDeferral())); + connect(mDeferChangeButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotEditDeferral())); TQWhatsThis::add(mDeferChangeButton, i18n("Change the alarm's deferred time, or cancel the deferral")); mDeferGroup->addSpace(0); @@ -291,7 +291,7 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par if (mTemplate) { mTemplateTimeGroup = new ButtonGroup(i18n("Time"), mainPage, "templateGroup"); - connect(mTemplateTimeGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(slotTemplateTimeType(int))); + connect(mTemplateTimeGroup, TQ_SIGNAL(buttonSet(int)), TQ_SLOT(slotTemplateTimeType(int))); layout->addWidget(mTemplateTimeGroup); grid = new TQGridLayout(mTemplateTimeGroup, 2, 2, marginHint(), spacingHint()); grid->addRowSpacing(0, fontMetrics().lineSpacing()/2); @@ -355,7 +355,7 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par else { mTimeWidget = new AlarmTimeWidget(i18n("Time"), AlarmTimeWidget::AT_TIME, mainPage, "timeGroup"); - connect(mTimeWidget, TQT_SIGNAL(anyTimeToggled(bool)), TQT_SLOT(slotAnyTimeToggled(bool))); + connect(mTimeWidget, TQ_SIGNAL(anyTimeToggled(bool)), TQ_SLOT(slotAnyTimeToggled(bool))); topLayout->addWidget(mTimeWidget); } @@ -489,7 +489,7 @@ void EditAlarmDlg::initCommand(TQWidget* parent) mCmdTypeScript = new CheckBox(i18n_p_EnterScript(), mCommandFrame); mCmdTypeScript->setFixedSize(mCmdTypeScript->sizeHint()); - connect(mCmdTypeScript, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotCmdScriptToggled(bool))); + connect(mCmdTypeScript, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotCmdScriptToggled(bool))); TQWhatsThis::add(mCmdTypeScript, i18n("Check to enter the contents of a script instead of a shell command line")); frameLayout->addWidget(mCmdTypeScript, 0, TQt::AlignAuto); @@ -595,7 +595,7 @@ void EditAlarmDlg::initEmail(TQWidget* parent) mEmailAddressButton = new TQPushButton(mEmailFrame); mEmailAddressButton->setPixmap(SmallIcon("contents")); mEmailAddressButton->setFixedSize(mEmailAddressButton->sizeHint()); - connect(mEmailAddressButton, TQT_SIGNAL(clicked()), TQT_SLOT(openAddressBook())); + connect(mEmailAddressButton, TQ_SIGNAL(clicked()), TQ_SLOT(openAddressBook())); TQToolTip::add(mEmailAddressButton, i18n("Open address book")); TQWhatsThis::add(mEmailAddressButton, i18n("Select email addresses from your address book.")); grid->addWidget(mEmailAddressButton, 1, 2); @@ -635,12 +635,12 @@ list->setGeometry(rect.left() - 50, rect.top(), rect.width(), rect.height()); grid->setColStretch(1, 1); mEmailAddAttachButton = new TQPushButton(i18n("Add..."), mEmailFrame); - connect(mEmailAddAttachButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddAttachment())); + connect(mEmailAddAttachButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddAttachment())); TQWhatsThis::add(mEmailAddAttachButton, i18n("Add an attachment to the email.")); grid->addWidget(mEmailAddAttachButton, 0, 2); mEmailRemoveButton = new TQPushButton(i18n("Remo&ve"), mEmailFrame); - connect(mEmailRemoveButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveAttachment())); + connect(mEmailRemoveButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveAttachment())); TQWhatsThis::add(mEmailRemoveButton, i18n("Remove the highlighted attachment from the email.")); grid->addWidget(mEmailRemoveButton, 1, 2); diff --git a/kalarm/eventlistviewbase.cpp b/kalarm/eventlistviewbase.cpp index 14a7afd6..2425a11b 100644 --- a/kalarm/eventlistviewbase.cpp +++ b/kalarm/eventlistviewbase.cpp @@ -199,7 +199,7 @@ void EventListViewBase::slotFind() if (!mFind) { mFind = new Find(this); - connect(mFind, TQT_SIGNAL(active(bool)), TQT_SIGNAL(findActive(bool))); + connect(mFind, TQ_SIGNAL(active(bool)), TQ_SIGNAL(findActive(bool))); } mFind->display(); } diff --git a/kalarm/find.cpp b/kalarm/find.cpp index 8882b6b2..9e30388e 100644 --- a/kalarm/find.cpp +++ b/kalarm/find.cpp @@ -146,7 +146,7 @@ void Find::display() mEmailType->setChecked(mOptions & FIND_EMAIL); #ifndef MODAL_FIND - connect(mDialog, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotFind())); + connect(mDialog, TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotFind())); #endif } @@ -245,7 +245,7 @@ void Find::slotFind() #else mFind = new KFind(mLastPattern, options, mListView, mDialog); #endif - connect(mFind, TQT_SIGNAL(destroyed()), TQT_SLOT(slotKFindDestroyed())); + connect(mFind, TQ_SIGNAL(destroyed()), TQ_SLOT(slotKFindDestroyed())); mFind->closeFindNextDialog(); // prevent 'Find Next' dialog appearing } diff --git a/kalarm/fontcolour.cpp b/kalarm/fontcolour.cpp index 74feffb6..64a8cdce 100644 --- a/kalarm/fontcolour.cpp +++ b/kalarm/fontcolour.cpp @@ -68,7 +68,7 @@ FontColourChooser::FontColourChooser(TQWidget *parent, const char *name, TQLabel* label = new TQLabel(i18n("&Foreground color:"), box); box->setStretchFactor(new TQWidget(box), 0); mFgColourButton = new ColourCombo(box); - connect(mFgColourButton, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(setSampleColour())); + connect(mFgColourButton, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(setSampleColour())); label->setBuddy(mFgColourButton); TQWhatsThis::add(box, i18n("Select the alarm message foreground color")); } @@ -80,7 +80,7 @@ FontColourChooser::FontColourChooser(TQWidget *parent, const char *name, TQLabel* label = new TQLabel(i18n("&Background color:"), box); box->setStretchFactor(new TQWidget(box), 0); mBgColourButton = new ColourCombo(box); - connect(mBgColourButton, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(setSampleColour())); + connect(mBgColourButton, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(setSampleColour())); label->setBuddy(mBgColourButton); TQWhatsThis::add(box, i18n("Select the alarm message background color")); hlayout->addStretch(); @@ -90,13 +90,13 @@ FontColourChooser::FontColourChooser(TQWidget *parent, const char *name, TQHBoxLayout* layout = new TQHBoxLayout(topLayout); TQPushButton* button = new TQPushButton(i18n("Add Co&lor..."), page); button->setFixedSize(button->sizeHint()); - connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddColour())); + connect(button, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddColour())); TQWhatsThis::add(button, i18n("Choose a new color to add to the color selection list.")); layout->addWidget(button); mRemoveColourButton = new TQPushButton(i18n("&Remove Color"), page); mRemoveColourButton->setFixedSize(mRemoveColourButton->sizeHint()); - connect(mRemoveColourButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveColour())); + connect(mRemoveColourButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveColour())); TQWhatsThis::add(mRemoveColourButton, i18n("Remove the color currently shown in the background color chooser, from the color selection list.")); layout->addWidget(mRemoveColourButton); @@ -107,7 +107,7 @@ FontColourChooser::FontColourChooser(TQWidget *parent, const char *name, TQHBoxLayout* layout = new TQHBoxLayout(topLayout); mDefaultFont = new CheckBox(i18n("Use &default font"), page); mDefaultFont->setMinimumSize(mDefaultFont->sizeHint()); - connect(mDefaultFont, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotDefaultFontToggled(bool))); + connect(mDefaultFont, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotDefaultFontToggled(bool))); TQWhatsThis::add(mDefaultFont, i18n("Check to use the default font current at the time the alarm is displayed.")); layout->addWidget(mDefaultFont); diff --git a/kalarm/fontcolourbutton.cpp b/kalarm/fontcolourbutton.cpp index 5321cdc9..a291a376 100644 --- a/kalarm/fontcolourbutton.cpp +++ b/kalarm/fontcolourbutton.cpp @@ -47,7 +47,7 @@ FontColourButton::FontColourButton(TQWidget* parent, const char* name) mButton = new PushButton(i18n("Font && Co&lor..."), this); mButton->setFixedSize(mButton->sizeHint()); - connect(mButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonPressed())); + connect(mButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotButtonPressed())); TQWhatsThis::add(mButton, i18n("Choose the font, and foreground and background color, for the alarm message.")); layout->addWidget(mButton); diff --git a/kalarm/kalarmapp.cpp b/kalarm/kalarmapp.cpp index 16186355..d9adbf7c 100644 --- a/kalarm/kalarmapp.cpp +++ b/kalarm/kalarmapp.cpp @@ -109,7 +109,7 @@ KAlarmApp::KAlarmApp() mSpeechEnabled(false) { Preferences::initialise(); - Preferences::connect(TQT_SIGNAL(preferencesChanged()), this, TQT_SLOT(slotPreferencesChanged())); + Preferences::connect(TQ_SIGNAL(preferencesChanged()), this, TQ_SLOT(slotPreferencesChanged())); KCal::CalFormat::setApplication(aboutData()->programName(), AlarmCalendar::icalProductId()); KARecurrence::setDefaultFeb29Type(Preferences::defaultFeb29Type()); @@ -118,7 +118,7 @@ KAlarmApp::KAlarmApp() if (AlarmCalendar::initialiseCalendars()) { - connect(AlarmCalendar::expiredCalendar(), TQT_SIGNAL(purged()), TQT_SLOT(slotExpiredPurged())); + connect(AlarmCalendar::expiredCalendar(), TQ_SIGNAL(purged()), TQ_SLOT(slotExpiredPurged())); TDEConfig* config = kapp->config(); config->setGroup(TQString::fromLatin1("General")); @@ -849,7 +849,7 @@ void KAlarmApp::displayFatalError(const TQString& message) mFatalError = 1; mFatalMessage = message; if (theInstance) - TQTimer::singleShot(0, theInstance, TQT_SLOT(quitFatal())); + TQTimer::singleShot(0, theInstance, TQ_SLOT(quitFatal())); } } @@ -873,7 +873,7 @@ void KAlarmApp::quitFatal() theInstance->quitIf(1, true); break; } - TQTimer::singleShot(1000, this, TQT_SLOT(quitFatal())); + TQTimer::singleShot(1000, this, TQ_SLOT(quitFatal())); } /****************************************************************************** @@ -989,7 +989,7 @@ bool KAlarmApp::displayTrayIcon(bool show, MainWindow* parent) creating = false; } mTrayWindow = new TrayWindow(parent ? parent : MainWindow::firstWindow()); - connect(mTrayWindow, TQT_SIGNAL(deleted()), TQT_SIGNAL(trayIconToggled())); + connect(mTrayWindow, TQ_SIGNAL(deleted()), TQ_SIGNAL(trayIconToggled())); mTrayWindow->show(); emit trayIconToggled(); @@ -998,7 +998,7 @@ bool KAlarmApp::displayTrayIcon(bool show, MainWindow* parent) mCheckingSystemTray = true; mSavedNoSystemTray = mNoSystemTray; mNoSystemTray = false; - TQTimer::singleShot(0, this, TQT_SLOT(slotSystemTrayTimer())); + TQTimer::singleShot(0, this, TQ_SLOT(slotSystemTrayTimer())); } } else if (mTrayWindow) @@ -1212,7 +1212,7 @@ bool KAlarmApp::scheduleEvent(KAEvent::Action action, const TQString& text, cons // Queue the alarm for insertion into the calendar file mDcopQueue.append(DcopTQEntry(event)); if (mInitialised) - TQTimer::singleShot(0, this, TQT_SLOT(processQueue())); + TQTimer::singleShot(0, this, TQ_SLOT(processQueue())); return true; } @@ -1234,7 +1234,7 @@ bool KAlarmApp::handleEvent(const TQString& urlString, const TQString& eventID, } mDcopQueue.append(DcopTQEntry(function, eventID)); if (mInitialised) - TQTimer::singleShot(0, this, TQT_SLOT(processQueue())); + TQTimer::singleShot(0, this, TQ_SLOT(processQueue())); return true; } @@ -1751,16 +1751,16 @@ ShellProcess* KAlarmApp::doShellCommand(const TQString& command, const KAEvent& comms = TDEProcess::AllOutput; } ShellProcess* proc = new ShellProcess(cmd); - connect(proc, TQT_SIGNAL(shellExited(ShellProcess*)), TQT_SLOT(slotCommandExited(ShellProcess*))); + connect(proc, TQ_SIGNAL(shellExited(ShellProcess*)), TQ_SLOT(slotCommandExited(ShellProcess*))); TQGuardedPtr<ShellProcess> logproc = 0; if (comms == TDEProcess::AllOutput && !event.logFile().isEmpty()) { // Output is to be appended to a log file. // Set up a logging process to write the command's output to. - connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), TQT_SLOT(slotCommandOutput(TDEProcess*,char*,int))); - connect(proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQT_SLOT(slotCommandOutput(TDEProcess*,char*,int))); + connect(proc, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), TQ_SLOT(slotCommandOutput(TDEProcess*,char*,int))); + connect(proc, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQ_SLOT(slotCommandOutput(TDEProcess*,char*,int))); logproc = new ShellProcess(TQString::fromLatin1("cat >>%1").arg(event.logFile())); - connect(logproc, TQT_SIGNAL(shellExited(ShellProcess*)), TQT_SLOT(slotLogProcExited(ShellProcess*))); + connect(logproc, TQ_SIGNAL(shellExited(ShellProcess*)), TQ_SLOT(slotLogProcExited(ShellProcess*))); logproc->start(TDEProcess::Stdin); TQCString heading; if (alarm && alarm->dateTime().isValid()) @@ -1940,7 +1940,7 @@ void KAlarmApp::setUpDcop() { mInitialised = true; // we're now ready to handle DCOP calls Daemon::createDcopHandler(); - TQTimer::singleShot(0, this, TQT_SLOT(processQueue())); // process anything already queued + TQTimer::singleShot(0, this, TQ_SLOT(processQueue())); // process anything already queued } } diff --git a/kalarm/kalarmd/adcalendar.cpp b/kalarm/kalarmd/adcalendar.cpp index b1033eb0..699e9684 100644 --- a/kalarm/kalarmd/adcalendar.cpp +++ b/kalarm/kalarmd/adcalendar.cpp @@ -96,7 +96,7 @@ bool ADCalendar::loadFile(bool reset) KURL dest; dest.setPath(mTempFileName); TDEIO::FileCopyJob* job = TDEIO::file_copy(url, dest, -1, true); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotDownloadJobResult(TDEIO::Job*))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotDownloadJobResult(TDEIO::Job*))); } return true; } diff --git a/kalarm/kalarmd/alarmdaemon.cpp b/kalarm/kalarmd/alarmdaemon.cpp index 573cac0d..71c39f1e 100644 --- a/kalarm/kalarmd/alarmdaemon.cpp +++ b/kalarm/kalarmd/alarmdaemon.cpp @@ -119,7 +119,7 @@ AlarmDaemon::AlarmDaemon(bool autostart, TQObject *parent, const char *name) } } // Give some extra time to KAlarm to be fully restored, then proceed as usual - TQTimer::singleShot(3000, this, TQT_SLOT(autostartKAlarm())); + TQTimer::singleShot(3000, this, TQ_SLOT(autostartKAlarm())); } } } @@ -168,7 +168,7 @@ void AlarmDaemon::startMonitoring() { // Set up the alarm timer mAlarmTimer = new TQTimer(this); - connect(mAlarmTimer, TQT_SIGNAL(timeout()), TQT_SLOT(checkAlarmsSlot())); + connect(mAlarmTimer, TQ_SIGNAL(timeout()), TQ_SLOT(checkAlarmsSlot())); setTimerStatus(); // Start monitoring calendar files. @@ -216,7 +216,7 @@ void AlarmDaemon::reloadCal(ADCalendar* cal, bool reset) { cal->close(); if (!cal->setLoadedConnected()) - connect(cal, TQT_SIGNAL(loaded(ADCalendar*, bool)), TQT_SLOT(calendarLoaded(ADCalendar*, bool))); + connect(cal, TQ_SIGNAL(loaded(ADCalendar*, bool)), TQ_SLOT(calendarLoaded(ADCalendar*, bool))); cal->loadFile(reset); } else if (reset) diff --git a/kalarm/latecancel.cpp b/kalarm/latecancel.cpp index ff684a77..6f656410 100644 --- a/kalarm/latecancel.cpp +++ b/kalarm/latecancel.cpp @@ -61,7 +61,7 @@ LateCancelSelector::LateCancelSelector(bool allowHourMinute, TQWidget* parent, c TQBoxLayout* layout = new TQVBoxLayout(mCheckboxFrame, 0, 0); mCheckbox = new CheckBox(i18n_n_CancelIfLate(), mCheckboxFrame); mCheckbox->setFixedSize(mCheckbox->sizeHint()); - connect(mCheckbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggled(bool))); + connect(mCheckbox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotToggled(bool))); TQWhatsThis::add(mCheckbox, whatsThis); layout->addWidget(mCheckbox, 0, TQt::AlignAuto); @@ -72,7 +72,7 @@ LateCancelSelector::LateCancelSelector(bool allowHourMinute, TQWidget* parent, c mTimeSelector = new TimeSelector(i18n("Cancel if late by 10 minutes", "Ca&ncel if late by"), TQString(), whatsThis, i18n("Enter how late will cause the alarm to be canceled"), allowHourMinute, mTimeSelectorFrame); - connect(mTimeSelector, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggled(bool))); + connect(mTimeSelector, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotToggled(bool))); layout->addWidget(mTimeSelector); mLayout->addWidget(mStack); diff --git a/kalarm/lib/buttongroup.cpp b/kalarm/lib/buttongroup.cpp index e3d47e41..d1ba243f 100644 --- a/kalarm/lib/buttongroup.cpp +++ b/kalarm/lib/buttongroup.cpp @@ -29,25 +29,25 @@ ButtonGroup::ButtonGroup(TQWidget* parent, const char* name) : TQButtonGroup(parent, name) { - connect(this, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(buttonSet(int))); + connect(this, TQ_SIGNAL(clicked(int)), TQ_SIGNAL(buttonSet(int))); } ButtonGroup::ButtonGroup(const TQString& title, TQWidget* parent, const char* name) : TQButtonGroup(title, parent, name) { - connect(this, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(buttonSet(int))); + connect(this, TQ_SIGNAL(clicked(int)), TQ_SIGNAL(buttonSet(int))); } ButtonGroup::ButtonGroup(int strips, TQt::Orientation orient, TQWidget* parent, const char* name) : TQButtonGroup(strips, orient, parent, name) { - connect(this, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(buttonSet(int))); + connect(this, TQ_SIGNAL(clicked(int)), TQ_SIGNAL(buttonSet(int))); } ButtonGroup::ButtonGroup(int strips, TQt::Orientation orient, const TQString& title, TQWidget* parent, const char* name) : TQButtonGroup(strips, orient, title, parent, name) { - connect(this, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(buttonSet(int))); + connect(this, TQ_SIGNAL(clicked(int)), TQ_SIGNAL(buttonSet(int))); } /****************************************************************************** @@ -57,7 +57,7 @@ ButtonGroup::ButtonGroup(int strips, TQt::Orientation orient, const TQString& ti int ButtonGroup::insert(TQButton* button, int id) { id = TQButtonGroup::insert(button, id); - connect(button, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotButtonToggled(bool))); + connect(button, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotButtonToggled(bool))); return id; } diff --git a/kalarm/lib/checkbox.cpp b/kalarm/lib/checkbox.cpp index a1f594bc..4b29d927 100644 --- a/kalarm/lib/checkbox.cpp +++ b/kalarm/lib/checkbox.cpp @@ -58,9 +58,9 @@ void CheckBox::setFocusWidget(TQWidget* w, bool enable) mFocusWidget = w; mFocusWidgetEnable = enable; if (w) - connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotClicked())); + connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotClicked())); else - disconnect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClicked())); + disconnect(this, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClicked())); } /****************************************************************************** diff --git a/kalarm/lib/colourcombo.cpp b/kalarm/lib/colourcombo.cpp index e52501ee..d612180a 100644 --- a/kalarm/lib/colourcombo.cpp +++ b/kalarm/lib/colourcombo.cpp @@ -39,9 +39,9 @@ ColourCombo::ColourCombo(TQWidget* parent, const char* name, const TQColor& defa mDisabled(false) { addColours(); - connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int))); - connect(this, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotHighlighted(int))); - Preferences::connect(TQT_SIGNAL(preferencesChanged()), this, TQT_SLOT(slotPreferencesChanged())); + connect(this, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivated(int))); + connect(this, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotHighlighted(int))); + Preferences::connect(TQ_SIGNAL(preferencesChanged()), this, TQ_SLOT(slotPreferencesChanged())); } void ColourCombo::setColour(const TQColor& colour) diff --git a/kalarm/lib/dateedit.cpp b/kalarm/lib/dateedit.cpp index 051e3a64..862e859f 100644 --- a/kalarm/lib/dateedit.cpp +++ b/kalarm/lib/dateedit.cpp @@ -28,7 +28,7 @@ DateEdit::DateEdit(TQWidget* parent, const char* name) : KDateEdit(parent, name) { - connect(this, TQT_SIGNAL(dateEntered(const TQDate&)), TQT_SLOT(newDateEntered(const TQDate&))); + connect(this, TQ_SIGNAL(dateEntered(const TQDate&)), TQ_SLOT(newDateEntered(const TQDate&))); } void DateEdit::setMinDate(const TQDate& d, const TQString& errorDate) diff --git a/kalarm/lib/label.cpp b/kalarm/lib/label.cpp index 49c17695..8a41d624 100644 --- a/kalarm/lib/label.cpp +++ b/kalarm/lib/label.cpp @@ -50,7 +50,7 @@ Label::Label(TQWidget* buddy, const TQString& text, TQWidget* parent, const char void Label::setBuddy(TQWidget* bud) { if (mRadioButton) - disconnect(mRadioButton, TQT_SIGNAL(destroyed()), this, TQT_SLOT(buddyDead())); + disconnect(mRadioButton, TQ_SIGNAL(destroyed()), this, TQ_SLOT(buddyDead())); TQWidget* w = bud; if (w) { @@ -74,7 +74,7 @@ void Label::setBuddy(TQWidget* bud) mFocusWidget = new LabelFocusWidget(this); TQLabel::setBuddy(mFocusWidget); mRadioButton = (TQRadioButton*)bud; - connect(mRadioButton, TQT_SIGNAL(destroyed()), this, TQT_SLOT(buddyDead())); + connect(mRadioButton, TQ_SIGNAL(destroyed()), this, TQ_SLOT(buddyDead())); } } diff --git a/kalarm/lib/radiobutton.cpp b/kalarm/lib/radiobutton.cpp index e9f60430..62fb9b63 100644 --- a/kalarm/lib/radiobutton.cpp +++ b/kalarm/lib/radiobutton.cpp @@ -58,9 +58,9 @@ void RadioButton::setFocusWidget(TQWidget* w, bool enable) mFocusWidget = w; mFocusWidgetEnable = enable; if (w) - connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotClicked())); + connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotClicked())); else - disconnect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClicked())); + disconnect(this, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClicked())); } /****************************************************************************** diff --git a/kalarm/lib/shellprocess.cpp b/kalarm/lib/shellprocess.cpp index 1ed64df7..0fe0159b 100644 --- a/kalarm/lib/shellprocess.cpp +++ b/kalarm/lib/shellprocess.cpp @@ -56,8 +56,8 @@ bool ShellProcess::start(Communication comm) return false; } KShellProcess::operator<<(mCommand); - connect(this, TQT_SIGNAL(wroteStdin(TDEProcess*)), TQT_SLOT(writtenStdin(TDEProcess*))); - connect(this, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotExited(TDEProcess*))); + connect(this, TQ_SIGNAL(wroteStdin(TDEProcess*)), TQ_SLOT(writtenStdin(TDEProcess*))); + connect(this, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(slotExited(TDEProcess*))); if (!KShellProcess::start(TDEProcess::NotifyOnExit, comm)) { mStatus = START_FAIL; diff --git a/kalarm/lib/spinbox.cpp b/kalarm/lib/spinbox.cpp index 80adc6d8..667d5c7c 100644 --- a/kalarm/lib/spinbox.cpp +++ b/kalarm/lib/spinbox.cpp @@ -65,7 +65,7 @@ void SpinBox::init() #if KDE_IS_VERSION(3,1,90) // Detect when the text field is edited - connect(editor(), TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(textEdited())); + connect(editor(), TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(textEdited())); #endif } diff --git a/kalarm/lib/spinbox2.cpp b/kalarm/lib/spinbox2.cpp index 43570dba..328813e2 100644 --- a/kalarm/lib/spinbox2.cpp +++ b/kalarm/lib/spinbox2.cpp @@ -89,11 +89,11 @@ void SpinBox2::init() mSpinMirror = new SpinMirror(mUpdown2, mUpdown2Frame, this); if (!mirrorStyle(style())) mSpinMirror->hide(); // hide mirrored spin buttons when they are inappropriate - connect(mSpinbox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(valueChange())); - connect(mSpinbox, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(valueChanged(int))); - connect(mSpinbox, TQT_SIGNAL(valueChanged(const TQString&)), TQT_SIGNAL(valueChanged(const TQString&))); - connect(mUpdown2, TQT_SIGNAL(stepped(int)), TQT_SLOT(stepPage(int))); - connect(mUpdown2, TQT_SIGNAL(styleUpdated()), TQT_SLOT(updateMirror())); + connect(mSpinbox, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(valueChange())); + connect(mSpinbox, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(valueChanged(int))); + connect(mSpinbox, TQ_SIGNAL(valueChanged(const TQString&)), TQ_SIGNAL(valueChanged(const TQString&))); + connect(mUpdown2, TQ_SIGNAL(stepped(int)), TQ_SLOT(stepPage(int))); + connect(mUpdown2, TQ_SIGNAL(styleUpdated()), TQ_SLOT(updateMirror())); } void SpinBox2::setReadOnly(bool ro) @@ -451,7 +451,7 @@ void SpinMirror::contentsMouseEvent(TQMouseEvent* e) { case TQEvent::MouseButtonPress: case TQEvent::MouseButtonRelease: - TQTimer::singleShot(0, this, TQT_SLOT(redraw())); + TQTimer::singleShot(0, this, TQ_SLOT(redraw())); break; default: break; @@ -481,11 +481,11 @@ bool SpinMirror::event(TQEvent* e) case TQEvent::Leave: case TQEvent::Enter: TQApplication::postEvent(mSpinWidget, new TQEvent(e->type())); - TQTimer::singleShot(0, this, TQT_SLOT(redraw())); + TQTimer::singleShot(0, this, TQ_SLOT(redraw())); break; case TQEvent::FocusIn: mSpinbox->setFocus(); - TQTimer::singleShot(0, this, TQT_SLOT(redraw())); + TQTimer::singleShot(0, this, TQ_SLOT(redraw())); break; default: break; diff --git a/kalarm/lib/synchtimer.cpp b/kalarm/lib/synchtimer.cpp index eecef7d4..e32cf659 100644 --- a/kalarm/lib/synchtimer.cpp +++ b/kalarm/lib/synchtimer.cpp @@ -48,11 +48,11 @@ void SynchTimer::connecT(TQObject* receiver, const char* member) Connection connection(receiver, member); if (mConnections.find(connection) != mConnections.end()) return; // the slot is already connected, so ignore request - connect(mTimer, TQT_SIGNAL(timeout()), receiver, member); + connect(mTimer, TQ_SIGNAL(timeout()), receiver, member); mConnections.append(connection); if (!mTimer->isActive()) { - connect(mTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimer())); + connect(mTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimer())); start(); } } diff --git a/kalarm/lib/timeedit.cpp b/kalarm/lib/timeedit.cpp index 80713f2f..21215a6c 100644 --- a/kalarm/lib/timeedit.cpp +++ b/kalarm/lib/timeedit.cpp @@ -38,13 +38,13 @@ TimeEdit::TimeEdit(TQWidget* parent, const char* name) bool use12hour = TDEGlobal::locale()->use12Clock(); mSpinBox = new TimeSpinBox(!use12hour, this); mSpinBox->setFixedSize(mSpinBox->sizeHint()); - connect(mSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int))); + connect(mSpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotValueChanged(int))); if (use12hour) { mAmPm = new ComboBox(this); setAmPmCombo(1, 1); // add "am" and "pm" options to the combo box mAmPm->setFixedSize(mAmPm->sizeHint()); - connect(mAmPm, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotAmPmChanged(int))); + connect(mAmPm, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotAmPmChanged(int))); } } diff --git a/kalarm/lib/timeperiod.cpp b/kalarm/lib/timeperiod.cpp index 37c78702..b2290a77 100644 --- a/kalarm/lib/timeperiod.cpp +++ b/kalarm/lib/timeperiod.cpp @@ -63,12 +63,12 @@ TimePeriod::TimePeriod(bool allowHourMinute, TQWidget* parent, const char* name) mSpinBox->setLineStep(1); mSpinBox->setLineShiftStep(10); mSpinBox->setRange(1, mMaxDays); - connect(mSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotDaysChanged(int))); + connect(mSpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotDaysChanged(int))); mSpinStack->addWidget(mSpinBox, 0); mTimeSpinBox = new TimeSpinBox(0, 99999, mSpinStack); mTimeSpinBox->setRange(1, maxMinutes); // max 999H59M - connect(mTimeSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotTimeChanged(int))); + connect(mTimeSpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotTimeChanged(int))); mSpinStack->addWidget(mTimeSpinBox, 1); mSpinStack->setFixedSize(mSpinBox->sizeHint().expandedTo(mTimeSpinBox->sizeHint())); @@ -88,7 +88,7 @@ TimePeriod::TimePeriod(bool allowHourMinute, TQWidget* parent, const char* name) mUnitsCombo->insertItem(i18n_weeks()); mMaxUnitShown = WEEKS; mUnitsCombo->setFixedSize(mUnitsCombo->sizeHint()); - connect(mUnitsCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotUnitsSelected(int))); + connect(mUnitsCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotUnitsSelected(int))); setFocusProxy(mUnitsCombo); setTabOrder(mUnitsCombo, mSpinStack); diff --git a/kalarm/lib/timespinbox.cpp b/kalarm/lib/timespinbox.cpp index 4bc161fd..db3d5400 100644 --- a/kalarm/lib/timespinbox.cpp +++ b/kalarm/lib/timespinbox.cpp @@ -70,7 +70,7 @@ TimeSpinBox::TimeSpinBox(bool use24hour, TQWidget* parent, const char* name) setShiftSteps(5, 360); // shift-left button increments 5 min / 6 hours setSelectOnStep(false); setAlignment(TQt::AlignHCenter); - connect(this, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int))); + connect(this, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotValueChanged(int))); } /****************************************************************************** diff --git a/kalarm/mainwindow.cpp b/kalarm/mainwindow.cpp index 0a7a2598..66a93a9c 100644 --- a/kalarm/mainwindow.cpp +++ b/kalarm/mainwindow.cpp @@ -149,14 +149,14 @@ MainWindow::MainWindow(bool restored) mListView->refresh(); // populate the alarm list mListView->clearSelection(); - connect(mListView, TQT_SIGNAL(itemDeleted()), TQT_SLOT(slotDeletion())); - connect(mListView, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelection())); - connect(mListView, TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), - TQT_SLOT(slotContextMenuRequested(TQListViewItem*, const TQPoint&, int))); - connect(mListView, TQT_SIGNAL(mouseButtonClicked(int, TQListViewItem*, const TQPoint&, int)), - TQT_SLOT(slotMouseClicked(int, TQListViewItem*, const TQPoint&, int))); - connect(mListView, TQT_SIGNAL(executed(TQListViewItem*)), TQT_SLOT(slotDoubleClicked(TQListViewItem*))); - connect(mListView->header(), TQT_SIGNAL(indexChange(int, int, int)), TQT_SLOT(columnsReordered())); + connect(mListView, TQ_SIGNAL(itemDeleted()), TQ_SLOT(slotDeletion())); + connect(mListView, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelection())); + connect(mListView, TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), + TQ_SLOT(slotContextMenuRequested(TQListViewItem*, const TQPoint&, int))); + connect(mListView, TQ_SIGNAL(mouseButtonClicked(int, TQListViewItem*, const TQPoint&, int)), + TQ_SLOT(slotMouseClicked(int, TQListViewItem*, const TQPoint&, int))); + connect(mListView, TQ_SIGNAL(executed(TQListViewItem*)), TQ_SLOT(slotDoubleClicked(TQListViewItem*))); + connect(mListView->header(), TQ_SIGNAL(indexChange(int, int, int)), TQ_SLOT(columnsReordered())); initActions(); mWindowList.append(this); @@ -326,27 +326,27 @@ void MainWindow::columnsReordered() void MainWindow::initActions() { TDEActionCollection* actions = actionCollection(); - mActionTemplates = new TDEAction(i18n("&Templates..."), 0, this, TQT_SLOT(slotTemplates()), actions, "templates"); - mActionNew = KAlarm::createNewAlarmAction(i18n("&New..."), this, TQT_SLOT(slotNew()), actions, "new"); - mActionNewFromTemplate = KAlarm::createNewFromTemplateAction(i18n("New &From Template"), this, TQT_SLOT(slotNewFromTemplate(const KAEvent&)), actions, "newFromTempl"); - mActionCreateTemplate = new TDEAction(i18n("Create Tem&plate..."), 0, this, TQT_SLOT(slotNewTemplate()), actions, "createTemplate"); - mActionCopy = new TDEAction(i18n("&Copy..."), "edit-copy", TQt::SHIFT+TQt::Key_Insert, this, TQT_SLOT(slotCopy()), actions, "copy"); - mActionModify = new TDEAction(i18n("&Edit..."), "edit", TQt::CTRL+TQt::Key_E, this, TQT_SLOT(slotModify()), actions, "modify"); - mActionDelete = new TDEAction(i18n("&Delete"), "edit-delete", TQt::Key_Delete, this, TQT_SLOT(slotDelete()), actions, "delete"); - mActionReactivate = new TDEAction(i18n("Reac&tivate"), 0, TQt::CTRL+TQt::Key_R, this, TQT_SLOT(slotReactivate()), actions, "undelete"); - mActionEnable = new TDEAction(TQString(), 0, TQt::CTRL+TQt::Key_B, this, TQT_SLOT(slotEnable()), actions, "disable"); - mActionView = new TDEAction(i18n("&View"), "viewmag", TQt::CTRL+TQt::Key_W, this, TQT_SLOT(slotView()), actions, "view"); - mActionShowTime = new TDEToggleAction(i18n_a_ShowAlarmTimes(), TQt::CTRL+TQt::Key_M, this, TQT_SLOT(slotShowTime()), actions, "showAlarmTimes"); + mActionTemplates = new TDEAction(i18n("&Templates..."), 0, this, TQ_SLOT(slotTemplates()), actions, "templates"); + mActionNew = KAlarm::createNewAlarmAction(i18n("&New..."), this, TQ_SLOT(slotNew()), actions, "new"); + mActionNewFromTemplate = KAlarm::createNewFromTemplateAction(i18n("New &From Template"), this, TQ_SLOT(slotNewFromTemplate(const KAEvent&)), actions, "newFromTempl"); + mActionCreateTemplate = new TDEAction(i18n("Create Tem&plate..."), 0, this, TQ_SLOT(slotNewTemplate()), actions, "createTemplate"); + mActionCopy = new TDEAction(i18n("&Copy..."), "edit-copy", TQt::SHIFT+TQt::Key_Insert, this, TQ_SLOT(slotCopy()), actions, "copy"); + mActionModify = new TDEAction(i18n("&Edit..."), "edit", TQt::CTRL+TQt::Key_E, this, TQ_SLOT(slotModify()), actions, "modify"); + mActionDelete = new TDEAction(i18n("&Delete"), "edit-delete", TQt::Key_Delete, this, TQ_SLOT(slotDelete()), actions, "delete"); + mActionReactivate = new TDEAction(i18n("Reac&tivate"), 0, TQt::CTRL+TQt::Key_R, this, TQ_SLOT(slotReactivate()), actions, "undelete"); + mActionEnable = new TDEAction(TQString(), 0, TQt::CTRL+TQt::Key_B, this, TQ_SLOT(slotEnable()), actions, "disable"); + mActionView = new TDEAction(i18n("&View"), "viewmag", TQt::CTRL+TQt::Key_W, this, TQ_SLOT(slotView()), actions, "view"); + mActionShowTime = new TDEToggleAction(i18n_a_ShowAlarmTimes(), TQt::CTRL+TQt::Key_M, this, TQ_SLOT(slotShowTime()), actions, "showAlarmTimes"); mActionShowTime->setCheckedState(i18n("Hide &Alarm Times")); - mActionShowTimeTo = new TDEToggleAction(i18n_o_ShowTimeToAlarms(), TQt::CTRL+TQt::Key_I, this, TQT_SLOT(slotShowTimeTo()), actions, "showTimeToAlarms"); + mActionShowTimeTo = new TDEToggleAction(i18n_o_ShowTimeToAlarms(), TQt::CTRL+TQt::Key_I, this, TQ_SLOT(slotShowTimeTo()), actions, "showTimeToAlarms"); mActionShowTimeTo->setCheckedState(i18n("Hide Time t&o Alarms")); - mActionShowExpired = new TDEToggleAction(i18n_e_ShowExpiredAlarms(), "history", TQt::CTRL+TQt::Key_P, this, TQT_SLOT(slotShowExpired()), actions, "showExpiredAlarms"); + mActionShowExpired = new TDEToggleAction(i18n_e_ShowExpiredAlarms(), "history", TQt::CTRL+TQt::Key_P, this, TQ_SLOT(slotShowExpired()), actions, "showExpiredAlarms"); mActionShowExpired->setCheckedState(i18n_e_HideExpiredAlarms()); - mActionToggleTrayIcon = new TDEToggleAction(i18n("Show in System &Tray"), 0, this, TQT_SLOT(slotToggleTrayIcon()), actions, "showInSystemTray"); + mActionToggleTrayIcon = new TDEToggleAction(i18n("Show in System &Tray"), 0, this, TQ_SLOT(slotToggleTrayIcon()), actions, "showInSystemTray"); mActionToggleTrayIcon->setCheckedState(i18n("Hide From System &Tray")); - new TDEAction(i18n("Import &Alarms..."), 0, this, TQT_SLOT(slotImportAlarms()), actions, "importAlarms"); - new TDEAction(i18n("Import &Birthdays..."), 0, this, TQT_SLOT(slotBirthdays()), actions, "importBirthdays"); - new TDEAction(i18n("&Refresh Alarms"), "reload", 0, this, TQT_SLOT(slotResetDaemon()), actions, "refreshAlarms"); + new TDEAction(i18n("Import &Alarms..."), 0, this, TQ_SLOT(slotImportAlarms()), actions, "importAlarms"); + new TDEAction(i18n("Import &Birthdays..."), 0, this, TQ_SLOT(slotBirthdays()), actions, "importBirthdays"); + new TDEAction(i18n("&Refresh Alarms"), "reload", 0, this, TQ_SLOT(slotResetDaemon()), actions, "refreshAlarms"); Daemon::createAlarmEnableAction(actions, "alarmEnable"); if (undoText.isNull()) { @@ -364,32 +364,32 @@ void MainWindow::initActions() redoTextStripped = KAlarm::stripAccel(redoText); delete act; } - mActionUndo = new TDEToolBarPopupAction(undoText, undoIcon, undoShortcut, this, TQT_SLOT(slotUndo()), actions, "edit_undo"); - mActionRedo = new TDEToolBarPopupAction(redoText, redoIcon, redoShortcut, this, TQT_SLOT(slotRedo()), actions, "edit_redo"); - KStdAction::find(mListView, TQT_SLOT(slotFind()), actions); - mActionFindNext = KStdAction::findNext(mListView, TQT_SLOT(slotFindNext()), actions); - mActionFindPrev = KStdAction::findPrev(mListView, TQT_SLOT(slotFindPrev()), actions); - KStdAction::selectAll(mListView, TQT_SLOT(slotSelectAll()), actions); - KStdAction::deselect(mListView, TQT_SLOT(slotDeselect()), actions); - KStdAction::quit(this, TQT_SLOT(slotQuit()), actions); - KStdAction::keyBindings(this, TQT_SLOT(slotConfigureKeys()), actions); - KStdAction::configureToolbars(this, TQT_SLOT(slotConfigureToolbar()), actions); - KStdAction::preferences(this, TQT_SLOT(slotPreferences()), actions); + mActionUndo = new TDEToolBarPopupAction(undoText, undoIcon, undoShortcut, this, TQ_SLOT(slotUndo()), actions, "edit_undo"); + mActionRedo = new TDEToolBarPopupAction(redoText, redoIcon, redoShortcut, this, TQ_SLOT(slotRedo()), actions, "edit_redo"); + KStdAction::find(mListView, TQ_SLOT(slotFind()), actions); + mActionFindNext = KStdAction::findNext(mListView, TQ_SLOT(slotFindNext()), actions); + mActionFindPrev = KStdAction::findPrev(mListView, TQ_SLOT(slotFindPrev()), actions); + KStdAction::selectAll(mListView, TQ_SLOT(slotSelectAll()), actions); + KStdAction::deselect(mListView, TQ_SLOT(slotDeselect()), actions); + KStdAction::quit(this, TQ_SLOT(slotQuit()), actions); + KStdAction::keyBindings(this, TQ_SLOT(slotConfigureKeys()), actions); + KStdAction::configureToolbars(this, TQ_SLOT(slotConfigureToolbar()), actions); + KStdAction::preferences(this, TQ_SLOT(slotPreferences()), actions); setStandardToolBarMenuEnabled(true); createGUI(UI_FILE); mContextMenu = static_cast<TDEPopupMenu*>(factory()->container("listContext", this)); mActionsMenu = static_cast<TDEPopupMenu*>(factory()->container("actions", this)); mMenuError = (!mContextMenu || !mActionsMenu); - connect(mActionsMenu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(updateActionsMenu())); - connect(mActionUndo->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotInitUndoMenu())); - connect(mActionUndo->popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(slotUndoItem(int))); - connect(mActionRedo->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotInitRedoMenu())); - connect(mActionRedo->popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(slotRedoItem(int))); - connect(Undo::instance(), TQT_SIGNAL(changed(const TQString&, const TQString&)), TQT_SLOT(slotUndoStatus(const TQString&, const TQString&))); - connect(mListView, TQT_SIGNAL(findActive(bool)), TQT_SLOT(slotFindActive(bool))); - Preferences::connect(TQT_SIGNAL(preferencesChanged()), this, TQT_SLOT(slotPrefsChanged())); - connect(theApp(), TQT_SIGNAL(trayIconToggled()), TQT_SLOT(updateTrayIconAction())); + connect(mActionsMenu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(updateActionsMenu())); + connect(mActionUndo->popupMenu(), TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotInitUndoMenu())); + connect(mActionUndo->popupMenu(), TQ_SIGNAL(activated(int)), TQ_SLOT(slotUndoItem(int))); + connect(mActionRedo->popupMenu(), TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotInitRedoMenu())); + connect(mActionRedo->popupMenu(), TQ_SIGNAL(activated(int)), TQ_SLOT(slotRedoItem(int))); + connect(Undo::instance(), TQ_SIGNAL(changed(const TQString&, const TQString&)), TQ_SLOT(slotUndoStatus(const TQString&, const TQString&))); + connect(mListView, TQ_SIGNAL(findActive(bool)), TQ_SLOT(slotFindActive(bool))); + Preferences::connect(TQ_SIGNAL(preferencesChanged()), this, TQ_SLOT(slotPrefsChanged())); + connect(theApp(), TQ_SIGNAL(trayIconToggled()), TQ_SLOT(updateTrayIconAction())); // Set menu item states setEnableText(true); @@ -485,7 +485,7 @@ void MainWindow::setUpdateTimer() { // Timeout every minute. needTimer->mMinuteTimerActive = true; - MinuteTimer::connect(needTimer, TQT_SLOT(slotUpdateTimeTo())); + MinuteTimer::connect(needTimer, TQ_SLOT(slotUpdateTimeTo())); kdDebug(5950) << "MainWindow::setUpdateTimer(): started timer" << endl; } else if (!needTimer && timerWindow) @@ -895,7 +895,7 @@ void MainWindow::slotTemplates() { mTemplateDlg = TemplateDlg::create(this); enableTemplateMenuItem(false); // disable menu item in all windows - connect(mTemplateDlg, TQT_SIGNAL(finished()), TQT_SLOT(slotTemplatesEnd())); + connect(mTemplateDlg, TQ_SIGNAL(finished()), TQ_SLOT(slotTemplatesEnd())); mTemplateDlg->show(); } } @@ -1088,7 +1088,7 @@ void MainWindow::slotConfigureToolbar() { saveMainWindowSettings(TDEGlobal::config(), WINDOW_NAME); KEditToolbar dlg(factory()); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(slotNewToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), this, TQ_SLOT(slotNewToolbarConfig())); dlg.exec(); } diff --git a/kalarm/messagewin.cpp b/kalarm/messagewin.cpp index f05770d0..7479ce4e 100644 --- a/kalarm/messagewin.cpp +++ b/kalarm/messagewin.cpp @@ -429,12 +429,12 @@ void MessageWin::initView() if (mDateTime.isDateOnly() || TQDate::currentDate().daysTo(mDateTime.date()) > 0) { setRemainingTextDay(); - MidnightTimer::connect(this, TQT_SLOT(setRemainingTextDay())); // update every day + MidnightTimer::connect(this, TQ_SLOT(setRemainingTextDay())); // update every day } else { setRemainingTextMinute(); - MinuteTimer::connect(this, TQT_SLOT(setRemainingTextMinute())); // update every minute + MinuteTimer::connect(this, TQ_SLOT(setRemainingTextMinute())); // update every minute } topLayout->addWidget(mRemainingText, 0, TQt::AlignHCenter); topLayout->addSpacing(KDialog::spacingHint()); @@ -512,7 +512,7 @@ void MessageWin::initView() mOkButton->clearFocus(); mOkButton->setFocusPolicy(TQWidget::ClickFocus); // don't allow keyboard selection mOkButton->setFixedSize(mOkButton->sizeHint()); - connect(mOkButton, TQT_SIGNAL(clicked()), TQT_SLOT(close())); + connect(mOkButton, TQ_SIGNAL(clicked()), TQ_SLOT(close())); grid->addWidget(mOkButton, 0, gridIndex++, AlignHCenter); TQWhatsThis::add(mOkButton, i18n("Acknowledge the alarm")); @@ -522,7 +522,7 @@ void MessageWin::initView() mEditButton = new TQPushButton(i18n("&Edit..."), topWidget); mEditButton->setFocusPolicy(TQWidget::ClickFocus); // don't allow keyboard selection mEditButton->setFixedSize(mEditButton->sizeHint()); - connect(mEditButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEdit())); + connect(mEditButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotEdit())); grid->addWidget(mEditButton, 0, gridIndex++, AlignHCenter); TQWhatsThis::add(mEditButton, i18n("Edit the alarm.")); } @@ -533,7 +533,7 @@ void MessageWin::initView() mDeferButton = new TQPushButton(i18n("&Defer..."), topWidget); mDeferButton->setFocusPolicy(TQWidget::ClickFocus); // don't allow keyboard selection mDeferButton->setFixedSize(mDeferButton->sizeHint()); - connect(mDeferButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotDefer())); + connect(mDeferButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotDefer())); grid->addWidget(mDeferButton, 0, gridIndex++, AlignHCenter); TQWhatsThis::add(mDeferButton, i18n("Defer the alarm until later.\n" @@ -550,7 +550,7 @@ void MessageWin::initView() mSilenceButton = new TQPushButton(topWidget); mSilenceButton->setPixmap(pixmap); mSilenceButton->setFixedSize(mSilenceButton->sizeHint()); - connect(mSilenceButton, TQT_SIGNAL(clicked()), TQT_SLOT(stopPlay())); + connect(mSilenceButton, TQ_SIGNAL(clicked()), TQ_SLOT(stopPlay())); grid->addWidget(mSilenceButton, 0, gridIndex++, AlignHCenter); TQToolTip::add(mSilenceButton, i18n("Stop sound")); TQWhatsThis::add(mSilenceButton, i18n("Stop playing the sound")); @@ -567,7 +567,7 @@ void MessageWin::initView() mKMailButton = new TQPushButton(topWidget); mKMailButton->setPixmap(pixmap); mKMailButton->setFixedSize(mKMailButton->sizeHint()); - connect(mKMailButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotShowKMailMessage())); + connect(mKMailButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotShowKMailMessage())); grid->addWidget(mKMailButton, 0, gridIndex++, AlignHCenter); TQToolTip::add(mKMailButton, i18n("Locate this email in KMail", "Locate in KMail")); TQWhatsThis::add(mKMailButton, i18n("Locate and highlight this email in KMail")); @@ -580,7 +580,7 @@ void MessageWin::initView() mKAlarmButton = new TQPushButton(topWidget); mKAlarmButton->setPixmap(pixmap); mKAlarmButton->setFixedSize(mKAlarmButton->sizeHint()); - connect(mKAlarmButton, TQT_SIGNAL(clicked()), TQT_SLOT(displayMainWindow())); + connect(mKAlarmButton, TQ_SIGNAL(clicked()), TQ_SLOT(displayMainWindow())); grid->addWidget(mKAlarmButton, 0, gridIndex++, AlignHCenter); TQString actKAlarm = i18n("Activate KAlarm"); TQToolTip::add(mKAlarmButton, actKAlarm); @@ -619,9 +619,9 @@ void MessageWin::setRemainingTextDay() if (days <= 0 && !mDateTime.isDateOnly()) { // The alarm is due today, so start refreshing every minute - MidnightTimer::disconnect(this, TQT_SLOT(setRemainingTextDay())); + MidnightTimer::disconnect(this, TQ_SLOT(setRemainingTextDay())); setRemainingTextMinute(); - MinuteTimer::connect(this, TQT_SLOT(setRemainingTextMinute())); // update every minute + MinuteTimer::connect(this, TQ_SLOT(setRemainingTextMinute())); // update every minute } else { @@ -796,14 +796,14 @@ void MessageWin::playAudio() #else // An audio file is specified. Because loading it may take some time, // call it on a timer to allow the window to display first. - TQTimer::singleShot(0, this, TQT_SLOT(slotPlayAudio())); + TQTimer::singleShot(0, this, TQ_SLOT(slotPlayAudio())); #endif } else if (mSpeak) { // The message is to be spoken. In case of error messges, // call it on a timer to allow the window to display first. - TQTimer::singleShot(0, this, TQT_SLOT(slotSpeak())); + TQTimer::singleShot(0, this, TQ_SLOT(slotSpeak())); } } @@ -868,7 +868,7 @@ void MessageWin::slotPlayAudio() { mFadeTimer = 0; mPlayTimer = new TQTimer(this); - connect(mPlayTimer, TQT_SIGNAL(timeout()), TQT_SLOT(checkAudioPlay())); + connect(mPlayTimer, TQ_SIGNAL(timeout()), TQ_SLOT(checkAudioPlay())); mArtsDispatcher = new KArtsDispatcher; mPlayedOnce = false; mAudioFileStart = TQTime::currentTime(); @@ -935,7 +935,7 @@ void MessageWin::initAudio(bool firstTime) } mSilenceButton->setEnabled(true); mPlayed = false; - connect(mPlayObject, TQT_SIGNAL(playObjectCreated()), TQT_SLOT(checkAudioPlay())); + connect(mPlayObject, TQ_SIGNAL(playObjectCreated()), TQ_SLOT(checkAudioPlay())); if (!mPlayObject->object().isNull()) checkAudioPlay(); } @@ -976,7 +976,7 @@ void MessageWin::checkAudioPlay() // Set up volume fade mAudioFileStart = now; mFadeTimer = new TQTimer(this); - connect(mFadeTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotFade())); + connect(mFadeTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotFade())); mFadeTimer->start(1000); // adjust volume every second } mPlayedOnce = true; @@ -1186,7 +1186,7 @@ void MessageWin::show() int delay = TQDateTime::currentDateTime().secsTo(mCloseTime); if (delay < 0) delay = 0; - TQTimer::singleShot(delay * 1000, this, TQT_SLOT(close())); + TQTimer::singleShot(delay * 1000, this, TQ_SLOT(close())); if (!delay) return; // don't show the window if auto-closing is already due } @@ -1302,7 +1302,7 @@ void MessageWin::showEvent(TQShowEvent* se) if (mAction == KAEvent::MESSAGE) { // Set the window size once the frame size is known - TQTimer::singleShot(0, this, TQT_SLOT(setMaxSize())); + TQTimer::singleShot(0, this, TQ_SLOT(setMaxSize())); } } mShown = true; @@ -1345,7 +1345,7 @@ void MessageWin::displayComplete() // Enable the window's buttons either now or after the configured delay if (mButtonDelay > 0) - TQTimer::singleShot(mButtonDelay, this, TQT_SLOT(enableButtons())); + TQTimer::singleShot(mButtonDelay, this, TQ_SLOT(enableButtons())); else enableButtons(); } @@ -1497,7 +1497,7 @@ void MessageWin::setDeferralLimit(const KAEvent& event) if (mDeferButton) { mDeferLimit = event.deferralLimit().dateTime(); - MidnightTimer::connect(this, TQT_SLOT(checkDeferralLimit())); // check every day + MidnightTimer::connect(this, TQ_SLOT(checkDeferralLimit())); // check every day mDisableDeferral = false; checkDeferralLimit(); } @@ -1519,14 +1519,14 @@ void MessageWin::checkDeferralLimit() int n = TQDate::currentDate().daysTo(mDeferLimit.date()); if (n > 0) return; - MidnightTimer::disconnect(this, TQT_SLOT(checkDeferralLimit())); + MidnightTimer::disconnect(this, TQ_SLOT(checkDeferralLimit())); if (n == 0) { // The deferral limit will be reached today n = TQTime::currentTime().secsTo(mDeferLimit.time()); if (n > 0) { - TQTimer::singleShot(n * 1000, this, TQT_SLOT(checkDeferralLimit())); + TQTimer::singleShot(n * 1000, this, TQ_SLOT(checkDeferralLimit())); return; } } diff --git a/kalarm/pickfileradio.cpp b/kalarm/pickfileradio.cpp index 15b56d94..bdfb2bb4 100644 --- a/kalarm/pickfileradio.cpp +++ b/kalarm/pickfileradio.cpp @@ -41,10 +41,10 @@ PickFileRadio::PickFileRadio(TQPushButton* button, LineEdit* edit, const TQStrin Q_ASSERT(parent); Q_ASSERT(button); mButton->setEnabled(false); - connect(mButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotPickFile())); + connect(mButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotPickFile())); if (mEdit) mEdit->setEnabled(false); - connect(mGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(slotSelectionChanged(int))); + connect(mGroup, TQ_SIGNAL(buttonSet(int)), TQ_SLOT(slotSelectionChanged(int))); } PickFileRadio::PickFileRadio(const TQString& text, TQButtonGroup* parent, const char* name) @@ -64,10 +64,10 @@ void PickFileRadio::init(TQPushButton* button, LineEdit* edit) mEdit = edit; mButton = button; mButton->setEnabled(false); - connect(mButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotPickFile())); + connect(mButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotPickFile())); if (mEdit) mEdit->setEnabled(false); - connect(mGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(slotSelectionChanged(int))); + connect(mGroup, TQ_SIGNAL(buttonSet(int)), TQ_SLOT(slotSelectionChanged(int))); setReadOnly(RadioButton::isReadOnly()); } @@ -165,7 +165,7 @@ void PickFileRadio::slotPickFile() // No file is selected, so revert to the previous radio button selection. // But wait a moment before setting the radio button, or it won't work. mRevertId = true; // prevent picker dialogue popping up twice - TQTimer::singleShot(0, this, TQT_SLOT(setLastId())); + TQTimer::singleShot(0, this, TQ_SLOT(setLastId())); } } diff --git a/kalarm/prefdlg.cpp b/kalarm/prefdlg.cpp index f439d609..38cd5603 100644 --- a/kalarm/prefdlg.cpp +++ b/kalarm/prefdlg.cpp @@ -263,7 +263,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame) // Run-on-demand radio button mRunOnDemand = new TQRadioButton(i18n("&Run only on demand"), group, "runDemand"); mRunOnDemand->setFixedSize(mRunOnDemand->sizeHint()); - connect(mRunOnDemand, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotRunModeToggled(bool))); + connect(mRunOnDemand, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotRunModeToggled(bool))); TQWhatsThis::add(mRunOnDemand, i18n("Check to run KAlarm only when required.\n\n" "Notes:\n" @@ -274,7 +274,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame) // Run-in-system-tray radio button mRunInSystemTray = new TQRadioButton(i18n("Run continuously in system &tray"), group, "runTray"); mRunInSystemTray->setFixedSize(mRunInSystemTray->sizeHint()); - connect(mRunInSystemTray, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotRunModeToggled(bool))); + connect(mRunInSystemTray, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotRunModeToggled(bool))); TQWhatsThis::add(mRunInSystemTray, i18n("Check to run KAlarm continuously in the TDE system tray.\n\n" "Notes:\n" @@ -286,7 +286,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame) // Run continuously options mDisableAlarmsIfStopped = new TQCheckBox(i18n("Disa&ble alarms while not running"), group, "disableAl"); mDisableAlarmsIfStopped->setFixedSize(mDisableAlarmsIfStopped->sizeHint()); - connect(mDisableAlarmsIfStopped, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotDisableIfStoppedToggled(bool))); + connect(mDisableAlarmsIfStopped, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotDisableIfStoppedToggled(bool))); TQWhatsThis::add(mDisableAlarmsIfStopped, i18n("Check to disable alarms whenever KAlarm is not running. Alarms will only appear while the system tray icon is visible.")); grid->addMultiCellWidget(mDisableAlarmsIfStopped, 3, 3, 1, 2, alignment); @@ -299,14 +299,14 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame) mAutostartTrayIcon = new TQCheckBox(i18n("Autostart at &login"), group, "autoTray"); #ifdef AUTOSTART_BY_KALARMD - connect(mAutostartTrayIcon, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotAutostartToggled(bool))); + connect(mAutostartTrayIcon, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotAutostartToggled(bool))); #endif grid->addMultiCellWidget(mAutostartTrayIcon, 5, 5, 0, 2, alignment); // Autostart alarm daemon mAutostartDaemon = new TQCheckBox(i18n("Start alarm monitoring at lo&gin"), group, "startDaemon"); mAutostartDaemon->setFixedSize(mAutostartDaemon->sizeHint()); - connect(mAutostartDaemon, TQT_SIGNAL(clicked()), TQT_SLOT(slotAutostartDaemonClicked())); + connect(mAutostartDaemon, TQ_SIGNAL(clicked()), TQ_SLOT(slotAutostartDaemonClicked())); TQWhatsThis::add(mAutostartDaemon, i18n("Automatically start alarm monitoring whenever you start TDE, by running the alarm daemon (%1).\n\n" "This option should always be checked unless you intend to discontinue use of KAlarm.") @@ -346,7 +346,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame) grid->addRowSpacing(0, fontMetrics().lineSpacing()/2); mKeepExpired = new TQCheckBox(i18n("Keep alarms after e&xpiry"), group, "keepExpired"); mKeepExpired->setFixedSize(mKeepExpired->sizeHint()); - connect(mKeepExpired, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotExpiredToggled(bool))); + connect(mKeepExpired, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotExpiredToggled(bool))); TQWhatsThis::add(mKeepExpired, i18n("Check to store alarms after expiry or deletion (except deleted alarms which were never triggered).")); grid->addMultiCellWidget(mKeepExpired, 1, 1, 0, 1, alignment); @@ -355,7 +355,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame) box->setSpacing(KDialog::spacingHint()); mPurgeExpired = new TQCheckBox(i18n("Discard ex&pired alarms after:"), box, "purgeExpired"); mPurgeExpired->setMinimumSize(mPurgeExpired->sizeHint()); - connect(mPurgeExpired, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotExpiredToggled(bool))); + connect(mPurgeExpired, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotExpiredToggled(bool))); mPurgeAfter = new SpinBox(box); mPurgeAfter->setMinValue(1); mPurgeAfter->setLineShiftStep(10); @@ -369,7 +369,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame) mClearExpired = new TQPushButton(i18n("Clear Expired Alar&ms"), group); mClearExpired->setFixedSize(mClearExpired->sizeHint()); - connect(mClearExpired, TQT_SIGNAL(clicked()), TQT_SLOT(slotClearExpired())); + connect(mClearExpired, TQ_SIGNAL(clicked()), TQ_SLOT(slotClearExpired())); TQWhatsThis::add(mClearExpired, i18n("Delete all existing expired alarms.")); grid->addWidget(mClearExpired, 3, 1, alignment); @@ -413,7 +413,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame) grid->addMultiCellWidget(box, row + 1, row + 1, 0, 2, TQt::AlignAuto); TQRadioButton* radio = new TQRadioButton(i18n("Other:"), box); radio->setFixedSize(radio->sizeHint()); - connect(radio, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotOtherTerminalToggled(bool))); + connect(radio, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotOtherTerminalToggled(bool))); mXtermType->insert(radio, mXtermCount); if (mXtermFirst < 0) mXtermFirst = mXtermCount; // note the id of the first button @@ -609,7 +609,7 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame) radio = new RadioButton(i18n("&Sendmail"), box, "sendmail"); radio->setMinimumSize(radio->sizeHint()); mEmailClient->insert(radio, Preferences::SENDMAIL); - connect(mEmailClient, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(slotEmailClientChanged(int))); + connect(mEmailClient, TQ_SIGNAL(buttonSet(int)), TQ_SLOT(slotEmailClientChanged(int))); box->setFixedHeight(box->sizeHint().height()); TQWhatsThis::add(box, i18n("Choose how to send email when an email alarm is triggered.\n" @@ -637,7 +637,7 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame) grid->addWidget(label, 1, 0); mFromAddressGroup = new ButtonGroup(group); mFromAddressGroup->hide(); - connect(mFromAddressGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(slotFromAddrChanged(int))); + connect(mFromAddressGroup, TQ_SIGNAL(buttonSet(int)), TQ_SLOT(slotFromAddrChanged(int))); // Line edit to enter a 'From' email address radio = new RadioButton(group); @@ -646,7 +646,7 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame) label->setBuddy(radio); grid->addWidget(radio, 1, 1); mEmailAddress = new TQLineEdit(group); - connect(mEmailAddress, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotAddressChanged())); + connect(mEmailAddress, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotAddressChanged())); TQString whatsThis = i18n("Your email address, used to identify you as the sender when sending email alarms."); TQWhatsThis::add(radio, whatsThis); TQWhatsThis::add(mEmailAddress, whatsThis); @@ -678,7 +678,7 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame) grid->addWidget(label, 5, 0); mBccAddressGroup = new ButtonGroup(group); mBccAddressGroup->hide(); - connect(mBccAddressGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(slotBccAddrChanged(int))); + connect(mBccAddressGroup, TQ_SIGNAL(buttonSet(int)), TQ_SLOT(slotBccAddrChanged(int))); // Line edit to enter a 'Bcc' email address radio = new RadioButton(group); @@ -962,7 +962,7 @@ EditPrefTab::EditPrefTab(TQVBox* frame) mSoundFileBrowse = new TQPushButton(box); mSoundFileBrowse->setPixmap(SmallIcon("document-open")); mSoundFileBrowse->setFixedSize(mSoundFileBrowse->sizeHint()); - connect(mSoundFileBrowse, TQT_SIGNAL(clicked()), TQT_SLOT(slotBrowseSoundFile())); + connect(mSoundFileBrowse, TQ_SIGNAL(clicked()), TQ_SLOT(slotBrowseSoundFile())); TQToolTip::add(mSoundFileBrowse, i18n("Choose a sound file")); TQWhatsThis::add(box, i18n("Enter the default sound file to use in the alarm edit dialog.")); @@ -1201,7 +1201,7 @@ ViewPrefTab::ViewPrefTab(TQVBox* frame) mTooltipShowAlarms = new TQCheckBox(i18n("Show next &24 hours' alarms"), group, "tooltipShow"); mTooltipShowAlarms->setMinimumSize(mTooltipShowAlarms->sizeHint()); - connect(mTooltipShowAlarms, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotTooltipAlarmsToggled(bool))); + connect(mTooltipShowAlarms, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotTooltipAlarmsToggled(bool))); TQWhatsThis::add(mTooltipShowAlarms, i18n("Specify whether to include in the system tray tooltip, a summary of alarms due in the next 24 hours")); grid->addMultiCellWidget(mTooltipShowAlarms, 1, 1, 0, 2, TQt::AlignAuto); @@ -1210,7 +1210,7 @@ ViewPrefTab::ViewPrefTab(TQVBox* frame) box->setSpacing(KDialog::spacingHint()); mTooltipMaxAlarms = new TQCheckBox(i18n("Ma&ximum number of alarms to show:"), box, "tooltipMax"); mTooltipMaxAlarms->setMinimumSize(mTooltipMaxAlarms->sizeHint()); - connect(mTooltipMaxAlarms, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotTooltipMaxToggled(bool))); + connect(mTooltipMaxAlarms, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotTooltipMaxToggled(bool))); mTooltipMaxAlarmCount = new SpinBox(1, 99, 1, box); mTooltipMaxAlarmCount->setLineShiftStep(5); mTooltipMaxAlarmCount->setMinimumSize(mTooltipMaxAlarmCount->sizeHint()); @@ -1221,14 +1221,14 @@ ViewPrefTab::ViewPrefTab(TQVBox* frame) mTooltipShowTime = new TQCheckBox(MainWindow::i18n_m_ShowAlarmTime(), group, "tooltipTime"); mTooltipShowTime->setMinimumSize(mTooltipShowTime->sizeHint()); - connect(mTooltipShowTime, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotTooltipTimeToggled(bool))); + connect(mTooltipShowTime, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotTooltipTimeToggled(bool))); TQWhatsThis::add(mTooltipShowTime, i18n("Specify whether to show in the system tray tooltip, the time at which each alarm is due")); grid->addMultiCellWidget(mTooltipShowTime, 3, 3, 1, 2, TQt::AlignAuto); mTooltipShowTimeTo = new TQCheckBox(MainWindow::i18n_l_ShowTimeToAlarm(), group, "tooltipTimeTo"); mTooltipShowTimeTo->setMinimumSize(mTooltipShowTimeTo->sizeHint()); - connect(mTooltipShowTimeTo, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotTooltipTimeToToggled(bool))); + connect(mTooltipShowTimeTo, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotTooltipTimeToToggled(bool))); TQWhatsThis::add(mTooltipShowTimeTo, i18n("Specify whether to show in the system tray tooltip, how long until each alarm is due")); grid->addMultiCellWidget(mTooltipShowTimeTo, 4, 4, 1, 2, TQt::AlignAuto); diff --git a/kalarm/recurrenceedit.cpp b/kalarm/recurrenceedit.cpp index 7c04c1db..feee5e84 100644 --- a/kalarm/recurrenceedit.cpp +++ b/kalarm/recurrenceedit.cpp @@ -116,7 +116,7 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name mRuleButtonGroup->setFrameStyle(TQFrame::NoFrame); lay->addWidget(mRuleButtonGroup); lay->addStretch(); // top-adjust the interval radio buttons - connect(mRuleButtonGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(periodClicked(int))); + connect(mRuleButtonGroup, TQ_SIGNAL(buttonSet(int)), TQ_SLOT(periodClicked(int))); mNoneButton = new RadioButton(i18n_Norecur(), mRuleButtonGroup); mNoneButton->setFixedSize(mNoneButton->sizeHint()); @@ -172,8 +172,8 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name mSubRepetition = new RepetitionButton(i18n("Sub-Repetition"), true, ruleFrame); mSubRepetition->setFixedSize(mSubRepetition->sizeHint()); mSubRepetition->setReadOnly(mReadOnly); - connect(mSubRepetition, TQT_SIGNAL(needsInitialisation()), TQT_SIGNAL(repeatNeedsInitialisation())); - connect(mSubRepetition, TQT_SIGNAL(changed()), TQT_SIGNAL(frequencyChanged())); + connect(mSubRepetition, TQ_SIGNAL(needsInitialisation()), TQ_SIGNAL(repeatNeedsInitialisation())); + connect(mSubRepetition, TQ_SIGNAL(changed()), TQ_SIGNAL(frequencyChanged())); TQWhatsThis::add(mSubRepetition, i18n("Set up a repetition within the recurrence, to trigger the alarm multiple times each time the recurrence is due.")); lay->addSpacing(KDialog::spacingHint()); lay->addWidget(mSubRepetition); @@ -196,11 +196,11 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name mMonthlyRule = new MonthlyRule(mReadOnly, ruleFrame, "monthFrame"); mYearlyRule = new YearlyRule(mReadOnly, ruleFrame, "yearFrame"); - connect(mSubDailyRule, TQT_SIGNAL(frequencyChanged()), this, TQT_SIGNAL(frequencyChanged())); - connect(mDailyRule, TQT_SIGNAL(frequencyChanged()), this, TQT_SIGNAL(frequencyChanged())); - connect(mWeeklyRule, TQT_SIGNAL(frequencyChanged()), this, TQT_SIGNAL(frequencyChanged())); - connect(mMonthlyRule, TQT_SIGNAL(frequencyChanged()), this, TQT_SIGNAL(frequencyChanged())); - connect(mYearlyRule, TQT_SIGNAL(frequencyChanged()), this, TQT_SIGNAL(frequencyChanged())); + connect(mSubDailyRule, TQ_SIGNAL(frequencyChanged()), this, TQ_SIGNAL(frequencyChanged())); + connect(mDailyRule, TQ_SIGNAL(frequencyChanged()), this, TQ_SIGNAL(frequencyChanged())); + connect(mWeeklyRule, TQ_SIGNAL(frequencyChanged()), this, TQ_SIGNAL(frequencyChanged())); + connect(mMonthlyRule, TQ_SIGNAL(frequencyChanged()), this, TQ_SIGNAL(frequencyChanged())); + connect(mYearlyRule, TQ_SIGNAL(frequencyChanged()), this, TQ_SIGNAL(frequencyChanged())); mRuleStack = new TQWidgetStack(ruleFrame); layout->addWidget(mRuleStack); @@ -217,7 +217,7 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name // which specify how long the recurrence is to last. mRangeButtonGroup = new ButtonGroup(i18n("Recurrence End"), this, "mRangeButtonGroup"); - connect(mRangeButtonGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(rangeTypeClicked())); + connect(mRangeButtonGroup, TQ_SIGNAL(buttonSet(int)), TQ_SLOT(rangeTypeClicked())); topLayout->addWidget(mRangeButtonGroup); TQVBoxLayout* vlayout = new TQVBoxLayout(mRangeButtonGroup, KDialog::marginHint(), KDialog::spacingHint()); @@ -239,7 +239,7 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name mRepeatCountEntry->setLineShiftStep(10); mRepeatCountEntry->setSelectOnStep(false); mRepeatCountEntry->setReadOnly(mReadOnly); - connect(mRepeatCountEntry, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(repeatCountChanged(int))); + connect(mRepeatCountEntry, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(repeatCountChanged(int))); TQWhatsThis::add(mRepeatCountEntry, i18n("Enter the total number of times to trigger the alarm")); mRepeatCountButton->setFocusWidget(mRepeatCountEntry); @@ -272,7 +272,7 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name mEndAnyTimeCheckBox = new CheckBox(i18n("Any time"), mRangeButtonGroup); mEndAnyTimeCheckBox->setFixedSize(mEndAnyTimeCheckBox->sizeHint()); mEndAnyTimeCheckBox->setReadOnly(mReadOnly); - connect(mEndAnyTimeCheckBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotAnyTimeToggled(bool))); + connect(mEndAnyTimeCheckBox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotAnyTimeToggled(bool))); TQWhatsThis::add(mEndAnyTimeCheckBox, i18n("Stop repeating the alarm after your first login on or after the specified end date")); layout->addWidget(mEndDateButton); @@ -300,7 +300,7 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name mExceptionDateList = new TQListBox(mExceptionGroup); mExceptionDateList->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); - connect(mExceptionDateList, TQT_SIGNAL(selectionChanged()), TQT_SLOT(enableExceptionButtons())); + connect(mExceptionDateList, TQ_SIGNAL(selectionChanged()), TQ_SLOT(enableExceptionButtons())); TQWhatsThis::add(mExceptionDateList, i18n("The list of exceptions, i.e. dates/times excluded from the recurrence")); vlayout->addWidget(mExceptionDateList); @@ -325,21 +325,21 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name layout = new TQHBoxLayout(vlayout, KDialog::spacingHint()); TQPushButton* button = new TQPushButton(i18n("Add"), mExceptionGroup); button->setFixedSize(button->sizeHint()); - connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(addException())); + connect(button, TQ_SIGNAL(clicked()), TQ_SLOT(addException())); TQWhatsThis::add(button, i18n("Add the date entered above to the exceptions list")); layout->addWidget(button); mChangeExceptionButton = new TQPushButton(i18n("Change"), mExceptionGroup); mChangeExceptionButton->setFixedSize(mChangeExceptionButton->sizeHint()); - connect(mChangeExceptionButton, TQT_SIGNAL(clicked()), TQT_SLOT(changeException())); + connect(mChangeExceptionButton, TQ_SIGNAL(clicked()), TQ_SLOT(changeException())); TQWhatsThis::add(mChangeExceptionButton, i18n("Replace the currently highlighted item in the exceptions list with the date entered above")); layout->addWidget(mChangeExceptionButton); mDeleteExceptionButton = new TQPushButton(i18n("Delete"), mExceptionGroup); mDeleteExceptionButton->setFixedSize(mDeleteExceptionButton->sizeHint()); - connect(mDeleteExceptionButton, TQT_SIGNAL(clicked()), TQT_SLOT(deleteException())); + connect(mDeleteExceptionButton, TQ_SIGNAL(clicked()), TQ_SLOT(deleteException())); TQWhatsThis::add(mDeleteExceptionButton, i18n("Remove the currently highlighted item from the exceptions list")); layout->addWidget(mDeleteExceptionButton); @@ -1137,7 +1137,7 @@ Rule::Rule(const TQString& freqText, const TQString& freqWhatsThis, bool time, b mIntSpinBox->setFixedSize(mIntSpinBox->sizeHint()); mIntSpinBox->setReadOnly(readOnly); } - connect(mSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(frequencyChanged())); + connect(mSpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(frequencyChanged())); label->setBuddy(mSpinBox); label = new TQLabel(freqText, box); label->setFixedSize(label->sizeHint()); @@ -1368,7 +1368,7 @@ MonthYearRule::MonthYearRule(const TQString& freqText, const TQString& freqWhats mDayCombo->setReadOnly(readOnly); TQWhatsThis::add(mDayCombo, i18n("Select the day of the month on which to repeat the alarm")); mDayButton->setFocusWidget(mDayCombo); - connect(mDayCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotDaySelected(int))); + connect(mDayCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotDaySelected(int))); box->setStretchFactor(new TQWidget(box), 1); // left adjust the controls box->setFixedHeight(box->sizeHint().height()); @@ -1418,7 +1418,7 @@ MonthYearRule::MonthYearRule(const TQString& freqText, const TQString& freqWhats box->setStretchFactor(new TQWidget(box), 1); // left adjust the controls box->setFixedHeight(box->sizeHint().height()); - connect(mButtonGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(clicked(int))); + connect(mButtonGroup, TQ_SIGNAL(buttonSet(int)), TQ_SLOT(clicked(int))); } MonthYearRule::DayPosType MonthYearRule::type() const @@ -1567,7 +1567,7 @@ YearlyRule::YearlyRule(bool readOnly, TQWidget* parent, const char* name) mMonthBox[i]->setReadOnly(readOnly); grid->addWidget(mMonthBox[i], i%3, i/3, TQt::AlignAuto); } - connect(mMonthBox[1], TQT_SIGNAL(toggled(bool)), TQT_SLOT(enableFeb29())); + connect(mMonthBox[1], TQ_SIGNAL(toggled(bool)), TQ_SLOT(enableFeb29())); w->setFixedHeight(w->sizeHint().height()); TQWhatsThis::add(w, i18n("Select the months of the year in which to repeat the alarm")); diff --git a/kalarm/reminder.cpp b/kalarm/reminder.cpp index dd4b4151..7f327a85 100644 --- a/kalarm/reminder.cpp +++ b/kalarm/reminder.cpp @@ -52,7 +52,7 @@ Reminder::Reminder(const TQString& caption, const TQString& reminderWhatsThis, c mTime = new TimeSelector(caption, i18n("in advance"), reminderWhatsThis, valueWhatsThis, allowHourMinute, this, "timeOption"); mTime->setFixedSize(mTime->sizeHint()); - connect(mTime, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotReminderToggled(bool))); + connect(mTime, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotReminderToggled(bool))); topLayout->addWidget(mTime); if (showOnceOnly) diff --git a/kalarm/repetition.cpp b/kalarm/repetition.cpp index 4305cd65..8a964eac 100644 --- a/kalarm/repetition.cpp +++ b/kalarm/repetition.cpp @@ -52,7 +52,7 @@ RepetitionButton::RepetitionButton(const TQString& caption, bool waitForInitiali { setToggleButton(true); setOn(false); - connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotPressed())); + connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotPressed())); } void RepetitionButton::set(int interval, int count) @@ -166,12 +166,12 @@ RepetitionDlg::RepetitionDlg(const TQString& caption, bool readOnly, TQWidget* p i18n("Enter the time between repetitions of the alarm"), true, page); mTimeSelector->setFixedSize(mTimeSelector->sizeHint()); - connect(mTimeSelector, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(intervalChanged(int))); - connect(mTimeSelector, TQT_SIGNAL(toggled(bool)), TQT_SLOT(repetitionToggled(bool))); + connect(mTimeSelector, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(intervalChanged(int))); + connect(mTimeSelector, TQ_SIGNAL(toggled(bool)), TQ_SLOT(repetitionToggled(bool))); topLayout->addWidget(mTimeSelector, 0, TQt::AlignAuto); mButtonGroup = new ButtonGroup(page, "buttonGroup"); - connect(mButtonGroup, TQT_SIGNAL(buttonSet(int)), TQT_SLOT(typeClicked())); + connect(mButtonGroup, TQ_SIGNAL(buttonSet(int)), TQ_SLOT(typeClicked())); topLayout->addWidget(mButtonGroup); TQBoxLayout* vlayout = new TQVBoxLayout(mButtonGroup, marginHint(), spacing); @@ -185,7 +185,7 @@ RepetitionDlg::RepetitionDlg(const TQString& caption, bool readOnly, TQWidget* p mCount->setFixedSize(mCount->sizeHint()); mCount->setLineShiftStep(10); mCount->setSelectOnStep(false); - connect(mCount, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(countChanged(int))); + connect(mCount, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(countChanged(int))); TQWhatsThis::add(mCount, i18n("Enter the number of times to trigger the alarm after its initial occurrence")); layout->addWidget(mCount); @@ -200,7 +200,7 @@ RepetitionDlg::RepetitionDlg(const TQString& caption, bool readOnly, TQWidget* p layout->addWidget(mDurationButton); mDuration = new TimePeriod(true, mButtonGroup); mDuration->setFixedSize(mDuration->sizeHint()); - connect(mDuration, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(durationChanged(int))); + connect(mDuration, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(durationChanged(int))); TQWhatsThis::add(mDuration, i18n("Enter the length of time to repeat the alarm")); layout->addWidget(mDuration); diff --git a/kalarm/sounddlg.cpp b/kalarm/sounddlg.cpp index d7dc7738..a94bb6fe 100644 --- a/kalarm/sounddlg.cpp +++ b/kalarm/sounddlg.cpp @@ -86,7 +86,7 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad mFilePlay = new TQPushButton(box); mFilePlay->setPixmap(SmallIcon("media-playback-start")); mFilePlay->setFixedSize(mFilePlay->sizeHint()); - connect(mFilePlay, TQT_SIGNAL(clicked()), TQT_SLOT(playSound())); + connect(mFilePlay, TQ_SIGNAL(clicked()), TQ_SLOT(playSound())); TQToolTip::add(mFilePlay, i18n("Test the sound")); TQWhatsThis::add(mFilePlay, i18n("Play the selected sound file.")); @@ -99,7 +99,7 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad mFileBrowseButton = new PushButton(box); mFileBrowseButton->setPixmap(SmallIcon("document-open")); mFileBrowseButton->setFixedSize(mFileBrowseButton->sizeHint()); - connect(mFileBrowseButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotPickFile())); + connect(mFileBrowseButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotPickFile())); TQToolTip::add(mFileBrowseButton, i18n("Choose a file")); TQWhatsThis::add(mFileBrowseButton, i18n("Select a sound file to play.")); @@ -128,7 +128,7 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad grid->addMultiCellWidget(box, 1, 1, 0, 2); mVolumeCheckbox = new CheckBox(i18n_v_SetVolume(), box); mVolumeCheckbox->setFixedSize(mVolumeCheckbox->sizeHint()); - connect(mVolumeCheckbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotVolumeToggled(bool))); + connect(mVolumeCheckbox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotVolumeToggled(bool))); TQWhatsThis::add(mVolumeCheckbox, i18n("Select to choose the volume for playing the sound file.")); @@ -143,7 +143,7 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad // Fade checkbox mFadeCheckbox = new CheckBox(i18n("Fade"), group); mFadeCheckbox->setFixedSize(mFadeCheckbox->sizeHint()); - connect(mFadeCheckbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotFadeToggled(bool))); + connect(mFadeCheckbox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotFadeToggled(bool))); TQWhatsThis::add(mFadeCheckbox, i18n("Select to fade the volume when the sound file first starts to play.")); grid->addMultiCellWidget(mFadeCheckbox, 2, 2, 1, 2, alignment); @@ -303,7 +303,7 @@ void SoundDlg::playSound() return; } mPlayTimer = new TQTimer(this); - connect(mPlayTimer, TQT_SIGNAL(timeout()), TQT_SLOT(checkAudioPlay())); + connect(mPlayTimer, TQ_SIGNAL(timeout()), TQ_SLOT(checkAudioPlay())); mArtsDispatcher = new KArtsDispatcher; mPlayStarted = false; KArtsServer aserver; @@ -313,7 +313,7 @@ void SoundDlg::playSound() mFilePlay->setPixmap(SmallIcon("media-playback-stop")); TQToolTip::add(mFilePlay, i18n("Stop sound")); TQWhatsThis::add(mFilePlay, i18n("Stop playing the sound")); - connect(mPlayObject, TQT_SIGNAL(playObjectCreated()), TQT_SLOT(checkAudioPlay())); + connect(mPlayObject, TQ_SIGNAL(playObjectCreated()), TQ_SLOT(checkAudioPlay())); if (!mPlayObject->object().isNull()) checkAudioPlay(); #endif diff --git a/kalarm/soundpicker.cpp b/kalarm/soundpicker.cpp index 947e9fb9..d9e43190 100644 --- a/kalarm/soundpicker.cpp +++ b/kalarm/soundpicker.cpp @@ -74,7 +74,7 @@ SoundPicker::SoundPicker(TQWidget* parent, const char* name) mTypeCombo->insertItem(i18n_File()); // index PLAY_FILE mSpeakShowing = !theApp()->speechEnabled(); showSpeak(!mSpeakShowing); // index SPEAK (only displayed if appropriate) - connect(mTypeCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTypeSelected(int))); + connect(mTypeCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotTypeSelected(int))); label->setBuddy(mTypeCombo); soundLayout->addWidget(mTypeBox); @@ -82,7 +82,7 @@ SoundPicker::SoundPicker(TQWidget* parent, const char* name) mFilePicker = new PushButton(this); mFilePicker->setPixmap(SmallIcon("playsound")); mFilePicker->setFixedSize(mFilePicker->sizeHint()); - connect(mFilePicker, TQT_SIGNAL(clicked()), TQT_SLOT(slotPickFile())); + connect(mFilePicker, TQ_SIGNAL(clicked()), TQ_SLOT(slotPickFile())); TQToolTip::add(mFilePicker, i18n("Configure sound file")); TQWhatsThis::add(mFilePicker, i18n("Configure a sound file to play when the alarm is displayed.")); soundLayout->addWidget(mFilePicker); diff --git a/kalarm/specialactions.cpp b/kalarm/specialactions.cpp index fd4b7a7d..f2599e35 100644 --- a/kalarm/specialactions.cpp +++ b/kalarm/specialactions.cpp @@ -46,7 +46,7 @@ SpecialActionsButton::SpecialActionsButton(const TQString& caption, TQWidget* pa { setToggleButton(true); setOn(false); - connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonPressed())); + connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotButtonPressed())); TQWhatsThis::add(this, i18n("Specify actions to execute before and after the alarm is displayed.")); } diff --git a/kalarm/startdaytimer.cpp b/kalarm/startdaytimer.cpp index 84f0096c..ef8ddf86 100644 --- a/kalarm/startdaytimer.cpp +++ b/kalarm/startdaytimer.cpp @@ -29,7 +29,7 @@ StartOfDayTimer* StartOfDayTimer::mInstance = 0; StartOfDayTimer::StartOfDayTimer() : DailyTimer(Preferences::startOfDay(), false) { - Preferences::connect(TQT_SIGNAL(startOfDayChanged(const TQTime&)), this, TQT_SLOT(startOfDayChanged(const TQTime&))); + Preferences::connect(TQ_SIGNAL(startOfDayChanged(const TQTime&)), this, TQ_SLOT(startOfDayChanged(const TQTime&))); } StartOfDayTimer* StartOfDayTimer::instance() diff --git a/kalarm/templatedlg.cpp b/kalarm/templatedlg.cpp index 7627b8d1..ebf7f1c6 100644 --- a/kalarm/templatedlg.cpp +++ b/kalarm/templatedlg.cpp @@ -54,34 +54,34 @@ TemplateDlg::TemplateDlg(TQWidget* parent, const char* name) mTemplateList = new TemplateListView(true, i18n("The list of alarm templates"), topWidget); mTemplateList->setSelectionMode(TQListView::Extended); mTemplateList->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); - connect(mTemplateList, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged())); + connect(mTemplateList, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectionChanged())); layout->addWidget(mTemplateList); layout = new TQVBoxLayout(topLayout); TQPushButton* button = new TQPushButton(i18n("&New..."), topWidget); - connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(slotNew())); + connect(button, TQ_SIGNAL(clicked()), TQ_SLOT(slotNew())); TQWhatsThis::add(button, i18n("Create a new alarm template")); layout->addWidget(button); mEditButton = new TQPushButton(i18n("&Edit..."), topWidget); - connect(mEditButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEdit())); + connect(mEditButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotEdit())); TQWhatsThis::add(mEditButton, i18n("Edit the currently highlighted alarm template")); layout->addWidget(mEditButton); mCopyButton = new TQPushButton(i18n("Co&py"), topWidget); - connect(mCopyButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotCopy())); + connect(mCopyButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotCopy())); TQWhatsThis::add(mCopyButton, i18n("Create a new alarm template based on a copy of the currently highlighted template")); layout->addWidget(mCopyButton); mDeleteButton = new TQPushButton(i18n("&Delete"), topWidget); - connect(mDeleteButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotDelete())); + connect(mDeleteButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotDelete())); TQWhatsThis::add(mDeleteButton, i18n("Delete the currently highlighted alarm template")); layout->addWidget(mDeleteButton); TDEAccel* accel = new TDEAccel(this); - accel->insert(TDEStdAccel::SelectAll, mTemplateList, TQT_SLOT(slotSelectAll())); - accel->insert(TDEStdAccel::Deselect, mTemplateList, TQT_SLOT(slotDeselect())); + accel->insert(TDEStdAccel::SelectAll, mTemplateList, TQ_SLOT(slotSelectAll())); + accel->insert(TDEStdAccel::Deselect, mTemplateList, TQ_SLOT(slotDeselect())); accel->readSettings(); mTemplateList->refresh(); diff --git a/kalarm/templatemenuaction.cpp b/kalarm/templatemenuaction.cpp index 5da72a6d..1bcabf12 100644 --- a/kalarm/templatemenuaction.cpp +++ b/kalarm/templatemenuaction.cpp @@ -35,9 +35,9 @@ TemplateMenuAction::TemplateMenuAction(const TQString& label, const TQString& ic : TDEActionMenu(label, icon, actions, name) { setDelayed(false); - connect(popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotInitMenu())); - connect(popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(slotSelected(int))); - connect(this, TQT_SIGNAL(selected(const KAEvent&)), receiver, slot); + connect(popupMenu(), TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotInitMenu())); + connect(popupMenu(), TQ_SIGNAL(activated(int)), TQ_SLOT(slotSelected(int))); + connect(this, TQ_SIGNAL(selected(const KAEvent&)), receiver, slot); } /****************************************************************************** diff --git a/kalarm/templatepickdlg.cpp b/kalarm/templatepickdlg.cpp index b3bc4488..9acd8fb8 100644 --- a/kalarm/templatepickdlg.cpp +++ b/kalarm/templatepickdlg.cpp @@ -46,9 +46,9 @@ TemplatePickDlg::TemplatePickDlg(TQWidget* parent, const char* name) mTemplateList = new TemplateListView(includeCmdAlarms, i18n("Select a template to base the new alarm on."), topWidget, "list"); mTemplateList->setSelectionMode(TQListView::Single); mTemplateList->refresh(); // populate the template list - connect(mTemplateList, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged())); + connect(mTemplateList, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectionChanged())); // Require a real double click (even if KDE is in single-click mode) to accept the selection - connect(mTemplateList, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), TQT_SLOT(slotOk())); + connect(mTemplateList, TQ_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), TQ_SLOT(slotOk())); topLayout->addWidget(mTemplateList); slotSelectionChanged(); // enable or disable the OK button diff --git a/kalarm/timeselector.cpp b/kalarm/timeselector.cpp index de7ef828..710152b4 100644 --- a/kalarm/timeselector.cpp +++ b/kalarm/timeselector.cpp @@ -44,7 +44,7 @@ TimeSelector::TimeSelector(const TQString& selectText, const TQString& postfix, TQHBoxLayout* layout = new TQHBoxLayout(topLayout, KDialog::spacingHint()); mSelect = new CheckBox(selectText, this); mSelect->setFixedSize(mSelect->sizeHint()); - connect(mSelect, TQT_SIGNAL(toggled(bool)), TQT_SLOT(selectToggled(bool))); + connect(mSelect, TQ_SIGNAL(toggled(bool)), TQ_SLOT(selectToggled(bool))); TQWhatsThis::add(mSelect, selectWhatsThis); layout->addWidget(mSelect); @@ -54,7 +54,7 @@ TimeSelector::TimeSelector(const TQString& selectText, const TQString& postfix, mPeriod = new TimePeriod(allowHourMinute, box); mPeriod->setFixedSize(mPeriod->sizeHint()); mPeriod->setSelectOnStep(false); - connect(mPeriod, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(periodChanged(int))); + connect(mPeriod, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(periodChanged(int))); mSelect->setFocusWidget(mPeriod); mPeriod->setEnabled(false); diff --git a/kalarm/traywindow.cpp b/kalarm/traywindow.cpp index 81eb4a06..90bd92ed 100644 --- a/kalarm/traywindow.cpp +++ b/kalarm/traywindow.cpp @@ -87,16 +87,16 @@ TrayWindow::TrayWindow(MainWindow* parent, const char* name) TDEActionCollection* actcol = actionCollection(); AlarmEnableAction* a = Daemon::createAlarmEnableAction(actcol, "tAlarmEnable"); a->plug(contextMenu()); - connect(a, TQT_SIGNAL(switched(bool)), TQT_SLOT(setEnabledStatus(bool))); - KAlarm::createNewAlarmAction(i18n("&New Alarm..."), this, TQT_SLOT(slotNewAlarm()), actcol, "tNew")->plug(contextMenu()); - KAlarm::createNewFromTemplateAction(i18n("New Alarm From &Template"), this, TQT_SLOT(slotNewFromTemplate(const KAEvent&)), actcol, "tNewFromTempl")->plug(contextMenu()); - KStdAction::preferences(this, TQT_SLOT(slotPreferences()), actcol)->plug(contextMenu()); + connect(a, TQ_SIGNAL(switched(bool)), TQ_SLOT(setEnabledStatus(bool))); + KAlarm::createNewAlarmAction(i18n("&New Alarm..."), this, TQ_SLOT(slotNewAlarm()), actcol, "tNew")->plug(contextMenu()); + KAlarm::createNewFromTemplateAction(i18n("New Alarm From &Template"), this, TQ_SLOT(slotNewFromTemplate(const KAEvent&)), actcol, "tNewFromTempl")->plug(contextMenu()); + KStdAction::preferences(this, TQ_SLOT(slotPreferences()), actcol)->plug(contextMenu()); // Replace the default handler for the Quit context menu item const char* quitName = KStdAction::name(KStdAction::Quit); actcol->remove(actcol->action(quitName)); actcol->tdeaccel()->remove(quitName); - KStdAction::quit(this, TQT_SLOT(slotQuit()), actcol); + KStdAction::quit(this, TQ_SLOT(slotQuit()), actcol); // Set icon to correspond with the alarms enabled menu status Daemon::checkStatus(); diff --git a/kandy/src/commandscheduler.cpp b/kandy/src/commandscheduler.cpp index cc18a666..d6a95390 100644 --- a/kandy/src/commandscheduler.cpp +++ b/kandy/src/commandscheduler.cpp @@ -35,8 +35,8 @@ CommandScheduler::CommandScheduler(Modem *modem,TQObject *parent, TQObject(parent,name), mModem(modem) { - connect(mModem,TQT_SIGNAL(gotLine(const char *)), - TQT_SLOT(processOutput(const char *))); + connect(mModem,TQ_SIGNAL(gotLine(const char *)), + TQ_SLOT(processOutput(const char *))); } void CommandScheduler::execute(ATCommand *command) diff --git a/kandy/src/kandy.cpp b/kandy/src/kandy.cpp index 47c16d7d..cd2e9826 100644 --- a/kandy/src/kandy.cpp +++ b/kandy/src/kandy.cpp @@ -81,12 +81,12 @@ Kandy::Kandy(CommandScheduler *scheduler) setAutoSaveSettings(); // allow the view to change the statusbar and caption - connect(mView, TQT_SIGNAL(signalChangeStatusbar(const TQString&)), - this, TQT_SLOT(changeStatusbar(const TQString&))); - connect(mView, TQT_SIGNAL(signalChangeCaption(const TQString&)), - this, TQT_SLOT(changeCaption(const TQString&))); + connect(mView, TQ_SIGNAL(signalChangeStatusbar(const TQString&)), + this, TQ_SLOT(changeStatusbar(const TQString&))); + connect(mView, TQ_SIGNAL(signalChangeCaption(const TQString&)), + this, TQ_SLOT(changeCaption(const TQString&))); - connect(mView,TQT_SIGNAL(modifiedChanged(bool)),TQT_SLOT(setTitle())); + connect(mView,TQ_SIGNAL(modifiedChanged(bool)),TQ_SLOT(setTitle())); TDEConfig *config = TDEGlobal::config(); config->setGroup("General"); @@ -123,26 +123,26 @@ void Kandy::save(const TQString & filename) void Kandy::setupActions() { - KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); - KStdAction::save(this, TQT_SLOT(fileSave()), actionCollection()); - KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection()); -// KStdAction::print(this, TQT_SLOT(filePrint()), actionCollection()); - KStdAction::quit(this, TQT_SLOT(close()), actionCollection()); + KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); + KStdAction::save(this, TQ_SLOT(fileSave()), actionCollection()); + KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection()); +// KStdAction::print(this, TQ_SLOT(filePrint()), actionCollection()); + KStdAction::quit(this, TQ_SLOT(close()), actionCollection()); createStandardStatusBarAction(); setStandardToolBarMenuEnabled(true); - KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection()); - KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection()); - new TDEAction(i18n("Mobile GUI"),0,this,TQT_SLOT(showMobileGui()), + new TDEAction(i18n("Mobile GUI"),0,this,TQ_SLOT(showMobileGui()), actionCollection(),"show_mobilegui"); - mConnectAction = new TDEAction(i18n("Connect"),0,this,TQT_SLOT(modemConnect()), + mConnectAction = new TDEAction(i18n("Connect"),0,this,TQ_SLOT(modemConnect()), actionCollection(),"modem_connect"); mDisconnectAction = new TDEAction(i18n("Disconnect"),0,this, - TQT_SLOT(modemDisconnect()),actionCollection(), + TQ_SLOT(modemDisconnect()),actionCollection(), "modem_disconnect"); createGUI(); @@ -252,7 +252,7 @@ void Kandy::optionsConfigureToolbars() // use the standard toolbar editor saveMainWindowSettings( TDEGlobal::config(), autoSaveGroup() ); KEditToolbar dlg(actionCollection()); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(newToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), this, TQ_SLOT(newToolbarConfig())); dlg.exec(); } diff --git a/kandy/src/kandyprefsdialog.cpp b/kandy/src/kandyprefsdialog.cpp index 60ec1a67..db7781de 100644 --- a/kandy/src/kandyprefsdialog.cpp +++ b/kandy/src/kandyprefsdialog.cpp @@ -292,60 +292,60 @@ void KandyPrefsDialog::setupAddressbookTab() } - connect( useHomeSuff->checkBox(), TQT_SIGNAL(toggled(bool)), - HomeSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) ); - connect( useHomeSuff->checkBox(), TQT_SIGNAL(toggled(bool)), - HomeSuff->label(), TQT_SLOT(setEnabled(bool)) ); - - connect( useWorkSuff->checkBox(), TQT_SIGNAL(toggled(bool)), - WorkSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) ); - connect( useWorkSuff->checkBox(), TQT_SIGNAL(toggled(bool)), - WorkSuff->label(), TQT_SLOT(setEnabled(bool)) ); - - connect( useMessagingSuff->checkBox(), TQT_SIGNAL(toggled(bool)), - MessagingSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) ); - connect( useMessagingSuff->checkBox(), TQT_SIGNAL(toggled(bool)), - MessagingSuff->label(), TQT_SLOT(setEnabled(bool)) ); - - connect( useFaxSuff->checkBox(), TQT_SIGNAL(toggled(bool)), - FaxSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) ); - connect( useFaxSuff->checkBox(), TQT_SIGNAL(toggled(bool)), - FaxSuff->label(), TQT_SLOT(setEnabled(bool)) ); - - connect( useCellSuff->checkBox(), TQT_SIGNAL(toggled(bool)), - CellSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) ); - connect( useCellSuff->checkBox(), TQT_SIGNAL(toggled(bool)), - CellSuff->label(), TQT_SLOT(setEnabled(bool)) ); - - connect( useVideoSuff->checkBox(), TQT_SIGNAL(toggled(bool)), - VideoSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) ); - connect( useVideoSuff->checkBox(), TQT_SIGNAL(toggled(bool)), - VideoSuff->label(), TQT_SLOT(setEnabled(bool)) ); - - connect( useMailboxSuff->checkBox(), TQT_SIGNAL(toggled(bool)), - MailboxSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) ); - connect( useMailboxSuff->checkBox(), TQT_SIGNAL(toggled(bool)), - MailboxSuff->label(), TQT_SLOT(setEnabled(bool)) ); - - connect( useModemSuff->checkBox(), TQT_SIGNAL(toggled(bool)), - ModemSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) ); - connect( useModemSuff->checkBox(), TQT_SIGNAL(toggled(bool)), - ModemSuff->label(), TQT_SLOT(setEnabled(bool)) ); - - connect( useCarSuff->checkBox(), TQT_SIGNAL(toggled(bool)), - CarSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) ); - connect( useCarSuff->checkBox(), TQT_SIGNAL(toggled(bool)), - CarSuff->label(), TQT_SLOT(setEnabled(bool)) ); - - connect( useISDNSuff->checkBox(), TQT_SIGNAL(toggled(bool)), - ISDNSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) ); - connect( useISDNSuff->checkBox(), TQT_SIGNAL(toggled(bool)), - ISDNSuff->label(), TQT_SLOT(setEnabled(bool)) ); - - connect( usePagerSuff->checkBox(), TQT_SIGNAL(toggled(bool)), - PagerSuff->lineEdit(), TQT_SLOT(setEnabled(bool)) ); - connect( usePagerSuff->checkBox(), TQT_SIGNAL(toggled(bool)), - PagerSuff->label(), TQT_SLOT(setEnabled(bool)) ); + connect( useHomeSuff->checkBox(), TQ_SIGNAL(toggled(bool)), + HomeSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) ); + connect( useHomeSuff->checkBox(), TQ_SIGNAL(toggled(bool)), + HomeSuff->label(), TQ_SLOT(setEnabled(bool)) ); + + connect( useWorkSuff->checkBox(), TQ_SIGNAL(toggled(bool)), + WorkSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) ); + connect( useWorkSuff->checkBox(), TQ_SIGNAL(toggled(bool)), + WorkSuff->label(), TQ_SLOT(setEnabled(bool)) ); + + connect( useMessagingSuff->checkBox(), TQ_SIGNAL(toggled(bool)), + MessagingSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) ); + connect( useMessagingSuff->checkBox(), TQ_SIGNAL(toggled(bool)), + MessagingSuff->label(), TQ_SLOT(setEnabled(bool)) ); + + connect( useFaxSuff->checkBox(), TQ_SIGNAL(toggled(bool)), + FaxSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) ); + connect( useFaxSuff->checkBox(), TQ_SIGNAL(toggled(bool)), + FaxSuff->label(), TQ_SLOT(setEnabled(bool)) ); + + connect( useCellSuff->checkBox(), TQ_SIGNAL(toggled(bool)), + CellSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) ); + connect( useCellSuff->checkBox(), TQ_SIGNAL(toggled(bool)), + CellSuff->label(), TQ_SLOT(setEnabled(bool)) ); + + connect( useVideoSuff->checkBox(), TQ_SIGNAL(toggled(bool)), + VideoSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) ); + connect( useVideoSuff->checkBox(), TQ_SIGNAL(toggled(bool)), + VideoSuff->label(), TQ_SLOT(setEnabled(bool)) ); + + connect( useMailboxSuff->checkBox(), TQ_SIGNAL(toggled(bool)), + MailboxSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) ); + connect( useMailboxSuff->checkBox(), TQ_SIGNAL(toggled(bool)), + MailboxSuff->label(), TQ_SLOT(setEnabled(bool)) ); + + connect( useModemSuff->checkBox(), TQ_SIGNAL(toggled(bool)), + ModemSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) ); + connect( useModemSuff->checkBox(), TQ_SIGNAL(toggled(bool)), + ModemSuff->label(), TQ_SLOT(setEnabled(bool)) ); + + connect( useCarSuff->checkBox(), TQ_SIGNAL(toggled(bool)), + CarSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) ); + connect( useCarSuff->checkBox(), TQ_SIGNAL(toggled(bool)), + CarSuff->label(), TQ_SLOT(setEnabled(bool)) ); + + connect( useISDNSuff->checkBox(), TQ_SIGNAL(toggled(bool)), + ISDNSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) ); + connect( useISDNSuff->checkBox(), TQ_SIGNAL(toggled(bool)), + ISDNSuff->label(), TQ_SLOT(setEnabled(bool)) ); + + connect( usePagerSuff->checkBox(), TQ_SIGNAL(toggled(bool)), + PagerSuff->lineEdit(), TQ_SLOT(setEnabled(bool)) ); + connect( usePagerSuff->checkBox(), TQ_SIGNAL(toggled(bool)), + PagerSuff->label(), TQ_SLOT(setEnabled(bool)) ); } void KandyPrefsDialog::setupWindowsTab() diff --git a/kandy/src/kandyview.cpp b/kandy/src/kandyview.cpp index 7f11adc9..51987b30 100644 --- a/kandy/src/kandyview.cpp +++ b/kandy/src/kandyview.cpp @@ -80,24 +80,24 @@ KandyView::KandyView(CommandScheduler *scheduler,TQWidget *parent) mCommandList->addColumn( i18n( "Hex" ) ); commandLayout->addWidget( mCommandList ); - connect( mCommandList, TQT_SIGNAL( doubleClicked(TQListViewItem*) ), - TQT_SLOT( executeCommand() ) ); + connect( mCommandList, TQ_SIGNAL( doubleClicked(TQListViewItem*) ), + TQ_SLOT( executeCommand() ) ); TQPushButton *buttonAdd = new TQPushButton( i18n("Add..."), commandBox ); commandLayout->addWidget( buttonAdd ); - connect( buttonAdd, TQT_SIGNAL( clicked() ), TQT_SLOT( addCommand() ) ); + connect( buttonAdd, TQ_SIGNAL( clicked() ), TQ_SLOT( addCommand() ) ); TQPushButton *buttonEdit = new TQPushButton( i18n("Edit..."), commandBox ); commandLayout->addWidget( buttonEdit ); - connect( buttonEdit, TQT_SIGNAL( clicked() ), TQT_SLOT( editCommand() ) ); + connect( buttonEdit, TQ_SIGNAL( clicked() ), TQ_SLOT( editCommand() ) ); TQPushButton *buttonDelete = new TQPushButton( i18n("Delete"), commandBox ); commandLayout->addWidget( buttonDelete ); - connect( buttonDelete, TQT_SIGNAL( clicked() ), TQT_SLOT( deleteCommand() ) ); + connect( buttonDelete, TQ_SIGNAL( clicked() ), TQ_SLOT( deleteCommand() ) ); TQPushButton *buttonExecute = new TQPushButton( i18n("Execute"), commandBox ); commandLayout->addWidget( buttonExecute ); - connect( buttonExecute, TQT_SIGNAL( clicked() ), TQT_SLOT( executeCommand() ) ); + connect( buttonExecute, TQ_SIGNAL( clicked() ), TQ_SLOT( executeCommand() ) ); TQSplitter *ioSplitter = new TQSplitter( TQt::Vertical, mainSplitter ); @@ -132,15 +132,15 @@ KandyView::KandyView(CommandScheduler *scheduler,TQWidget *parent) mResultView = new TQTextEdit( resultBox ); mResultView->setReadOnly( true ); - connect (mInput,TQT_SIGNAL(returnPressed()),TQT_SLOT(processLastLine())); + connect (mInput,TQ_SIGNAL(returnPressed()),TQ_SLOT(processLastLine())); - connect(mScheduler->modem(),TQT_SIGNAL(gotLine(const char *)), - TQT_SLOT(appendOutput(const char *))); + connect(mScheduler->modem(),TQ_SIGNAL(gotLine(const char *)), + TQ_SLOT(appendOutput(const char *))); - connect(mScheduler,TQT_SIGNAL(result(const TQString &)), - mResultView,TQT_SLOT(setText(const TQString &))); - connect(mScheduler,TQT_SIGNAL(commandProcessed(ATCommand *)), - TQT_SLOT(setResult(ATCommand *))); + connect(mScheduler,TQ_SIGNAL(result(const TQString &)), + mResultView,TQ_SLOT(setText(const TQString &))); + connect(mScheduler,TQ_SIGNAL(commandProcessed(ATCommand *)), + TQ_SLOT(setResult(ATCommand *))); } KandyView::~KandyView() @@ -158,7 +158,7 @@ void KandyView::importPhonebook() { #if 0 createMobileGui(); - connect (mMobileGui,TQT_SIGNAL(phonebookRead()),mMobileGui,TQT_SLOT(writeKab())); + connect (mMobileGui,TQ_SIGNAL(phonebookRead()),mMobileGui,TQ_SLOT(writeKab())); mMobileGui->readPhonebook(); #endif } diff --git a/kandy/src/main.cpp b/kandy/src/main.cpp index a22229d5..00ca8764 100644 --- a/kandy/src/main.cpp +++ b/kandy/src/main.cpp @@ -135,18 +135,18 @@ int main(int argc, char **argv) args->clear(); - TQObject::connect(k,TQT_SIGNAL(showMobileWin()),m,TQT_SLOT(show())); - TQObject::connect(m,TQT_SIGNAL(showTerminalWin()),k,TQT_SLOT(show())); - TQObject::connect(m,TQT_SIGNAL(showPreferencesWin()), - k,TQT_SLOT(optionsPreferences())); - - TQObject::connect( m->view(), TQT_SIGNAL( connectModem() ), k, - TQT_SLOT( modemConnect() ) ); - TQObject::connect( m->view(), TQT_SIGNAL( disconnectModem() ), k, - TQT_SLOT( modemDisconnect() ) ); - - TQObject::connect( modem, TQT_SIGNAL( errorMessage( const TQString & ) ), - k, TQT_SLOT( showErrorMessage( const TQString & ) ) ); + TQObject::connect(k,TQ_SIGNAL(showMobileWin()),m,TQ_SLOT(show())); + TQObject::connect(m,TQ_SIGNAL(showTerminalWin()),k,TQ_SLOT(show())); + TQObject::connect(m,TQ_SIGNAL(showPreferencesWin()), + k,TQ_SLOT(optionsPreferences())); + + TQObject::connect( m->view(), TQ_SIGNAL( connectModem() ), k, + TQ_SLOT( modemConnect() ) ); + TQObject::connect( m->view(), TQ_SIGNAL( disconnectModem() ), k, + TQ_SLOT( modemDisconnect() ) ); + + TQObject::connect( modem, TQ_SIGNAL( errorMessage( const TQString & ) ), + k, TQ_SLOT( showErrorMessage( const TQString & ) ) ); initModem( modem ); diff --git a/kandy/src/mobilegui.cpp b/kandy/src/mobilegui.cpp index 819d7e0f..eb1f79a7 100644 --- a/kandy/src/mobilegui.cpp +++ b/kandy/src/mobilegui.cpp @@ -220,10 +220,10 @@ MobileGui::MobileGui( CommandScheduler *scheduler, KandyPrefs *kprefs, setMobState( UNLOADED ); // Setup signal handlers - connect( mScheduler, TQT_SIGNAL( commandProcessed( ATCommand * ) ), - TQT_SLOT( processResult( ATCommand * ) ) ); - connect( mScheduler->modem(), TQT_SIGNAL( gotLine( const char * ) ), - TQT_SLOT( termAddOutput( const char * ) ) ); + connect( mScheduler, TQ_SIGNAL( commandProcessed( ATCommand * ) ), + TQ_SLOT( processResult( ATCommand * ) ) ); + connect( mScheduler->modem(), TQ_SIGNAL( gotLine( const char * ) ), + TQ_SLOT( termAddOutput( const char * ) ) ); } diff --git a/kandy/src/mobilemain.cpp b/kandy/src/mobilemain.cpp index 497a3ec4..277ec288 100644 --- a/kandy/src/mobilemain.cpp +++ b/kandy/src/mobilemain.cpp @@ -55,10 +55,10 @@ MobileMain::MobileMain(CommandScheduler *scheduler, KandyPrefs *prefs) setupActions(); statusBar()->insertItem(i18n(" Disconnected "),1,0,true); - connect(mView,TQT_SIGNAL(statusMessage(const TQString &)), - TQT_SLOT(showStatusMessage(const TQString &))); - connect(mView,TQT_SIGNAL(transienStatusMessage(const TQString &)), - TQT_SLOT(showTransienStatusMessage(const TQString &))); + connect(mView,TQ_SIGNAL(statusMessage(const TQString &)), + TQ_SLOT(showStatusMessage(const TQString &))); + connect(mView,TQ_SIGNAL(transienStatusMessage(const TQString &)), + TQ_SLOT(showTransienStatusMessage(const TQString &))); statusBar()->show(); @@ -71,17 +71,17 @@ MobileMain::~MobileMain() void MobileMain::setupActions() { - KStdAction::quit(this, TQT_SLOT(close()), actionCollection()); + KStdAction::quit(this, TQ_SLOT(close()), actionCollection()); - new TDEAction(i18n("Terminal"),0,this,TQT_SLOT(showTerminal()), + new TDEAction(i18n("Terminal"),0,this,TQ_SLOT(showTerminal()), actionCollection(),"show_terminal"); createStandardStatusBarAction(); setStandardToolBarMenuEnabled(true); - KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection()); - KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection()); createGUI("kandymobileui.rc"); } @@ -130,7 +130,7 @@ void MobileMain::optionsConfigureToolbars() // use the standard toolbar editor saveMainWindowSettings( TDEGlobal::config(), autoSaveGroup() ); KEditToolbar dlg(actionCollection()); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(newToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), this, TQ_SLOT(newToolbarConfig())); dlg.exec(); } diff --git a/kandy/src/modem.cpp b/kandy/src/modem.cpp index 2a275bf4..ef16d00d 100644 --- a/kandy/src/modem.cpp +++ b/kandy/src/modem.cpp @@ -84,7 +84,7 @@ Modem::Modem( KandyPrefs *kprefs, TQObject *parent, const char *name ) : timer = new TQTimer( this, "modemtimer" ); TQ_CHECK_PTR( timer ); - connect( timer, TQT_SIGNAL( timeout() ), TQT_SLOT( timerDone() ) ); + connect( timer, TQ_SIGNAL( timeout() ), TQ_SLOT( timerDone() ) ); init(); xreset(); @@ -234,7 +234,7 @@ bool Modem::open() sn = new TQSocketNotifier( fd, TQSocketNotifier::Read, this, "modemsocketnotifier" ); TQ_CHECK_PTR( sn ); - connect( sn, TQT_SIGNAL( activated( int ) ), TQT_SLOT( readChar( int ) ) ); + connect( sn, TQ_SIGNAL( activated( int ) ), TQ_SLOT( readChar( int ) ) ); mOpen = true; @@ -372,7 +372,7 @@ void Modem::timerStart( int msec ) void Modem::receiveXModem( bool crc ) { disconnect( sn, 0, this, 0 ); - connect( sn, TQT_SIGNAL( activated( int ) ), TQT_SLOT( readXChar( int ) ) ); + connect( sn, TQ_SIGNAL( activated( int ) ), TQ_SLOT( readXChar( int ) ) ); xcrc = crc; @@ -598,7 +598,7 @@ void Modem::xreset() if ( sn ) { disconnect( sn, 0, this, 0 ); - connect( sn, TQT_SIGNAL( activated( int ) ), TQT_SLOT( readChar( int ) ) ); + connect( sn, TQ_SIGNAL( activated( int ) ), TQ_SLOT( readChar( int ) ) ); } } diff --git a/karm/desktoptracker.cpp b/karm/desktoptracker.cpp index 06216570..cf41d5b3 100644 --- a/karm/desktoptracker.cpp +++ b/karm/desktoptracker.cpp @@ -11,8 +11,8 @@ const int minimumInterval = 5; // seconds DesktopTracker::DesktopTracker () { // Setup desktop change handling - connect( &kWinModule, TQT_SIGNAL( currentDesktopChanged(int) ), - this, TQT_SLOT( handleDesktopChange(int) )); + connect( &kWinModule, TQ_SIGNAL( currentDesktopChanged(int) ), + this, TQ_SLOT( handleDesktopChange(int) )); _desktopCount = kWinModule.numberOfDesktops(); _previousDesktop = kWinModule.currentDesktop()-1; @@ -21,7 +21,7 @@ DesktopTracker::DesktopTracker () if( _previousDesktop < 0 ) _previousDesktop = 0; _timer = new TQTimer(this); - connect( _timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( changeTimers() ) ); + connect( _timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( changeTimers() ) ); } void DesktopTracker::handleDesktopChange( int desktop ) diff --git a/karm/edittaskdialog.cpp b/karm/edittaskdialog.cpp index d63a339a..37d215d5 100644 --- a/karm/edittaskdialog.cpp +++ b/karm/edittaskdialog.cpp @@ -72,7 +72,7 @@ EditTaskDialog::EditTaskDialog( TQString caption, bool editDlg, _absoluteRB = new TQRadioButton( i18n( "Edit &absolute" ), page, "_absoluteRB" ); lay1->addWidget( _absoluteRB ); - connect( _absoluteRB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAbsolutePressed() ) ); + connect( _absoluteRB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAbsolutePressed() ) ); // Absolute times @@ -124,7 +124,7 @@ EditTaskDialog::EditTaskDialog( TQString caption, bool editDlg, _relativeRB = new TQRadioButton( i18n( "Edit &relative (apply to both time and" " session time)" ), page, "_relativeRB" ); lay1->addWidget( _relativeRB ); - connect( _relativeRB, TQT_SIGNAL( clicked() ), this, TQT_SLOT(slotRelativePressed()) ); + connect( _relativeRB, TQ_SIGNAL( clicked() ), this, TQ_SLOT(slotRelativePressed()) ); // The relative times TQHBoxLayout *lay4 = new TQHBoxLayout(); @@ -207,7 +207,7 @@ EditTaskDialog::EditTaskDialog( TQString caption, bool editDlg, for (int i=0; i<desktopCount; i++) _deskBox[i]->setEnabled(enableDesktops); - connect(_desktopCB, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAutoTrackingPressed())); + connect(_desktopCB, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAutoTrackingPressed())); lay1->addStretch(1); diff --git a/karm/idletimedetector.cpp b/karm/idletimedetector.cpp index 110eacd0..bf4092f5 100644 --- a/karm/idletimedetector.cpp +++ b/karm/idletimedetector.cpp @@ -27,7 +27,7 @@ IdleTimeDetector::IdleTimeDetector(int maxIdle) } _timer = new TQTimer(this); - connect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(check())); + connect(_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(check())); #else _idleDetectionPossible = false; #endif // HAVE_LIBXSS diff --git a/karm/karm_part.cpp b/karm/karm_part.cpp index 8be87ef6..25531967 100644 --- a/karm/karm_part.cpp +++ b/karm/karm_part.cpp @@ -40,9 +40,9 @@ karmPart::karmPart( TQWidget *parentWidget, const char *widgetName, setWidget(_taskView); // create our actions - KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); - KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection()); - KStdAction::save(this, TQT_SLOT(save()), actionCollection()); + KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); + KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection()); + KStdAction::save(this, TQ_SLOT(save()), actionCollection()); makeMenus(); @@ -50,29 +50,29 @@ karmPart::karmPart( TQWidget *parentWidget, const char *widgetName, // connections - connect( _taskView, TQT_SIGNAL( totalTimesChanged( long, long ) ), - this, TQT_SLOT( updateTime( long, long ) ) ); - connect( _taskView, TQT_SIGNAL( selectionChanged ( TQListViewItem * )), - this, TQT_SLOT(slotSelectionChanged())); - connect( _taskView, TQT_SIGNAL( updateButtons() ), - this, TQT_SLOT(slotSelectionChanged())); + connect( _taskView, TQ_SIGNAL( totalTimesChanged( long, long ) ), + this, TQ_SLOT( updateTime( long, long ) ) ); + connect( _taskView, TQ_SIGNAL( selectionChanged ( TQListViewItem * )), + this, TQ_SLOT(slotSelectionChanged())); + connect( _taskView, TQ_SIGNAL( updateButtons() ), + this, TQ_SLOT(slotSelectionChanged())); // Setup context menu request handling connect( _taskView, - TQT_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int )), + TQ_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int )), this, - TQT_SLOT( contextMenuRequest( TQListViewItem*, const TQPoint&, int ))); + TQ_SLOT( contextMenuRequest( TQListViewItem*, const TQPoint&, int ))); _tray = new KarmTray( this ); - connect( _tray, TQT_SIGNAL( quitSelected() ), TQT_SLOT( quit() ) ); + connect( _tray, TQ_SIGNAL( quitSelected() ), TQ_SLOT( quit() ) ); - connect( _taskView, TQT_SIGNAL( timersActive() ), _tray, TQT_SLOT( startClock() ) ); - connect( _taskView, TQT_SIGNAL( timersActive() ), this, TQT_SLOT( enableStopAll() )); - connect( _taskView, TQT_SIGNAL( timersInactive() ), _tray, TQT_SLOT( stopClock() ) ); - connect( _taskView, TQT_SIGNAL( timersInactive() ), this, TQT_SLOT( disableStopAll())); - connect( _taskView, TQT_SIGNAL( tasksChanged( TQPtrList<Task> ) ), - _tray, TQT_SLOT( updateToolTip( TQPtrList<Task> ) )); + connect( _taskView, TQ_SIGNAL( timersActive() ), _tray, TQ_SLOT( startClock() ) ); + connect( _taskView, TQ_SIGNAL( timersActive() ), this, TQ_SLOT( enableStopAll() )); + connect( _taskView, TQ_SIGNAL( timersInactive() ), _tray, TQ_SLOT( stopClock() ) ); + connect( _taskView, TQ_SIGNAL( timersInactive() ), this, TQ_SLOT( disableStopAll())); + connect( _taskView, TQ_SIGNAL( tasksChanged( TQPtrList<Task> ) ), + _tray, TQ_SLOT( updateToolTip( TQPtrList<Task> ) )); _taskView->load(); @@ -113,119 +113,119 @@ void karmPart::makeMenus() *actionNew, *actionNewSub; - (void) KStdAction::quit( this, TQT_SLOT( quit() ), actionCollection()); - (void) KStdAction::print( this, TQT_SLOT( print() ), actionCollection()); - actionKeyBindings = KStdAction::keyBindings( this, TQT_SLOT( keyBindings() ), + (void) KStdAction::quit( this, TQ_SLOT( quit() ), actionCollection()); + (void) KStdAction::print( this, TQ_SLOT( print() ), actionCollection()); + actionKeyBindings = KStdAction::keyBindings( this, TQ_SLOT( keyBindings() ), actionCollection() ); actionPreferences = KStdAction::preferences(_preferences, - TQT_SLOT(showDialog()), + TQ_SLOT(showDialog()), actionCollection() ); - (void) KStdAction::save( this, TQT_SLOT( save() ), actionCollection() ); + (void) KStdAction::save( this, TQ_SLOT( save() ), actionCollection() ); TDEAction* actionStartNewSession = new TDEAction( i18n("Start &New Session"), 0, this, - TQT_SLOT( startNewSession() ), + TQ_SLOT( startNewSession() ), actionCollection(), "start_new_session"); TDEAction* actionResetAll = new TDEAction( i18n("&Reset All Times"), 0, this, - TQT_SLOT( resetAllTimes() ), + TQ_SLOT( resetAllTimes() ), actionCollection(), "reset_all_times"); actionStart = new TDEAction( i18n("&Start"), TQString::fromLatin1("1rightarrow"), Key_S, _taskView, - TQT_SLOT( startCurrentTimer() ), actionCollection(), + TQ_SLOT( startCurrentTimer() ), actionCollection(), "start"); actionStop = new TDEAction( i18n("S&top"), TQString::fromLatin1("process-stop"), 0, _taskView, - TQT_SLOT( stopCurrentTimer() ), actionCollection(), + TQ_SLOT( stopCurrentTimer() ), actionCollection(), "stop"); actionStopAll = new TDEAction( i18n("Stop &All Timers"), Key_Escape, _taskView, - TQT_SLOT( stopAllTimers() ), actionCollection(), + TQ_SLOT( stopAllTimers() ), actionCollection(), "stopAll"); actionStopAll->setEnabled(false); actionNew = new TDEAction( i18n("&New..."), TQString::fromLatin1("document-new"), CTRL+Key_N, _taskView, - TQT_SLOT( newTask() ), actionCollection(), + TQ_SLOT( newTask() ), actionCollection(), "new_task"); actionNewSub = new TDEAction( i18n("New &Subtask..."), TQString::fromLatin1("application-vnd.tde.tdemultiple"), CTRL+ALT+Key_N, _taskView, - TQT_SLOT( newSubTask() ), actionCollection(), + TQ_SLOT( newSubTask() ), actionCollection(), "new_sub_task"); actionDelete = new TDEAction( i18n("&Delete"), TQString::fromLatin1("edit-delete"), Key_Delete, _taskView, - TQT_SLOT( deleteTask() ), actionCollection(), + TQ_SLOT( deleteTask() ), actionCollection(), "delete_task"); actionEdit = new TDEAction( i18n("&Edit..."), TQString::fromLatin1("edit"), CTRL + Key_E, _taskView, - TQT_SLOT( editTask() ), actionCollection(), + TQ_SLOT( editTask() ), actionCollection(), "edit_task"); // actionAddComment = new TDEAction( i18n("&Add Comment..."), // TQString::fromLatin1("text-x-generic"), // CTRL+ALT+Key_E, // _taskView, -// TQT_SLOT( addCommentToTask() ), +// TQ_SLOT( addCommentToTask() ), // actionCollection(), // "add_comment_to_task"); actionMarkAsComplete = new TDEAction( i18n("&Mark as Complete"), TQString::fromLatin1("text-x-generic"), CTRL+Key_M, _taskView, - TQT_SLOT( markTaskAsComplete() ), + TQ_SLOT( markTaskAsComplete() ), actionCollection(), "mark_as_complete"); actionMarkAsIncomplete = new TDEAction( i18n("&Mark as Incomplete"), TQString::fromLatin1("text-x-generic"), CTRL+Key_M, _taskView, - TQT_SLOT( markTaskAsIncomplete() ), + TQ_SLOT( markTaskAsIncomplete() ), actionCollection(), "mark_as_incomplete"); actionClipTotals = new TDEAction( i18n("&Copy Totals to Clipboard"), TQString::fromLatin1("klipper"), CTRL+Key_C, _taskView, - TQT_SLOT( clipTotals() ), + TQ_SLOT( clipTotals() ), actionCollection(), "clip_totals"); actionClipHistory = new TDEAction( i18n("Copy &History to Clipboard"), TQString::fromLatin1("klipper"), CTRL+ALT+Key_C, _taskView, - TQT_SLOT( clipHistory() ), + TQ_SLOT( clipHistory() ), actionCollection(), "clip_history"); new TDEAction( i18n("Import &Legacy Flat File..."), 0, - _taskView, TQT_SLOT(loadFromFlatFile()), actionCollection(), + _taskView, TQ_SLOT(loadFromFlatFile()), actionCollection(), "import_flatfile"); new TDEAction( i18n("&Export to CSV File..."), 0, - _taskView, TQT_SLOT(exportcsvFile()), actionCollection(), + _taskView, TQ_SLOT(exportcsvFile()), actionCollection(), "export_csvfile"); new TDEAction( i18n("Export &History to CSV File..."), 0, - this, TQT_SLOT(exportcsvHistory()), actionCollection(), + this, TQ_SLOT(exportcsvHistory()), actionCollection(), "export_csvhistory"); new TDEAction( i18n("Import Tasks From &Planner..."), 0, - _taskView, TQT_SLOT(importPlanner()), actionCollection(), + _taskView, TQ_SLOT(importPlanner()), actionCollection(), "import_planner"); new TDEAction( i18n("Configure KArm..."), 0, - _preferences, TQT_SLOT(showDialog()), actionCollection(), + _preferences, TQ_SLOT(showDialog()), actionCollection(), "configure_karm"); /* new TDEAction( i18n("Import E&vents"), 0, _taskView, - TQT_SLOT( loadFromKOrgEvents() ), actionCollection(), + TQ_SLOT( loadFromKOrgEvents() ), actionCollection(), "import_korg_events"); */ @@ -287,12 +287,12 @@ void karmPart::setReadWrite(bool rw) { // notify your internal widget of the read-write state if (rw) - connect(_taskView, TQT_SIGNAL(textChanged()), - this, TQT_SLOT(setModified())); + connect(_taskView, TQ_SIGNAL(textChanged()), + this, TQ_SLOT(setModified())); else { - disconnect(_taskView, TQT_SIGNAL(textChanged()), - this, TQT_SLOT(setModified())); + disconnect(_taskView, TQ_SIGNAL(textChanged()), + this, TQ_SLOT(setModified())); } ReadWritePart::setReadWrite(rw); diff --git a/karm/karmstorage.cpp b/karm/karmstorage.cpp index 1992c0f8..92f69ff6 100644 --- a/karm/karmstorage.cpp +++ b/karm/karmstorage.cpp @@ -132,8 +132,8 @@ TQString KarmStorage::load (TaskView* view, const Preferences* preferences, TQSt } _calendar = resource; - TQObject::connect (_calendar, TQT_SIGNAL(resourceChanged(ResourceCalendar *)), - view, TQT_SLOT(iCalFileModified(ResourceCalendar *))); + TQObject::connect (_calendar, TQ_SIGNAL(resourceChanged(ResourceCalendar *)), + view, TQ_SLOT(iCalFileModified(ResourceCalendar *))); _calendar->setTimeZoneId( KPimPrefs::timezone() ); _calendar->setResourceName( TQString::fromLatin1("KArm") ); _calendar->open(); diff --git a/karm/mainwindow.cpp b/karm/mainwindow.cpp index ff9b8515..6edc6b2d 100644 --- a/karm/mainwindow.cpp +++ b/karm/mainwindow.cpp @@ -57,33 +57,33 @@ MainWindow::MainWindow( const TQString &icsfile ) _watcher->updateMenus(); // connections - connect( _taskView, TQT_SIGNAL( totalTimesChanged( long, long ) ), - this, TQT_SLOT( updateTime( long, long ) ) ); - connect( _taskView, TQT_SIGNAL( selectionChanged ( TQListViewItem * )), - this, TQT_SLOT(slotSelectionChanged())); - connect( _taskView, TQT_SIGNAL( updateButtons() ), - this, TQT_SLOT(slotSelectionChanged())); - connect( _taskView, TQT_SIGNAL( setStatusBar( TQString ) ), - this, TQT_SLOT(setStatusBar( TQString ))); + connect( _taskView, TQ_SIGNAL( totalTimesChanged( long, long ) ), + this, TQ_SLOT( updateTime( long, long ) ) ); + connect( _taskView, TQ_SIGNAL( selectionChanged ( TQListViewItem * )), + this, TQ_SLOT(slotSelectionChanged())); + connect( _taskView, TQ_SIGNAL( updateButtons() ), + this, TQ_SLOT(slotSelectionChanged())); + connect( _taskView, TQ_SIGNAL( setStatusBar( TQString ) ), + this, TQ_SLOT(setStatusBar( TQString ))); loadGeometry(); // Setup context menu request handling connect( _taskView, - TQT_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int )), + TQ_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int )), this, - TQT_SLOT( contextMenuRequest( TQListViewItem*, const TQPoint&, int ))); + TQ_SLOT( contextMenuRequest( TQListViewItem*, const TQPoint&, int ))); _tray = new KarmTray( this ); - connect( _tray, TQT_SIGNAL( quitSelected() ), TQT_SLOT( quit() ) ); + connect( _tray, TQ_SIGNAL( quitSelected() ), TQ_SLOT( quit() ) ); - connect( _taskView, TQT_SIGNAL( timersActive() ), _tray, TQT_SLOT( startClock() ) ); - connect( _taskView, TQT_SIGNAL( timersActive() ), this, TQT_SLOT( enableStopAll() )); - connect( _taskView, TQT_SIGNAL( timersInactive() ), _tray, TQT_SLOT( stopClock() ) ); - connect( _taskView, TQT_SIGNAL( timersInactive() ), this, TQT_SLOT( disableStopAll())); - connect( _taskView, TQT_SIGNAL( tasksChanged( TQPtrList<Task> ) ), - _tray, TQT_SLOT( updateToolTip( TQPtrList<Task> ) )); + connect( _taskView, TQ_SIGNAL( timersActive() ), _tray, TQ_SLOT( startClock() ) ); + connect( _taskView, TQ_SIGNAL( timersActive() ), this, TQ_SLOT( enableStopAll() )); + connect( _taskView, TQ_SIGNAL( timersInactive() ), _tray, TQ_SLOT( stopClock() ) ); + connect( _taskView, TQ_SIGNAL( timersInactive() ), this, TQ_SLOT( disableStopAll())); + connect( _taskView, TQ_SIGNAL( tasksChanged( TQPtrList<Task> ) ), + _tray, TQ_SLOT( updateToolTip( TQPtrList<Task> ) )); _taskView->load(); @@ -251,89 +251,89 @@ void MainWindow::makeMenus() *actionNew, *actionNewSub; - (void) KStdAction::quit( this, TQT_SLOT( quit() ), actionCollection()); - (void) KStdAction::print( this, TQT_SLOT( print() ), actionCollection()); - actionKeyBindings = KStdAction::keyBindings( this, TQT_SLOT( keyBindings() ), + (void) KStdAction::quit( this, TQ_SLOT( quit() ), actionCollection()); + (void) KStdAction::print( this, TQ_SLOT( print() ), actionCollection()); + actionKeyBindings = KStdAction::keyBindings( this, TQ_SLOT( keyBindings() ), actionCollection() ); actionPreferences = KStdAction::preferences(_preferences, - TQT_SLOT(showDialog()), + TQ_SLOT(showDialog()), actionCollection() ); - (void) KStdAction::save( this, TQT_SLOT( save() ), actionCollection() ); + (void) KStdAction::save( this, TQ_SLOT( save() ), actionCollection() ); TDEAction* actionStartNewSession = new TDEAction( i18n("Start &New Session"), 0, this, - TQT_SLOT( startNewSession() ), + TQ_SLOT( startNewSession() ), actionCollection(), "start_new_session"); TDEAction* actionResetAll = new TDEAction( i18n("&Reset All Times"), 0, this, - TQT_SLOT( resetAllTimes() ), + TQ_SLOT( resetAllTimes() ), actionCollection(), "reset_all_times"); actionStart = new TDEAction( i18n("&Start"), TQString::fromLatin1("1rightarrow"), Key_S, _taskView, - TQT_SLOT( startCurrentTimer() ), actionCollection(), + TQ_SLOT( startCurrentTimer() ), actionCollection(), "start"); actionStop = new TDEAction( i18n("S&top"), TQString::fromLatin1("process-stop"), Key_S, _taskView, - TQT_SLOT( stopCurrentTimer() ), actionCollection(), + TQ_SLOT( stopCurrentTimer() ), actionCollection(), "stop"); actionStopAll = new TDEAction( i18n("Stop &All Timers"), Key_Escape, _taskView, - TQT_SLOT( stopAllTimers() ), actionCollection(), + TQ_SLOT( stopAllTimers() ), actionCollection(), "stopAll"); actionStopAll->setEnabled(false); actionNew = new TDEAction( i18n("&New..."), TQString::fromLatin1("document-new"), CTRL+Key_N, _taskView, - TQT_SLOT( newTask() ), actionCollection(), + TQ_SLOT( newTask() ), actionCollection(), "new_task"); actionNewSub = new TDEAction( i18n("New &Subtask..."), TQString::fromLatin1("application-vnd.tde.tdemultiple"), CTRL+ALT+Key_N, _taskView, - TQT_SLOT( newSubTask() ), actionCollection(), + TQ_SLOT( newSubTask() ), actionCollection(), "new_sub_task"); actionDelete = new TDEAction( i18n("&Delete"), TQString::fromLatin1("edit-delete"), Key_Delete, _taskView, - TQT_SLOT( deleteTask() ), actionCollection(), + TQ_SLOT( deleteTask() ), actionCollection(), "delete_task"); actionEdit = new TDEAction( i18n("&Edit..."), TQString::fromLatin1("edit"), CTRL + Key_E, _taskView, - TQT_SLOT( editTask() ), actionCollection(), + TQ_SLOT( editTask() ), actionCollection(), "edit_task"); // actionAddComment = new TDEAction( i18n("&Add Comment..."), // TQString::fromLatin1("text-x-generic"), // CTRL+ALT+Key_E, // _taskView, -// TQT_SLOT( addCommentToTask() ), +// TQ_SLOT( addCommentToTask() ), // actionCollection(), // "add_comment_to_task"); actionMarkAsComplete = new TDEAction( i18n("&Mark as Complete"), TQString::fromLatin1("text-x-generic"), CTRL+Key_M, _taskView, - TQT_SLOT( markTaskAsComplete() ), + TQ_SLOT( markTaskAsComplete() ), actionCollection(), "mark_as_complete"); actionMarkAsIncomplete = new TDEAction( i18n("&Mark as Incomplete"), TQString::fromLatin1("text-x-generic"), CTRL+Key_M, _taskView, - TQT_SLOT( markTaskAsIncomplete() ), + TQ_SLOT( markTaskAsIncomplete() ), actionCollection(), "mark_as_incomplete"); actionClipTotals = new TDEAction( i18n("&Copy Totals to Clipboard"), TQString::fromLatin1("klipper"), CTRL+Key_C, _taskView, - TQT_SLOT( clipTotals() ), + TQ_SLOT( clipTotals() ), actionCollection(), "clip_totals"); // actionClipTotals will never be used again, overwrite it @@ -341,34 +341,34 @@ void MainWindow::makeMenus() TQString::fromLatin1("klipper"), 0, _taskView, - TQT_SLOT( clipSession() ), + TQ_SLOT( clipSession() ), actionCollection(), "clip_session"); actionClipHistory = new TDEAction( i18n("Copy &History to Clipboard"), TQString::fromLatin1("klipper"), CTRL+ALT+Key_C, _taskView, - TQT_SLOT( clipHistory() ), + TQ_SLOT( clipHistory() ), actionCollection(), "clip_history"); new TDEAction( i18n("Import &Legacy Flat File..."), 0, - _taskView, TQT_SLOT(loadFromFlatFile()), actionCollection(), + _taskView, TQ_SLOT(loadFromFlatFile()), actionCollection(), "import_flatfile"); new TDEAction( i18n("&Export to CSV File..."), 0, - _taskView, TQT_SLOT(exportcsvFile()), actionCollection(), + _taskView, TQ_SLOT(exportcsvFile()), actionCollection(), "export_csvfile"); new TDEAction( i18n("Export &History to CSV File..."), 0, - this, TQT_SLOT(exportcsvHistory()), actionCollection(), + this, TQ_SLOT(exportcsvHistory()), actionCollection(), "export_csvhistory"); new TDEAction( i18n("Import Tasks From &Planner..."), 0, - _taskView, TQT_SLOT(importPlanner()), actionCollection(), + _taskView, TQ_SLOT(importPlanner()), actionCollection(), "import_planner"); /* new TDEAction( i18n("Import E&vents"), 0, _taskView, - TQT_SLOT( loadFromKOrgEvents() ), actionCollection(), + TQ_SLOT( loadFromKOrgEvents() ), actionCollection(), "import_korg_events"); */ diff --git a/karm/preferences.cpp b/karm/preferences.cpp index 29b242cf..e8a437ef 100644 --- a/karm/preferences.cpp +++ b/karm/preferences.cpp @@ -68,8 +68,8 @@ void Preferences::makeBehaviorPage() topLevel->addStretch(); - connect( _doIdleDetectionW, TQT_SIGNAL( clicked() ), this, - TQT_SLOT( idleDetectCheckBoxChanged() )); + connect( _doIdleDetectionW, TQ_SIGNAL( clicked() ), this, + TQ_SLOT( idleDetectCheckBoxChanged() )); } void Preferences::makeDisplayPage() @@ -138,8 +138,8 @@ void Preferences::makeStoragePage() topLevel->addStretch(); // checkboxes disable file selection controls - connect( _doAutoSaveW, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( autoSaveCheckBoxChanged() )); + connect( _doAutoSaveW, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( autoSaveCheckBoxChanged() )); } void Preferences::disableIdleDetection() diff --git a/karm/task.cpp b/karm/task.cpp index 5b05407d..88c0e099 100644 --- a/karm/task.cpp +++ b/karm/task.cpp @@ -54,11 +54,11 @@ void Task::init( const TQString& taskName, long minutes, long sessionTime, // If our parent is the taskview then connect our totalTimesChanged // signal to its receiver if ( ! parent() ) - connect( this, TQT_SIGNAL( totalTimesChanged ( long, long ) ), - listView(), TQT_SLOT( taskTotalTimesChanged( long, long) )); + connect( this, TQ_SIGNAL( totalTimesChanged ( long, long ) ), + listView(), TQ_SLOT( taskTotalTimesChanged( long, long) )); - connect( this, TQT_SIGNAL( deletingTask( Task* ) ), - listView(), TQT_SLOT( deletingTask( Task* ) )); + connect( this, TQ_SIGNAL( deletingTask( Task* ) ), + listView(), TQ_SLOT( deletingTask( Task* ) )); if (icons == 0) { icons = new TQPtrVector<TQPixmap>(8); @@ -80,7 +80,7 @@ void Task::init( const TQString& taskName, long minutes, long sessionTime, _totalSessionTime = _sessionTime = sessionTime; _timer = new TQTimer(this); _desktops = desktops; - connect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateActiveIcon())); + connect(_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateActiveIcon())); setPixmap(1, UserIcon(TQString::fromLatin1("empty-watch.xpm"))); _currentPic = 0; _percentcomplete = percent_complete; diff --git a/karm/taskview.cpp b/karm/taskview.cpp index d1b80bf8..ad0877f1 100644 --- a/karm/taskview.cpp +++ b/karm/taskview.cpp @@ -42,10 +42,10 @@ TaskView::TaskView(TQWidget *parent, const char *name, const TQString &icsfile ) _preferences = Preferences::instance( icsfile ); _storage = KarmStorage::instance(); - connect( this, TQT_SIGNAL( expanded( TQListViewItem * ) ), - this, TQT_SLOT( itemStateChanged( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( collapsed( TQListViewItem * ) ), - this, TQT_SLOT( itemStateChanged( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( expanded( TQListViewItem * ) ), + this, TQ_SLOT( itemStateChanged( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( collapsed( TQListViewItem * ) ), + this, TQ_SLOT( itemStateChanged( TQListViewItem * ) ) ); // setup default values previousColumnWidths[0] = previousColumnWidths[1] @@ -65,49 +65,49 @@ TaskView::TaskView(TQWidget *parent, const char *name, const TQString &icsfile ) // set up the minuteTimer _minuteTimer = new TQTimer(this); - connect( _minuteTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( minuteUpdate() )); + connect( _minuteTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( minuteUpdate() )); _minuteTimer->start(1000 * secsPerMinute); // React when user changes iCalFile - connect(_preferences, TQT_SIGNAL(iCalFile(TQString)), - this, TQT_SLOT(iCalFileChanged(TQString))); + connect(_preferences, TQ_SIGNAL(iCalFile(TQString)), + this, TQ_SLOT(iCalFileChanged(TQString))); // resize columns when config is changed - connect(_preferences, TQT_SIGNAL( setupChanged() ), this,TQT_SLOT( adaptColumns() )); + connect(_preferences, TQ_SIGNAL( setupChanged() ), this,TQ_SLOT( adaptColumns() )); _minuteTimer->start(1000 * secsPerMinute); // Set up the idle detection. _idleTimeDetector = new IdleTimeDetector( _preferences->idlenessTimeout() ); - connect( _idleTimeDetector, TQT_SIGNAL( extractTime(int) ), - this, TQT_SLOT( extractTime(int) )); - connect( _idleTimeDetector, TQT_SIGNAL( stopAllTimersAt(TQDateTime) ), - this, TQT_SLOT( stopAllTimersAt(TQDateTime) )); - connect( _preferences, TQT_SIGNAL( idlenessTimeout(int) ), - _idleTimeDetector, TQT_SLOT( setMaxIdle(int) )); - connect( _preferences, TQT_SIGNAL( detectIdleness(bool) ), - _idleTimeDetector, TQT_SLOT( toggleOverAllIdleDetection(bool) )); + connect( _idleTimeDetector, TQ_SIGNAL( extractTime(int) ), + this, TQ_SLOT( extractTime(int) )); + connect( _idleTimeDetector, TQ_SIGNAL( stopAllTimersAt(TQDateTime) ), + this, TQ_SLOT( stopAllTimersAt(TQDateTime) )); + connect( _preferences, TQ_SIGNAL( idlenessTimeout(int) ), + _idleTimeDetector, TQ_SLOT( setMaxIdle(int) )); + connect( _preferences, TQ_SIGNAL( detectIdleness(bool) ), + _idleTimeDetector, TQ_SLOT( toggleOverAllIdleDetection(bool) )); if (!_idleTimeDetector->isIdleDetectionPossible()) _preferences->disableIdleDetection(); // Setup auto save timer _autoSaveTimer = new TQTimer(this); - connect( _preferences, TQT_SIGNAL( autoSave(bool) ), - this, TQT_SLOT( autoSaveChanged(bool) )); - connect( _preferences, TQT_SIGNAL( autoSavePeriod(int) ), - this, TQT_SLOT( autoSavePeriodChanged(int) )); - connect( _autoSaveTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( save() )); + connect( _preferences, TQ_SIGNAL( autoSave(bool) ), + this, TQ_SLOT( autoSaveChanged(bool) )); + connect( _preferences, TQ_SIGNAL( autoSavePeriod(int) ), + this, TQ_SLOT( autoSavePeriodChanged(int) )); + connect( _autoSaveTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( save() )); // Setup manual save timer (to save changes a little while after they happen) _manualSaveTimer = new TQTimer(this); - connect( _manualSaveTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( save() )); + connect( _manualSaveTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( save() )); // Connect desktop tracker events to task starting/stopping _desktopTracker = new DesktopTracker(); - connect( _desktopTracker, TQT_SIGNAL( reachedtActiveDesktop( Task* ) ), - this, TQT_SLOT( startTimerFor(Task*) )); - connect( _desktopTracker, TQT_SIGNAL( leftActiveDesktop( Task* ) ), - this, TQT_SLOT( stopTimerFor(Task*) )); + connect( _desktopTracker, TQ_SIGNAL( reachedtActiveDesktop( Task* ) ), + this, TQ_SLOT( startTimerFor(Task*) )); + connect( _desktopTracker, TQ_SIGNAL( leftActiveDesktop( Task* ) ), + this, TQ_SLOT( stopTimerFor(Task*) )); new TaskViewWhatsThis( this ); } diff --git a/karm/tdeaccelmenuwatch.cpp b/karm/tdeaccelmenuwatch.cpp index 5cb22366..3cc72ea8 100644 --- a/karm/tdeaccelmenuwatch.cpp +++ b/karm/tdeaccelmenuwatch.cpp @@ -27,7 +27,7 @@ void TDEAccelMenuWatch::setMenu( TQPopupMenu *menu ) if ( !_menuList.findRef( menu ) ) { _menuList.append( menu ); - connect( menu, TQT_SIGNAL(destroyed()), this, TQT_SLOT(removeDeadMenu()) ); + connect( menu, TQ_SIGNAL(destroyed()), this, TQ_SLOT(removeDeadMenu()) ); } _menu = menu; diff --git a/karm/test/script.cpp b/karm/test/script.cpp index f9fa9d9e..ab6f7579 100644 --- a/karm/test/script.cpp +++ b/karm/test/script.cpp @@ -47,14 +47,14 @@ Script::Script( const TQDir& workingDirectory ) m_proc = new TQProcess( this ); m_proc->setWorkingDirectory( workingDirectory ); - connect ( m_proc, TQT_SIGNAL( readyReadStdout() ), - this , TQT_SLOT ( stdout() ) + connect ( m_proc, TQ_SIGNAL( readyReadStdout() ), + this , TQ_SLOT ( stdout() ) ); - connect ( m_proc, TQT_SIGNAL( readyReadStderr() ), - this , TQT_SLOT ( stderr() ) + connect ( m_proc, TQ_SIGNAL( readyReadStderr() ), + this , TQ_SLOT ( stderr() ) ); - connect ( m_proc, TQT_SIGNAL( processExited() ), - this , TQT_SLOT ( exit() ) + connect ( m_proc, TQ_SIGNAL( processExited() ), + this , TQ_SLOT ( exit() ) ); } @@ -79,7 +79,7 @@ int Script::run() { m_proc->start(); // This didn't work. But Ctrl-C does. :P - //TQTimer::singleShot( m_timeoutInSeconds * 1000, m_proc, TQT_SLOT( kill() ) ); + //TQTimer::singleShot( m_timeoutInSeconds * 1000, m_proc, TQ_SLOT( kill() ) ); //while ( ! m_proc->normalExit() ); while ( m_proc->isRunning() ); return m_status; @@ -89,7 +89,7 @@ void Script::terminate() { // These both trigger processExited, so exit() will run. m_proc->tryTerminate(); - TQTimer::singleShot( NICE_KILL_TIMEOUT_IN_SECS*1000, m_proc, TQT_SLOT( kill() ) ); + TQTimer::singleShot( NICE_KILL_TIMEOUT_IN_SECS*1000, m_proc, TQ_SLOT( kill() ) ); } void Script::exit() diff --git a/karm/tray.cpp b/karm/tray.cpp index 5187c7e4..9332d1e0 100644 --- a/karm/tray.cpp +++ b/karm/tray.cpp @@ -35,8 +35,8 @@ KarmTray::KarmTray(MainWindow* parent) { // the timer that updates the "running" icon in the tray _taskActiveTimer = new TQTimer(this); - connect( _taskActiveTimer, TQT_SIGNAL( timeout() ), this, - TQT_SLOT( advanceClock()) ); + connect( _taskActiveTimer, TQ_SIGNAL( timeout() ), this, + TQ_SLOT( advanceClock()) ); if (icons == 0) { icons = new TQPtrVector<TQPixmap>(8); diff --git a/kdgantt/KDGanttSemiSizingControl.cpp b/kdgantt/KDGanttSemiSizingControl.cpp index 86268e87..6ea8375d 100644 --- a/kdgantt/KDGanttSemiSizingControl.cpp +++ b/kdgantt/KDGanttSemiSizingControl.cpp @@ -248,7 +248,7 @@ void KDGanttSemiSizingControl::init() { _but = new TQPushButton( this ); _but->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); - connect( _but, TQT_SIGNAL( clicked() ), this, TQT_SLOT(changeState()) ); + connect( _but, TQ_SIGNAL( clicked() ), this, TQ_SLOT(changeState()) ); _layout = 0; TQWhatsThis::add( _but, "Click on this button to show the \nlegend at the bottom of the widget"); TQToolTip::add( _but, "Show / hide legend"); diff --git a/kdgantt/KDGanttView.cpp b/kdgantt/KDGanttView.cpp index 5df5248b..e9adada9 100644 --- a/kdgantt/KDGanttView.cpp +++ b/kdgantt/KDGanttView.cpp @@ -100,17 +100,17 @@ KDGanttView::KDGanttView( TQWidget* parent, const char* name ) spacerLeft = new TQHBox( leftWidget ); myListView = new KDListView(leftWidget, this); myListView->setVScrollBarMode (TQScrollView::AlwaysOff ); - connect( myListView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), - this, TQT_SLOT( slotSelectionChanged( TQListViewItem* ) ) ); + connect( myListView, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ), + this, TQ_SLOT( slotSelectionChanged( TQListViewItem* ) ) ); - connect( myListView, TQT_SIGNAL( mouseButtonClicked ( int, TQListViewItem * , const TQPoint &, int ) ), this, TQT_SLOT( slotmouseButtonClicked ( int , TQListViewItem * , const TQPoint &, int ) ) ); - connect( myListView, TQT_SIGNAL( contextMenuRequested ( TQListViewItem * , const TQPoint &, int ) ), this, TQT_SLOT( slotcontextMenuRequested ( TQListViewItem * , const TQPoint & , int ) ) ); + connect( myListView, TQ_SIGNAL( mouseButtonClicked ( int, TQListViewItem * , const TQPoint &, int ) ), this, TQ_SLOT( slotmouseButtonClicked ( int , TQListViewItem * , const TQPoint &, int ) ) ); + connect( myListView, TQ_SIGNAL( contextMenuRequested ( TQListViewItem * , const TQPoint &, int ) ), this, TQ_SLOT( slotcontextMenuRequested ( TQListViewItem * , const TQPoint & , int ) ) ); - connect( myListView, TQT_SIGNAL(currentChanged( TQListViewItem * ) ), this, TQT_SLOT(slotCurrentChanged ( TQListViewItem * ) ) ); - connect( myListView, TQT_SIGNAL(itemRenamed ( TQListViewItem * , int , const TQString & ) ), this, TQT_SLOT(slotItemRenamed ( TQListViewItem *, int , const TQString & ) ) ); - connect( myListView, TQT_SIGNAL(mouseButtonPressed( int, TQListViewItem * , const TQPoint &, int ) ), this, TQT_SLOT(slotMouseButtonPressed ( int , TQListViewItem * , const TQPoint & , int ) ) ); + connect( myListView, TQ_SIGNAL(currentChanged( TQListViewItem * ) ), this, TQ_SLOT(slotCurrentChanged ( TQListViewItem * ) ) ); + connect( myListView, TQ_SIGNAL(itemRenamed ( TQListViewItem * , int , const TQString & ) ), this, TQ_SLOT(slotItemRenamed ( TQListViewItem *, int , const TQString & ) ) ); + connect( myListView, TQ_SIGNAL(mouseButtonPressed( int, TQListViewItem * , const TQPoint &, int ) ), this, TQ_SLOT(slotMouseButtonPressed ( int , TQListViewItem * , const TQPoint & , int ) ) ); - //connect( myListView, TQT_SIGNAL( ), this, TQT_SLOT( ) ); + //connect( myListView, TQ_SIGNAL( ), this, TQ_SLOT( ) ); myTimeTable = new KDTimeTableWidget (rightWidget,this); spacerRight = new TQWidget( rightWidget ); @@ -145,8 +145,8 @@ KDGanttView::KDGanttView( TQWidget* parent, const char* name ) setLineWidth( 2 ); myListView->setFrameStyle( TQFrame::NoFrame ); myListView->setMargin( 0 ); - TQObject::connect(myListView, TQT_SIGNAL ( expanded ( TQListViewItem * ) ) , myTimeTable , TQT_SLOT( expandItem(TQListViewItem * ))) ; - TQObject::connect(myListView, TQT_SIGNAL (collapsed ( TQListViewItem * ) ) , myTimeTable , TQT_SLOT(collapseItem(TQListViewItem * ))) ; + TQObject::connect(myListView, TQ_SIGNAL ( expanded ( TQListViewItem * ) ) , myTimeTable , TQ_SLOT( expandItem(TQListViewItem * ))) ; + TQObject::connect(myListView, TQ_SIGNAL (collapsed ( TQListViewItem * ) ) , myTimeTable , TQ_SLOT(collapseItem(TQListViewItem * ))) ; timeHeaderSpacerWidget->setFixedWidth(myCanvasView->verticalScrollBar()->width() ); listViewIsVisible = true; @@ -158,7 +158,7 @@ KDGanttView::KDGanttView( TQWidget* parent, const char* name ) myTextColor = TQt::black; myLegendItems = new TQPtrList<legendItem>; - //TQObject::connect( this, TQT_SIGNAL (itemDoubleClicked( KDGanttViewItem* ) ) , this, TQT_SLOT( editItem( KDGanttViewItem* ))) ; + //TQObject::connect( this, TQ_SIGNAL (itemDoubleClicked( KDGanttViewItem* ) ) , this, TQ_SLOT( editItem( KDGanttViewItem* ))) ; myItemAttributeDialog = new itemAttributeDialog(); setRepaintMode( KDGanttView::Medium ); //setRepaintMode( KDGanttView::Always ); @@ -166,19 +166,19 @@ KDGanttView::KDGanttView( TQWidget* parent, const char* name ) setHeaderVisible( false ); // now connecting the widgets - connect(myCanvasView->horizontalScrollBar(), TQT_SIGNAL ( valueChanged ( int )) ,myTimeHeaderScroll->horizontalScrollBar(), TQT_SLOT( setValue ( int))) ; - connect(myCanvasView, TQT_SIGNAL ( heightResized( int )) ,myTimeTable, TQT_SLOT( checkHeight ( int))) ; - connect(myCanvasView, TQT_SIGNAL ( widthResized( int )) ,myTimeHeader, TQT_SLOT( checkWidth ( int))) ; - - TQObject::connect(myCanvasView->verticalScrollBar(), TQT_SIGNAL ( valueChanged ( int ) ) ,myListView->verticalScrollBar(), TQT_SLOT( setValue ( int ))) ; - connect(myTimeHeader, TQT_SIGNAL ( sizeChanged( int ) ) ,this, TQT_SLOT(slotHeaderSizeChanged() )) ; - connect(myTimeHeader, TQT_SIGNAL ( sizeChanged( int ) ) ,myTimeTable, TQT_SLOT(resetWidth( int ) )) ; - connect(myListView, TQT_SIGNAL ( contentsMoving ( int, int ) ) ,myCanvasView, TQT_SLOT( moveMyContent( int, int ))) ; - connect(myTimeTable, TQT_SIGNAL ( heightComputed ( int ) ) ,myCanvasView, TQT_SLOT( setMyContentsHeight( int ))) ; + connect(myCanvasView->horizontalScrollBar(), TQ_SIGNAL ( valueChanged ( int )) ,myTimeHeaderScroll->horizontalScrollBar(), TQ_SLOT( setValue ( int))) ; + connect(myCanvasView, TQ_SIGNAL ( heightResized( int )) ,myTimeTable, TQ_SLOT( checkHeight ( int))) ; + connect(myCanvasView, TQ_SIGNAL ( widthResized( int )) ,myTimeHeader, TQ_SLOT( checkWidth ( int))) ; + + TQObject::connect(myCanvasView->verticalScrollBar(), TQ_SIGNAL ( valueChanged ( int ) ) ,myListView->verticalScrollBar(), TQ_SLOT( setValue ( int ))) ; + connect(myTimeHeader, TQ_SIGNAL ( sizeChanged( int ) ) ,this, TQ_SLOT(slotHeaderSizeChanged() )) ; + connect(myTimeHeader, TQ_SIGNAL ( sizeChanged( int ) ) ,myTimeTable, TQ_SLOT(resetWidth( int ) )) ; + connect(myListView, TQ_SIGNAL ( contentsMoving ( int, int ) ) ,myCanvasView, TQ_SLOT( moveMyContent( int, int ))) ; + connect(myTimeTable, TQ_SIGNAL ( heightComputed ( int ) ) ,myCanvasView, TQ_SLOT( setMyContentsHeight( int ))) ; // the next three are for adding new ticks at left/right - connect( myCanvasView->horizontalScrollBar(), TQT_SIGNAL (prevLine () ) ,this, TQT_SLOT(addTickLeft())); - connect( myCanvasView->horizontalScrollBar(), TQT_SIGNAL (nextLine () ) ,this, TQT_SLOT(addTickRight())); - connect( myCanvasView->horizontalScrollBar(), TQT_SIGNAL (valueChanged ( int ) ) ,this, TQT_SLOT( enableAdding( int ))); + connect( myCanvasView->horizontalScrollBar(), TQ_SIGNAL (prevLine () ) ,this, TQ_SLOT(addTickLeft())); + connect( myCanvasView->horizontalScrollBar(), TQ_SIGNAL (nextLine () ) ,this, TQ_SLOT(addTickRight())); + connect( myCanvasView->horizontalScrollBar(), TQ_SIGNAL (valueChanged ( int ) ) ,this, TQ_SLOT( enableAdding( int ))); // now initing fCenterTimeLineAfterShow = false; @@ -553,18 +553,18 @@ void KDGanttView::setRepaintMode( RepaintMode mode ) break; case Medium: - connect( cvv, TQT_SIGNAL (sliderReleased () ) ,this, TQT_SLOT(forceRepaint())); - connect( cvh, TQT_SIGNAL (sliderReleased () ) ,this, TQT_SLOT(forceRepaint())); - connect( cvv, TQT_SIGNAL (nextLine () ) ,this, TQT_SLOT(forceRepaint())); - connect( cvh, TQT_SIGNAL (nextLine () ) ,this, TQT_SLOT(forceRepaint())); - connect( cvv, TQT_SIGNAL (prevLine () ) ,this, TQT_SLOT(forceRepaint())); - connect( cvh, TQT_SIGNAL (prevLine () ) ,this, TQT_SLOT(forceRepaint())); + connect( cvv, TQ_SIGNAL (sliderReleased () ) ,this, TQ_SLOT(forceRepaint())); + connect( cvh, TQ_SIGNAL (sliderReleased () ) ,this, TQ_SLOT(forceRepaint())); + connect( cvv, TQ_SIGNAL (nextLine () ) ,this, TQ_SLOT(forceRepaint())); + connect( cvh, TQ_SIGNAL (nextLine () ) ,this, TQ_SLOT(forceRepaint())); + connect( cvv, TQ_SIGNAL (prevLine () ) ,this, TQ_SLOT(forceRepaint())); + connect( cvh, TQ_SIGNAL (prevLine () ) ,this, TQ_SLOT(forceRepaint())); break; case Always: - connect( cvv, TQT_SIGNAL (valueChanged ( int ) ) ,this, TQT_SLOT(forceRepaint( int ))); - connect( cvh, TQT_SIGNAL (valueChanged ( int ) ) ,this, TQT_SLOT(forceRepaint( int ))); - connect( cvv, TQT_SIGNAL (sliderReleased () ) ,this, TQT_SLOT(forceRepaint())); - connect( cvh, TQT_SIGNAL (sliderReleased () ) ,this, TQT_SLOT(forceRepaint())); + connect( cvv, TQ_SIGNAL (valueChanged ( int ) ) ,this, TQ_SLOT(forceRepaint( int ))); + connect( cvh, TQ_SIGNAL (valueChanged ( int ) ) ,this, TQ_SLOT(forceRepaint( int ))); + connect( cvv, TQ_SIGNAL (sliderReleased () ) ,this, TQ_SLOT(forceRepaint())); + connect( cvh, TQ_SIGNAL (sliderReleased () ) ,this, TQ_SLOT(forceRepaint())); break; } } diff --git a/kdgantt/KDGanttViewSubwidgets.cpp b/kdgantt/KDGanttViewSubwidgets.cpp index d9d30fb9..4b1e3472 100644 --- a/kdgantt/KDGanttViewSubwidgets.cpp +++ b/kdgantt/KDGanttViewSubwidgets.cpp @@ -725,42 +725,42 @@ KDTimeHeaderWidget:: KDTimeHeaderWidget( TQWidget* parent,KDGanttView* gant ) myPopupMenu = new TQPopupMenu(this); TQPopupMenu * zoomPopupMenu = new TQPopupMenu(this); myPopupMenu->insertItem (i18n("Zoom"),zoomPopupMenu, 1); - zoomPopupMenu->insertItem( i18n("Zoom to 100%"),this, TQT_SLOT(setSettings(int)),0 ,21,21 ); - zoomPopupMenu->insertItem( i18n("Zoom to Fit"),this, TQT_SLOT(setSettings(int)),0 ,20,20 ); - zoomPopupMenu->insertItem( i18n("Zoom In (x 2)"),this, TQT_SLOT(setSettings(int)),0 ,22,22 ); - zoomPopupMenu->insertItem( i18n("Zoom In (x 6)"),this, TQT_SLOT(setSettings(int)),0 ,24,24 ); - zoomPopupMenu->insertItem( i18n("Zoom In (x 12)"),this, TQT_SLOT(setSettings(int)),0 ,26,26 ); - zoomPopupMenu->insertItem( i18n("Zoom Out (x 1/2)"),this, TQT_SLOT(setSettings(int)),0 ,23,23 ); - zoomPopupMenu->insertItem( i18n("Zoom Out (x 1/6)"),this, TQT_SLOT(setSettings(int)),0 ,25,25 ); - zoomPopupMenu->insertItem( i18n("Zoom Out (x 1/12)"),this, TQT_SLOT(setSettings(int)),0 ,27,27 ); + zoomPopupMenu->insertItem( i18n("Zoom to 100%"),this, TQ_SLOT(setSettings(int)),0 ,21,21 ); + zoomPopupMenu->insertItem( i18n("Zoom to Fit"),this, TQ_SLOT(setSettings(int)),0 ,20,20 ); + zoomPopupMenu->insertItem( i18n("Zoom In (x 2)"),this, TQ_SLOT(setSettings(int)),0 ,22,22 ); + zoomPopupMenu->insertItem( i18n("Zoom In (x 6)"),this, TQ_SLOT(setSettings(int)),0 ,24,24 ); + zoomPopupMenu->insertItem( i18n("Zoom In (x 12)"),this, TQ_SLOT(setSettings(int)),0 ,26,26 ); + zoomPopupMenu->insertItem( i18n("Zoom Out (x 1/2)"),this, TQ_SLOT(setSettings(int)),0 ,23,23 ); + zoomPopupMenu->insertItem( i18n("Zoom Out (x 1/6)"),this, TQ_SLOT(setSettings(int)),0 ,25,25 ); + zoomPopupMenu->insertItem( i18n("Zoom Out (x 1/12)"),this, TQ_SLOT(setSettings(int)),0 ,27,27 ); scalePopupMenu = new TQPopupMenu(this); myPopupMenu->insertItem (i18n("Scale"),scalePopupMenu, 2); - scalePopupMenu->insertItem( i18n("Minute"),this, TQT_SLOT(setSettings(int)),0 ,1,1 ); - scalePopupMenu->insertItem( i18n("Hour"),this, TQT_SLOT(setSettings(int)),0 ,2,2 ); - scalePopupMenu->insertItem( i18n("Day"),this, TQT_SLOT(setSettings(int)),0 ,3,3 ); - scalePopupMenu->insertItem( i18n("Week"),this, TQT_SLOT(setSettings(int)),0 ,4,4 ); - scalePopupMenu->insertItem( i18n("Month"),this, TQT_SLOT(setSettings(int)),0 ,5,5 ); - scalePopupMenu->insertItem( i18n("Auto"),this, TQT_SLOT(setSettings(int)),0 ,6,6 ); + scalePopupMenu->insertItem( i18n("Minute"),this, TQ_SLOT(setSettings(int)),0 ,1,1 ); + scalePopupMenu->insertItem( i18n("Hour"),this, TQ_SLOT(setSettings(int)),0 ,2,2 ); + scalePopupMenu->insertItem( i18n("Day"),this, TQ_SLOT(setSettings(int)),0 ,3,3 ); + scalePopupMenu->insertItem( i18n("Week"),this, TQ_SLOT(setSettings(int)),0 ,4,4 ); + scalePopupMenu->insertItem( i18n("Month"),this, TQ_SLOT(setSettings(int)),0 ,5,5 ); + scalePopupMenu->insertItem( i18n("Auto"),this, TQ_SLOT(setSettings(int)),0 ,6,6 ); scalePopupMenu->setCheckable ( true ); timePopupMenu = new TQPopupMenu(this); myPopupMenu->insertItem (i18n("Time Format"),timePopupMenu, 3); - timePopupMenu->insertItem( i18n("24 Hour"),this, TQT_SLOT(setSettings(int)),0 ,40,40 ); - timePopupMenu->insertItem( i18n("12 PM Hour"),this, TQT_SLOT(setSettings(int)),0 ,41,41 ); - timePopupMenu->insertItem( i18n("24:00 Hour"),this, TQT_SLOT(setSettings(int)),0 ,42,42 ); + timePopupMenu->insertItem( i18n("24 Hour"),this, TQ_SLOT(setSettings(int)),0 ,40,40 ); + timePopupMenu->insertItem( i18n("12 PM Hour"),this, TQ_SLOT(setSettings(int)),0 ,41,41 ); + timePopupMenu->insertItem( i18n("24:00 Hour"),this, TQ_SLOT(setSettings(int)),0 ,42,42 ); yearPopupMenu = new TQPopupMenu(this); myPopupMenu->insertItem (i18n("Year Format"),yearPopupMenu, 4); - yearPopupMenu->insertItem( i18n("Four Digit"),this, TQT_SLOT(setSettings(int)),0 ,50,50 ); - yearPopupMenu->insertItem( i18n("Two Digit"),this, TQT_SLOT(setSettings(int)),0 ,51,51 ); - yearPopupMenu->insertItem( i18n("Two Digit Apostrophe"),this, TQT_SLOT(setSettings(int)),0 ,52,52 ); - yearPopupMenu->insertItem( i18n("No Date on Minute/Hour Scale"),this, TQT_SLOT(setSettings(int)),0 ,53,53 ); + yearPopupMenu->insertItem( i18n("Four Digit"),this, TQ_SLOT(setSettings(int)),0 ,50,50 ); + yearPopupMenu->insertItem( i18n("Two Digit"),this, TQ_SLOT(setSettings(int)),0 ,51,51 ); + yearPopupMenu->insertItem( i18n("Two Digit Apostrophe"),this, TQ_SLOT(setSettings(int)),0 ,52,52 ); + yearPopupMenu->insertItem( i18n("No Date on Minute/Hour Scale"),this, TQ_SLOT(setSettings(int)),0 ,53,53 ); gridPopupMenu = new TQPopupMenu(this); myPopupMenu->insertItem (i18n("Grid"),gridPopupMenu,5); - gridPopupMenu->insertItem( i18n("Show Minor Grid"),this, TQT_SLOT(setSettings(int)),0 ,10,10 ); - gridPopupMenu->insertItem( i18n("Show Major Grid"),this, TQT_SLOT(setSettings(int)),0 ,11,11 ); - gridPopupMenu->insertItem( i18n("Show No Grid"),this, TQT_SLOT(setSettings(int)),0 ,12,12 ); - myPopupMenu->insertItem( i18n("Print"),this, TQT_SLOT(setSettings(int)),0 ,30,30 ); - connect(myPopupMenu, TQT_SIGNAL ( aboutToShow () ) , this, TQT_SLOT( preparePopupMenu() )) ; + gridPopupMenu->insertItem( i18n("Show Minor Grid"),this, TQ_SLOT(setSettings(int)),0 ,10,10 ); + gridPopupMenu->insertItem( i18n("Show Major Grid"),this, TQ_SLOT(setSettings(int)),0 ,11,11 ); + gridPopupMenu->insertItem( i18n("Show No Grid"),this, TQ_SLOT(setSettings(int)),0 ,12,12 ); + myPopupMenu->insertItem( i18n("Print"),this, TQ_SLOT(setSettings(int)),0 ,30,30 ); + connect(myPopupMenu, TQ_SIGNAL ( aboutToShow () ) , this, TQ_SLOT( preparePopupMenu() )) ; flagZoomToFit = false; setShowMinorTicks( true ); myRealEnd = myHorizonEnd; @@ -2702,7 +2702,7 @@ KDListView::KDListView(TQWidget* parent, KDGanttView* gantView):TQListView (pare setDefaultRenameAction(TQListView::Accept); setColumnWidthMode ( 0,Maximum ); _calendarMode = false; - // TQObject::connect(this, TQT_SIGNAL ( pressed ( TQListViewItem * )) , this, TQT_SLOT( dragItem( TQListViewItem *))) ; + // TQObject::connect(this, TQ_SIGNAL ( pressed ( TQListViewItem * )) , this, TQ_SLOT( dragItem( TQListViewItem *))) ; } @@ -3177,38 +3177,38 @@ KDGanttCanvasView::KDGanttCanvasView( KDGanttView* sender,TQCanvas* canvas, TQWi TQPopupMenu * newMenu = new TQPopupMenu( this ); TQPopupMenu * onView = new TQPopupMenu( this ); onView->insertItem( i18n( "Summary" ), this, - TQT_SLOT ( newRootItem( int ) ), 0, 0 ); + TQ_SLOT ( newRootItem( int ) ), 0, 0 ); onView->insertItem( i18n( "Event" ), this, - TQT_SLOT ( newRootItem( int ) ), 0, 1); + TQ_SLOT ( newRootItem( int ) ), 0, 1); onView->insertItem( i18n( "Task" ), this, - TQT_SLOT ( newRootItem( int ) ), 0, 2 ); + TQ_SLOT ( newRootItem( int ) ), 0, 2 ); onItem->insertItem( i18n( "New Root" ), onView ); newMenu->insertItem( i18n( "Summary" ), - this, TQT_SLOT ( newChildItem( int) ), 0, 0 ); + this, TQ_SLOT ( newChildItem( int) ), 0, 0 ); newMenu->insertItem( i18n( "Event" ), - this, TQT_SLOT ( newChildItem( int ) ), 0, 1 ); + this, TQ_SLOT ( newChildItem( int ) ), 0, 1 ); newMenu->insertItem( i18n( "Task" ), - this, TQT_SLOT ( newChildItem( int ) ), 0, 2 ); + this, TQ_SLOT ( newChildItem( int ) ), 0, 2 ); onItem->insertItem( i18n( "New Child" ), newMenu ); TQPopupMenu * afterMenu = new TQPopupMenu( this ); afterMenu->insertItem( i18n( "Summary" ), - this, TQT_SLOT ( newChildItem( int) ), 0, 0+4 ); + this, TQ_SLOT ( newChildItem( int) ), 0, 0+4 ); afterMenu->insertItem( i18n( "Event" ), - this, TQT_SLOT ( newChildItem( int ) ), 0, 1+4 ); + this, TQ_SLOT ( newChildItem( int ) ), 0, 1+4 ); afterMenu->insertItem( i18n( "Task" ), - this, TQT_SLOT ( newChildItem( int ) ), 0, 2+4 ); + this, TQ_SLOT ( newChildItem( int ) ), 0, 2+4 ); onItem->insertItem( i18n( "New After" ), afterMenu ); TQPopupMenu *pasteMenu = new TQPopupMenu( this ); pasteMenu->insertItem( i18n( "As Root" ), - this, TQT_SLOT ( pasteItem( int ) ), 0, 0 ); + this, TQ_SLOT ( pasteItem( int ) ), 0, 0 ); pasteMenu->insertItem( i18n( "As Child" ), - this, TQT_SLOT ( pasteItem( int ) ), 0, 1 ); + this, TQ_SLOT ( pasteItem( int ) ), 0, 1 ); pasteMenu->insertItem( i18n( "After" ), - this, TQT_SLOT ( pasteItem( int ) ), 0, 2 ); + this, TQ_SLOT ( pasteItem( int ) ), 0, 2 ); onItem->insertItem( i18n( "Paste" ), pasteMenu, 3 ); - onItem->insertItem( i18n( "Cut Item" ), this, TQT_SLOT ( cutItem() ) ); + onItem->insertItem( i18n( "Cut Item" ), this, TQ_SLOT ( cutItem() ) ); onItem->setItemEnabled( 3, false ); myMyContentsHeight = 0; _showItemAddPopupMenu = false; @@ -3216,13 +3216,13 @@ KDGanttCanvasView::KDGanttCanvasView( KDGanttView* sender,TQCanvas* canvas, TQWi TQObject *scrollViewTimer = child( "scrollview scrollbar timer", "TQTimer", false ); Q_ASSERT( scrollViewTimer ); if ( scrollViewTimer ) { - disconnect( scrollViewTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateScrollBars() ) ); + disconnect( scrollViewTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateScrollBars() ) ); } // If they needed a scrollbar timer in scrollview... - connect( &scrollBarTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(myUpdateScrollBars() ) ); + connect( &scrollBarTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(myUpdateScrollBars() ) ); myScrollTimer = new TQTimer( this, "myScrollTimer" ); - connect( myScrollTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotScrollTimer() ) ); + connect( myScrollTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotScrollTimer() ) ); autoScrollEnabled = false; } diff --git a/kgantt/kgantt/KGantt.cpp b/kgantt/kgantt/KGantt.cpp index f16d4776..59df7764 100644 --- a/kgantt/kgantt/KGantt.cpp +++ b/kgantt/kgantt/KGantt.cpp @@ -58,8 +58,8 @@ KGantt::KGantt(KGanttItem* toplevelitem, _ganttbar = new xQGanttBarView(_toplevelitem, _splitter); _ganttbar->setPalette(pal1); - connect(_ganttbar, TQT_SIGNAL(contentsMoving(int,int)), - _ganttlist, TQT_SLOT(contentsMoved(int,int))); + connect(_ganttbar, TQ_SIGNAL(contentsMoving(int,int)), + _ganttlist, TQ_SLOT(contentsMoved(int,int))); _ganttlist->setBarView(_ganttbar); diff --git a/kgantt/kgantt/KGanttBarConfig.cpp b/kgantt/kgantt/KGanttBarConfig.cpp index ff5f4ee8..547373b1 100644 --- a/kgantt/kgantt/KGanttBarConfig.cpp +++ b/kgantt/kgantt/KGanttBarConfig.cpp @@ -20,8 +20,8 @@ KGanttBarConfig::KGanttBarConfig(xQGanttBarView* barview, _barview = barview; KColorButton* b = new KColorButton(this); - connect(b, TQT_SIGNAL(changed(const TQColor&)), - this, TQT_SLOT(changeBackground(const TQColor&))); + connect(b, TQ_SIGNAL(changed(const TQColor&)), + this, TQ_SLOT(changeBackground(const TQColor&))); } diff --git a/kgantt/kgantt/KGanttItem.cpp b/kgantt/kgantt/KGanttItem.cpp index f032ede0..c517e767 100644 --- a/kgantt/kgantt/KGanttItem.cpp +++ b/kgantt/kgantt/KGanttItem.cpp @@ -94,8 +94,8 @@ KGanttItem::addRelation(KGanttItem* from, KGanttItem* to, KGanttRelation* rel = new KGanttRelation(from,to,text); _relations.append(rel); - connect(rel, TQT_SIGNAL(destroyed(KGanttRelation*)), - this, TQT_SLOT(removeRelation(KGanttRelation*))); + connect(rel, TQ_SIGNAL(destroyed(KGanttRelation*)), + this, TQ_SLOT(removeRelation(KGanttRelation*))); emit changed(this, RelationAdded); return rel; @@ -130,8 +130,8 @@ KGanttItem::registerItem(KGanttItem* item) { _subitems.append(item); - connect(item, TQT_SIGNAL(changed(KGanttItem*, KGanttItem::Change)), - this, TQT_SLOT(subItemChanged(KGanttItem*, KGanttItem::Change)) ); + connect(item, TQ_SIGNAL(changed(KGanttItem*, KGanttItem::Change)), + this, TQ_SLOT(subItemChanged(KGanttItem*, KGanttItem::Change)) ); bool minChanged = false; bool maxChanged = false; diff --git a/kgantt/kgantt/KGanttRelation.cpp b/kgantt/kgantt/KGanttRelation.cpp index e5eab3b4..13bba2aa 100644 --- a/kgantt/kgantt/KGanttRelation.cpp +++ b/kgantt/kgantt/KGanttRelation.cpp @@ -23,11 +23,11 @@ KGanttRelation::KGanttRelation(KGanttItem* from, KGanttItem* to, _text = text; _pen = TQPen(TQColor(20,20,20),1); - connect(from, TQT_SIGNAL(destroyed(KGanttItem*)), - this, TQT_SLOT(itemDestroyed(KGanttItem*))); + connect(from, TQ_SIGNAL(destroyed(KGanttItem*)), + this, TQ_SLOT(itemDestroyed(KGanttItem*))); - connect(to, TQT_SIGNAL(destroyed(KGanttItem*)), - this, TQT_SLOT(itemDestroyed(KGanttItem*))); + connect(to, TQ_SIGNAL(destroyed(KGanttItem*)), + this, TQ_SLOT(itemDestroyed(KGanttItem*))); } diff --git a/kgantt/kgantt/xQGanttBarView.cpp b/kgantt/kgantt/xQGanttBarView.cpp index 60d25797..3e691c04 100644 --- a/kgantt/kgantt/xQGanttBarView.cpp +++ b/kgantt/kgantt/xQGanttBarView.cpp @@ -33,14 +33,14 @@ xQGanttBarView::xQGanttBarView(KGanttItem* toplevelitem, _viewport->setMode(xQGanttBarViewPort::Select); - connect(_viewport, TQT_SIGNAL(scroll(int,int)), - this, TQT_SLOT(scrollBy(int,int)) ); + connect(_viewport, TQ_SIGNAL(scroll(int,int)), + this, TQ_SLOT(scrollBy(int,int)) ); - connect(_viewport, TQT_SIGNAL(recalculated()), - this, TQT_SLOT(drawHeader()) ); + connect(_viewport, TQ_SIGNAL(recalculated()), + this, TQ_SLOT(drawHeader()) ); - connect(horizontalScrollBar(), TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(horizontalScrollBarChanged(int)) ); + connect(horizontalScrollBar(), TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(horizontalScrollBarChanged(int)) ); } diff --git a/kgantt/kgantt/xQGanttBarViewPort.cpp b/kgantt/kgantt/xQGanttBarViewPort.cpp index 04067f4c..5aca74c9 100644 --- a/kgantt/kgantt/xQGanttBarViewPort.cpp +++ b/kgantt/kgantt/xQGanttBarViewPort.cpp @@ -52,8 +52,8 @@ xQGanttBarViewPort::xQGanttBarViewPort(KGanttItem* toplevelitem, _itemTextEdit->hide(); _itemTextEdit->setFrame(false); - connect(_itemTextEdit, TQT_SIGNAL(returnPressed ()), - this, TQT_SLOT(textEdited())); + connect(_itemTextEdit, TQ_SIGNAL(returnPressed ()), + this, TQ_SLOT(textEdited())); _iconloader = new TDEIconLoader(); @@ -83,8 +83,8 @@ xQGanttBarViewPort::xQGanttBarViewPort(KGanttItem* toplevelitem, _cursor_lupe = new TQCursor( TQPixmap(lupe) ); - connect(_toplevelitem, TQT_SIGNAL(changed(KGanttItem*, KGanttItem::Change)), - this, TQT_SLOT(toplevelitemChanged(KGanttItem*, KGanttItem::Change)) ); + connect(_toplevelitem, TQ_SIGNAL(changed(KGanttItem*, KGanttItem::Change)), + this, TQ_SLOT(toplevelitemChanged(KGanttItem*, KGanttItem::Change)) ); recalc(); adjustSize(); @@ -116,8 +116,8 @@ xQGanttBarViewPort::toolbar(TQMainWindow* mw) _toolbar->insertButton("ganttSelect.png", 0, - TQT_SIGNAL(clicked()), - this, TQT_SLOT(setSelect()), + TQ_SIGNAL(clicked()), + this, TQ_SLOT(setSelect()), true, i18n("Select") ); TDEPopupMenu *selectMenu = new TDEPopupMenu(_toolbar); @@ -128,7 +128,7 @@ xQGanttBarViewPort::toolbar(TQMainWindow* mw) */ TQPixmap pix = _iconloader->loadIcon("ganttSelecttask.png", TDEIcon::Toolbar , 16 ); if(pix.isNull()) printf("ganttSelecttask.png not found !\n"); - selectMenu->insertItem(pix, i18n("Select All"), this, TQT_SLOT(selectAll()) ); + selectMenu->insertItem(pix, i18n("Select All"), this, TQ_SLOT(selectAll()) ); /* @@ -136,7 +136,7 @@ xQGanttBarViewPort::toolbar(TQMainWindow* mw) */ pix = _iconloader->loadIcon("ganttUnselecttask", TDEIcon::Toolbar , 16 ); if(pix.isNull()) printf("ganttUnselecttask.png not found !\n"); - selectMenu->insertItem(pix, i18n("Unselect All"), this, TQT_SLOT(unselectAll()) ); + selectMenu->insertItem(pix, i18n("Unselect All"), this, TQ_SLOT(unselectAll()) ); TDEToolBarButton* b = _toolbar->getButton(0); @@ -144,31 +144,31 @@ xQGanttBarViewPort::toolbar(TQMainWindow* mw) _toolbar->insertButton("viewmag.png", 1, - TQT_SIGNAL(clicked()), - this, TQT_SLOT(setZoom()), + TQ_SIGNAL(clicked()), + this, TQ_SLOT(setZoom()), true, i18n("Zoom") ); TDEPopupMenu* zoomMenu = new TDEPopupMenu(_toolbar); pix = _iconloader->loadIcon("viewmag.png", TDEIcon::Toolbar , 16 ); if(pix.isNull()) printf("viewmag.png not found !\n"); - zoomMenu->insertItem(pix, i18n("Zoom All"), this, TQT_SLOT(zoomAll()) ); + zoomMenu->insertItem(pix, i18n("Zoom All"), this, TQ_SLOT(zoomAll()) ); zoomMenu->insertSeparator(); pix = _iconloader->loadIcon("viewmag+.png", TDEIcon::Toolbar , 16 ); if(pix.isNull()) printf("viewmag+.png not found !\n"); - zoomMenu->insertItem(pix, i18n("Zoom In +"), this, TQT_SLOT(zoomIn()) ); + zoomMenu->insertItem(pix, i18n("Zoom In +"), this, TQ_SLOT(zoomIn()) ); pix = _iconloader->loadIcon("viewmag-.png", TDEIcon::Toolbar , 16 ); if(pix.isNull()) printf("viewmag-.png not found !\n"); - zoomMenu->insertItem(pix, i18n("Zoom Out -"), this, TQT_SLOT(zoomOut()) ); + zoomMenu->insertItem(pix, i18n("Zoom Out -"), this, TQ_SLOT(zoomOut()) ); b = _toolbar->getButton(1); b->setDelayedPopup(zoomMenu); _toolbar->insertButton("move.png", 2, - TQT_SIGNAL(clicked()), - this, TQT_SLOT(setMove()), + TQ_SIGNAL(clicked()), + this, TQ_SLOT(setMove()), true, i18n("Move") ); return _toolbar; @@ -191,17 +191,17 @@ xQGanttBarViewPort::initMenu() TQPixmap pix = _iconloader->loadIcon("ganttSelect.png", TDEIcon::Toolbar , 16 ); if(pix.isNull()) printf("ganttSelect.png not found !\n"); - _selectMenu->insertItem(pix, i18n("Select Mode"), this, TQT_SLOT(setSelect())); + _selectMenu->insertItem(pix, i18n("Select Mode"), this, TQ_SLOT(setSelect())); _selectMenu->insertSeparator(); pix = _iconloader->loadIcon("ganttSelecttask.png", TDEIcon::Toolbar , 16 ); if(pix.isNull()) printf("ganttSelecttask.png not found !\n"); - _selectMenu->insertItem(pix, i18n("Select All"), this, TQT_SLOT(selectAll()) ); + _selectMenu->insertItem(pix, i18n("Select All"), this, TQ_SLOT(selectAll()) ); pix = _iconloader->loadIcon("ganttUnselecttask", TDEIcon::Toolbar , 16 ); if(pix.isNull()) printf("ganttUnselecttask.png not found !\n"); - _selectMenu->insertItem(pix, i18n("Unselect All"), this, TQT_SLOT(unselectAll()) ); + _selectMenu->insertItem(pix, i18n("Unselect All"), this, TQ_SLOT(unselectAll()) ); _menu->insertItem( i18n("Select"), _selectMenu); @@ -214,32 +214,32 @@ xQGanttBarViewPort::initMenu() pix = _iconloader->loadIcon("viewmag.png", TDEIcon::Toolbar , 16 ); if(pix.isNull()) printf("viewmag.png not found !\n"); - _zoomMenu->insertItem(i18n("Zoom Mode"), this, TQT_SLOT(setZoom()) ); + _zoomMenu->insertItem(i18n("Zoom Mode"), this, TQ_SLOT(setZoom()) ); _zoomMenu->insertSeparator(); - _zoomMenu->insertItem(pix, i18n("Zoom All"), this, TQT_SLOT(zoomAll()) ); + _zoomMenu->insertItem(pix, i18n("Zoom All"), this, TQ_SLOT(zoomAll()) ); _zoomMenu->insertSeparator(); pix = _iconloader->loadIcon("viewmag+.png", TDEIcon::Toolbar , 16 ); if(pix.isNull()) printf("viewmag+.png not found !\n"); - _zoomMenu->insertItem(pix, i18n("Zoom In +"), this, TQT_SLOT(zoomIn()) ); + _zoomMenu->insertItem(pix, i18n("Zoom In +"), this, TQ_SLOT(zoomIn()) ); pix = _iconloader->loadIcon("viewmag-.png", TDEIcon::Toolbar , 16 ); if(pix.isNull()) printf("viewmag-.png not found !\n"); - _zoomMenu->insertItem(pix, i18n("Zoom Out -"), this, TQT_SLOT(zoomOut()) ); + _zoomMenu->insertItem(pix, i18n("Zoom Out -"), this, TQ_SLOT(zoomOut()) ); _menu->insertItem( "Zoom", _zoomMenu); pix = _iconloader->loadIcon("move.png", TDEIcon::Toolbar , 16 ); if(pix.isNull()) printf("move.png not found !\n"); - _menu->insertItem(pix, i18n("Move Mode"), this, TQT_SLOT(setMove()) ); + _menu->insertItem(pix, i18n("Move Mode"), this, TQ_SLOT(setMove()) ); _menu->insertSeparator(); pix = _iconloader->loadIcon("configure.png", TDEIcon::Toolbar , 16 ); if(pix.isNull()) printf("configure.png not found !\n"); - _menu->insertItem(pix, i18n("Configure Gantt..."), _parent, TQT_SLOT(showConfig())); + _menu->insertItem(pix, i18n("Configure Gantt..."), _parent, TQ_SLOT(showConfig())); } @@ -1017,8 +1017,8 @@ xQGanttBarViewPort::deleteSelectedItems() #ifdef _DEBUG_ printf(" : %s \n", subitem->getText().latin1() ); #endif - connect(subitem, TQT_SIGNAL(destroyed(KGanttItem*)), - this, TQT_SLOT(itemDestroyed(KGanttItem*))); + connect(subitem, TQ_SIGNAL(destroyed(KGanttItem*)), + this, TQ_SLOT(itemDestroyed(KGanttItem*))); } list.remove(_toplevelitem); diff --git a/kgantt/kgantt/xQGanttListViewPort.cpp b/kgantt/kgantt/xQGanttListViewPort.cpp index d643fe8c..e12534ef 100644 --- a/kgantt/kgantt/xQGanttListViewPort.cpp +++ b/kgantt/kgantt/xQGanttListViewPort.cpp @@ -50,16 +50,16 @@ xQGanttListViewPort::setBarViewPort(xQGanttBarViewPort* v) printf("setBarViewPort()\n"); - connect(_barviewport, TQT_SIGNAL(resized()), - this, TQT_SLOT(barViewResized())); + connect(_barviewport, TQ_SIGNAL(resized()), + this, TQ_SLOT(barViewResized())); - connect(_barviewport, TQT_SIGNAL(recalculated()), - this, TQT_SLOT(update())); + connect(_barviewport, TQ_SIGNAL(recalculated()), + this, TQ_SLOT(update())); /* - connect(_barviewport, TQT_SIGNAL(contentsRepainted()), - this, TQT_SLOT(barViewRepainted())); + connect(_barviewport, TQ_SIGNAL(contentsRepainted()), + this, TQ_SLOT(barViewRepainted())); */ } diff --git a/kmail/Mainpage.dox b/kmail/Mainpage.dox index cd21bf04..1a4879f3 100644 --- a/kmail/Mainpage.dox +++ b/kmail/Mainpage.dox @@ -282,8 +282,8 @@ factories. For example, to retrieve the full message from a folder you do : FolderJob *job = folderParent->createJob( aMsg, tGetMessage ); -connect( job, SIGNAL(messageRetrieved(KMMessage*)), - SLOT(msgWasRetrieved(KMMessage*)) ); +connect( job, TQ_SIGNAL(messageRetrieved(KMMessage*)), + TQ_SLOT(msgWasRetrieved(KMMessage*)) ); job->start(); @@ -856,7 +856,7 @@ public: : TQObject( 0, "DelayedHelloWorldBodyPartMemento" ), KMail::BodyPartMemento() { - QTimer::singleShot( 10*1000, this, SLOT(slotTimeout()) ); + QTimer::singleShot( 10*1000, this, TQ_SLOT(slotTimeout()) ); } private Q_SLOTS: diff --git a/kmail/accountcombobox.cpp b/kmail/accountcombobox.cpp index 97f95b11..3f200f66 100644 --- a/kmail/accountcombobox.cpp +++ b/kmail/accountcombobox.cpp @@ -37,10 +37,10 @@ using namespace KMail; AccountComboBox::AccountComboBox( TQWidget* parent, const char* name ) : TQComboBox( parent, name ) { - connect( kmkernel->acctMgr(), TQT_SIGNAL( accountAdded( KMAccount* ) ), - this, TQT_SLOT( slotRefreshAccounts() ) ); - connect( kmkernel->acctMgr(), TQT_SIGNAL( accountRemoved( KMAccount* ) ), - this, TQT_SLOT( slotRefreshAccounts() ) ); + connect( kmkernel->acctMgr(), TQ_SIGNAL( accountAdded( KMAccount* ) ), + this, TQ_SLOT( slotRefreshAccounts() ) ); + connect( kmkernel->acctMgr(), TQ_SIGNAL( accountRemoved( KMAccount* ) ), + this, TQ_SLOT( slotRefreshAccounts() ) ); slotRefreshAccounts(); } diff --git a/kmail/accountdialog.cpp b/kmail/accountdialog.cpp index 417ec4d1..c8ac7e29 100644 --- a/kmail/accountdialog.cpp +++ b/kmail/accountdialog.cpp @@ -353,7 +353,7 @@ void AccountDialog::makeLocalAccountPage() TQPushButton *choose = new TQPushButton( i18n("Choo&se..."), page ); choose->setAutoDefault( false ); - connect( choose, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotLocationChooser()) ); + connect( choose, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotLocationChooser()) ); topLayout->addWidget( choose, 3, 2 ); TQButtonGroup *group = new TQButtonGroup(i18n("Locking Method"), page ); @@ -373,8 +373,8 @@ void AccountDialog::makeLocalAccountPage() mLocal.procmailLockFileName->insertStringList(procmailrcParser.getLockFilesList()); mLocal.procmailLockFileName->setEnabled(false); - TQObject::connect(mLocal.lockProcmail, TQT_SIGNAL(toggled(bool)), - mLocal.procmailLockFileName, TQT_SLOT(setEnabled(bool))); + TQObject::connect(mLocal.lockProcmail, TQ_SIGNAL(toggled(bool)), + mLocal.procmailLockFileName, TQ_SLOT(setEnabled(bool))); mLocal.lockMutt = new TQRadioButton( i18n("&Mutt dotlock"), group); @@ -404,19 +404,19 @@ void AccountDialog::makeLocalAccountPage() TQWhatsThis::add( mLocal.resourceClearButton, i18n( "Delete all allocations for the resource represented by this account." ) ); mLocal.resourceClearButton->setEnabled( false ); - connect( mLocal.resourceCheck, TQT_SIGNAL( toggled(bool) ), - mLocal.resourceClearButton, TQT_SLOT( setEnabled(bool) ) ); - connect( mLocal.resourceClearButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotClearResourceAllocations() ) ); + connect( mLocal.resourceCheck, TQ_SIGNAL( toggled(bool) ), + mLocal.resourceClearButton, TQ_SLOT( setEnabled(bool) ) ); + connect( mLocal.resourceClearButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotClearResourceAllocations() ) ); mLocal.resourceClearPastButton = new TQPushButton( i18n( "Clear Past" ), resourceHB ); mLocal.resourceClearPastButton->setEnabled( false ); - connect( mLocal.resourceCheck, TQT_SIGNAL( toggled(bool) ), - mLocal.resourceClearPastButton, TQT_SLOT( setEnabled(bool) ) ); + connect( mLocal.resourceCheck, TQ_SIGNAL( toggled(bool) ), + mLocal.resourceClearPastButton, TQ_SLOT( setEnabled(bool) ) ); TQWhatsThis::add( mLocal.resourceClearPastButton, i18n( "Delete all outdated allocations for the resource represented by this account." ) ); - connect( mLocal.resourceClearPastButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotClearPastResourceAllocations() ) ); + connect( mLocal.resourceClearPastButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotClearPastResourceAllocations() ) ); topLayout->addMultiCellWidget( resourceHB, 5, 5, 0, 2 ); #endif @@ -428,8 +428,8 @@ void AccountDialog::makeLocalAccountPage() mLocal.intervalCheck = new TQCheckBox( i18n("Enable &interval mail checking"), page ); topLayout->addMultiCellWidget( mLocal.intervalCheck, 6, 6, 0, 2 ); - connect( mLocal.intervalCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotEnableLocalInterval(bool)) ); + connect( mLocal.intervalCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotEnableLocalInterval(bool)) ); mLocal.intervalLabel = new TQLabel( i18n("Check inter&val:"), page ); topLayout->addWidget( mLocal.intervalLabel, 7, 0 ); mLocal.intervalSpin = new KIntNumInput( page ); @@ -457,7 +457,7 @@ void AccountDialog::makeLocalAccountPage() mLocal.identityLabel->setBuddy( mLocal.identityCombo ); topLayout->addWidget( mLocal.identityCombo, 10, 1 ); - connect(kapp,TQT_SIGNAL(tdedisplayFontChanged()),TQT_SLOT(slotFontChanged())); + connect(kapp,TQ_SIGNAL(tdedisplayFontChanged()),TQ_SLOT(slotFontChanged())); } void AccountDialog::makeMaildirAccountPage() @@ -492,7 +492,7 @@ void AccountDialog::makeMaildirAccountPage() TQPushButton *choose = new TQPushButton( i18n("Choo&se..."), page ); choose->setAutoDefault( false ); - connect( choose, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMaildirChooser()) ); + connect( choose, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotMaildirChooser()) ); topLayout->addWidget( choose, 3, 2 ); #if 0 @@ -503,21 +503,21 @@ void AccountDialog::makeMaildirAccountPage() mMaildir.resourceClearButton = new TQPushButton( i18n( "Clear" ), resourceHB ); mMaildir.resourceClearButton->setEnabled( false ); - connect( mMaildir.resourceCheck, TQT_SIGNAL( toggled(bool) ), - mMaildir.resourceClearButton, TQT_SLOT( setEnabled(bool) ) ); + connect( mMaildir.resourceCheck, TQ_SIGNAL( toggled(bool) ), + mMaildir.resourceClearButton, TQ_SLOT( setEnabled(bool) ) ); TQWhatsThis::add( mMaildir.resourceClearButton, i18n( "Delete all allocations for the resource represented by this account." ) ); - connect( mMaildir.resourceClearButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotClearResourceAllocations() ) ); + connect( mMaildir.resourceClearButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotClearResourceAllocations() ) ); mMaildir.resourceClearPastButton = new TQPushButton( i18n( "Clear Past" ), resourceHB ); mMaildir.resourceClearPastButton->setEnabled( false ); - connect( mMaildir.resourceCheck, TQT_SIGNAL( toggled(bool) ), - mMaildir.resourceClearPastButton, TQT_SLOT( setEnabled(bool) ) ); + connect( mMaildir.resourceCheck, TQ_SIGNAL( toggled(bool) ), + mMaildir.resourceClearPastButton, TQ_SLOT( setEnabled(bool) ) ); TQWhatsThis::add( mMaildir.resourceClearPastButton, i18n( "Delete all outdated allocations for the resource represented by this account." ) ); - connect( mMaildir.resourceClearPastButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotClearPastResourceAllocations() ) ); + connect( mMaildir.resourceClearPastButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotClearPastResourceAllocations() ) ); topLayout->addMultiCellWidget( resourceHB, 4, 4, 0, 2 ); #endif @@ -528,8 +528,8 @@ void AccountDialog::makeMaildirAccountPage() mMaildir.intervalCheck = new TQCheckBox( i18n("Enable &interval mail checking"), page ); topLayout->addMultiCellWidget( mMaildir.intervalCheck, 5, 5, 0, 2 ); - connect( mMaildir.intervalCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotEnableMaildirInterval(bool)) ); + connect( mMaildir.intervalCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotEnableMaildirInterval(bool)) ); mMaildir.intervalLabel = new TQLabel( i18n("Check inter&val:"), page ); topLayout->addWidget( mMaildir.intervalLabel, 6, 0 ); mMaildir.intervalSpin = new KIntNumInput( page ); @@ -557,7 +557,7 @@ void AccountDialog::makeMaildirAccountPage() mMaildir.identityLabel->setBuddy( mMaildir.identityCombo ); topLayout->addWidget( mMaildir.identityCombo, 9, 1 ); - connect(kapp,TQT_SIGNAL(tdedisplayFontChanged()),TQT_SLOT(slotFontChanged())); + connect(kapp,TQ_SIGNAL(tdedisplayFontChanged()),TQ_SLOT(slotFontChanged())); } @@ -638,19 +638,19 @@ void AccountDialog::makePopAccountPage() mPop.leaveOnServerCheck = new TQCheckBox( i18n("Lea&ve fetched messages on the server"), page1 ); - connect( mPop.leaveOnServerCheck, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotLeaveOnServerClicked() ) ); + connect( mPop.leaveOnServerCheck, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotLeaveOnServerClicked() ) ); grid->addMultiCellWidget( mPop.leaveOnServerCheck, 6, 6, 0, 1 ); TQHBox *afterDaysBox = new TQHBox( page1 ); afterDaysBox->setSpacing( KDialog::spacingHint() ); mPop.leaveOnServerDaysCheck = new TQCheckBox( i18n("Leave messages on the server for"), afterDaysBox ); - connect( mPop.leaveOnServerDaysCheck, TQT_SIGNAL( toggled(bool) ), - this, TQT_SLOT( slotEnableLeaveOnServerDays(bool)) ); + connect( mPop.leaveOnServerDaysCheck, TQ_SIGNAL( toggled(bool) ), + this, TQ_SLOT( slotEnableLeaveOnServerDays(bool)) ); mPop.leaveOnServerDaysSpin = new KIntNumInput( afterDaysBox ); mPop.leaveOnServerDaysSpin->setRange( 1, 365, 1, false ); - connect( mPop.leaveOnServerDaysSpin, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotLeaveOnServerDaysChanged(int))); + connect( mPop.leaveOnServerDaysSpin, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotLeaveOnServerDaysChanged(int))); mPop.leaveOnServerDaysSpin->setValue( 1 ); afterDaysBox->setStretchFactor( mPop.leaveOnServerDaysSpin, 1 ); grid->addMultiCellWidget( afterDaysBox, 7, 7, 0, 1 ); @@ -658,20 +658,20 @@ void AccountDialog::makePopAccountPage() leaveOnServerCountBox->setSpacing( KDialog::spacingHint() ); mPop.leaveOnServerCountCheck = new TQCheckBox( i18n("Keep only the last"), leaveOnServerCountBox ); - connect( mPop.leaveOnServerCountCheck, TQT_SIGNAL( toggled(bool) ), - this, TQT_SLOT( slotEnableLeaveOnServerCount(bool)) ); + connect( mPop.leaveOnServerCountCheck, TQ_SIGNAL( toggled(bool) ), + this, TQ_SLOT( slotEnableLeaveOnServerCount(bool)) ); mPop.leaveOnServerCountSpin = new KIntNumInput( leaveOnServerCountBox ); mPop.leaveOnServerCountSpin->setRange( 1, 999999, 1, false ); - connect( mPop.leaveOnServerCountSpin, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotLeaveOnServerCountChanged(int))); + connect( mPop.leaveOnServerCountSpin, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotLeaveOnServerCountChanged(int))); mPop.leaveOnServerCountSpin->setValue( 100 ); grid->addMultiCellWidget( leaveOnServerCountBox, 8, 8, 0, 1 ); TQHBox *leaveOnServerSizeBox = new TQHBox( page1 ); leaveOnServerSizeBox->setSpacing( KDialog::spacingHint() ); mPop.leaveOnServerSizeCheck = new TQCheckBox( i18n("Keep only the last"), leaveOnServerSizeBox ); - connect( mPop.leaveOnServerSizeCheck, TQT_SIGNAL( toggled(bool) ), - this, TQT_SLOT( slotEnableLeaveOnServerSize(bool)) ); + connect( mPop.leaveOnServerSizeCheck, TQ_SIGNAL( toggled(bool) ), + this, TQ_SLOT( slotEnableLeaveOnServerSize(bool)) ); mPop.leaveOnServerSizeSpin = new KIntNumInput( leaveOnServerSizeBox ); mPop.leaveOnServerSizeSpin->setRange( 1, 999999, 1, false ); mPop.leaveOnServerSizeSpin->setSuffix( i18n(" MB") ); @@ -685,21 +685,21 @@ void AccountDialog::makePopAccountPage() mPop.resourceClearButton = new TQPushButton( i18n( "Clear" ), resourceHB ); mPop.resourceClearButton->setEnabled( false ); - connect( mPop.resourceCheck, TQT_SIGNAL( toggled(bool) ), - mPop.resourceClearButton, TQT_SLOT( setEnabled(bool) ) ); + connect( mPop.resourceCheck, TQ_SIGNAL( toggled(bool) ), + mPop.resourceClearButton, TQ_SLOT( setEnabled(bool) ) ); TQWhatsThis::add( mPop.resourceClearButton, i18n( "Delete all allocations for the resource represented by this account." ) ); - connect( mPop.resourceClearButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotClearResourceAllocations() ) ); + connect( mPop.resourceClearButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotClearResourceAllocations() ) ); mPop.resourceClearPastButton = new TQPushButton( i18n( "Clear Past" ), resourceHB ); mPop.resourceClearPastButton->setEnabled( false ); - connect( mPop.resourceCheck, TQT_SIGNAL( toggled(bool) ), - mPop.resourceClearPastButton, TQT_SLOT( setEnabled(bool) ) ); + connect( mPop.resourceCheck, TQ_SIGNAL( toggled(bool) ), + mPop.resourceClearPastButton, TQ_SLOT( setEnabled(bool) ) ); TQWhatsThis::add( mPop.resourceClearPastButton, i18n( "Delete all outdated allocations for the resource represented by this account." ) ); - connect( mPop.resourceClearPastButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotClearPastResourceAllocations() ) ); + connect( mPop.resourceClearPastButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotClearPastResourceAllocations() ) ); grid->addMultiCellWidget( resourceHB, 10, 10, 0, 2 ); #endif @@ -715,14 +715,14 @@ void AccountDialog::makePopAccountPage() mPop.filterOnServerSizeSpin->setEnabled( false ); hbox->setStretchFactor( mPop.filterOnServerSizeSpin, 1 ); mPop.filterOnServerSizeSpin->setRange( 1, 10000000, 100, false ); - connect(mPop.filterOnServerSizeSpin, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotFilterOnServerSizeChanged(int))); + connect(mPop.filterOnServerSizeSpin, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotFilterOnServerSizeChanged(int))); mPop.filterOnServerSizeSpin->setValue( 50000 ); grid->addMultiCellWidget( hbox, 11, 11, 0, 1 ); - connect( mPop.filterOnServerCheck, TQT_SIGNAL(toggled(bool)), - mPop.filterOnServerSizeSpin, TQT_SLOT(setEnabled(bool)) ); - connect( mPop.filterOnServerCheck, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotFilterOnServerClicked() ) ); + connect( mPop.filterOnServerCheck, TQ_SIGNAL(toggled(bool)), + mPop.filterOnServerSizeSpin, TQ_SLOT(setEnabled(bool)) ); + connect( mPop.filterOnServerCheck, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotFilterOnServerClicked() ) ); TQString msg = i18n("If you select this option, POP Filters will be used to " "decide what to do with messages. You can then select " "to download, delete or keep them on the server." ); @@ -732,8 +732,8 @@ void AccountDialog::makePopAccountPage() mPop.intervalCheck = new TQCheckBox( i18n("Enable &interval mail checking"), page1 ); grid->addMultiCellWidget( mPop.intervalCheck, 12, 12, 0, 1 ); - connect( mPop.intervalCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotEnablePopInterval(bool)) ); + connect( mPop.intervalCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotEnablePopInterval(bool)) ); mPop.intervalLabel = new TQLabel( i18n("Chec&k interval:"), page1 ); grid->addWidget( mPop.intervalLabel, 13, 0 ); mPop.intervalSpin = new KIntNumInput( page1 ); @@ -770,8 +770,8 @@ void AccountDialog::makePopAccountPage() TQHBoxLayout *buttonLay = new TQHBoxLayout( vlay ); mPop.checkCapabilities = new TQPushButton( i18n("Check &What the Server Supports"), page2 ); - connect(mPop.checkCapabilities, TQT_SIGNAL(clicked()), - TQT_SLOT(slotCheckPopCapabilities())); + connect(mPop.checkCapabilities, TQ_SIGNAL(clicked()), + TQ_SLOT(slotCheckPopCapabilities())); buttonLay->addStretch(); buttonLay->addWidget( mPop.checkCapabilities ); buttonLay->addStretch(); @@ -788,8 +788,8 @@ void AccountDialog::makePopAccountPage() mPop.encryptionTLS = new TQRadioButton( i18n("Use &TLS for secure mail download"), mPop.encryptionGroup ); - connect(mPop.encryptionGroup, TQT_SIGNAL(clicked(int)), - TQT_SLOT(slotPopEncryptionChanged(int))); + connect(mPop.encryptionGroup, TQ_SIGNAL(clicked(int)), + TQ_SLOT(slotPopEncryptionChanged(int))); vlay->addWidget( mPop.encryptionGroup ); mPop.authGroup = new TQButtonGroup( 1, TQt::Horizontal, @@ -817,13 +817,13 @@ void AccountDialog::makePopAccountPage() mPop.usePipeliningCheck = new TQCheckBox( i18n("&Use pipelining for faster mail download"), page2 ); - connect(mPop.usePipeliningCheck, TQT_SIGNAL(clicked()), - TQT_SLOT(slotPipeliningClicked())); + connect(mPop.usePipeliningCheck, TQ_SIGNAL(clicked()), + TQ_SLOT(slotPipeliningClicked())); vlay->addWidget( mPop.usePipeliningCheck ); vlay->addStretch(); - connect(kapp,TQT_SIGNAL(tdedisplayFontChanged()),TQT_SLOT(slotFontChanged())); + connect(kapp,TQ_SIGNAL(tdedisplayFontChanged()),TQ_SLOT(slotFontChanged())); } @@ -909,7 +909,7 @@ void AccountDialog::makeImapAccountPage( bool connected ) button->setFixedSize( 22, 22 ); button->setIconSet( TDEGlobal::iconLoader()->loadIconSet( "reload", TDEIcon::Small, 0 ) ); - connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotReloadNamespaces()) ); + connect( button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotReloadNamespaces()) ); TQWhatsThis::add( button, i18n("Reload the namespaces from the server. This overwrites any changes.") ); grid->addWidget( box, row, 0 ); @@ -926,7 +926,7 @@ void AccountDialog::makeImapAccountPage( bool connected ) mImap.editPNS->setAutoRaise( true ); mImap.editPNS->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); mImap.editPNS->setFixedSize( 22, 22 ); - connect( mImap.editPNS, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditPersonalNamespace()) ); + connect( mImap.editPNS, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEditPersonalNamespace()) ); label = new TQLabel( i18n("Other Users"), listbox ); TQWhatsThis::add( label, i18n( "These namespaces include the folders of other users." ) ); @@ -938,7 +938,7 @@ void AccountDialog::makeImapAccountPage( bool connected ) mImap.editONS->setAutoRaise( true ); mImap.editONS->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); mImap.editONS->setFixedSize( 22, 22 ); - connect( mImap.editONS, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditOtherUsersNamespace()) ); + connect( mImap.editONS, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEditOtherUsersNamespace()) ); label = new TQLabel( i18n("Shared"), listbox ); TQWhatsThis::add( label, i18n( "These namespaces include the shared folders." ) ); @@ -950,7 +950,7 @@ void AccountDialog::makeImapAccountPage( bool connected ) mImap.editSNS->setAutoRaise( true ); mImap.editSNS->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); mImap.editSNS->setFixedSize( 22, 22 ); - connect( mImap.editSNS, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditSharedNamespace()) ); + connect( mImap.editSNS, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEditSharedNamespace()) ); label->setBuddy( listbox ); grid->addWidget( listbox, row, 1 ); @@ -1021,21 +1021,21 @@ void AccountDialog::makeImapAccountPage( bool connected ) mImap.resourceClearButton = new TQPushButton( i18n( "Clear" ), resourceHB ); mImap.resourceClearButton->setEnabled( false ); - connect( mImap.resourceCheck, TQT_SIGNAL( toggled(bool) ), - mImap.resourceClearButton, TQT_SLOT( setEnabled(bool) ) ); + connect( mImap.resourceCheck, TQ_SIGNAL( toggled(bool) ), + mImap.resourceClearButton, TQ_SLOT( setEnabled(bool) ) ); TQWhatsThis::add( mImap.resourceClearButton, i18n( "Delete all allocations for the resource represented by this account." ) ); - connect( mImap.resourceClearButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotClearResourceAllocations() ) ); + connect( mImap.resourceClearButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotClearResourceAllocations() ) ); mImap.resourceClearPastButton = new TQPushButton( i18n( "Clear Past" ), resourceHB ); mImap.resourceClearPastButton->setEnabled( false ); - connect( mImap.resourceCheck, TQT_SIGNAL( toggled(bool) ), - mImap.resourceClearPastButton, TQT_SLOT( setEnabled(bool) ) ); + connect( mImap.resourceCheck, TQ_SIGNAL( toggled(bool) ), + mImap.resourceClearPastButton, TQ_SLOT( setEnabled(bool) ) ); TQWhatsThis::add( mImap.resourceClearPastButton, i18n( "Delete all outdated allocations for the resource represented by this account." ) ); - connect( mImap.resourceClearPastButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotClearPastResourceAllocations() ) ); + connect( mImap.resourceClearPastButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotClearPastResourceAllocations() ) ); grid->addMultiCellWidget( resourceHB, row, row, 0, 2 ); #endif @@ -1048,8 +1048,8 @@ void AccountDialog::makeImapAccountPage( bool connected ) mImap.intervalCheck = new TQCheckBox( i18n("Enable &interval mail checking"), page1 ); grid->addMultiCellWidget( mImap.intervalCheck, row, row, 0, 2 ); - connect( mImap.intervalCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotEnableImapInterval(bool)) ); + connect( mImap.intervalCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotEnableImapInterval(bool)) ); ++row; mImap.intervalLabel = new TQLabel( i18n("Check inter&val:"), page1 ); grid->addWidget( mImap.intervalLabel, row, 0 ); @@ -1085,8 +1085,8 @@ void AccountDialog::makeImapAccountPage( bool connected ) TQHBoxLayout *buttonLay = new TQHBoxLayout( vlay ); mImap.checkCapabilities = new TQPushButton( i18n("Check &What the Server Supports"), page2 ); - connect(mImap.checkCapabilities, TQT_SIGNAL(clicked()), - TQT_SLOT(slotCheckImapCapabilities())); + connect(mImap.checkCapabilities, TQ_SIGNAL(clicked()), + TQ_SLOT(slotCheckImapCapabilities())); buttonLay->addStretch(); buttonLay->addWidget( mImap.checkCapabilities ); buttonLay->addStretch(); @@ -1103,8 +1103,8 @@ void AccountDialog::makeImapAccountPage( bool connected ) mImap.encryptionTLS = new TQRadioButton( i18n("Use &TLS for secure mail download"), mImap.encryptionGroup ); - connect(mImap.encryptionGroup, TQT_SIGNAL(clicked(int)), - TQT_SLOT(slotImapEncryptionChanged(int))); + connect(mImap.encryptionGroup, TQ_SIGNAL(clicked(int)), + TQ_SLOT(slotImapEncryptionChanged(int))); vlay->addWidget( mImap.encryptionGroup ); mImap.authGroup = new TQButtonGroup( 1, TQt::Horizontal, @@ -1130,7 +1130,7 @@ void AccountDialog::makeImapAccountPage( bool connected ) mSieveConfigEditor->layout()->setMargin( KDialog::marginHint() ); tabWidget->addTab( mSieveConfigEditor, i18n("&Filtering") ); - connect(kapp,TQT_SIGNAL(tdedisplayFontChanged()),TQT_SLOT(slotFontChanged())); + connect(kapp,TQ_SIGNAL(tdedisplayFontChanged()),TQ_SLOT(slotFontChanged())); } @@ -1542,9 +1542,9 @@ void AccountDialog::slotCheckPopCapabilities() delete mServerTest; mServerTest = new KMServerTest(POP_PROTOCOL, mPop.hostEdit->text(), mPop.portEdit->text().toInt()); - connect( mServerTest, TQT_SIGNAL( capabilities( const TQStringList &, + connect( mServerTest, TQ_SIGNAL( capabilities( const TQStringList &, const TQStringList & ) ), - this, TQT_SLOT( slotPopCapabilities( const TQStringList &, + this, TQ_SLOT( slotPopCapabilities( const TQStringList &, const TQStringList & ) ) ); mPop.checkCapabilities->setEnabled(false); } @@ -1561,9 +1561,9 @@ void AccountDialog::slotCheckImapCapabilities() delete mServerTest; mServerTest = new KMServerTest(IMAP_PROTOCOL, mImap.hostEdit->text(), mImap.portEdit->text().toInt()); - connect( mServerTest, TQT_SIGNAL( capabilities( const TQStringList &, + connect( mServerTest, TQ_SIGNAL( capabilities( const TQStringList &, const TQStringList & ) ), - this, TQT_SLOT( slotImapCapabilities( const TQStringList &, + this, TQ_SLOT( slotImapCapabilities( const TQStringList &, const TQStringList & ) ) ); mImap.checkCapabilities->setEnabled(false); } @@ -2120,10 +2120,10 @@ void AccountDialog::slotReloadNamespaces() mImap.otherUsersNS->setText( TQString() ); mImap.sharedNS->setText( TQString() ); ImapAccountBase* ai = static_cast<ImapAccountBase*>( mAccount ); - connect( ai, TQT_SIGNAL( namespacesFetched( const ImapAccountBase::nsDelimMap& ) ), - this, TQT_SLOT( slotSetupNamespaces( const ImapAccountBase::nsDelimMap& ) ) ); - connect( ai, TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) ); + connect( ai, TQ_SIGNAL( namespacesFetched( const ImapAccountBase::nsDelimMap& ) ), + this, TQ_SLOT( slotSetupNamespaces( const ImapAccountBase::nsDelimMap& ) ) ); + connect( ai, TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( slotConnectionResult(int, const TQString&) ) ); ai->getNamespaces(); } } @@ -2132,17 +2132,17 @@ void AccountDialog::slotConnectionResult( int errorCode, const TQString& ) { if ( errorCode > 0 ) { ImapAccountBase* ai = static_cast<ImapAccountBase*>( mAccount ); - disconnect( ai, TQT_SIGNAL( namespacesFetched( const ImapAccountBase::nsDelimMap& ) ), - this, TQT_SLOT( slotSetupNamespaces( const ImapAccountBase::nsDelimMap& ) ) ); - disconnect( ai, TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) ); + disconnect( ai, TQ_SIGNAL( namespacesFetched( const ImapAccountBase::nsDelimMap& ) ), + this, TQ_SLOT( slotSetupNamespaces( const ImapAccountBase::nsDelimMap& ) ) ); + disconnect( ai, TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( slotConnectionResult(int, const TQString&) ) ); mImap.personalNS->setText( TQString() ); } } void AccountDialog::slotSetupNamespaces( const ImapAccountBase::nsDelimMap& map ) { - disconnect( this, TQT_SLOT( slotSetupNamespaces( const ImapAccountBase::nsDelimMap& ) ) ); + disconnect( this, TQ_SLOT( slotSetupNamespaces( const ImapAccountBase::nsDelimMap& ) ) ); mImap.personalNS->setText( TQString() ); mImap.otherUsersNS->setText( TQString() ); mImap.sharedNS->setText( TQString() ); @@ -2297,7 +2297,7 @@ NamespaceEditDialog::NamespaceEditDialog( TQWidget *parent, TQGrid* grid = new TQGrid( 2, page ); mBg = new TQButtonGroup( 0 ); - connect( mBg, TQT_SIGNAL( clicked(int) ), this, TQT_SLOT( slotRemoveEntry(int) ) ); + connect( mBg, TQ_SIGNAL( clicked(int) ), this, TQ_SLOT( slotRemoveEntry(int) ) ); mDelimMap = mNamespaceMap->find( mType ).data(); ImapAccountBase::namespaceDelim::Iterator it; for ( it = mDelimMap.begin(); it != mDelimMap.end(); ++it ) { diff --git a/kmail/accountmanager.cpp b/kmail/accountmanager.cpp index 6b9f38fe..4f05eb16 100644 --- a/kmail/accountmanager.cpp +++ b/kmail/accountmanager.cpp @@ -149,8 +149,8 @@ void AccountManager::processNextCheck( bool _newMail ) kdDebug(5006) << "account " << acct->name() << " finished check" << endl; mAcctChecking.remove( acct ); kmkernel->filterMgr()->deref(); - disconnect( acct, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), - this, TQT_SLOT( processNextCheck( bool ) ) ); + disconnect( acct, TQ_SIGNAL( finishedCheck( bool, CheckStatus ) ), + this, TQ_SLOT( processNextCheck( bool ) ) ); } if ( mAcctChecking.isEmpty() ) { // all checks finished, display summary @@ -219,8 +219,8 @@ void AccountManager::processNextCheck( bool _newMail ) } } - connect( curAccount, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), - this, TQT_SLOT( processNextCheck( bool ) ) ); + connect( curAccount, TQ_SIGNAL( finishedCheck( bool, CheckStatus ) ), + this, TQ_SLOT( processNextCheck( bool ) ) ); KPIM::BroadcastStatus::instance()->setStatusMsg( i18n("Checking account %1 for new mail").arg(curAccount->name())); @@ -258,8 +258,8 @@ KMAccount* AccountManager::create( const TQString &aType, const TQString &aName, kdWarning(5006) << "Attempt to instantiate a non-existing account type!" << endl; return 0; } - connect( act, TQT_SIGNAL( newMailsProcessed( const TQMap<TQString, int> & ) ), - this, TQT_SLOT( addToTotalNewMailCount( const TQMap<TQString, int> & ) ) ); + connect( act, TQ_SIGNAL( newMailsProcessed( const TQMap<TQString, int> & ) ), + this, TQ_SLOT( addToTotalNewMailCount( const TQMap<TQString, int> & ) ) ); return act; } diff --git a/kmail/accountwizard.cpp b/kmail/accountwizard.cpp index 92e6a232..b050275c 100644 --- a/kmail/accountwizard.cpp +++ b/kmail/accountwizard.cpp @@ -282,8 +282,8 @@ void AccountWizard::setupServerInformationPage() mIncomingLocation = new KLineEdit( mIncomingLocationWdg ); mChooseLocation = new TQPushButton( i18n( "Choose..." ), mIncomingLocationWdg ); - connect( mChooseLocation, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( chooseLocation() ) ); + connect( mChooseLocation, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( chooseLocation() ) ); layout->addWidget( mIncomingLabel, 0, 0, AlignTop ); layout->addWidget( mIncomingLocationWdg, 0, 1 ); @@ -303,8 +303,8 @@ void AccountWizard::setupServerInformationPage() mServerInformationPage ); layout->addWidget( mLocalDelivery, 3, 0 ); - connect( mLocalDelivery, TQT_SIGNAL( toggled( bool ) ), - mOutgoingServer, TQT_SLOT( setDisabled( bool ) ) ); + connect( mLocalDelivery, TQ_SIGNAL( toggled( bool ) ), + mOutgoingServer, TQ_SLOT( setDisabled( bool ) ) ); addPage( mServerInformationPage, i18n( "Server Information" ) ); } @@ -361,7 +361,7 @@ void AccountWizard::accept() manager->commit(); - TQTimer::singleShot( 0, this, TQT_SLOT( createTransport() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( createTransport() ) ); } void AccountWizard::createTransport() @@ -386,7 +386,7 @@ void AccountWizard::createTransport() mTransportInfo->auth = false; mTransportInfo->setStorePasswd( false ); - TQTimer::singleShot( 0, this, TQT_SLOT( transportCreated() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( transportCreated() ) ); } else { // delivery via SMTP mTransportInfo->type = "smtp"; mTransportInfo->name = accountName(); @@ -425,7 +425,7 @@ void AccountWizard::transportCreated() mTransportInfoList.setAutoDelete( true ); mTransportInfoList.clear(); - TQTimer::singleShot( 0, this, TQT_SLOT( createAccount() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( createAccount() ) ); } void AccountWizard::createAccount() @@ -485,7 +485,7 @@ void AccountWizard::createAccount() else if ( mTypeBox->type() == AccountTypeBox::IMAP || mTypeBox->type() == AccountTypeBox::dIMAP ) checkImapCapabilities( mIncomingServer->text(), port ); else - TQTimer::singleShot( 0, this, TQT_SLOT( accountCreated() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( accountCreated() ) ); } void AccountWizard::accountCreated() @@ -513,8 +513,8 @@ void AccountWizard::checkPopCapabilities( const TQString &server, int port ) delete mServerTest; mServerTest = new KMServerTest( POP_PROTOCOL, server, port ); - connect( mServerTest, TQT_SIGNAL( capabilities( const TQStringList&, const TQStringList& ) ), - this, TQT_SLOT( popCapabilities( const TQStringList&, const TQStringList& ) ) ); + connect( mServerTest, TQ_SIGNAL( capabilities( const TQStringList&, const TQStringList& ) ), + this, TQ_SLOT( popCapabilities( const TQStringList&, const TQStringList& ) ) ); mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).arg( server ) ); } @@ -524,8 +524,8 @@ void AccountWizard::checkImapCapabilities( const TQString &server, int port ) delete mServerTest; mServerTest = new KMServerTest( IMAP_PROTOCOL, server, port ); - connect( mServerTest, TQT_SIGNAL( capabilities( const TQStringList&, const TQStringList& ) ), - this, TQT_SLOT( imapCapabilities( const TQStringList&, const TQStringList& ) ) ); + connect( mServerTest, TQ_SIGNAL( capabilities( const TQStringList&, const TQStringList& ) ), + this, TQ_SLOT( imapCapabilities( const TQStringList&, const TQStringList& ) ) ); mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).arg( server ) ); } @@ -535,9 +535,9 @@ void AccountWizard::checkSmtpCapabilities( const TQString &server, int port ) delete mServerTest; mServerTest = new KMServerTest( SMTP_PROTOCOL, server, port ); - connect( mServerTest, TQT_SIGNAL( capabilities( const TQStringList&, const TQStringList&, + connect( mServerTest, TQ_SIGNAL( capabilities( const TQStringList&, const TQStringList&, const TQString&, const TQString&, const TQString& ) ), - this, TQT_SLOT( smtpCapabilities( const TQStringList&, const TQStringList&, + this, TQ_SLOT( smtpCapabilities( const TQStringList&, const TQStringList&, const TQString&, const TQString&, const TQString& ) ) ); mAuthInfoLabel = createInfoLabel( i18n( "Check for supported security capabilities of %1..." ).arg( server ) ); diff --git a/kmail/acljobs.cpp b/kmail/acljobs.cpp index 4b5f54f6..036ed51d 100644 --- a/kmail/acljobs.cpp +++ b/kmail/acljobs.cpp @@ -170,8 +170,8 @@ ACLJobs::GetACLJob::GetACLJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo ) : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo ) { - connect( this, TQT_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)), - TQT_SLOT(slotInfoMessage(TDEIO::Job*,const TQString&)) ); + connect( this, TQ_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)), + TQ_SLOT(slotInfoMessage(TDEIO::Job*,const TQString&)) ); } void ACLJobs::GetACLJob::slotInfoMessage( TDEIO::Job*, const TQString& str ) @@ -191,8 +191,8 @@ ACLJobs::GetUserRightsJob::GetUserRightsJob( const KURL& url, const TQByteArray bool showProgressInfo ) : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo ) { - connect( this, TQT_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)), - TQT_SLOT(slotInfoMessage(TDEIO::Job*,const TQString&)) ); + connect( this, TQ_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)), + TQ_SLOT(slotInfoMessage(TDEIO::Job*,const TQString&)) ); } void ACLJobs::GetUserRightsJob::slotInfoMessage( TDEIO::Job*, const TQString& str ) @@ -216,7 +216,7 @@ ACLJobs::MultiSetACLJob::MultiSetACLJob( TDEIO::Slave* slave, const KURL& url, c mSlave( slave ), mUrl( url ), mACLList( acl ), mACLListIterator( mACLList.begin() ) { - TQTimer::singleShot(0, this, TQT_SLOT(slotStart())); + TQTimer::singleShot(0, this, TQ_SLOT(slotStart())); } void ACLJobs::MultiSetACLJob::slotStart() diff --git a/kmail/actionscheduler.cpp b/kmail/actionscheduler.cpp index 738d6285..ec892d00 100644 --- a/kmail/actionscheduler.cpp +++ b/kmail/actionscheduler.cpp @@ -82,19 +82,19 @@ ActionScheduler::ActionScheduler(KMFilterMgr::FilterSet set, lastCommand = 0; lastJob = 0; finishTimer = new TQTimer( this, "finishTimer" ); - connect( finishTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(finish())); + connect( finishTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(finish())); fetchMessageTimer = new TQTimer( this, "fetchMessageTimer" ); - connect( fetchMessageTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(fetchMessage())); + connect( fetchMessageTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(fetchMessage())); tempCloseFoldersTimer = new TQTimer( this, "tempCloseFoldersTimer" ); - connect( tempCloseFoldersTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(tempCloseFolders())); + connect( tempCloseFoldersTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(tempCloseFolders())); processMessageTimer = new TQTimer( this, "processMessageTimer" ); - connect( processMessageTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(processMessage())); + connect( processMessageTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(processMessage())); filterMessageTimer = new TQTimer( this, "filterMessageTimer" ); - connect( filterMessageTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(filterMessage())); + connect( filterMessageTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(filterMessage())); timeOutTimer = new TQTimer( this, "timeOutTimer" ); - connect( timeOutTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeOut())); + connect( timeOutTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeOut())); fetchTimeOutTimer = new TQTimer( this, "fetchTimeOutTimer" ); - connect( fetchTimeOutTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(fetchTimeOut())); + connect( fetchTimeOutTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(fetchTimeOut())); TQValueList<KMFilter*>::Iterator it = filters.begin(); for (; it != filters.end(); ++it) @@ -122,10 +122,10 @@ ActionScheduler::~ActionScheduler() { schedulerList->remove( this ); tempCloseFolders(); - disconnect( mSrcFolder, TQT_SIGNAL(closed()), - this, TQT_SLOT(folderClosedOrExpunged()) ); - disconnect( mSrcFolder, TQT_SIGNAL(expunged(KMFolder*)), - this, TQT_SLOT(folderClosedOrExpunged()) ); + disconnect( mSrcFolder, TQ_SIGNAL(closed()), + this, TQ_SLOT(folderClosedOrExpunged()) ); + disconnect( mSrcFolder, TQ_SIGNAL(expunged(KMFolder*)), + this, TQ_SLOT(folderClosedOrExpunged()) ); mSrcFolder->close("actionschedsrc"); if (mDeleteSrcFolder) @@ -157,12 +157,12 @@ void ActionScheduler::setSourceFolder( KMFolder *srcFolder ) { srcFolder->open("actionschedsrc"); if (mSrcFolder) { - disconnect( mSrcFolder, TQT_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)), - this, TQT_SLOT(msgAdded(KMFolder*, TQ_UINT32)) ); - disconnect( mSrcFolder, TQT_SIGNAL(closed()), - this, TQT_SLOT(folderClosedOrExpunged()) ); - disconnect( mSrcFolder, TQT_SIGNAL(expunged(KMFolder*)), - this, TQT_SLOT(folderClosedOrExpunged()) ); + disconnect( mSrcFolder, TQ_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)), + this, TQ_SLOT(msgAdded(KMFolder*, TQ_UINT32)) ); + disconnect( mSrcFolder, TQ_SIGNAL(closed()), + this, TQ_SLOT(folderClosedOrExpunged()) ); + disconnect( mSrcFolder, TQ_SIGNAL(expunged(KMFolder*)), + this, TQ_SLOT(folderClosedOrExpunged()) ); mSrcFolder->close("actionschedsrc"); } mSrcFolder = srcFolder; @@ -170,12 +170,12 @@ void ActionScheduler::setSourceFolder( KMFolder *srcFolder ) for (i = 0; i < mSrcFolder->count(); ++i) enqueue( mSrcFolder->getMsgBase( i )->getMsgSerNum() ); if (mSrcFolder) { - connect( mSrcFolder, TQT_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)), - this, TQT_SLOT(msgAdded(KMFolder*, TQ_UINT32)) ); - connect( mSrcFolder, TQT_SIGNAL(closed()), - this, TQT_SLOT(folderClosedOrExpunged()) ); - connect( mSrcFolder, TQT_SIGNAL(expunged(KMFolder*)), - this, TQT_SLOT(folderClosedOrExpunged()) ); + connect( mSrcFolder, TQ_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)), + this, TQ_SLOT(msgAdded(KMFolder*, TQ_UINT32)) ); + connect( mSrcFolder, TQ_SIGNAL(closed()), + this, TQ_SLOT(folderClosedOrExpunged()) ); + connect( mSrcFolder, TQ_SIGNAL(expunged(KMFolder*)), + this, TQ_SLOT(folderClosedOrExpunged()) ); } } @@ -422,8 +422,8 @@ void ActionScheduler::fetchMessage() fetchTimeOutTime = TQTime::currentTime(); fetchTimeOutTimer->start( 60 * 1000, true ); FolderJob *job = msg->parent()->createJob( msg ); - connect( job, TQT_SIGNAL(messageRetrieved( KMMessage* )), - TQT_SLOT(messageFetched( KMMessage* )) ); + connect( job, TQ_SIGNAL(messageRetrieved( KMMessage* )), + TQ_SLOT(messageFetched( KMMessage* )) ); lastJob = job; job->start(); } else { @@ -563,8 +563,8 @@ void ActionScheduler::processMessage() } if (msg) { FolderJob *job = msg->parent()->createJob( msg ); - connect( job, TQT_SIGNAL(messageRetrieved( KMMessage* )), - TQT_SLOT(messageRetrieved( KMMessage* )) ); + connect( job, TQ_SIGNAL(messageRetrieved( KMMessage* )), + TQ_SLOT(messageRetrieved( KMMessage* )) ); job->start(); } else { mExecuting = false; @@ -689,8 +689,8 @@ void ActionScheduler::moveMessage() timeOutTime = TQTime::currentTime(); KMCommand *cmd = new KMMoveCommand( folder, msg ); - connect( cmd, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( moveMessageFinished( KMCommand * ) ) ); + connect( cmd, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( moveMessageFinished( KMCommand * ) ) ); cmd->start(); // sometimes the move command doesn't complete so time out after a minute // and move onto the next message @@ -727,16 +727,16 @@ void ActionScheduler::moveMessageFinished( KMCommand *command ) if (mResult == ResultOk) { mExecutingLock = false; if (cmd) - connect( cmd, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( processMessage() ) ); + connect( cmd, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( processMessage() ) ); else processMessageTimer->start( 0, true ); } else { // Note: An alternative to consider is just calling // finishTimer->start and returning if (cmd) - connect( cmd, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( finish() ) ); + connect( cmd, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( finish() ) ); else finishTimer->start( 0, true ); } @@ -758,8 +758,8 @@ void ActionScheduler::timeOut() // Note: This is a good place for a debug statement assert( lastCommand ); // sometimes imap jobs seem to just stall so give up and move on - disconnect( lastCommand, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( moveMessageFinished( KMCommand * ) ) ); + disconnect( lastCommand, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( moveMessageFinished( KMCommand * ) ) ); lastCommand = 0; mExecutingLock = false; mExecuting = false; @@ -773,8 +773,8 @@ void ActionScheduler::fetchTimeOut() // Note: This is a good place for a debug statement assert( lastJob ); // sometimes imap jobs seem to just stall so give up and move on - disconnect( lastJob, TQT_SIGNAL(messageRetrieved( KMMessage* )), - this, TQT_SLOT(messageFetched( KMMessage* )) ); + disconnect( lastJob, TQ_SIGNAL(messageRetrieved( KMMessage* )), + this, TQ_SLOT(messageFetched( KMMessage* )) ); lastJob->kill(); lastJob = 0; fetchMessageTimer->start( 0, true ); diff --git a/kmail/annotationjobs.cpp b/kmail/annotationjobs.cpp index c2fd8267..37f16d64 100644 --- a/kmail/annotationjobs.cpp +++ b/kmail/annotationjobs.cpp @@ -66,8 +66,8 @@ AnnotationJobs::GetAnnotationJob::GetAnnotationJob( const KURL& url, const TQStr : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo ), mEntry( entry ) { - connect( this, TQT_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)), - TQT_SLOT(slotInfoMessage(TDEIO::Job*,const TQString&)) ); + connect( this, TQ_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)), + TQ_SLOT(slotInfoMessage(TDEIO::Job*,const TQString&)) ); } void AnnotationJobs::GetAnnotationJob::slotInfoMessage( TDEIO::Job*, const TQString& str ) @@ -88,7 +88,7 @@ AnnotationJobs::MultiGetAnnotationJob::MultiGetAnnotationJob( mSlave( slave ), mUrl( url ), mEntryList( entries ), mEntryListIterator( mEntryList.begin() ) { - TQTimer::singleShot(0, this, TQT_SLOT(slotStart())); + TQTimer::singleShot(0, this, TQ_SLOT(slotStart())); } @@ -143,7 +143,7 @@ AnnotationJobs::MultiSetAnnotationJob::MultiSetAnnotationJob( mSlave( slave ), mUrl( url ), mAnnotationList( annotations ), mAnnotationListIterator( mAnnotationList.begin() ) { - TQTimer::singleShot(0, this, TQT_SLOT(slotStart())); + TQTimer::singleShot(0, this, TQ_SLOT(slotStart())); } @@ -196,7 +196,7 @@ AnnotationJobs::MultiUrlGetAnnotationJob::MultiUrlGetAnnotationJob( TDEIO::Slave mPathListIterator( mPathList.begin() ), mAnnotation( annotation ) { - TQTimer::singleShot(0, this, TQT_SLOT(slotStart())); + TQTimer::singleShot(0, this, TQ_SLOT(slotStart())); } diff --git a/kmail/antispamwizard.cpp b/kmail/antispamwizard.cpp index 5552b058..e512e701 100644 --- a/kmail/antispamwizard.cpp +++ b/kmail/antispamwizard.cpp @@ -104,24 +104,24 @@ AntiSpamWizard::AntiSpamWizard( WizardMode mode, ( mMode == AntiSpam ) ? i18n( "Welcome to the KMail Anti-Spam Wizard" ) : i18n( "Welcome to the KMail Anti-Virus Wizard" ) ); - connect( mInfoPage, TQT_SIGNAL( selectionChanged( void ) ), - this, TQT_SLOT( checkProgramsSelections( void ) ) ); + connect( mInfoPage, TQ_SIGNAL( selectionChanged( void ) ), + this, TQ_SLOT( checkProgramsSelections( void ) ) ); if ( mMode == AntiSpam ) { mSpamRulesPage = new ASWizSpamRulesPage( 0, "", mainFolderTree ); addPage( mSpamRulesPage, i18n( "Options to fine-tune the handling of spam messages" )); - connect( mSpamRulesPage, TQT_SIGNAL( selectionChanged( void ) ), - this, TQT_SLOT( slotBuildSummary( void ) ) ); + connect( mSpamRulesPage, TQ_SIGNAL( selectionChanged( void ) ), + this, TQ_SLOT( slotBuildSummary( void ) ) ); } else { mVirusRulesPage = new ASWizVirusRulesPage( 0, "", mainFolderTree ); addPage( mVirusRulesPage, i18n( "Options to fine-tune the handling of virus messages" )); - connect( mVirusRulesPage, TQT_SIGNAL( selectionChanged( void ) ), - this, TQT_SLOT( checkVirusRulesSelections( void ) ) ); + connect( mVirusRulesPage, TQ_SIGNAL( selectionChanged( void ) ), + this, TQ_SLOT( checkVirusRulesSelections( void ) ) ); } - connect( this, TQT_SIGNAL( helpClicked( void) ), - this, TQT_SLOT( slotHelpClicked( void ) ) ); + connect( this, TQ_SIGNAL( helpClicked( void) ), + this, TQ_SLOT( slotHelpClicked( void ) ) ); setNextEnabled( mInfoPage, false ); @@ -132,7 +132,7 @@ AntiSpamWizard::AntiSpamWizard( WizardMode mode, setFinishEnabled( mSummaryPage, true ); } - TQTimer::singleShot( 0, this, TQT_SLOT( checkToolAvailability( void ) ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( checkToolAvailability( void ) ) ); } @@ -891,8 +891,8 @@ ASWizInfoPage::ASWizInfoPage( AntiSpamWizard::WizardMode mode, mToolsList->setRowMode( TQListBox::FixedNumber ); mToolsList->setRowMode( 10 ); layout->addWidget( mToolsList ); - connect( mToolsList, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(processSelectionChange(void)) ); + connect( mToolsList, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(processSelectionChange(void)) ); mSelectionHint = new TQLabel( this ); mSelectionHint->setText( "" ); @@ -983,16 +983,16 @@ ASWizSpamRulesPage::ASWizSpamRulesPage( TQWidget * parent, const char * name, layout->addStretch(); - connect( mMarkRules, TQT_SIGNAL(clicked()), - this, TQT_SLOT(processSelectionChange(void)) ); - connect( mMoveSpamRules, TQT_SIGNAL(clicked()), - this, TQT_SLOT(processSelectionChange(void)) ); - connect( mMoveUnsureRules, TQT_SIGNAL(clicked()), - this, TQT_SLOT(processSelectionChange(void)) ); - connect( mFolderReqForSpamFolder, TQT_SIGNAL(folderChanged(KMFolder*)), - this, TQT_SLOT(processSelectionChange(KMFolder*)) ); - connect( mFolderReqForUnsureFolder, TQT_SIGNAL(folderChanged(KMFolder*)), - this, TQT_SLOT(processSelectionChange(KMFolder*)) ); + connect( mMarkRules, TQ_SIGNAL(clicked()), + this, TQ_SLOT(processSelectionChange(void)) ); + connect( mMoveSpamRules, TQ_SIGNAL(clicked()), + this, TQ_SLOT(processSelectionChange(void)) ); + connect( mMoveUnsureRules, TQ_SIGNAL(clicked()), + this, TQ_SLOT(processSelectionChange(void)) ); + connect( mFolderReqForSpamFolder, TQ_SIGNAL(folderChanged(KMFolder*)), + this, TQ_SLOT(processSelectionChange(KMFolder*)) ); + connect( mFolderReqForUnsureFolder, TQ_SIGNAL(folderChanged(KMFolder*)), + this, TQ_SLOT(processSelectionChange(KMFolder*)) ); mMarkRules->setChecked( true ); mMoveSpamRules->setChecked( true ); @@ -1093,14 +1093,14 @@ ASWizVirusRulesPage::ASWizVirusRulesPage( TQWidget * parent, const char * name, mFolderTree = new SimpleFolderTree( this, mainFolderTree, s, true ); grid->addWidget( mFolderTree, 3, 0 ); - connect( mPipeRules, TQT_SIGNAL(clicked()), - this, TQT_SLOT(processSelectionChange(void)) ); - connect( mMoveRules, TQT_SIGNAL(clicked()), - this, TQT_SLOT(processSelectionChange(void)) ); - connect( mMarkRules, TQT_SIGNAL(clicked()), - this, TQT_SLOT(processSelectionChange(void)) ); - connect( mMoveRules, TQT_SIGNAL( toggled( bool ) ), - mMarkRules, TQT_SLOT( setEnabled( bool ) ) ); + connect( mPipeRules, TQ_SIGNAL(clicked()), + this, TQ_SLOT(processSelectionChange(void)) ); + connect( mMoveRules, TQ_SIGNAL(clicked()), + this, TQ_SLOT(processSelectionChange(void)) ); + connect( mMarkRules, TQ_SIGNAL(clicked()), + this, TQ_SLOT(processSelectionChange(void)) ); + connect( mMoveRules, TQ_SIGNAL( toggled( bool ) ), + mMarkRules, TQ_SLOT( setEnabled( bool ) ) ); } bool ASWizVirusRulesPage::pipeRulesSelected() const diff --git a/kmail/archivefolderdialog.cpp b/kmail/archivefolderdialog.cpp index 58db524c..4a62497c 100644 --- a/kmail/archivefolderdialog.cpp +++ b/kmail/archivefolderdialog.cpp @@ -71,8 +71,8 @@ ArchiveFolderDialog::ArchiveFolderDialog( TQWidget *parent ) mainLayout->addWidget( folderLabel, row, 0 ); mFolderRequester = new FolderRequester( mainWidget, kmkernel->getKMMainWidget()->folderTree() ); mFolderRequester->setMustBeReadWrite( false ); - connect( mFolderRequester, TQT_SIGNAL(folderChanged(KMFolder *)), - TQT_SLOT(slotFolderChanged(KMFolder *)) ); + connect( mFolderRequester, TQ_SIGNAL(folderChanged(KMFolder *)), + TQ_SLOT(slotFolderChanged(KMFolder *)) ); folderLabel->setBuddy( mFolderRequester ); mainLayout->addWidget( mFolderRequester, row, 1 ); row++; @@ -88,8 +88,8 @@ ArchiveFolderDialog::ArchiveFolderDialog( TQWidget *parent ) mFormatComboBox->insertItem( i18n( "BZ2-Compressed Tar Archive (.tar.bz2)" ) ); mFormatComboBox->insertItem( i18n( "GZ-Compressed Tar Archive (.tar.gz)" ) ); mFormatComboBox->setCurrentItem( 2 ); - connect( mFormatComboBox, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotFixFileExtension()) ); + connect( mFormatComboBox, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotFixFileExtension()) ); mainLayout->addWidget( mFormatComboBox, row, 1 ); row++; @@ -100,10 +100,10 @@ ArchiveFolderDialog::ArchiveFolderDialog( TQWidget *parent ) mUrlRequester->setFilter( "*.tar *.zip *.tar.gz *.tar.bz2" ); mUrlRequester->fileDialog()->setKeepLocation( true ); fileNameLabel->setBuddy( mUrlRequester ); - connect( mUrlRequester->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)), - TQT_SLOT(slotUrlChanged(const TQString &)) ); - connect( mUrlRequester, TQT_SIGNAL(urlSelected(const TQString&)), - this, TQT_SLOT(slotFixFileExtension()) ); + connect( mUrlRequester->lineEdit(), TQ_SIGNAL(textChanged(const TQString &)), + TQ_SLOT(slotUrlChanged(const TQString &)) ); + connect( mUrlRequester, TQ_SIGNAL(urlSelected(const TQString&)), + this, TQ_SLOT(slotFixFileExtension()) ); mainLayout->addWidget( mUrlRequester, row, 1 ); row++; diff --git a/kmail/backupjob.cpp b/kmail/backupjob.cpp index bf78e68c..b67834c4 100644 --- a/kmail/backupjob.cpp +++ b/kmail/backupjob.cpp @@ -234,15 +234,15 @@ void BackupJob::archiveNextMessage() // Use a singleshot timer, or otherwise we risk ending up in a very big recursion // for folders that have many messages mCurrentMessage = message; - TQTimer::singleShot( 0, this, TQT_SLOT( processCurrentMessage() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( processCurrentMessage() ) ); } else if ( message->parent() ) { mCurrentJob = message->parent()->createJob( message ); mCurrentJob->setCancellable( false ); - connect( mCurrentJob, TQT_SIGNAL( messageRetrieved( KMMessage* ) ), - this, TQT_SLOT( messageRetrieved( KMMessage* ) ) ); - connect( mCurrentJob, TQT_SIGNAL( result( KMail::FolderJob* ) ), - this, TQT_SLOT( folderJobFinished( KMail::FolderJob* ) ) ); + connect( mCurrentJob, TQ_SIGNAL( messageRetrieved( KMMessage* ) ), + this, TQ_SLOT( messageRetrieved( KMMessage* ) ) ); + connect( mCurrentJob, TQ_SIGNAL( result( KMail::FolderJob* ) ), + this, TQ_SLOT( folderJobFinished( KMail::FolderJob* ) ) ); mCurrentJob->start(); } else { @@ -490,8 +490,8 @@ void BackupJob::start() TQString(), true ); mProgressItem->setUsesBusyIndicator( true ); - connect( mProgressItem, TQT_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), - this, TQT_SLOT(cancelJob()) ); + connect( mProgressItem, TQ_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), + this, TQ_SLOT(cancelJob()) ); archiveNextFolder(); } diff --git a/kmail/cachedimapjob.cpp b/kmail/cachedimapjob.cpp index bba5b1b6..89dd1116 100644 --- a/kmail/cachedimapjob.cpp +++ b/kmail/cachedimapjob.cpp @@ -200,11 +200,11 @@ void CachedImapJob::listMessages() ImapAccountBase::jobData jd( url.url(), mFolder->folder() ); jd.cancellable = true; mAccount->insertJob( job, jd ); - connect( job, TQT_SIGNAL( result(TDEIO::Job *) ), - this, TQT_SLOT( slotListMessagesResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result(TDEIO::Job *) ), + this, TQ_SLOT( slotListMessagesResult( TDEIO::Job* ) ) ); // send the data directly for KMFolderCachedImap - connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), - mFolder, TQT_SLOT( slotGetMessagesData( TDEIO::Job* , const TQByteArray& ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + mFolder, TQ_SLOT( slotGetMessagesData( TDEIO::Job* , const TQByteArray& ) ) ); } void CachedImapJob::slotDeleteNextMessages( TDEIO::Job* job ) @@ -240,8 +240,8 @@ void CachedImapJob::slotDeleteNextMessages( TDEIO::Job* job ) TDEIO::Scheduler::assignJobToSlave( mAccount->slave(), simpleJob ); ImapAccountBase::jobData jd( url.url(), mFolder->folder() ); mAccount->insertJob( simpleJob, jd ); - connect( simpleJob, TQT_SIGNAL( result(TDEIO::Job *) ), - this, TQT_SLOT( slotDeleteNextMessages(TDEIO::Job *) ) ); + connect( simpleJob, TQ_SIGNAL( result(TDEIO::Job *) ), + this, TQ_SLOT( slotDeleteNextMessages(TDEIO::Job *) ) ); } void CachedImapJob::expungeFolder() @@ -254,8 +254,8 @@ void CachedImapJob::expungeFolder() TDEIO::Scheduler::assignJobToSlave( mAccount->slave(), job ); ImapAccountBase::jobData jd( url.url(), mFolder->folder() ); mAccount->insertJob( job, jd ); - connect( job, TQT_SIGNAL( result(TDEIO::Job *) ), - this, TQT_SLOT( slotExpungeResult(TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result(TDEIO::Job *) ), + this, TQ_SLOT( slotExpungeResult(TDEIO::Job *) ) ); } void CachedImapJob::slotExpungeResult( TDEIO::Job * job ) @@ -349,12 +349,12 @@ void CachedImapJob::slotGetNextMessage(TDEIO::Job * job) TDEIO::SimpleJob *simpleJob = TDEIO::get(url, false, false); TDEIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob); mAccount->insertJob(simpleJob, jd); - connect(simpleJob, TQT_SIGNAL(processedSize(TDEIO::Job *, TDEIO::filesize_t)), - this, TQT_SLOT(slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t))); - connect(simpleJob, TQT_SIGNAL(result(TDEIO::Job *)), - this, TQT_SLOT(slotGetNextMessage(TDEIO::Job *))); - connect(simpleJob, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - mFolder, TQT_SLOT(slotSimpleData(TDEIO::Job *, const TQByteArray &))); + connect(simpleJob, TQ_SIGNAL(processedSize(TDEIO::Job *, TDEIO::filesize_t)), + this, TQ_SLOT(slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t))); + connect(simpleJob, TQ_SIGNAL(result(TDEIO::Job *)), + this, TQ_SLOT(slotGetNextMessage(TDEIO::Job *))); + connect(simpleJob, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + mFolder, TQ_SLOT(slotSimpleData(TDEIO::Job *, const TQByteArray &))); } void CachedImapJob::slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t processed) @@ -420,14 +420,14 @@ void CachedImapJob::slotPutNextMessage() TDEIO::SimpleJob *simpleJob = TDEIO::put(url, 0, false, false, false); TDEIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob); mAccount->insertJob(simpleJob, jd); - connect( simpleJob, TQT_SIGNAL( result(TDEIO::Job *) ), - TQT_SLOT( slotPutMessageResult(TDEIO::Job *) ) ); - connect( simpleJob, TQT_SIGNAL( dataReq(TDEIO::Job *, TQByteArray &) ), - TQT_SLOT( slotPutMessageDataReq(TDEIO::Job *, TQByteArray &) ) ); - connect( simpleJob, TQT_SIGNAL( data(TDEIO::Job *, const TQByteArray &) ), - mFolder, TQT_SLOT( slotSimpleData(TDEIO::Job *, const TQByteArray &) ) ); - connect( simpleJob, TQT_SIGNAL(infoMessage(TDEIO::Job *, const TQString &)), - TQT_SLOT(slotPutMessageInfoData(TDEIO::Job *, const TQString &)) ); + connect( simpleJob, TQ_SIGNAL( result(TDEIO::Job *) ), + TQ_SLOT( slotPutMessageResult(TDEIO::Job *) ) ); + connect( simpleJob, TQ_SIGNAL( dataReq(TDEIO::Job *, TQByteArray &) ), + TQ_SLOT( slotPutMessageDataReq(TDEIO::Job *, TQByteArray &) ) ); + connect( simpleJob, TQ_SIGNAL( data(TDEIO::Job *, const TQByteArray &) ), + mFolder, TQ_SLOT( slotSimpleData(TDEIO::Job *, const TQByteArray &) ) ); + connect( simpleJob, TQ_SIGNAL(infoMessage(TDEIO::Job *, const TQString &)), + TQ_SLOT(slotPutMessageInfoData(TDEIO::Job *, const TQString &)) ); } @@ -590,8 +590,8 @@ void CachedImapJob::slotAddNextSubfolder( TDEIO::Job * job ) TDEIO::SimpleJob *simpleJob = TDEIO::mkdir(url); TDEIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob); mAccount->insertJob(simpleJob, jd); - connect( simpleJob, TQT_SIGNAL(result(TDEIO::Job *)), - this, TQT_SLOT(slotAddNextSubfolder(TDEIO::Job *)) ); + connect( simpleJob, TQ_SIGNAL(result(TDEIO::Job *)), + this, TQ_SLOT(slotAddNextSubfolder(TDEIO::Job *)) ); } else { TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); @@ -608,8 +608,8 @@ void CachedImapJob::slotAddNextSubfolder( TDEIO::Job * job ) TDEIO::SimpleJob *simpleJob = TDEIO::special( url.url(), packedArgs, false ); TDEIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob); mAccount->insertJob(simpleJob, jd); - connect( simpleJob, TQT_SIGNAL(result(TDEIO::Job *)), - this, TQT_SLOT(slotAddNextSubfolder(TDEIO::Job *)) ); + connect( simpleJob, TQ_SIGNAL(result(TDEIO::Job *)), + this, TQ_SLOT(slotAddNextSubfolder(TDEIO::Job *)) ); } } @@ -648,8 +648,8 @@ void CachedImapJob::slotDeleteNextFolder( TDEIO::Job *job ) TDEIO::SimpleJob *simpleJob = TDEIO::file_delete(url, false); TDEIO::Scheduler::assignJobToSlave(mAccount->slave(), simpleJob); mAccount->insertJob(simpleJob, jd); - connect( simpleJob, TQT_SIGNAL( result(TDEIO::Job *) ), - TQT_SLOT( slotDeleteNextFolder(TDEIO::Job *) ) ); + connect( simpleJob, TQ_SIGNAL( result(TDEIO::Job *) ), + TQ_SLOT( slotDeleteNextFolder(TDEIO::Job *) ) ); } void CachedImapJob::checkUidValidity() @@ -663,10 +663,10 @@ void CachedImapJob::checkUidValidity() TDEIO::SimpleJob *job = TDEIO::get( url, false, false ); TDEIO::Scheduler::assignJobToSlave( mAccount->slave(), job ); mAccount->insertJob( job, jd ); - connect( job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotCheckUidValidityResult(TDEIO::Job *)) ); - connect( job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - mFolder, TQT_SLOT(slotSimpleData(TDEIO::Job *, const TQByteArray &))); + connect( job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotCheckUidValidityResult(TDEIO::Job *)) ); + connect( job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + mFolder, TQ_SLOT(slotSimpleData(TDEIO::Job *, const TQByteArray &))); } void CachedImapJob::slotCheckUidValidityResult(TDEIO::Job * job) @@ -752,8 +752,8 @@ void CachedImapJob::renameFolder( const TQString &newName ) TDEIO::SimpleJob *simpleJob = TDEIO::rename( urlSrc, urlDst, false ); TDEIO::Scheduler::assignJobToSlave( mAccount->slave(), simpleJob ); mAccount->insertJob( simpleJob, jd ); - connect( simpleJob, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotRenameFolderResult(TDEIO::Job *)) ); + connect( simpleJob, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotRenameFolderResult(TDEIO::Job *)) ); } static void renameChildFolders( KMFolderDir* dir, const TQString& oldPath, @@ -826,14 +826,14 @@ void CachedImapJob::slotSubscribtionChange2Failed( const TQString &errorMessage void CachedImapJob::slotSubscribtionChange1Done( const TQString&, bool ) { - disconnect( mAccount, TQT_SIGNAL( subscriptionChanged( const TQString&, bool ) ), - this, TQT_SLOT( slotSubscribtionChange1Done( const TQString&, bool ) ) ); - connect( mAccount, TQT_SIGNAL( subscriptionChanged( const TQString&, bool ) ), - this, TQT_SLOT( slotSubscribtionChange2Done( const TQString&, bool ) ) ); - disconnect( mAccount, TQT_SIGNAL( subscriptionChangeFailed( const TQString& ) ), - this, TQT_SLOT( slotSubscribtionChange1Failed( const TQString& ) ) ); - connect( mAccount, TQT_SIGNAL( subscriptionChangeFailed( const TQString& ) ), - this, TQT_SLOT( slotSubscribtionChange2Failed( const TQString& ) ) ); + disconnect( mAccount, TQ_SIGNAL( subscriptionChanged( const TQString&, bool ) ), + this, TQ_SLOT( slotSubscribtionChange1Done( const TQString&, bool ) ) ); + connect( mAccount, TQ_SIGNAL( subscriptionChanged( const TQString&, bool ) ), + this, TQ_SLOT( slotSubscribtionChange2Done( const TQString&, bool ) ) ); + disconnect( mAccount, TQ_SIGNAL( subscriptionChangeFailed( const TQString& ) ), + this, TQ_SLOT( slotSubscribtionChange1Failed( const TQString& ) ) ); + connect( mAccount, TQ_SIGNAL( subscriptionChangeFailed( const TQString& ) ), + this, TQ_SLOT( slotSubscribtionChange2Failed( const TQString& ) ) ); mAccount->changeSubscription( false, mOldImapPath, true /* quiet */ ); } @@ -865,10 +865,10 @@ void CachedImapJob::slotRenameFolderResult( TDEIO::Job *job ) // Okay, the folder seems to be renamed on the server and on disk. // Now unsubscribe from the old folder name and subscribe to the new folder name, // so that the folder doesn't suddenly disappear after renaming it - connect( mAccount, TQT_SIGNAL( subscriptionChangeFailed( const TQString& ) ), - this, TQT_SLOT( slotSubscribtionChange1Failed( const TQString& ) ) ); - connect( mAccount, TQT_SIGNAL( subscriptionChanged( const TQString&, bool ) ), - this, TQT_SLOT( slotSubscribtionChange1Done( const TQString&, bool ) ) ); + connect( mAccount, TQ_SIGNAL( subscriptionChangeFailed( const TQString& ) ), + this, TQ_SLOT( slotSubscribtionChange1Failed( const TQString& ) ) ); + connect( mAccount, TQ_SIGNAL( subscriptionChanged( const TQString&, bool ) ), + this, TQ_SLOT( slotSubscribtionChange1Done( const TQString&, bool ) ) ); mAccount->changeSubscription( true, mNewImapPath, true /* quiet */ ); } } diff --git a/kmail/chiasmuskeyselector.cpp b/kmail/chiasmuskeyselector.cpp index 9e25743e..c4e546ff 100644 --- a/kmail/chiasmuskeyselector.cpp +++ b/kmail/chiasmuskeyselector.cpp @@ -35,8 +35,8 @@ ChiasmusKeySelector::ChiasmusKeySelector( TQWidget* parent, const TQString& capt layout->addStretch(); - connect( mListBox, TQT_SIGNAL( doubleClicked( TQListBoxItem * ) ), this, TQT_SLOT( slotOk() ) ); - connect( mListBox, TQT_SIGNAL( returnPressed( TQListBoxItem * ) ), this, TQT_SLOT( slotOk() ) ); + connect( mListBox, TQ_SIGNAL( doubleClicked( TQListBoxItem * ) ), this, TQ_SLOT( slotOk() ) ); + connect( mListBox, TQ_SIGNAL( returnPressed( TQListBoxItem * ) ), this, TQ_SLOT( slotOk() ) ); mListBox->setFocus(); } diff --git a/kmail/colorlistbox.cpp b/kmail/colorlistbox.cpp index c7481924..a8610dcd 100644 --- a/kmail/colorlistbox.cpp +++ b/kmail/colorlistbox.cpp @@ -32,7 +32,7 @@ ColorListBox::ColorListBox( TQWidget *parent, const char *name, WFlags f ) :TDEListBox( parent, name, f ), mCurrentOnDragEnter(-1) { - connect( this, TQT_SIGNAL(selected(int)), this, TQT_SLOT(newColor(int)) ); + connect( this, TQ_SIGNAL(selected(int)), this, TQ_SLOT(newColor(int)) ); setAcceptDrops( true); } diff --git a/kmail/compactionjob.cpp b/kmail/compactionjob.cpp index a2ace485..90d0e9f4 100644 --- a/kmail/compactionjob.cpp +++ b/kmail/compactionjob.cpp @@ -131,7 +131,7 @@ int MboxCompactionJob::executeNow( bool silent ) mCurrentIndex = 0; kdDebug(5006) << "MboxCompactionJob: starting to compact folder " << mSrcFolder->location() << " into " << mTempName << endl; - connect( &mTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotDoWork() ) ); + connect( &mTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotDoWork() ) ); if ( !mImmediate ) mTimer.start( COMPACTIONJOB_TIMERINTERVAL ); slotDoWork(); @@ -229,7 +229,7 @@ int MaildirCompactionJob::executeNow( bool silent ) mCurrentIndex = 0; kdDebug(5006) << "MaildirCompactionJob: starting to compact in folder " << mSrcFolder->location() << endl; - connect( &mTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotDoWork() ) ); + connect( &mTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotDoWork() ) ); if ( !mImmediate ) mTimer.start( COMPACTIONJOB_TIMERINTERVAL ); slotDoWork(); diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp index 68c1faf5..c0beb0fd 100644 --- a/kmail/configuredialog.cpp +++ b/kmail/configuredialog.cpp @@ -270,8 +270,8 @@ void ConfigureDialog::slotUser2() { return; } mProfileDialog = new ProfileDialog( this, "mProfileDialog" ); - connect( mProfileDialog, TQT_SIGNAL(profileSelected(TDEConfig*)), - this, TQT_SIGNAL(installProfile(TDEConfig*)) ); + connect( mProfileDialog, TQ_SIGNAL(profileSelected(TDEConfig*)), + this, TQ_SIGNAL(installProfile(TDEConfig*)) ); mProfileDialog->show(); } @@ -291,14 +291,14 @@ IdentityPage::IdentityPage( TQWidget * parent, const char * name ) TQHBoxLayout * hlay = new TQHBoxLayout( this, 0, KDialog::spacingHint() ); mIdentityList = new IdentityListView( this ); - connect( mIdentityList, TQT_SIGNAL(selectionChanged()), - TQT_SLOT(slotIdentitySelectionChanged()) ); - connect( mIdentityList, TQT_SIGNAL(itemRenamed(TQListViewItem*,const TQString&,int)), - TQT_SLOT(slotRenameIdentity(TQListViewItem*,const TQString&,int)) ); - connect( mIdentityList, TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)), - TQT_SLOT(slotModifyIdentity()) ); - connect( mIdentityList, TQT_SIGNAL(contextMenu(TDEListView*,TQListViewItem*,const TQPoint&)), - TQT_SLOT(slotContextMenu(TDEListView*,TQListViewItem*,const TQPoint&)) ); + connect( mIdentityList, TQ_SIGNAL(selectionChanged()), + TQ_SLOT(slotIdentitySelectionChanged()) ); + connect( mIdentityList, TQ_SIGNAL(itemRenamed(TQListViewItem*,const TQString&,int)), + TQ_SLOT(slotRenameIdentity(TQListViewItem*,const TQString&,int)) ); + connect( mIdentityList, TQ_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)), + TQ_SLOT(slotModifyIdentity()) ); + connect( mIdentityList, TQ_SIGNAL(contextMenu(TDEListView*,TQListViewItem*,const TQPoint&)), + TQ_SLOT(slotContextMenu(TDEListView*,TQListViewItem*,const TQPoint&)) ); // ### connect dragged(...), ... hlay->addWidget( mIdentityList, 1 ); @@ -319,16 +319,16 @@ IdentityPage::IdentityPage( TQWidget * parent, const char * name ) mRemoveButton->setEnabled( false ); mSetAsDefaultButton->setAutoDefault( false ); mSetAsDefaultButton->setEnabled( false ); - connect( button, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotNewIdentity()) ); - connect( mModifyButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotModifyIdentity()) ); - connect( mRenameButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRenameIdentity()) ); - connect( mRemoveButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRemoveIdentity()) ); - connect( mSetAsDefaultButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSetAsDefault()) ); + connect( button, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotNewIdentity()) ); + connect( mModifyButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotModifyIdentity()) ); + connect( mRenameButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRenameIdentity()) ); + connect( mRemoveButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRemoveIdentity()) ); + connect( mSetAsDefaultButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSetAsDefault()) ); vlay->addWidget( button ); vlay->addWidget( mModifyButton ); vlay->addWidget( mRenameButton ); @@ -493,13 +493,13 @@ void IdentityPage::slotContextMenu( TDEListView *, TQListViewItem * i, IdentityListViewItem * item = dynamic_cast<IdentityListViewItem*>( i ); TQPopupMenu * menu = new TQPopupMenu( this ); - menu->insertItem( i18n("Add..."), this, TQT_SLOT(slotNewIdentity()) ); + menu->insertItem( i18n("Add..."), this, TQ_SLOT(slotNewIdentity()) ); if ( item ) { - menu->insertItem( i18n("Modify..."), this, TQT_SLOT(slotModifyIdentity()) ); + menu->insertItem( i18n("Modify..."), this, TQ_SLOT(slotModifyIdentity()) ); if ( mIdentityList->childCount() > 1 ) - menu->insertItem( i18n("Remove"), this, TQT_SLOT(slotRemoveIdentity()) ); + menu->insertItem( i18n("Remove"), this, TQ_SLOT(slotRemoveIdentity()) ); if ( !item->identity().isDefault() ) - menu->insertItem( i18n("Set as Default"), this, TQT_SLOT(slotSetAsDefault()) ); + menu->insertItem( i18n("Set as Default"), this, TQ_SLOT(slotSetAsDefault()) ); } menu->exec( pos ); delete menu; @@ -563,16 +563,16 @@ AccountsPage::AccountsPage( TQWidget * parent, const char * name ) // mReceivingTab = new ReceivingTab(); addTab( mReceivingTab, i18n( "&Receiving" ) ); - connect( mReceivingTab, TQT_SIGNAL(accountListChanged(const TQStringList &)), - this, TQT_SIGNAL(accountListChanged(const TQStringList &)) ); + connect( mReceivingTab, TQ_SIGNAL(accountListChanged(const TQStringList &)), + this, TQ_SIGNAL(accountListChanged(const TQStringList &)) ); // // "Sending" tab: // mSendingTab = new SendingTab(); addTab( mSendingTab, i18n( "&Sending" ) ); - connect( mSendingTab, TQT_SIGNAL(transportListChanged(const TQStringList&)), - this, TQT_SIGNAL(transportListChanged(const TQStringList&)) ); + connect( mSendingTab, TQ_SIGNAL(transportListChanged(const TQStringList&)), + this, TQ_SIGNAL(transportListChanged(const TQStringList&)) ); load(); } @@ -608,10 +608,10 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char * mTransportList->addColumn( i18n("Type") ); mTransportList->setAllColumnsShowFocus( true ); mTransportList->setSorting( -1 ); - connect( mTransportList, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotTransportSelected()) ); - connect( mTransportList, TQT_SIGNAL(doubleClicked( TQListViewItem *)), - this, TQT_SLOT(slotModifySelectedTransport()) ); + connect( mTransportList, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotTransportSelected()) ); + connect( mTransportList, TQ_SIGNAL(doubleClicked( TQListViewItem *)), + this, TQ_SLOT(slotModifySelectedTransport()) ); hlay->addWidget( mTransportList, 1 ); // a vbox layout for the buttons: zero stretch, spacing inherited from hlay @@ -620,31 +620,31 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char * // "add..." button: stretch 0 button = new TQPushButton( i18n("A&dd..."), this ); button->setAutoDefault( false ); - connect( button, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotAddTransport()) ); + connect( button, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotAddTransport()) ); btn_vlay->addWidget( button ); // "modify..." button: stretch 0 mModifyTransportButton = new TQPushButton( i18n("&Modify..."), this ); mModifyTransportButton->setAutoDefault( false ); mModifyTransportButton->setEnabled( false ); // b/c no item is selected yet - connect( mModifyTransportButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotModifySelectedTransport()) ); + connect( mModifyTransportButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotModifySelectedTransport()) ); btn_vlay->addWidget( mModifyTransportButton ); // "remove" button: stretch 0 mRemoveTransportButton = new TQPushButton( i18n("R&emove"), this ); mRemoveTransportButton->setAutoDefault( false ); mRemoveTransportButton->setEnabled( false ); // b/c no item is selected yet - connect( mRemoveTransportButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRemoveSelectedTransport()) ); + connect( mRemoveTransportButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRemoveSelectedTransport()) ); btn_vlay->addWidget( mRemoveTransportButton ); mSetDefaultTransportButton = new TQPushButton( i18n("Set Default"), this ); mSetDefaultTransportButton->setAutoDefault( false ); mSetDefaultTransportButton->setEnabled( false ); - connect ( mSetDefaultTransportButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSetDefaultTransport()) ); + connect ( mSetDefaultTransportButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSetDefaultTransport()) ); btn_vlay->addWidget( mSetDefaultTransportButton ); btn_vlay->addStretch( 1 ); // spacer @@ -660,8 +660,8 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char * // "confirm before send" check box: mConfirmSendCheck = new TQCheckBox( i18n("Confirm &before send"), group ); glay->addMultiCellWidget( mConfirmSendCheck, 0, 0, 0, 1 ); - connect( mConfirmSendCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mConfirmSendCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // "send on check" combo: mSendOnCheckCombo = new TQComboBox( false, group ); @@ -670,8 +670,8 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char * << i18n("On Manual Mail Checks") << i18n("On All Mail Checks") ); glay->addWidget( mSendOnCheckCombo, 1, 1 ); - connect( mSendOnCheckCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mSendOnCheckCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // "default send method" combo: mSendMethodCombo = new TQComboBox( false, group ); @@ -679,8 +679,8 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char * << i18n("Send Now") << i18n("Send Later") ); glay->addWidget( mSendMethodCombo, 2, 1 ); - connect( mSendMethodCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mSendMethodCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // "message property" combo: @@ -690,14 +690,14 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char * << i18n("Allow 8-bit") << i18n("MIME Compliant (Quoted Printable)") ); glay->addWidget( mMessagePropertyCombo, 3, 1 ); - connect( mMessagePropertyCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mMessagePropertyCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // "default domain" input field: mDefaultDomainEdit = new KLineEdit( group ); glay->addMultiCellWidget( mDefaultDomainEdit, 4, 4, 1, 2 ); - connect( mDefaultDomainEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mDefaultDomainEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // labels: TQLabel *l = new TQLabel( mSendOnCheckCombo, /*buddy*/ @@ -1082,10 +1082,10 @@ AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const cha mAccountList->addColumn( i18n("Folder") ); mAccountList->setAllColumnsShowFocus( true ); mAccountList->setSorting( -1 ); - connect( mAccountList, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotAccountSelected()) ); - connect( mAccountList, TQT_SIGNAL(doubleClicked( TQListViewItem *)), - this, TQT_SLOT(slotModifySelectedAccount()) ); + connect( mAccountList, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotAccountSelected()) ); + connect( mAccountList, TQ_SIGNAL(doubleClicked( TQListViewItem *)), + this, TQ_SLOT(slotModifySelectedAccount()) ); hlay->addWidget( mAccountList, 1 ); // a vbox layout for the buttons: zero stretch, spacing inherited from hlay @@ -1094,31 +1094,31 @@ AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const cha // "add..." button: stretch 0 button = new TQPushButton( i18n("A&dd..."), this ); button->setAutoDefault( false ); - connect( button, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotAddAccount()) ); + connect( button, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotAddAccount()) ); btn_vlay->addWidget( button ); // "modify..." button: stretch 0 mModifyAccountButton = new TQPushButton( i18n("&Modify..."), this ); mModifyAccountButton->setAutoDefault( false ); mModifyAccountButton->setEnabled( false ); // b/c no item is selected yet - connect( mModifyAccountButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotModifySelectedAccount()) ); + connect( mModifyAccountButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotModifySelectedAccount()) ); btn_vlay->addWidget( mModifyAccountButton ); // "remove..." button: stretch 0 mRemoveAccountButton = new TQPushButton( i18n("R&emove"), this ); mRemoveAccountButton->setAutoDefault( false ); mRemoveAccountButton->setEnabled( false ); // b/c no item is selected yet - connect( mRemoveAccountButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRemoveSelectedAccount()) ); + connect( mRemoveAccountButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRemoveSelectedAccount()) ); btn_vlay->addWidget( mRemoveAccountButton ); btn_vlay->addStretch( 1 ); // spacer mCheckmailStartupCheck = new TQCheckBox( i18n("Chec&k mail on startup"), this ); vlay->addWidget( mCheckmailStartupCheck ); - connect( mCheckmailStartupCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mCheckmailStartupCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // "New Mail Notification" group box: stretch 0 group = new TQVGroupBox( i18n("New Mail Notification"), this ); @@ -1129,8 +1129,8 @@ AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const cha mBeepNewMailCheck = new TQCheckBox(i18n("&Beep"), group ); mBeepNewMailCheck->setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed ) ); - connect( mBeepNewMailCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mBeepNewMailCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // "Detailed new mail notification" check box mVerboseNotificationCheck = @@ -1142,15 +1142,15 @@ AccountsPageReceivingTab::AccountsPageReceivingTab( TQWidget * parent, const cha "messages" ) ); TQWhatsThis::add( mVerboseNotificationCheck, GlobalSettings::self()->verboseNewMailNotificationItem()->whatsThis() ); - connect( mVerboseNotificationCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged() ) ); + connect( mVerboseNotificationCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged() ) ); // "Other Actions" button: mOtherNewMailActionsButton = new TQPushButton( i18n("Other Actio&ns"), group ); mOtherNewMailActionsButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); - connect( mOtherNewMailActionsButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotEditNotifications()) ); + connect( mOtherNewMailActionsButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotEditNotifications()) ); } AccountsPageReceivingTab::~AccountsPageReceivingTab() @@ -1412,7 +1412,7 @@ void AccountsPage::ReceivingTab::doLoadOther() { mBeepNewMailCheck->setChecked( general.readBoolEntry("beep-on-mail", false ) ); mCheckmailStartupCheck->setChecked( general.readBoolEntry("checkmail-startup", false) ); - TQTimer::singleShot( 0, this, TQT_SLOT( slotTweakAccountList() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotTweakAccountList() ) ); } void AccountsPage::ReceivingTab::slotTweakAccountList() @@ -1565,8 +1565,8 @@ AppearancePageFontsTab::AppearancePageFontsTab( TQWidget * parent, const char * mCustomFontCheck = new TQCheckBox( i18n("&Use custom fonts"), this ); vlay->addWidget( mCustomFontCheck ); vlay->addWidget( new KSeparator( KSeparator::HLine, this ) ); - connect ( mCustomFontCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect ( mCustomFontCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // "font location" combo box and label: hlay = new TQHBoxLayout( vlay ); // inherites spacing @@ -1589,20 +1589,20 @@ AppearancePageFontsTab::AppearancePageFontsTab( TQWidget * parent, const char * false, 4 ); mFontChooser->setEnabled( false ); // since !mCustomFontCheck->isChecked() vlay->addWidget( mFontChooser ); - connect ( mFontChooser, TQT_SIGNAL( fontSelected( const TQFont& ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect ( mFontChooser, TQ_SIGNAL( fontSelected( const TQFont& ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // {en,dis}able widgets depending on the state of mCustomFontCheck: - connect( mCustomFontCheck, TQT_SIGNAL(toggled(bool)), - label, TQT_SLOT(setEnabled(bool)) ); - connect( mCustomFontCheck, TQT_SIGNAL(toggled(bool)), - mFontLocationCombo, TQT_SLOT(setEnabled(bool)) ); - connect( mCustomFontCheck, TQT_SIGNAL(toggled(bool)), - mFontChooser, TQT_SLOT(setEnabled(bool)) ); + connect( mCustomFontCheck, TQ_SIGNAL(toggled(bool)), + label, TQ_SLOT(setEnabled(bool)) ); + connect( mCustomFontCheck, TQ_SIGNAL(toggled(bool)), + mFontLocationCombo, TQ_SLOT(setEnabled(bool)) ); + connect( mCustomFontCheck, TQ_SIGNAL(toggled(bool)), + mFontChooser, TQ_SLOT(setEnabled(bool)) ); // load the right font settings into mFontChooser: - connect( mFontLocationCombo, TQT_SIGNAL(activated(int) ), - this, TQT_SLOT(slotFontSelectorChanged(int)) ); + connect( mFontLocationCombo, TQ_SIGNAL(activated(int) ), + this, TQ_SLOT(slotFontSelectorChanged(int)) ); } @@ -1629,14 +1629,14 @@ void AppearancePage::FontsTab::slotFontSelectorChanged( int index ) mActiveFontIndex = index; // Disonnect so the "Apply" button is not activated by the change - disconnect ( mFontChooser, TQT_SIGNAL( fontSelected( const TQFont& ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + disconnect ( mFontChooser, TQ_SIGNAL( fontSelected( const TQFont& ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // Display the new setting: mFontChooser->setFont( mFont[index], fontNames[index].onlyFixed ); - connect ( mFontChooser, TQT_SIGNAL( fontSelected( const TQFont& ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect ( mFontChooser, TQ_SIGNAL( fontSelected( const TQFont& ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // Disable Family and Size list if we have selected a quote font: mFontChooser->enableColumn( TDEFontChooser::FamilyList|TDEFontChooser::SizeList, @@ -1739,8 +1739,8 @@ AppearancePageColorsTab::AppearancePageColorsTab( TQWidget * parent, const char vlay = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); mCustomColorCheck = new TQCheckBox( i18n("&Use custom colors"), this ); vlay->addWidget( mCustomColorCheck ); - connect( mCustomColorCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mCustomColorCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // color list box: mColorList = new ColorListBox( this ); @@ -1755,8 +1755,8 @@ AppearancePageColorsTab::AppearancePageColorsTab( TQWidget * parent, const char new TQCheckBox( i18n("Recycle colors on deep "ing"), this ); mRecycleColorCheck->setEnabled( false ); vlay->addWidget( mRecycleColorCheck ); - connect( mRecycleColorCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mRecycleColorCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // close to quota threshold TQHBoxLayout *hbox = new TQHBoxLayout(vlay); @@ -1764,25 +1764,25 @@ AppearancePageColorsTab::AppearancePageColorsTab( TQWidget * parent, const char hbox->addWidget( l ); l->setEnabled( false ); mCloseToQuotaThreshold = new TQSpinBox( 0, 100, 1, this ); - connect( mCloseToQuotaThreshold, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mCloseToQuotaThreshold, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); mCloseToQuotaThreshold->setEnabled( false ); mCloseToQuotaThreshold->setSuffix( i18n("%")); hbox->addWidget( mCloseToQuotaThreshold ); hbox->addWidget( new TQWidget(this), 2 ); // {en,dir}able widgets depending on the state of mCustomColorCheck: - connect( mCustomColorCheck, TQT_SIGNAL(toggled(bool)), - mColorList, TQT_SLOT(setEnabled(bool)) ); - connect( mCustomColorCheck, TQT_SIGNAL(toggled(bool)), - mRecycleColorCheck, TQT_SLOT(setEnabled(bool)) ); - connect( mCustomColorCheck, TQT_SIGNAL(toggled(bool)), - l, TQT_SLOT(setEnabled(bool)) ); - connect( mCustomColorCheck, TQT_SIGNAL(toggled(bool)), - mCloseToQuotaThreshold, TQT_SLOT(setEnabled(bool)) ); + connect( mCustomColorCheck, TQ_SIGNAL(toggled(bool)), + mColorList, TQ_SLOT(setEnabled(bool)) ); + connect( mCustomColorCheck, TQ_SIGNAL(toggled(bool)), + mRecycleColorCheck, TQ_SLOT(setEnabled(bool)) ); + connect( mCustomColorCheck, TQ_SIGNAL(toggled(bool)), + l, TQ_SLOT(setEnabled(bool)) ); + connect( mCustomColorCheck, TQ_SIGNAL(toggled(bool)), + mCloseToQuotaThreshold, TQ_SLOT(setEnabled(bool)) ); - connect( mCustomColorCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mCustomColorCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); } void AppearancePage::ColorsTab::doLoadOther() { @@ -1823,8 +1823,8 @@ void AppearancePage::ColorsTab::doLoadOther() { mColorList->setColor( i, reader.readColorEntry( colorNames[i].configName, &defaultColor[i] ) ); } - connect( mColorList, TQT_SIGNAL( changed( ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mColorList, TQ_SIGNAL( changed( ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); } void AppearancePage::ColorsTab::installProfile( TDEConfig * profile ) { @@ -1911,30 +1911,30 @@ AppearancePageLayoutTab::AppearancePageLayoutTab( TQWidget * parent, const char // "folder list" radio buttons: populateButtonGroup( mFolderListGroup = new TQHButtonGroup( this ), folderListMode ); vlay->addWidget( mFolderListGroup ); - connect( mFolderListGroup, TQT_SIGNAL ( clicked( int ) ), - this, TQT_SLOT( slotEmitChanged() ) ); + connect( mFolderListGroup, TQ_SIGNAL ( clicked( int ) ), + this, TQ_SLOT( slotEmitChanged() ) ); mFavoriteFolderViewCB = new TQCheckBox( i18n("Show favorite folder view"), this ); - connect( mFavoriteFolderViewCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEmitChanged()) ); + connect( mFavoriteFolderViewCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEmitChanged()) ); vlay->addWidget( mFavoriteFolderViewCB ); // "show reader window" radio buttons: populateButtonGroup( mReaderWindowModeGroup = new TQVButtonGroup( this ), readerWindowMode ); vlay->addWidget( mReaderWindowModeGroup ); - connect( mReaderWindowModeGroup, TQT_SIGNAL ( clicked( int ) ), - this, TQT_SLOT( slotEmitChanged() ) ); + connect( mReaderWindowModeGroup, TQ_SIGNAL ( clicked( int ) ), + this, TQ_SLOT( slotEmitChanged() ) ); // "Show MIME Tree" radio buttons: populateButtonGroup( mMIMETreeModeGroup = new TQVButtonGroup( this ), mimeTreeMode ); vlay->addWidget( mMIMETreeModeGroup ); - connect( mMIMETreeModeGroup, TQT_SIGNAL ( clicked( int ) ), - this, TQT_SLOT( slotEmitChanged() ) ); + connect( mMIMETreeModeGroup, TQ_SIGNAL ( clicked( int ) ), + this, TQ_SLOT( slotEmitChanged() ) ); // "MIME Tree Location" radio buttons: populateButtonGroup( mMIMETreeLocationGroup = new TQHButtonGroup( this ), mimeTreeLocation ); vlay->addWidget( mMIMETreeLocationGroup ); - connect( mMIMETreeLocationGroup, TQT_SIGNAL ( clicked( int ) ), - this, TQT_SLOT( slotEmitChanged() ) ); + connect( mMIMETreeLocationGroup, TQ_SIGNAL ( clicked( int ) ), + this, TQ_SLOT( slotEmitChanged() ) ); vlay->addStretch( 10 ); // spacer } @@ -2015,14 +2015,14 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha mNestedMessagesCheck = new TQCheckBox( i18n("&Threaded message list"), group ); - connect( mMessageSizeCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); - connect( mAttachmentCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); - connect( mCryptoIconsCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); - connect( mNestedMessagesCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mMessageSizeCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); + connect( mAttachmentCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); + connect( mCryptoIconsCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); + connect( mNestedMessagesCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); vlay->addWidget( group ); @@ -2048,8 +2048,8 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha vlay->addWidget( mNestingPolicy ); - connect( mNestingPolicy, TQT_SIGNAL( clicked( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mNestingPolicy, TQ_SIGNAL( clicked( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // "Date Display" group: mDateDisplay = new TQVButtonGroup( i18n("Date Display"), this ); @@ -2064,10 +2064,10 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha if ( dateDisplayConfig[i].dateDisplay == DateFormatter::Custom ) { mCustomDateFormatEdit = new KLineEdit( mDateDisplay ); mCustomDateFormatEdit->setEnabled( false ); - connect( radio, TQT_SIGNAL(toggled(bool)), - mCustomDateFormatEdit, TQT_SLOT(setEnabled(bool)) ); - connect( mCustomDateFormatEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotEmitChanged(void)) ); + connect( radio, TQ_SIGNAL(toggled(bool)), + mCustomDateFormatEdit, TQ_SLOT(setEnabled(bool)) ); + connect( mCustomDateFormatEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotEmitChanged(void)) ); TQString customDateWhatsThis = i18n("<qt><p><strong>These expressions may be used for the date:" "</strong></p>" @@ -2106,8 +2106,8 @@ AppearancePageHeadersTab::AppearancePageHeadersTab( TQWidget * parent, const cha } // end for loop populating mDateDisplay vlay->addWidget( mDateDisplay ); - connect( mDateDisplay, TQT_SIGNAL( clicked( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mDateDisplay, TQ_SIGNAL( clicked( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); vlay->addStretch( 10 ); // spacer @@ -2261,40 +2261,40 @@ AppearancePageReaderTab::AppearancePageReaderTab( TQWidget * parent, TQToolTip::add( mCloseAfterReplyOrForwardCheck, i18n( "Close the standalone message window after replying or forwarding the message" ) ); vlay->addWidget( mCloseAfterReplyOrForwardCheck ); - connect( mCloseAfterReplyOrForwardCheck, TQT_SIGNAL ( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged() ) ); + connect( mCloseAfterReplyOrForwardCheck, TQ_SIGNAL ( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged() ) ); // "show colorbar" check box: populateCheckBox( mShowColorbarCheck = new TQCheckBox( this ), showColorbarMode ); vlay->addWidget( mShowColorbarCheck ); - connect( mShowColorbarCheck, TQT_SIGNAL ( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged() ) ); + connect( mShowColorbarCheck, TQ_SIGNAL ( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged() ) ); // "show spam status" check box; populateCheckBox( mShowSpamStatusCheck = new TQCheckBox( this ), showSpamStatusMode ); vlay->addWidget( mShowSpamStatusCheck ); - connect( mShowSpamStatusCheck, TQT_SIGNAL ( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged() ) ); + connect( mShowSpamStatusCheck, TQ_SIGNAL ( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged() ) ); // "replace smileys by emoticons" check box; populateCheckBox( mShowEmoticonsCheck = new TQCheckBox( this ), showEmoticons ); vlay->addWidget( mShowEmoticonsCheck ); - connect( mShowEmoticonsCheck, TQT_SIGNAL ( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged() ) ); + connect( mShowEmoticonsCheck, TQ_SIGNAL ( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged() ) ); // "Use smaller font for quoted text" check box mShrinkQuotesCheck = new TQCheckBox( i18n( shrinkQuotes.desc ), this, "kcfg_ShrinkQuotes" ); vlay->addWidget( mShrinkQuotesCheck ); - connect( mShrinkQuotesCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged() ) ); + connect( mShrinkQuotesCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged() ) ); // "Show expand/collaps quote marks" check box; TQHBoxLayout *hlay= new TQHBoxLayout( vlay ); // inherits spacing populateCheckBox( mShowExpandQuotesMark= new TQCheckBox( this ), showExpandQuotesMark); hlay->addWidget( mShowExpandQuotesMark); - connect( mShowExpandQuotesMark, TQT_SIGNAL ( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged() ) ); + connect( mShowExpandQuotesMark, TQ_SIGNAL ( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged() ) ); hlay->addStretch( 1 ); mCollapseQuoteLevelSpin = new KIntSpinBox( 0/*min*/,10/*max*/,1/*step*/, @@ -2306,20 +2306,20 @@ AppearancePageReaderTab::AppearancePageReaderTab( TQWidget * parent, hlay->addWidget( label ); mCollapseQuoteLevelSpin->setEnabled( false ); //since !mShowExpandQuotesMark->isCheckec() - connect( mCollapseQuoteLevelSpin, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mCollapseQuoteLevelSpin, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); hlay->addWidget( mCollapseQuoteLevelSpin); - connect( mShowExpandQuotesMark, TQT_SIGNAL( toggled( bool ) ), - mCollapseQuoteLevelSpin, TQT_SLOT( setEnabled( bool ) ) ); + connect( mShowExpandQuotesMark, TQ_SIGNAL( toggled( bool ) ), + mCollapseQuoteLevelSpin, TQ_SLOT( setEnabled( bool ) ) ); // Fallback Character Encoding hlay = new TQHBoxLayout( vlay ); // inherits spacing mCharsetCombo = new TQComboBox( this ); mCharsetCombo->insertStringList( KMMsgBase::supportedEncodings( false ) ); - connect( mCharsetCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mCharsetCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); TQString fallbackCharsetWhatsThis = i18n( GlobalSettings::self()->fallbackCharacterEncodingItem()->whatsThis().utf8() ); @@ -2339,8 +2339,8 @@ AppearancePageReaderTab::AppearancePageReaderTab( TQWidget * parent, mOverrideCharsetCombo->insertStringList( encodings ); mOverrideCharsetCombo->setCurrentItem(0); - connect( mOverrideCharsetCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mOverrideCharsetCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); TQString overrideCharsetWhatsThis = i18n( GlobalSettings::self()->overrideCharacterEncodingItem()->whatsThis().utf8() ); @@ -2354,8 +2354,8 @@ AppearancePageReaderTab::AppearancePageReaderTab( TQWidget * parent, populateCheckBox( mShowCurrentTimeCheck = new TQCheckBox( this ), showCurrentTime ); vlay->addWidget( mShowCurrentTimeCheck ); - connect( mShowCurrentTimeCheck, TQT_SIGNAL ( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged() ) ); + connect( mShowCurrentTimeCheck, TQ_SIGNAL ( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged() ) ); vlay->addStretch( 100 ); // spacer } @@ -2485,17 +2485,17 @@ AppearancePageSystemTrayTab::AppearancePageSystemTrayTab( TQWidget * parent, // "Enable system tray applet" check box mSystemTrayCheck = new TQCheckBox( i18n("Enable system tray icon"), this ); vlay->addWidget( mSystemTrayCheck ); - connect( mSystemTrayCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mSystemTrayCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // System tray modes mSystemTrayGroup = new TQVButtonGroup( i18n("System Tray Mode"), this ); mSystemTrayGroup->layout()->setSpacing( KDialog::spacingHint() ); vlay->addWidget( mSystemTrayGroup ); - connect( mSystemTrayGroup, TQT_SIGNAL( clicked( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); - connect( mSystemTrayCheck, TQT_SIGNAL( toggled( bool ) ), - mSystemTrayGroup, TQT_SLOT( setEnabled( bool ) ) ); + connect( mSystemTrayGroup, TQ_SIGNAL( clicked( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); + connect( mSystemTrayCheck, TQ_SIGNAL( toggled( bool ) ), + mSystemTrayGroup, TQ_SLOT( setEnabled( bool ) ) ); mSystemTrayGroup->insert( new TQRadioButton( i18n("Always show KMail in system tray"), mSystemTrayGroup ), GlobalSettings::EnumSystemTrayPolicy::ShowAlways ); @@ -2617,14 +2617,14 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char * GlobalSettings::self()->autoTextSignatureItem()->label(), this ); vlay->addWidget( mAutoAppSignFileCheck ); - connect( mAutoAppSignFileCheck, TQT_SIGNAL( stateChanged(int) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mAutoAppSignFileCheck, TQ_SIGNAL( stateChanged(int) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); mTopQuoteCheck = new TQCheckBox( GlobalSettings::self()->prependSignatureItem()->label(), this ); vlay->addWidget( mTopQuoteCheck); - connect( mTopQuoteCheck, TQT_SIGNAL( stateChanged(int) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mTopQuoteCheck, TQ_SIGNAL( stateChanged(int) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); mSmartQuoteCheck = new TQCheckBox( GlobalSettings::self()->smartQuoteItem()->label(), @@ -2634,8 +2634,8 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char * "even when the line was created by adding an additional linebreak while\n" "word-wrapping the text." ) ); vlay->addWidget( mSmartQuoteCheck ); - connect( mSmartQuoteCheck, TQT_SIGNAL( stateChanged(int) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mSmartQuoteCheck, TQ_SIGNAL( stateChanged(int) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); mQuoteSelectionOnlyCheck = new TQCheckBox( GlobalSettings::self()->quoteSelectionOnlyItem()->label(), this, "kcfg_QuoteSelectionOnly" ); @@ -2643,28 +2643,28 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char * i18n( "When replying, only quote the selected text instead of the complete message " "when there is text selected in the message window." ) ); vlay->addWidget( mQuoteSelectionOnlyCheck ); - connect( mQuoteSelectionOnlyCheck, TQT_SIGNAL( stateChanged(int) ), - this, TQT_SLOT( slotEmitChanged(void) ) ); + connect( mQuoteSelectionOnlyCheck, TQ_SIGNAL( stateChanged(int) ), + this, TQ_SLOT( slotEmitChanged(void) ) ); mStripSignatureCheck = new TQCheckBox( GlobalSettings::self()->stripSignatureItem()->label(), this, "kcfg_StripSignature" ); vlay->addWidget( mStripSignatureCheck ); - connect( mStripSignatureCheck, TQT_SIGNAL( stateChanged(int) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mStripSignatureCheck, TQ_SIGNAL( stateChanged(int) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); mAutoRequestMDNCheck = new TQCheckBox( GlobalSettings::self()->requestMDNItem()->label(), this, "kcfg_RequestMDN" ); vlay->addWidget( mAutoRequestMDNCheck ); - connect( mAutoRequestMDNCheck, TQT_SIGNAL( stateChanged(int) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mAutoRequestMDNCheck, TQ_SIGNAL( stateChanged(int) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); mShowRecentAddressesInComposer = new TQCheckBox( GlobalSettings::self()->showRecentAddressesInComposerItem()->label(), this, "kcfg_ShowRecentAddressesInComposer" ); vlay->addWidget( mShowRecentAddressesInComposer ); - connect( mShowRecentAddressesInComposer, TQT_SIGNAL( stateChanged(int) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mShowRecentAddressesInComposer, TQ_SIGNAL( stateChanged(int) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // a checkbox for "word wrap" and a spinbox for the column in // which to wrap: @@ -2673,20 +2673,20 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char * GlobalSettings::self()->wordWrapItem()->label(), this, "kcfg_WordWrap" ); hlay->addWidget( mWordWrapCheck ); - connect( mWordWrapCheck, TQT_SIGNAL( stateChanged(int) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mWordWrapCheck, TQ_SIGNAL( stateChanged(int) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); mWrapColumnSpin = new KIntSpinBox( 30/*min*/, 78/*max*/, 1/*step*/, 78/*init*/, 10 /*base*/, this, "kcfg_LineWrapWidth" ); mWrapColumnSpin->setEnabled( false ); // since !mWordWrapCheck->isChecked() - connect( mWrapColumnSpin, TQT_SIGNAL( valueChanged(int) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mWrapColumnSpin, TQ_SIGNAL( valueChanged(int) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); hlay->addWidget( mWrapColumnSpin ); hlay->addStretch( 1 ); // only enable the spinbox if the checkbox is checked: - connect( mWordWrapCheck, TQT_SIGNAL(toggled(bool)), - mWrapColumnSpin, TQT_SLOT(setEnabled(bool)) ); + connect( mWordWrapCheck, TQ_SIGNAL(toggled(bool)), + mWrapColumnSpin, TQ_SLOT(setEnabled(bool)) ); // a checkbox for "too many recipient warning" and a spinbox for the recipient threshold hlay = new TQHBoxLayout( vlay ); // inherits spacing @@ -2694,8 +2694,8 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char * GlobalSettings::self()->tooManyRecipientsItem()->label(), this, "kcfg_TooManyRecipients" ); hlay->addWidget( mRecipientCheck ); - connect( mRecipientCheck, TQT_SIGNAL( stateChanged(int) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mRecipientCheck, TQ_SIGNAL( stateChanged(int) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); TQString recipientCheckWhatsthis = i18n( GlobalSettings::self()->tooManyRecipientsItem()->whatsThis().utf8() ); @@ -2706,8 +2706,8 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char * mRecipientSpin = new KIntSpinBox( 1/*min*/, 100/*max*/, 1/*step*/, 5/*init*/, 10 /*base*/, this, "kcfg_RecipientThreshold" ); mRecipientSpin->setEnabled( false ); - connect( mRecipientSpin, TQT_SIGNAL( valueChanged(int) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mRecipientSpin, TQ_SIGNAL( valueChanged(int) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); TQString recipientWhatsthis = i18n( GlobalSettings::self()->recipientThresholdItem()->whatsThis().utf8() ); @@ -2719,8 +2719,8 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char * hlay->addWidget( mRecipientSpin ); hlay->addStretch( 1 ); // only enable the spinbox if the checkbox is checked: - connect( mRecipientCheck, TQT_SIGNAL(toggled(bool)), - mRecipientSpin, TQT_SLOT(setEnabled(bool)) ); + connect( mRecipientCheck, TQ_SIGNAL(toggled(bool)), + mRecipientSpin, TQ_SLOT(setEnabled(bool)) ); hlay = new TQHBoxLayout( vlay ); // inherits spacing @@ -2732,8 +2732,8 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char * mAutoSave->setSpecialValueText( i18n("No autosave") ); mAutoSave->setSuffix( i18n(" min") ); hlay->addStretch( 1 ); - connect( mAutoSave, TQT_SIGNAL( valueChanged(int) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mAutoSave, TQ_SIGNAL( valueChanged(int) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); hlay = new TQHBoxLayout( vlay ); // inherits spacing mForwardTypeCombo = new KComboBox( false, this ); @@ -2746,21 +2746,21 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char * hlay->addWidget( label ); hlay->addWidget( mForwardTypeCombo ); hlay->addStretch( 1 ); - connect( mForwardTypeCombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mForwardTypeCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT( slotEmitChanged( void ) ) ); hlay = new TQHBoxLayout( vlay ); // inherits spacing TQPushButton *completionOrderBtn = new TQPushButton( i18n( "Configure Completion Order" ), this ); - connect( completionOrderBtn, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotConfigureCompletionOrder() ) ); + connect( completionOrderBtn, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotConfigureCompletionOrder() ) ); hlay->addWidget( completionOrderBtn ); hlay->addItem( new TQSpacerItem(0, 0) ); // recent addresses hlay = new TQHBoxLayout( vlay ); // inherits spacing TQPushButton *recentAddressesBtn = new TQPushButton( i18n( "Edit Recent Addresses..." ), this ); - connect( recentAddressesBtn, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotConfigureRecentAddresses() ) ); + connect( recentAddressesBtn, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotConfigureRecentAddresses() ) ); hlay->addWidget( recentAddressesBtn ); hlay->addItem( new TQSpacerItem(0, 0) ); @@ -2771,17 +2771,17 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char * mExternalEditorCheck = new TQCheckBox( GlobalSettings::self()->useExternalEditorItem()->label(), group, "kcfg_UseExternalEditor" ); - connect( mExternalEditorCheck, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mExternalEditorCheck, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); hbox = new TQHBox( group ); label = new TQLabel( GlobalSettings::self()->externalEditorItem()->label(), hbox ); mEditorRequester = new KURLRequester( hbox, "kcfg_ExternalEditor" ); - connect( mEditorRequester, TQT_SIGNAL( urlSelected(const TQString&) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); - connect( mEditorRequester, TQT_SIGNAL( textChanged(const TQString&) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mEditorRequester, TQ_SIGNAL( urlSelected(const TQString&) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); + connect( mEditorRequester, TQ_SIGNAL( textChanged(const TQString&) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); hbox->setStretchFactor( mEditorRequester, 1 ); label->setBuddy( mEditorRequester ); @@ -2791,16 +2791,16 @@ ComposerPageGeneralTab::ComposerPageGeneralTab( TQWidget * parent, const char * "application/x-shellscript " "application/x-desktop" ); mEditorRequester->setEnabled( false ); // !mExternalEditorCheck->isChecked() - connect( mExternalEditorCheck, TQT_SIGNAL(toggled(bool)), - label, TQT_SLOT(setEnabled(bool)) ); - connect( mExternalEditorCheck, TQT_SIGNAL(toggled(bool)), - mEditorRequester, TQT_SLOT(setEnabled(bool)) ); + connect( mExternalEditorCheck, TQ_SIGNAL(toggled(bool)), + label, TQ_SLOT(setEnabled(bool)) ); + connect( mExternalEditorCheck, TQ_SIGNAL(toggled(bool)), + mEditorRequester, TQ_SLOT(setEnabled(bool)) ); label = new TQLabel( i18n("<b>%f</b> will be replaced with the " "filename to edit."), group ); label->setEnabled( false ); // see above - connect( mExternalEditorCheck, TQT_SIGNAL(toggled(bool)), - label, TQT_SLOT(setEnabled(bool)) ); + connect( mExternalEditorCheck, TQ_SIGNAL(toggled(bool)), + label, TQ_SLOT(setEnabled(bool)) ); vlay->addWidget( group ); vlay->addStretch( 100 ); @@ -2942,8 +2942,8 @@ ComposerPagePhrasesTab::ComposerPagePhrasesTab( TQWidget * parent, const char * glay->addWidget( new TQLabel( mPhraseLanguageCombo, i18n("Lang&uage:"), this ), 1, 0 ); glay->addMultiCellWidget( mPhraseLanguageCombo, 1, 1, 1, 2 ); - connect( mPhraseLanguageCombo, TQT_SIGNAL(activated(const TQString&)), - this, TQT_SLOT(slotLanguageChanged(const TQString&)) ); + connect( mPhraseLanguageCombo, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(slotLanguageChanged(const TQString&)) ); // row 2: "add..." and "remove" push buttons: button = new TQPushButton( i18n("A&dd..."), this ); @@ -2953,39 +2953,39 @@ ComposerPagePhrasesTab::ComposerPagePhrasesTab( TQWidget * parent, const char * mRemoveButton->setAutoDefault( false ); mRemoveButton->setEnabled( false ); // combo doesn't contain anything... glay->addWidget( mRemoveButton, 2, 2 ); - connect( button, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotNewLanguage()) ); - connect( mRemoveButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRemoveLanguage()) ); + connect( button, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotNewLanguage()) ); + connect( mRemoveButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRemoveLanguage()) ); // row 3: "reply to sender" line edit and label: mPhraseReplyEdit = new KLineEdit( this ); - connect( mPhraseReplyEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mPhraseReplyEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); glay->addWidget( new TQLabel( mPhraseReplyEdit, i18n("Reply to se&nder:"), this ), 3, 0 ); glay->addMultiCellWidget( mPhraseReplyEdit, 3, 3, 1, 2 ); // cols 1..2 // row 4: "reply to all" line edit and label: mPhraseReplyAllEdit = new KLineEdit( this ); - connect( mPhraseReplyAllEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mPhraseReplyAllEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); glay->addWidget( new TQLabel( mPhraseReplyAllEdit, i18n("Repl&y to all:"), this ), 4, 0 ); glay->addMultiCellWidget( mPhraseReplyAllEdit, 4, 4, 1, 2 ); // cols 1..2 // row 5: "forward" line edit and label: mPhraseForwardEdit = new KLineEdit( this ); - connect( mPhraseForwardEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mPhraseForwardEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); glay->addWidget( new TQLabel( mPhraseForwardEdit, i18n("&Forward:"), this ), 5, 0 ); glay->addMultiCellWidget( mPhraseForwardEdit, 5, 5, 1, 2 ); // cols 1..2 // row 6: "quote indicator" line edit and label: mPhraseIndentPrefixEdit = new KLineEdit( this ); - connect( mPhraseIndentPrefixEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mPhraseIndentPrefixEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); glay->addWidget( new TQLabel( mPhraseIndentPrefixEdit, i18n("&Quote indicator:"), this ), 6, 0 ); glay->addMultiCellWidget( mPhraseIndentPrefixEdit, 6, 6, 1, 2 ); @@ -3133,8 +3133,8 @@ ComposerPageTemplatesTab::ComposerPageTemplatesTab( TQWidget * parent, const cha mWidget = new TemplatesConfiguration( this ); vlay->addWidget( mWidget ); - connect( mWidget, TQT_SIGNAL( changed() ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mWidget, TQ_SIGNAL( changed() ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); } void ComposerPage::TemplatesTab::doLoadFromGlobalSettings() { @@ -3157,8 +3157,8 @@ ComposerPageCustomTemplatesTab::ComposerPageCustomTemplatesTab( TQWidget * paren mWidget = new CustomTemplates( this ); vlay->addWidget( mWidget ); - connect( mWidget, TQT_SIGNAL( changed() ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mWidget, TQ_SIGNAL( changed() ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); } void ComposerPage::CustomTemplatesTab::doLoadFromGlobalSettings() { @@ -3200,15 +3200,15 @@ ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * parent, const char * i18n("A&dd..."), i18n("Re&move"), i18n("Mod&ify..."), i18n("Enter new reply prefix:") ); - connect( mReplyListEditor, TQT_SIGNAL( changed( void ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mReplyListEditor, TQ_SIGNAL( changed( void ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // row 2: "replace [...]" check box: mReplaceReplyPrefixCheck = new TQCheckBox( GlobalSettings::self()->replaceReplyPrefixItem()->label(), group, "kcfg_ReplaceReplyPrefix" ); - connect( mReplaceReplyPrefixCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mReplaceReplyPrefixCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); vlay->addWidget( group ); @@ -3228,15 +3228,15 @@ ComposerPageSubjectTab::ComposerPageSubjectTab( TQWidget * parent, const char * i18n("Remo&ve"), i18n("Modify..."), i18n("Enter new forward prefix:") ); - connect( mForwardListEditor, TQT_SIGNAL( changed( void ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mForwardListEditor, TQ_SIGNAL( changed( void ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // row 3: "replace [...]" check box: mReplaceForwardPrefixCheck = new TQCheckBox( GlobalSettings::self()->replaceForwardPrefixItem()->label(), group, "kcfg_ReplaceForwardPrefix" ); - connect( mReplaceForwardPrefixCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mReplaceForwardPrefixCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); vlay->addWidget( group ); } @@ -3276,20 +3276,20 @@ ComposerPageCharsetTab::ComposerPageCharsetTab( TQWidget * parent, const char * new SimpleStringListEditor( this, 0, SimpleStringListEditor::All, i18n("A&dd..."), i18n("Remo&ve"), i18n("&Modify..."), i18n("Enter charset:") ); - connect( mCharsetListEditor, TQT_SIGNAL( changed( void ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mCharsetListEditor, TQ_SIGNAL( changed( void ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); vlay->addWidget( mCharsetListEditor, 1 ); mKeepReplyCharsetCheck = new TQCheckBox( i18n("&Keep original charset when " "replying or forwarding (if " "possible)"), this ); - connect( mKeepReplyCharsetCheck, TQT_SIGNAL ( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mKeepReplyCharsetCheck, TQ_SIGNAL ( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); vlay->addWidget( mKeepReplyCharsetCheck ); - connect( mCharsetListEditor, TQT_SIGNAL(aboutToAdd(TQString&)), - this, TQT_SLOT(slotVerifyCharset(TQString&)) ); + connect( mCharsetListEditor, TQ_SIGNAL(aboutToAdd(TQString&)), + this, TQ_SLOT(slotVerifyCharset(TQString&)) ); } void ComposerPage::CharsetTab::slotVerifyCharset( TQString & charset ) { @@ -3367,8 +3367,8 @@ ComposerPageHeadersTab::ComposerPageHeadersTab( TQWidget * parent, const char * // "Use custom Message-Id suffix" checkbox: mCreateOwnMessageIdCheck = new TQCheckBox( i18n("&Use custom message-id suffix"), this ); - connect( mCreateOwnMessageIdCheck, TQT_SIGNAL ( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mCreateOwnMessageIdCheck, TQ_SIGNAL ( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); vlay->addWidget( mCreateOwnMessageIdCheck ); // "Message-Id suffix" line edit and label: @@ -3384,12 +3384,12 @@ ComposerPageHeadersTab::ComposerPageHeadersTab( TQWidget * parent, const char * mMessageIdSuffixEdit->setEnabled( false ); hlay->addWidget( label ); hlay->addWidget( mMessageIdSuffixEdit, 1 ); - connect( mCreateOwnMessageIdCheck, TQT_SIGNAL(toggled(bool) ), - label, TQT_SLOT(setEnabled(bool)) ); - connect( mCreateOwnMessageIdCheck, TQT_SIGNAL(toggled(bool) ), - mMessageIdSuffixEdit, TQT_SLOT(setEnabled(bool)) ); - connect( mMessageIdSuffixEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mCreateOwnMessageIdCheck, TQ_SIGNAL(toggled(bool) ), + label, TQ_SLOT(setEnabled(bool)) ); + connect( mCreateOwnMessageIdCheck, TQ_SIGNAL(toggled(bool) ), + mMessageIdSuffixEdit, TQ_SLOT(setEnabled(bool)) ); + connect( mMessageIdSuffixEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // horizontal rule and "custom header fields" label: vlay->addWidget( new KSeparator( KSeparator::HLine, this ) ); @@ -3404,18 +3404,18 @@ ComposerPageHeadersTab::ComposerPageHeadersTab( TQWidget * parent, const char * mTagList->addColumn( i18n("Value") ); mTagList->setAllColumnsShowFocus( true ); mTagList->setSorting( -1 ); - connect( mTagList, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotMimeHeaderSelectionChanged()) ); + connect( mTagList, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotMimeHeaderSelectionChanged()) ); glay->addMultiCellWidget( mTagList, 0, 2, 0, 1 ); // "new" and "remove" buttons: button = new TQPushButton( i18n("Ne&w"), this ); - connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewMimeHeader()) ); + connect( button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNewMimeHeader()) ); button->setAutoDefault( false ); glay->addWidget( button, 0, 2 ); mRemoveHeaderButton = new TQPushButton( i18n("Re&move"), this ); - connect( mRemoveHeaderButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRemoveMimeHeader()) ); + connect( mRemoveHeaderButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRemoveMimeHeader()) ); button->setAutoDefault( false ); glay->addWidget( mRemoveHeaderButton, 1, 2 ); @@ -3426,8 +3426,8 @@ ComposerPageHeadersTab::ComposerPageHeadersTab( TQWidget * parent, const char * mTagNameLabel->setEnabled( false ); glay->addWidget( mTagNameLabel, 3, 0 ); glay->addWidget( mTagNameEdit, 3, 1 ); - connect( mTagNameEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotMimeHeaderNameChanged(const TQString&)) ); + connect( mTagNameEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotMimeHeaderNameChanged(const TQString&)) ); mTagValueEdit = new KLineEdit( this ); mTagValueEdit->setEnabled( false ); @@ -3435,8 +3435,8 @@ ComposerPageHeadersTab::ComposerPageHeadersTab( TQWidget * parent, const char * mTagValueLabel->setEnabled( false ); glay->addWidget( mTagValueLabel, 4, 0 ); glay->addWidget( mTagValueEdit, 4, 1 ); - connect( mTagValueEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotMimeHeaderValueChanged(const TQString&)) ); + connect( mTagValueEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotMimeHeaderValueChanged(const TQString&)) ); } void ComposerPage::HeadersTab::slotMimeHeaderSelectionChanged() @@ -3583,10 +3583,10 @@ ComposerPageAttachmentsTab::ComposerPageAttachmentsTab( TQWidget * parent, TQToolTip::add( mOutlookCompatibleCheck, i18n( "Turn this option on to make Outlook(tm) understand attachment names " "containing non-English characters" ) ); - connect( mOutlookCompatibleCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); - connect( mOutlookCompatibleCheck, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotOutlookCompatibleClicked() ) ); + connect( mOutlookCompatibleCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); + connect( mOutlookCompatibleCheck, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotOutlookCompatibleClicked() ) ); vlay->addWidget( mOutlookCompatibleCheck ); vlay->addSpacing( 5 ); @@ -3594,8 +3594,8 @@ ComposerPageAttachmentsTab::ComposerPageAttachmentsTab( TQWidget * parent, mMissingAttachmentDetectionCheck = new TQCheckBox( i18n("E&nable detection of missing attachments"), this ); mMissingAttachmentDetectionCheck->setChecked( true ); - connect( mMissingAttachmentDetectionCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mMissingAttachmentDetectionCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); vlay->addWidget( mMissingAttachmentDetectionCheck ); // "Attachment key words" label and string list editor @@ -3611,14 +3611,14 @@ ComposerPageAttachmentsTab::ComposerPageAttachmentsTab( TQWidget * parent, i18n("A&dd..."), i18n("Re&move"), i18n("Mod&ify..."), i18n("Enter new key word:") ); - connect( mAttachWordsListEditor, TQT_SIGNAL( changed( void ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mAttachWordsListEditor, TQ_SIGNAL( changed( void ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); vlay->addWidget( mAttachWordsListEditor ); - connect( mMissingAttachmentDetectionCheck, TQT_SIGNAL(toggled(bool) ), - label, TQT_SLOT(setEnabled(bool)) ); - connect( mMissingAttachmentDetectionCheck, TQT_SIGNAL(toggled(bool) ), - mAttachWordsListEditor, TQT_SLOT(setEnabled(bool)) ); + connect( mMissingAttachmentDetectionCheck, TQ_SIGNAL(toggled(bool) ), + label, TQ_SLOT(setEnabled(bool)) ); + connect( mMissingAttachmentDetectionCheck, TQ_SIGNAL(toggled(bool) ), + mAttachWordsListEditor, TQ_SLOT(setEnabled(bool)) ); } void ComposerPage::AttachmentsTab::doLoadFromGlobalSettings() { @@ -3802,13 +3802,13 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * mHtmlMailCheck = new TQCheckBox( i18n("Prefer H&TML to plain text"), group ); TQWhatsThis::add( mHtmlMailCheck, htmlWhatsThis ); - connect( mHtmlMailCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mHtmlMailCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); mExternalReferences = new TQCheckBox( i18n("Allow messages to load e&xternal " "references from the Internet" ), group ); TQWhatsThis::add( mExternalReferences, externalWhatsThis ); - connect( mExternalReferences, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mExternalReferences, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); label = new KActiveLabel( i18n("<b>WARNING:</b> Allowing HTML in email may " "increase the risk that your system will be " "compromised by present and anticipated security " @@ -3824,7 +3824,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * group = new TQVGroupBox( i18n("Encrypted Messages"), this ); group->layout()->setSpacing( KDialog::spacingHint() ); mAlwaysDecrypt = new TQCheckBox( i18n( "Attempt decryption of encrypted messages when viewing" ), group ); - connect( mAlwaysDecrypt, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(slotEmitChanged()) ); + connect( mAlwaysDecrypt, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(slotEmitChanged()) ); vlay->addWidget( group ); // "Message Disposition Notification" groupbox: @@ -3835,8 +3835,8 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * // "ignore", "ask", "deny", "always send" radiobutton line: mMDNGroup = new TQButtonGroup( group ); mMDNGroup->hide(); - connect( mMDNGroup, TQT_SIGNAL( clicked( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mMDNGroup, TQ_SIGNAL( clicked( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); hbox = new TQHBox( group ); hbox->setSpacing( KDialog::spacingHint() ); @@ -3863,8 +3863,8 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * // "Original Message quote" radiobutton line: mOrigQuoteGroup = new TQButtonGroup( group ); mOrigQuoteGroup->hide(); - connect( mOrigQuoteGroup, TQT_SIGNAL( clicked( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mOrigQuoteGroup, TQ_SIGNAL( clicked( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); hbox = new TQHBox( group ); hbox->setSpacing( KDialog::spacingHint() ); @@ -3884,7 +3884,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * hbox->setStretchFactor( w, 1 ); mNoMDNsWhenEncryptedCheck = new TQCheckBox( i18n("Do not send MDNs in response to encrypted messages"), group ); - connect( mNoMDNsWhenEncryptedCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEmitChanged()) ); + connect( mNoMDNsWhenEncryptedCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEmitChanged()) ); // Warning label: label = new KActiveLabel( i18n("<b>WARNING:</b> Unconditionally returning " @@ -3900,7 +3900,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab( TQWidget * parent, const char * group->layout()->setSpacing( KDialog::spacingHint() ); mAutomaticallyImportAttachedKeysCheck = new TQCheckBox( i18n("Automatically import keys and certificates"), group ); - connect( mAutomaticallyImportAttachedKeysCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEmitChanged()) ); + connect( mAutomaticallyImportAttachedKeysCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEmitChanged()) ); vlay->addWidget( group ); @@ -4003,13 +4003,13 @@ SecurityPageComposerCryptoTab::SecurityPageComposerCryptoTab( TQWidget * parent, TQVBoxLayout* vlay = new TQVBoxLayout( this, 0, 0 ); mWidget = new ComposerCryptoConfiguration( this ); - connect( mWidget->mAutoSignature, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->mEncToSelf, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->mShowEncryptionResult, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->mShowKeyApprovalDlg, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->mAutoEncrypt, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->mNeverEncryptWhenSavingInDrafts, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->mStoreEncrypted, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotEmitChanged() ) ); + connect( mWidget->mAutoSignature, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->mEncToSelf, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->mShowEncryptionResult, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->mShowKeyApprovalDlg, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->mAutoEncrypt, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->mNeverEncryptWhenSavingInDrafts, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->mStoreEncrypted, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotEmitChanged() ) ); vlay->addWidget( mWidget ); } @@ -4080,20 +4080,20 @@ SecurityPageWarningTab::SecurityPageWarningTab( TQWidget * parent, const char * mWidget = new WarningConfiguration( this ); vlay->addWidget( mWidget ); - connect( mWidget->warnGroupBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEmitChanged()) ); - connect( mWidget->mWarnUnsigned, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEmitChanged()) ); - connect( mWidget->warnUnencryptedCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEmitChanged()) ); - connect( mWidget->warnReceiverNotInCertificateCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEmitChanged()) ); - connect( mWidget->mWarnSignKeyExpiresSB, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->mWarnSignChainCertExpiresSB, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->mWarnSignRootCertExpiresSB, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotEmitChanged() ) ); + connect( mWidget->warnGroupBox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEmitChanged()) ); + connect( mWidget->mWarnUnsigned, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEmitChanged()) ); + connect( mWidget->warnUnencryptedCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEmitChanged()) ); + connect( mWidget->warnReceiverNotInCertificateCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEmitChanged()) ); + connect( mWidget->mWarnSignKeyExpiresSB, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->mWarnSignChainCertExpiresSB, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->mWarnSignRootCertExpiresSB, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotEmitChanged() ) ); - connect( mWidget->mWarnEncrKeyExpiresSB, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->mWarnEncrChainCertExpiresSB, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->mWarnEncrRootCertExpiresSB, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotEmitChanged() ) ); + connect( mWidget->mWarnEncrKeyExpiresSB, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->mWarnEncrChainCertExpiresSB, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->mWarnEncrRootCertExpiresSB, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotEmitChanged() ) ); - connect( mWidget->enableAllWarningsPB, TQT_SIGNAL(clicked()), - TQT_SLOT(slotReenableAllWarningsClicked()) ); + connect( mWidget->enableAllWarningsPB, TQ_SIGNAL(clicked()), + TQ_SLOT(slotReenableAllWarningsClicked()) ); } void SecurityPage::WarningTab::doLoadOther() { @@ -4206,28 +4206,28 @@ SecurityPageSMimeTab::SecurityPageSMimeTab( TQWidget * parent, const char * name mConfig = Kleo::CryptoBackendFactory::instance()->config(); - connect( mWidget->CRLRB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->OCSPRB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->OCSPResponderURL, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->OCSPResponderSignature, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->doNotCheckCertPolicyCB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->neverConsultCB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->fetchMissingCB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotEmitChanged() ) ); - - connect( mWidget->ignoreServiceURLCB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->ignoreHTTPDPCB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->disableHTTPCB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->honorHTTPProxyRB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->useCustomHTTPProxyRB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->customHTTPProxy, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->ignoreLDAPDPCB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->disableLDAPCB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotEmitChanged() ) ); - connect( mWidget->customLDAPProxy, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( slotEmitChanged() ) ); - - connect( mWidget->disableHTTPCB, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotUpdateHTTPActions() ) ); - connect( mWidget->ignoreHTTPDPCB, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotUpdateHTTPActions() ) ); + connect( mWidget->CRLRB, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->OCSPRB, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->OCSPResponderURL, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->OCSPResponderSignature, TQ_SIGNAL( changed() ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->doNotCheckCertPolicyCB, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->neverConsultCB, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->fetchMissingCB, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotEmitChanged() ) ); + + connect( mWidget->ignoreServiceURLCB, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->ignoreHTTPDPCB, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->disableHTTPCB, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->honorHTTPProxyRB, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->useCustomHTTPProxyRB, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->customHTTPProxy, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->ignoreLDAPDPCB, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->disableLDAPCB, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotEmitChanged() ) ); + connect( mWidget->customLDAPProxy, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( slotEmitChanged() ) ); + + connect( mWidget->disableHTTPCB, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotUpdateHTTPActions() ) ); + connect( mWidget->ignoreHTTPDPCB, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotUpdateHTTPActions() ) ); // Button-group for exclusive radiobuttons TQButtonGroup* bgHTTPProxy = new TQButtonGroup( mWidget ); @@ -4504,7 +4504,7 @@ SecurityPageCryptPlugTab::SecurityPageCryptPlugTab( TQWidget * parent, const cha TQVBoxLayout * vlay = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); mBackendConfig = Kleo::CryptoBackendFactory::instance()->configWidget( this, "mBackendConfig" ); - connect( mBackendConfig, TQT_SIGNAL( changed( bool ) ), this, TQT_SIGNAL( changed( bool ) ) ); + connect( mBackendConfig, TQ_SIGNAL( changed( bool ) ), this, TQ_SIGNAL( changed( bool ) ) ); vlay->addWidget( mBackendConfig ); } @@ -4563,13 +4563,13 @@ MiscPageFolderTab::MiscPageFolderTab( TQWidget * parent, const char * name ) "trash"), this ); vlay->addWidget( mEmptyFolderConfirmCheck ); - connect( mEmptyFolderConfirmCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mEmptyFolderConfirmCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); mExcludeImportantFromExpiry = new TQCheckBox( i18n("E&xclude important messages from expiry"), this ); vlay->addWidget( mExcludeImportantFromExpiry ); - connect( mExcludeImportantFromExpiry, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mExcludeImportantFromExpiry, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // "when trying to find unread messages" combo + label: stretch 0 hlay = new TQHBoxLayout( vlay ); // inherits spacing @@ -4587,8 +4587,8 @@ MiscPageFolderTab::MiscPageFolderTab( TQWidget * parent, const char * name ) "Loop in All Folders")); hlay->addWidget( label ); hlay->addWidget( mLoopOnGotoUnread, 1 ); - connect( mLoopOnGotoUnread, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mLoopOnGotoUnread, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // when entering a folder hlay = new TQHBoxLayout( vlay ); // inherits spacing @@ -4611,8 +4611,8 @@ MiscPageFolderTab::MiscPageFolderTab( TQWidget * parent, const char * name ) "Jump to Oldest Message") ); hlay->addWidget( label ); hlay->addWidget( mActionEnterFolder, 1 ); - connect( mActionEnterFolder, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mActionEnterFolder, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); hlay = new TQHBoxLayout( vlay ); // inherits spacing mDelayedMarkAsRead = new TQCheckBox( i18n("Mar&k selected message as read after"), this ); @@ -4623,19 +4623,19 @@ MiscPageFolderTab::MiscPageFolderTab( TQWidget * parent, const char * name ) mDelayedMarkTime->setEnabled( false ); // since mDelayedMarkAsREad is off hlay->addWidget( mDelayedMarkTime ); hlay->addStretch( 1 ); - connect( mDelayedMarkTime, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); - connect( mDelayedMarkAsRead, TQT_SIGNAL(toggled(bool)), - mDelayedMarkTime, TQT_SLOT(setEnabled(bool))); - connect( mDelayedMarkAsRead, TQT_SIGNAL(toggled(bool)), - this , TQT_SLOT(slotEmitChanged( void ))); + connect( mDelayedMarkTime, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); + connect( mDelayedMarkAsRead, TQ_SIGNAL(toggled(bool)), + mDelayedMarkTime, TQ_SLOT(setEnabled(bool))); + connect( mDelayedMarkAsRead, TQ_SIGNAL(toggled(bool)), + this , TQ_SLOT(slotEmitChanged( void ))); // "show popup after Drag'n'Drop" checkbox: stretch 0 mShowPopupAfterDnD = new TQCheckBox( i18n("Ask for action after &dragging messages to another folder"), this ); vlay->addWidget( mShowPopupAfterDnD ); - connect( mShowPopupAfterDnD, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mShowPopupAfterDnD, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // "default mailbox format" combo + label: stretch 0 hlay = new TQHBoxLayout( vlay ); // inherits spacing @@ -4668,8 +4668,8 @@ MiscPageFolderTab::MiscPageFolderTab( TQWidget * parent, const char * name ) TQWhatsThis::add( label, msg ); hlay->addWidget( label ); hlay->addWidget( mMailboxPrefCombo, 1 ); - connect( mMailboxPrefCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mMailboxPrefCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // "On startup..." option: hlay = new TQHBoxLayout( vlay ); // inherits spacing @@ -4679,23 +4679,23 @@ MiscPageFolderTab::MiscPageFolderTab( TQWidget * parent, const char * name ) i18n("Open this folder on startup:"), this ); hlay->addWidget( label ); hlay->addWidget( mOnStartupOpenFolder, 1 ); - connect( mOnStartupOpenFolder, TQT_SIGNAL( folderChanged( KMFolder* ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mOnStartupOpenFolder, TQ_SIGNAL( folderChanged( KMFolder* ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // "Empty &trash on program exit" option: hlay = new TQHBoxLayout( vlay ); // inherits spacing mEmptyTrashCheck = new TQCheckBox( i18n("Empty local &trash folder on program exit"), this ); hlay->addWidget( mEmptyTrashCheck ); - connect( mEmptyTrashCheck, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mEmptyTrashCheck, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); #ifdef HAVE_INDEXLIB // indexing enabled option: mIndexingEnabled = new TQCheckBox( i18n("Enable full text &indexing"), this ); vlay->addWidget( mIndexingEnabled ); - connect( mIndexingEnabled, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mIndexingEnabled, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); #endif // "Quota Units" @@ -4709,7 +4709,7 @@ MiscPageFolderTab::MiscPageFolderTab( TQWidget * parent, const char * name ) << i18n("GB") ); hlay->addWidget( label ); hlay->addWidget( mQuotaCmbBox, 1 ); - connect( mQuotaCmbBox, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mQuotaCmbBox, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotEmitChanged( void ) ) ); vlay->addStretch( 1 ); @@ -4817,14 +4817,14 @@ MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* parent, const char* name ) "the Kontact applications" ) ); TQWhatsThis::add( mEnableImapResCB, i18n( GlobalSettings::self()->theIMAPResourceEnabledItem()->whatsThis().utf8() ) ); - connect( mEnableImapResCB, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mEnableImapResCB, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); mBox = new TQWidget( b1 ); TQGridLayout* grid = new TQGridLayout( mBox, 5, 2, 0, KDialog::spacingHint() ); grid->setColStretch( 1, 1 ); - connect( mEnableImapResCB, TQT_SIGNAL( toggled(bool) ), - mBox, TQT_SLOT( setEnabled(bool) ) ); + connect( mEnableImapResCB, TQ_SIGNAL( toggled(bool) ), + mBox, TQ_SLOT( setEnabled(bool) ) ); TQLabel* storageFormatLA = new TQLabel( i18n("&Format used for the groupware folders:"), mBox ); @@ -4842,8 +4842,8 @@ MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* parent, const char* name ) grid->addWidget( mStorageFormatCombo, 0, 1 ); TQToolTip::add( mStorageFormatCombo, toolTip ); TQWhatsThis::add( mStorageFormatCombo, whatsThis ); - connect( mStorageFormatCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotStorageFormatChanged( int ) ) ); + connect( mStorageFormatCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotStorageFormatChanged( int ) ) ); TQLabel* languageLA = new TQLabel( i18n("&Language of the groupware folders:"), mBox ); @@ -4862,8 +4862,8 @@ MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* parent, const char* name ) grid->addWidget( mLanguageCombo, 1, 1 ); TQToolTip::add( mLanguageCombo, toolTip ); TQWhatsThis::add( mLanguageCombo, whatsThis ); - connect( mLanguageCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mLanguageCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); mFolderComboLabel = new TQLabel( mBox ); // text depends on storage format toolTip = i18n( "Set the parent of the resource folders" ); @@ -4882,8 +4882,8 @@ MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* parent, const char* name ) mFolderComboStack->addWidget( mFolderCombo, 0 ); TQToolTip::add( mFolderCombo, toolTip ); TQWhatsThis::add( mFolderCombo, whatsThis ); - connect( mFolderCombo, TQT_SIGNAL( folderChanged( KMFolder* ) ), - this, TQT_SLOT( slotEmitChanged() ) ); + connect( mFolderCombo, TQ_SIGNAL( folderChanged( KMFolder* ) ), + this, TQ_SLOT( slotEmitChanged() ) ); // Second possibility in the widgetstack: a combo showing the list of accounts // This is used with the kolab xml storage since the groupware folders @@ -4892,8 +4892,8 @@ MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* parent, const char* name ) mFolderComboStack->addWidget( mAccountCombo, 1 ); TQToolTip::add( mAccountCombo, toolTip ); TQWhatsThis::add( mAccountCombo, whatsThis ); - connect( mAccountCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotEmitChanged() ) ); + connect( mAccountCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotEmitChanged() ) ); mHideGroupwareFolders = new TQCheckBox( i18n( "&Hide groupware folders" ), mBox, "HideGroupwareFoldersBox" ); @@ -4903,8 +4903,8 @@ MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* parent, const char* name ) "resource folders in the folder tree." ) ); TQWhatsThis::add( mHideGroupwareFolders, i18n( GlobalSettings::self() ->hideGroupwareFoldersItem()->whatsThis().utf8() ) ); - connect( mHideGroupwareFolders, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotEmitChanged() ) ); + connect( mHideGroupwareFolders, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotEmitChanged() ) ); mOnlyShowGroupwareFolders = new TQCheckBox( i18n( "&Only show groupware folders for this account" ), mBox, "OnlyGroupwareFoldersBox" ); @@ -4915,20 +4915,20 @@ MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* parent, const char* name ) "configured for groupware." ) ); TQWhatsThis::add( mOnlyShowGroupwareFolders, i18n( GlobalSettings::self() ->showOnlyGroupwareFoldersForGroupwareAccountItem()->whatsThis().utf8() ) ); - connect( mOnlyShowGroupwareFolders, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotEmitChanged() ) ); + connect( mOnlyShowGroupwareFolders, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotEmitChanged() ) ); mSyncImmediately = new TQCheckBox( i18n( "Synchronize groupware changes immediately" ), mBox ); TQToolTip::add( mSyncImmediately, i18n( "Synchronize groupware changes in disconnected IMAP folders immediately when being online." ) ); - connect( mSyncImmediately, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEmitChanged()) ); + connect( mSyncImmediately, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEmitChanged()) ); grid->addMultiCellWidget( mSyncImmediately, 4, 4, 0, 1 ); mDeleteInvitations = new TQCheckBox( i18n( GlobalSettings::self()->deleteInvitationEmailsAfterSendingReplyItem()->label().utf8() ), mBox ); TQWhatsThis::add( mDeleteInvitations, i18n( GlobalSettings::self() ->deleteInvitationEmailsAfterSendingReplyItem()->whatsThis().utf8() ) ); - connect( mDeleteInvitations, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEmitChanged()) ); + connect( mDeleteInvitations, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEmitChanged()) ); grid->addMultiCellWidget( mDeleteInvitations, 5, 5, 0, 1 ); // Groupware functionality compatibility setup @@ -4939,47 +4939,47 @@ MiscPageGroupwareTab::MiscPageGroupwareTab( TQWidget* parent, const char* name ) // Currently believed to be disused. mEnableGwCB = new TQCheckBox( i18n("&Enable groupware functionality"), b1 ); gBox->setSpacing( KDialog::spacingHint() ); - connect( mEnableGwCB, TQT_SIGNAL( toggled(bool) ), - gBox, TQT_SLOT( setEnabled(bool) ) ); - connect( mEnableGwCB, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mEnableGwCB, TQ_SIGNAL( toggled(bool) ), + gBox, TQ_SLOT( setEnabled(bool) ) ); + connect( mEnableGwCB, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); #endif mEnableGwCB = 0; mLegacyMangleFromTo = new TQCheckBox( i18n( "Mangle From:/To: headers in replies to invitations" ), gBox ); TQToolTip::add( mLegacyMangleFromTo, i18n( "Turn this option on in order to make Outlook(tm) understand your answers to invitation replies" ) ); TQWhatsThis::add( mLegacyMangleFromTo, i18n( GlobalSettings::self()-> legacyMangleFromToHeadersItem()->whatsThis().utf8() ) ); - connect( mLegacyMangleFromTo, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mLegacyMangleFromTo, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); mLegacyBodyInvites = new TQCheckBox( i18n( "Send invitations in the mail body" ), gBox ); TQToolTip::add( mLegacyBodyInvites, i18n( "Turn this option on in order to make Outlook(tm) understand your answers to invitations" ) ); TQWhatsThis::add( mLegacyMangleFromTo, i18n( GlobalSettings::self()-> legacyBodyInvitesItem()->whatsThis().utf8() ) ); - connect( mLegacyBodyInvites, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotLegacyBodyInvitesToggled( bool ) ) ); - connect( mLegacyBodyInvites, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mLegacyBodyInvites, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotLegacyBodyInvitesToggled( bool ) ) ); + connect( mLegacyBodyInvites, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); mExchangeCompatibleInvitations = new TQCheckBox( i18n( "Exchange compatible invitation naming" ), gBox ); TQToolTip::add( mExchangeCompatibleInvitations, i18n( "Outlook(tm), when used in combination with a Microsoft Exchange server,\nhas a problem understanding standards-compliant groupware e-mail.\nTurn this option on to send groupware invitations and replies in an Exchange compatible way." ) ); TQWhatsThis::add( mExchangeCompatibleInvitations, i18n( GlobalSettings::self()-> exchangeCompatibleInvitationsItem()->whatsThis().utf8() ) ); - connect( mExchangeCompatibleInvitations, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mExchangeCompatibleInvitations, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); mOutlookCompatibleInvitationComments = new TQCheckBox( i18n( "Outlook compatible invitation reply comments" ), gBox ); TQToolTip::add( mOutlookCompatibleInvitationComments, i18n( "Send invitation reply comments in a way that Microsoft Outlook(tm) understands." ) ); TQWhatsThis::add( mOutlookCompatibleInvitationComments, i18n( GlobalSettings::self()-> outlookCompatibleInvitationReplyCommentsItem()->whatsThis().utf8() ) ); - connect( mOutlookCompatibleInvitationComments, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mOutlookCompatibleInvitationComments, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); mAutomaticSending = new TQCheckBox( i18n( "Automatic invitation sending" ), gBox ); TQToolTip::add( mAutomaticSending, i18n( "When this is on, the user will not see the mail composer window. Invitation mails are sent automatically" ) ); TQWhatsThis::add( mAutomaticSending, i18n( GlobalSettings::self()-> automaticSendingItem()->whatsThis().utf8() ) ); - connect( mAutomaticSending, TQT_SIGNAL( stateChanged( int ) ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mAutomaticSending, TQ_SIGNAL( stateChanged( int ) ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); // Open space padding at the end new TQLabel( this ); @@ -5174,8 +5174,8 @@ AccountUpdater::AccountUpdater(ImapAccountBase *account) void AccountUpdater::update() { - connect( mAccount, TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( namespacesFetched() ) ); + connect( mAccount, TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( namespacesFetched() ) ); mAccount->makeConnection(); } diff --git a/kmail/configuredialog_p.cpp b/kmail/configuredialog_p.cpp index 83c13a31..f244bc8e 100644 --- a/kmail/configuredialog_p.cpp +++ b/kmail/configuredialog_p.cpp @@ -53,8 +53,8 @@ NewIdentityDialog::NewIdentityDialog( const TQStringList & identities, mLineEdit->setFocus(); hlay->addWidget( new TQLabel( mLineEdit, i18n("&New identity:"), page ) ); hlay->addWidget( mLineEdit, 1 ); - connect( mLineEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotEnableOK(const TQString&)) ); + connect( mLineEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotEnableOK(const TQString&)) ); mButtonGroup = new TQButtonGroup( page ); mButtonGroup->hide(); @@ -89,10 +89,10 @@ NewIdentityDialog::NewIdentityDialog( const TQStringList & identities, // enable/disable combobox and label depending on the third radio // button's state: - connect( radio, TQT_SIGNAL(toggled(bool)), - label, TQT_SLOT(setEnabled(bool)) ); - connect( radio, TQT_SIGNAL(toggled(bool)), - mComboBox, TQT_SLOT(setEnabled(bool)) ); + connect( radio, TQ_SIGNAL(toggled(bool)), + label, TQ_SLOT(setEnabled(bool)) ); + connect( radio, TQ_SIGNAL(toggled(bool)), + mComboBox, TQ_SLOT(setEnabled(bool)) ); enableButtonOK( false ); // since line edit is empty } @@ -305,12 +305,12 @@ ProfileDialog::ProfileDialog( TQWidget * parent, const char * name, bool modal ) setup(); - connect( mListView, TQT_SIGNAL(selectionChanged()), - TQT_SLOT(slotSelectionChanged()) ); - connect( mListView, TQT_SIGNAL(doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), - TQT_SLOT(slotOk()) ); + connect( mListView, TQ_SIGNAL(selectionChanged()), + TQ_SLOT(slotSelectionChanged()) ); + connect( mListView, TQ_SIGNAL(doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), + TQ_SLOT(slotOk()) ); - connect( this, TQT_SIGNAL(finished()), TQT_SLOT(delayedDestruct()) ); + connect( this, TQ_SIGNAL(finished()), TQ_SLOT(delayedDestruct()) ); enableButtonOK( false ); } @@ -375,8 +375,8 @@ ConfigModuleWithTabs::ConfigModuleWithTabs( TQWidget * parent, void ConfigModuleWithTabs::addTab( ConfigModuleTab* tab, const TQString & title ) { mTabWidget->addTab( tab, title ); - connect( tab, TQT_SIGNAL(changed( bool )), - this, TQT_SIGNAL(changed( bool )) ); + connect( tab, TQ_SIGNAL(changed( bool )), + this, TQ_SIGNAL(changed( bool )) ); } void ConfigModuleWithTabs::load() { diff --git a/kmail/copyfolderjob.cpp b/kmail/copyfolderjob.cpp index 165d9468..a237db10 100644 --- a/kmail/copyfolderjob.cpp +++ b/kmail/copyfolderjob.cpp @@ -95,8 +95,8 @@ void CopyFolderJob::copyMessagesToTargetDir() slotCopyNextChild(); // no contents, check subfolders } else { KMCommand *command = new KMCopyCommand( mNewFolder, msgList ); - connect( command, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( slotCopyCompleted( KMCommand * ) ) ); + connect( command, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( slotCopyCompleted( KMCommand * ) ) ); command->start(); } } @@ -104,8 +104,8 @@ void CopyFolderJob::copyMessagesToTargetDir() void CopyFolderJob::slotCopyCompleted( KMCommand* command ) { kdDebug(5006) << k_funcinfo << (command?command->result():0) << endl; - disconnect( command, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( slotCopyCompleted( KMCommand * ) ) ); + disconnect( command, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( slotCopyCompleted( KMCommand * ) ) ); mStorage->blockSignals( false ); @@ -160,8 +160,8 @@ void CopyFolderJob::slotCopyNextChild( bool success ) // let it do its thing and report back when we are ready to do the next sibling mNextChildFolder->open( "copyfolder" ); // refcount FolderJob* job = new CopyFolderJob( mNextChildFolder->storage(), dir); - connect( job, TQT_SIGNAL( folderCopyComplete( bool ) ), - this, TQT_SLOT( slotCopyNextChild( bool ) ) ); + connect( job, TQ_SIGNAL( folderCopyComplete( bool ) ), + this, TQ_SLOT( slotCopyNextChild( bool ) ) ); job->start(); } @@ -194,8 +194,8 @@ bool CopyFolderJob::createTargetDir() TQString imapPath; imapPath = anAccount->createImapPath( selectedStorage->imapPath(), mStorage->folder()->name() ); KMFolderImap* newStorage = static_cast<KMFolderImap*>( mNewFolder->storage() ); - connect( selectedStorage, TQT_SIGNAL(folderCreationResult(const TQString&, bool)), - this, TQT_SLOT(folderCreationDone(const TQString&, bool)) ); + connect( selectedStorage, TQ_SIGNAL(folderCreationResult(const TQString&, bool)), + this, TQ_SLOT(folderCreationDone(const TQString&, bool)) ); selectedStorage->createFolder(mStorage->folder()->name(), TQString()); // create it on the server newStorage->initializeFrom( selectedStorage, imapPath, TQString() ); static_cast<KMFolderImap*>(mNewParent->owner()->storage())->setAccount( selectedStorage->account() ); diff --git a/kmail/customtemplates.cpp b/kmail/customtemplates.cpp index 5daf001d..4d4080ed 100644 --- a/kmail/customtemplates.cpp +++ b/kmail/customtemplates.cpp @@ -68,29 +68,29 @@ CustomTemplates::CustomTemplates( TQWidget *parent, const char *name ) mEditFrame->setEnabled( false ); - connect( mName, TQT_SIGNAL( textChanged ( const TQString &) ), - this, TQT_SLOT( slotNameChanged( const TQString & ) ) ); - connect( mEdit, TQT_SIGNAL( textChanged() ), - this, TQT_SLOT( slotTextChanged( void ) ) ); - connect( mToEdit, TQT_SIGNAL( textChanged(const TQString&) ), - this, TQT_SLOT( slotTextChanged( void ) ) ); - connect( mCCEdit, TQT_SIGNAL( textChanged(const TQString&) ), - this, TQT_SLOT( slotTextChanged( void ) ) ); - - connect( mInsertCommand, TQT_SIGNAL( insertCommand(TQString, int) ), - this, TQT_SLOT( slotInsertCommand(TQString, int) ) ); - - connect( mAdd, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotAddClicked() ) ); - connect( mRemove, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotRemoveClicked() ) ); - connect( mList, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotListSelectionChanged() ) ); - connect( mType, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotTypeActivated( int ) ) ); - - connect( mKeyButton, TQT_SIGNAL( capturedShortcut( const TDEShortcut& ) ), - this, TQT_SLOT( slotShortcutCaptured( const TDEShortcut& ) ) ); + connect( mName, TQ_SIGNAL( textChanged ( const TQString &) ), + this, TQ_SLOT( slotNameChanged( const TQString & ) ) ); + connect( mEdit, TQ_SIGNAL( textChanged() ), + this, TQ_SLOT( slotTextChanged( void ) ) ); + connect( mToEdit, TQ_SIGNAL( textChanged(const TQString&) ), + this, TQ_SLOT( slotTextChanged( void ) ) ); + connect( mCCEdit, TQ_SIGNAL( textChanged(const TQString&) ), + this, TQ_SLOT( slotTextChanged( void ) ) ); + + connect( mInsertCommand, TQ_SIGNAL( insertCommand(TQString, int) ), + this, TQ_SLOT( slotInsertCommand(TQString, int) ) ); + + connect( mAdd, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotAddClicked() ) ); + connect( mRemove, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotRemoveClicked() ) ); + connect( mList, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotListSelectionChanged() ) ); + connect( mType, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotTypeActivated( int ) ) ); + + connect( mKeyButton, TQ_SIGNAL( capturedShortcut( const TDEShortcut& ) ), + this, TQ_SLOT( slotShortcutCaptured( const TDEShortcut& ) ) ); mReplyPix = TDEIconLoader().loadIcon( "mail-reply-sender", TDEIcon::Small ); mReplyAllPix = TDEIconLoader().loadIcon( "mail-reply-all", TDEIcon::Small ); diff --git a/kmail/dictionarycombobox.cpp b/kmail/dictionarycombobox.cpp index be705d3d..b6da5abf 100644 --- a/kmail/dictionarycombobox.cpp +++ b/kmail/dictionarycombobox.cpp @@ -48,10 +48,10 @@ namespace KMail { mDefaultDictionary( 0 ) { reloadCombo(); - connect( this, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotDictionaryChanged( int ) ) ); - connect( this, TQT_SIGNAL( dictionaryChanged( int ) ), - mSpellConfig, TQT_SLOT( sSetDictionary( int ) ) ); + connect( this, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotDictionaryChanged( int ) ) ); + connect( this, TQ_SIGNAL( dictionaryChanged( int ) ), + mSpellConfig, TQ_SLOT( sSetDictionary( int ) ) ); } DictionaryComboBox::~DictionaryComboBox() diff --git a/kmail/editorwatcher.cpp b/kmail/editorwatcher.cpp index a7f25c3b..fdff42f7 100644 --- a/kmail/editorwatcher.cpp +++ b/kmail/editorwatcher.cpp @@ -63,7 +63,7 @@ EditorWatcher::EditorWatcher(const KURL & url, const TQString &mimeType, bool op mDone( false ) { assert( mUrl.isLocalFile() ); - connect( &mTimer, TQT_SIGNAL(timeout()), TQT_SLOT(checkEditDone()) ); + connect( &mTimer, TQ_SIGNAL(timeout()), TQ_SLOT(checkEditDone()) ); } bool EditorWatcher::start() @@ -88,7 +88,7 @@ bool EditorWatcher::start() mInotifyWatch = inotify_add_watch( mInotifyFd, mUrl.path().latin1(), IN_CLOSE | IN_OPEN | IN_MODIFY ); if ( mInotifyWatch >= 0 ) { TQSocketNotifier *sn = new TQSocketNotifier( mInotifyFd, TQSocketNotifier::Read, this ); - connect( sn, TQT_SIGNAL(activated(int)), TQT_SLOT(inotifyEvent()) ); + connect( sn, TQ_SIGNAL(activated(int)), TQ_SLOT(inotifyEvent()) ); mHaveInotify = true; mFileModified = false; } @@ -101,7 +101,7 @@ bool EditorWatcher::start() TQStringList params = KRun::processDesktopExec( *offer, list, false ); mEditor = new TDEProcess( this ); *mEditor << params; - connect( mEditor, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(editorExited()) ); + connect( mEditor, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(editorExited()) ); if ( !mEditor->start() ) return false; mEditorRunning = true; diff --git a/kmail/expirejob.cpp b/kmail/expirejob.cpp index a3749947..b38ad294 100644 --- a/kmail/expirejob.cpp +++ b/kmail/expirejob.cpp @@ -107,7 +107,7 @@ void ExpireJob::execute() mFolderOpen = true; mCurrentIndex = storage->count()-1; kdDebug(5006) << "ExpireJob: starting to expire in folder " << mSrcFolder->location() << endl; - connect( &mTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotDoWork() ) ); + connect( &mTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotDoWork() ) ); mTimer.start( EXPIREJOB_TIMERINTERVAL ); slotDoWork(); // do nothing here, we might be deleted! @@ -169,8 +169,8 @@ void ExpireJob::done() << mSrcFolder->location() << " " << count << " messages to remove." << endl; KMMoveCommand* cmd = new KMMoveCommand( 0, mRemovedMsgs ); - connect( cmd, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( slotMessagesMoved( KMCommand * ) ) ); + connect( cmd, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( slotMessagesMoved( KMCommand * ) ) ); cmd->start(); moving = true; str = i18n( "Removing 1 old message from folder %1...", @@ -191,8 +191,8 @@ void ExpireJob::done() << mRemovedMsgs.count() << " messages to move to " << mMoveToFolder->label() << endl; KMMoveCommand* cmd = new KMMoveCommand( mMoveToFolder, mRemovedMsgs ); - connect( cmd, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( slotMessagesMoved( KMCommand * ) ) ); + connect( cmd, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( slotMessagesMoved( KMCommand * ) ) ); cmd->start(); moving = true; str = i18n( "Moving 1 old message from folder %1 to folder %2...", diff --git a/kmail/expirypropertiesdialog.cpp b/kmail/expirypropertiesdialog.cpp index f1c3274f..76e8d219 100644 --- a/kmail/expirypropertiesdialog.cpp +++ b/kmail/expirypropertiesdialog.cpp @@ -44,8 +44,8 @@ ExpiryPropertiesDialog::ExpiryPropertiesDialog( KMFolderTree* tree, KMFolder* fo expireReadMailCB = new TQCheckBox( privateLayoutWidget, "expireReadMailCB" ); expireReadMailCB->setText( i18n( "Expire read mails after" ) ); - connect( expireReadMailCB, TQT_SIGNAL( toggled( bool )), - this, TQT_SLOT( slotUpdateControls() ) ); + connect( expireReadMailCB, TQ_SIGNAL( toggled( bool )), + this, TQ_SLOT( slotUpdateControls() ) ); readHBox->addWidget( expireReadMailCB ); expireReadMailSB = new TQSpinBox( privateLayoutWidget, "expireReadMailSB" ); @@ -62,8 +62,8 @@ ExpiryPropertiesDialog::ExpiryPropertiesDialog( KMFolderTree* tree, KMFolder* fo expireUnreadMailCB = new TQCheckBox( privateLayoutWidget, "expireUnreadMailCB" ); expireUnreadMailCB->setText( i18n( "Expire unread mails after" ) ); - connect( expireUnreadMailCB, TQT_SIGNAL( toggled( bool )), - this, TQT_SLOT( slotUpdateControls() ) ); + connect( expireUnreadMailCB, TQ_SIGNAL( toggled( bool )), + this, TQ_SLOT( slotUpdateControls() ) ); unreadHBox->addWidget( expireUnreadMailCB ); expireUnreadMailSB = new TQSpinBox( privateLayoutWidget, "expireUnreadMailSB" ); @@ -92,8 +92,8 @@ ExpiryPropertiesDialog::ExpiryPropertiesDialog( KMFolderTree* tree, KMFolder* fo moveToRB = new TQRadioButton( privateLayoutWidget, "moveToRB" ); actionsGroup->insert( moveToRB ); - connect( moveToRB, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotUpdateControls() ) ); + connect( moveToRB, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotUpdateControls() ) ); moveToRB->setText( i18n( "Move to:" ) ); moveToHBox->addWidget( moveToRB ); diff --git a/kmail/favoritefolderview.cpp b/kmail/favoritefolderview.cpp index 22d093aa..543ea18f 100644 --- a/kmail/favoritefolderview.cpp +++ b/kmail/favoritefolderview.cpp @@ -55,15 +55,15 @@ FavoriteFolderViewItem::FavoriteFolderViewItem(FavoriteFolderView * parent, cons { // same stuff as in KMFolderTreeItem again, this time even with virtual methods working init(); - connect( folder, TQT_SIGNAL(nameChanged()), TQT_SLOT(nameChanged()) ); - connect( folder, TQT_SIGNAL(iconsChanged()), TQT_SLOT(slotIconsChanged()) ); + connect( folder, TQ_SIGNAL(nameChanged()), TQ_SLOT(nameChanged()) ); + connect( folder, TQ_SIGNAL(iconsChanged()), TQ_SLOT(slotIconsChanged()) ); - connect( folder, TQT_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)), TQT_SLOT(updateCount()) ); - connect( folder, TQT_SIGNAL(numUnreadMsgsChanged(KMFolder*)), TQT_SLOT(updateCount()) ); - connect( folder, TQT_SIGNAL(msgRemoved(KMFolder*)), TQT_SLOT(updateCount()) ); - connect( folder, TQT_SIGNAL(folderSizeChanged( KMFolder* )), TQT_SLOT(updateCount()) ); + connect( folder, TQ_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)), TQ_SLOT(updateCount()) ); + connect( folder, TQ_SIGNAL(numUnreadMsgsChanged(KMFolder*)), TQ_SLOT(updateCount()) ); + connect( folder, TQ_SIGNAL(msgRemoved(KMFolder*)), TQ_SLOT(updateCount()) ); + connect( folder, TQ_SIGNAL(folderSizeChanged( KMFolder* )), TQ_SLOT(updateCount()) ); - TQTimer::singleShot( 0, this, TQT_SLOT(updateCount()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(updateCount()) ); if ( unreadCount() > 0 ) setPixmap( 0, unreadIcon( iconSize() ) ); @@ -97,23 +97,23 @@ FavoriteFolderView::FavoriteFolderView( KMMainWidget *mainWidget, TQWidget * par setSorting( -1 ); setShowSortIndicator( false ); - connect( this, TQT_SIGNAL(selectionChanged()), TQT_SLOT(selectionChanged()) ); - connect( this, TQT_SIGNAL(clicked(TQListViewItem*)), TQT_SLOT(itemClicked(TQListViewItem*)) ); - connect( this, TQT_SIGNAL(dropped(TQDropEvent*,TQListViewItem*)), TQT_SLOT(dropped(TQDropEvent*,TQListViewItem*)) ); - connect( this, TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint &, int)), - TQT_SLOT(contextMenu(TQListViewItem*,const TQPoint&)) ); - connect( this, TQT_SIGNAL(moved()), TQT_SLOT(notifyInstancesOnChange()) ); - connect( this, TQT_SIGNAL(triggerRefresh()), TQT_SLOT(refresh()) ); + connect( this, TQ_SIGNAL(selectionChanged()), TQ_SLOT(selectionChanged()) ); + connect( this, TQ_SIGNAL(clicked(TQListViewItem*)), TQ_SLOT(itemClicked(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(dropped(TQDropEvent*,TQListViewItem*)), TQ_SLOT(dropped(TQDropEvent*,TQListViewItem*)) ); + connect( this, TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint &, int)), + TQ_SLOT(contextMenu(TQListViewItem*,const TQPoint&)) ); + connect( this, TQ_SIGNAL(moved()), TQ_SLOT(notifyInstancesOnChange()) ); + connect( this, TQ_SIGNAL(triggerRefresh()), TQ_SLOT(refresh()) ); - connect( kmkernel->folderMgr(), TQT_SIGNAL(changed()), TQT_SLOT(initializeFavorites()) ); - connect( kmkernel->dimapFolderMgr(), TQT_SIGNAL(changed()), TQT_SLOT(initializeFavorites()) ); - connect( kmkernel->imapFolderMgr(), TQT_SIGNAL(changed()), TQT_SLOT(initializeFavorites()) ); - connect( kmkernel->searchFolderMgr(), TQT_SIGNAL(changed()), TQT_SLOT(initializeFavorites()) ); + connect( kmkernel->folderMgr(), TQ_SIGNAL(changed()), TQ_SLOT(initializeFavorites()) ); + connect( kmkernel->dimapFolderMgr(), TQ_SIGNAL(changed()), TQ_SLOT(initializeFavorites()) ); + connect( kmkernel->imapFolderMgr(), TQ_SIGNAL(changed()), TQ_SLOT(initializeFavorites()) ); + connect( kmkernel->searchFolderMgr(), TQ_SIGNAL(changed()), TQ_SLOT(initializeFavorites()) ); - connect( kmkernel->folderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)), TQT_SLOT(folderRemoved(KMFolder*)) ); - connect( kmkernel->dimapFolderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)), TQT_SLOT(folderRemoved(KMFolder*)) ); - connect( kmkernel->imapFolderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)), TQT_SLOT(folderRemoved(KMFolder*)) ); - connect( kmkernel->searchFolderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)), TQT_SLOT(folderRemoved(KMFolder*)) ); + connect( kmkernel->folderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)), TQ_SLOT(folderRemoved(KMFolder*)) ); + connect( kmkernel->dimapFolderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)), TQ_SLOT(folderRemoved(KMFolder*)) ); + connect( kmkernel->imapFolderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)), TQ_SLOT(folderRemoved(KMFolder*)) ); + connect( kmkernel->searchFolderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)), TQ_SLOT(folderRemoved(KMFolder*)) ); TQFont f = font(); f.setItalic( true ); @@ -153,7 +153,7 @@ void FavoriteFolderView::readConfig() ensureItemVisible( firstChild() ); // folder tree is not yet populated at this point - TQTimer::singleShot( 0, this, TQT_SLOT(initializeFavorites()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(initializeFavorites()) ); readColorConfig(); mReadingConfig = false; @@ -334,18 +334,18 @@ void FavoriteFolderView::contextMenu(TQListViewItem * item, const TQPoint & poin mainWidget()->action("empty")->plug( &contextMenu ); contextMenu.insertSeparator(); - contextMenu.insertItem( SmallIconSet("configure_shortcuts"), i18n("&Assign Shortcut..."), fti, TQT_SLOT(assignShortcut()) ); - contextMenu.insertItem( i18n("Expire..."), fti, TQT_SLOT(slotShowExpiryProperties()) ); + contextMenu.insertItem( SmallIconSet("configure_shortcuts"), i18n("&Assign Shortcut..."), fti, TQ_SLOT(assignShortcut()) ); + contextMenu.insertItem( i18n("Expire..."), fti, TQ_SLOT(slotShowExpiryProperties()) ); mainWidget()->action("modify")->plug( &contextMenu ); contextMenu.insertSeparator(); contextMenu.insertItem( SmallIconSet("edit-delete"), i18n("Remove From Favorites"), - this, TQT_SLOT(removeFolder()) ); - contextMenu.insertItem( SmallIconSet("edit"), i18n("Rename Favorite"), this, TQT_SLOT(renameFolder()) ); + this, TQ_SLOT(removeFolder()) ); + contextMenu.insertItem( SmallIconSet("edit"), i18n("Rename Favorite"), this, TQ_SLOT(renameFolder()) ); } else { contextMenu.insertItem( SmallIconSet("bookmark_add"), i18n("Add Favorite Folder..."), - this, TQT_SLOT(addFolder()) ); + this, TQ_SLOT(addFolder()) ); } contextMenu.exec( point, 0 ); } diff --git a/kmail/filterimporterexporter.cpp b/kmail/filterimporterexporter.cpp index df91b8dc..6703ef1d 100644 --- a/kmail/filterimporterexporter.cpp +++ b/kmail/filterimporterexporter.cpp @@ -66,8 +66,8 @@ FilterSelectionDialog::FilterSelectionDialog( TQWidget * parent ) buttonLayout->addWidget( selectAllButton ); unselectAllButton = new KPushButton( i18n( "Unselect All" ), w ); buttonLayout->addWidget( unselectAllButton ); - connect( selectAllButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSelectAllButton() ) ); - connect( unselectAllButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotUnselectAllButton() ) ); + connect( selectAllButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSelectAllButton() ) ); + connect( unselectAllButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotUnselectAllButton() ) ); resize( 300, 350 ); } diff --git a/kmail/filterlogdlg.cpp b/kmail/filterlogdlg.cpp index eaaefd79..6ea6e29d 100644 --- a/kmail/filterlogdlg.cpp +++ b/kmail/filterlogdlg.cpp @@ -73,8 +73,8 @@ FilterLogDialog::FilterLogDialog( TQWidget * parent ) mLogActiveBox = new TQCheckBox( i18n("&Log filter activities"), page ); mLogActiveBox->setChecked( FilterLog::instance()->isLogging() ); - connect( mLogActiveBox, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSwitchLogState(void)) ); + connect( mLogActiveBox, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSwitchLogState(void)) ); TQWhatsThis::add( mLogActiveBox, i18n( "You can turn logging of filter activities on and off here. " "Of course, log data is collected and shown only when logging " @@ -82,15 +82,15 @@ FilterLogDialog::FilterLogDialog( TQWidget * parent ) mLogDetailsBox = new TQVGroupBox( i18n( "Logging Details" ), page ); mLogDetailsBox->setEnabled( mLogActiveBox->isChecked() ); - connect( mLogActiveBox, TQT_SIGNAL( toggled( bool ) ), - mLogDetailsBox, TQT_SLOT( setEnabled( bool ) ) ); + connect( mLogActiveBox, TQ_SIGNAL( toggled( bool ) ), + mLogDetailsBox, TQ_SLOT( setEnabled( bool ) ) ); mLogPatternDescBox = new TQCheckBox( i18n("Log pattern description"), mLogDetailsBox ); mLogPatternDescBox->setChecked( FilterLog::instance()->isContentTypeEnabled( FilterLog::patternDesc ) ); - connect( mLogPatternDescBox, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotChangeLogDetail(void)) ); + connect( mLogPatternDescBox, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotChangeLogDetail(void)) ); // TODO //TQWhatsThis::add( mLogPatternDescBox, // i18n( "" ) ); @@ -99,8 +99,8 @@ FilterLogDialog::FilterLogDialog( TQWidget * parent ) mLogDetailsBox ); mLogRuleEvaluationBox->setChecked( FilterLog::instance()->isContentTypeEnabled( FilterLog::ruleResult ) ); - connect( mLogRuleEvaluationBox, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotChangeLogDetail(void)) ); + connect( mLogRuleEvaluationBox, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotChangeLogDetail(void)) ); TQWhatsThis::add( mLogRuleEvaluationBox, i18n( "You can control the feedback in the log concerning the " "evaluation of the filter rules of applied filters: " @@ -113,8 +113,8 @@ FilterLogDialog::FilterLogDialog( TQWidget * parent ) mLogDetailsBox ); mLogPatternResultBox->setChecked( FilterLog::instance()->isContentTypeEnabled( FilterLog::patternResult ) ); - connect( mLogPatternResultBox, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotChangeLogDetail(void)) ); + connect( mLogPatternResultBox, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotChangeLogDetail(void)) ); // TODO //TQWhatsThis::add( mLogPatternResultBox, // i18n( "" ) ); @@ -123,8 +123,8 @@ FilterLogDialog::FilterLogDialog( TQWidget * parent ) mLogDetailsBox ); mLogFilterActionBox->setChecked( FilterLog::instance()->isContentTypeEnabled( FilterLog::appliedAction ) ); - connect( mLogFilterActionBox, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotChangeLogDetail(void)) ); + connect( mLogFilterActionBox, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotChangeLogDetail(void)) ); // TODO //TQWhatsThis::add( mLogFilterActionBox, // i18n( "" ) ); @@ -138,8 +138,8 @@ FilterLogDialog::FilterLogDialog( TQWidget * parent ) mLogMemLimitSpin->setValue( FilterLog::instance()->getMaxLogSize() / 1024 ); mLogMemLimitSpin->setSuffix( " KB" ); mLogMemLimitSpin->setSpecialValueText( i18n("unlimited") ); - connect( mLogMemLimitSpin, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotChangeLogMemLimit(int)) ); + connect( mLogMemLimitSpin, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotChangeLogMemLimit(int)) ); TQWhatsThis::add( mLogMemLimitSpin, i18n( "Collecting log data uses memory to temporarily store the " "log data; here you can limit the maximum amount of memory " @@ -147,12 +147,12 @@ FilterLogDialog::FilterLogDialog( TQWidget * parent ) "this limit then the oldest data will be discarded until " "the limit is no longer exceeded. " ) ); - connect(FilterLog::instance(), TQT_SIGNAL(logEntryAdded(TQString)), - this, TQT_SLOT(slotLogEntryAdded(TQString))); - connect(FilterLog::instance(), TQT_SIGNAL(logShrinked(void)), - this, TQT_SLOT(slotLogShrinked(void))); - connect(FilterLog::instance(), TQT_SIGNAL(logStateChanged(void)), - this, TQT_SLOT(slotLogStateChanged(void))); + connect(FilterLog::instance(), TQ_SIGNAL(logEntryAdded(TQString)), + this, TQ_SLOT(slotLogEntryAdded(TQString))); + connect(FilterLog::instance(), TQ_SIGNAL(logShrinked(void)), + this, TQ_SLOT(slotLogShrinked(void))); + connect(FilterLog::instance(), TQ_SIGNAL(logStateChanged(void)), + this, TQ_SLOT(slotLogStateChanged(void))); setInitialSize( TQSize( 500, 500 ) ); #if !KDE_IS_VERSION( 3, 2, 91 ) diff --git a/kmail/folderdiaacltab.cpp b/kmail/folderdiaacltab.cpp index 43d15a51..94cf2d48 100644 --- a/kmail/folderdiaacltab.cpp +++ b/kmail/folderdiaacltab.cpp @@ -117,9 +117,9 @@ KMail::ACLEntryDialog::ACLEntryDialog( IMAPUserIdFormat userIdFormat, const TQSt TQLabel *noteLabel = new TQLabel( i18n( "<b>Note: </b>Renaming requires write permissions on the parent folder." ), page ); topLayout->addMultiCellWidget( noteLabel, 2, 2, 0, 2 ); - connect( mUserIdLineEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotChanged() ) ); - connect( kabBtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSelectAddresses() ) ); - connect( mButtonGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( slotChanged() ) ); + connect( mUserIdLineEdit, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotChanged() ) ); + connect( kabBtn, TQ_SIGNAL( clicked() ), TQ_SLOT( slotSelectAddresses() ) ); + connect( mButtonGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( slotChanged() ) ); enableButtonOK( false ); mUserIdLineEdit->setFocus(); @@ -338,12 +338,12 @@ KMail::FolderDiaACLTab::FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* parent, mListView->addColumn( i18n( "User Id" ) ); mListView->addColumn( i18n( "Permissions" ) ); - connect( mListView, TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)), - TQT_SLOT(slotEditACL(TQListViewItem*)) ); - connect( mListView, TQT_SIGNAL(returnPressed(TQListViewItem*)), - TQT_SLOT(slotEditACL(TQListViewItem*)) ); - connect( mListView, TQT_SIGNAL(currentChanged(TQListViewItem*)), - TQT_SLOT(slotSelectionChanged(TQListViewItem*)) ); + connect( mListView, TQ_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)), + TQ_SLOT(slotEditACL(TQListViewItem*)) ); + connect( mListView, TQ_SIGNAL(returnPressed(TQListViewItem*)), + TQ_SLOT(slotEditACL(TQListViewItem*)) ); + connect( mListView, TQ_SIGNAL(currentChanged(TQListViewItem*)), + TQ_SLOT(slotSelectionChanged(TQListViewItem*)) ); TQVBox* buttonBox = new TQVBox( mACLWidget ); buttonBox->setSpacing( KDialog::spacingHint() ); @@ -353,13 +353,13 @@ KMail::FolderDiaACLTab::FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* parent, TQWidget *spacer = new TQWidget( buttonBox ); spacer->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ); - connect( mAddACL, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAddACL() ) ); - connect( mEditACL, TQT_SIGNAL( clicked() ), TQT_SLOT( slotEditACL() ) ); - connect( mRemoveACL, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRemoveACL() ) ); + connect( mAddACL, TQ_SIGNAL( clicked() ), TQ_SLOT( slotAddACL() ) ); + connect( mEditACL, TQ_SIGNAL( clicked() ), TQ_SLOT( slotEditACL() ) ); + connect( mRemoveACL, TQ_SIGNAL( clicked() ), TQ_SLOT( slotRemoveACL() ) ); mEditACL->setEnabled( false ); mRemoveACL->setEnabled( false ); - connect( this, TQT_SIGNAL( changed(bool) ), TQT_SLOT( slotChanged(bool) ) ); + connect( this, TQ_SIGNAL( changed(bool) ), TQ_SLOT( slotChanged(bool) ) ); } // Warning before save() this will return the url of the _parent_ folder, when creating a new one @@ -457,8 +457,8 @@ void KMail::FolderDiaACLTab::load() if ( state == ImapAccountBase::Error ) { // Cancelled by user, or slave can't start slotConnectionResult( -1, TQString() ); } else if ( state == ImapAccountBase::Connecting ) { - connect( mImapAccount, TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) ); + connect( mImapAccount, TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( slotConnectionResult(int, const TQString&) ) ); } else { // Connected slotConnectionResult( 0, TQString() ); } @@ -466,8 +466,8 @@ void KMail::FolderDiaACLTab::load() void KMail::FolderDiaACLTab::slotConnectionResult( int errorCode, const TQString& errorMsg ) { - disconnect( mImapAccount, TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) ); + disconnect( mImapAccount, TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( slotConnectionResult(int, const TQString&) ) ); if ( errorCode ) { if ( errorCode == -1 ) // unspecified error mLabel->setText( i18n( "Error connecting to server %1" ).arg( mImapAccount->host() ) ); @@ -478,8 +478,8 @@ void KMail::FolderDiaACLTab::slotConnectionResult( int errorCode, const TQString } if ( mUserRightsState != KMail::ACLJobs::Ok ) { - connect( mImapAccount, TQT_SIGNAL( receivedUserRights( KMFolder* ) ), - this, TQT_SLOT( slotReceivedUserRights( KMFolder* ) ) ); + connect( mImapAccount, TQ_SIGNAL( receivedUserRights( KMFolder* ) ), + this, TQ_SLOT( slotReceivedUserRights( KMFolder* ) ) ); KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->parentFolder(); mImapAccount->getUserRights( folder, mImapPath ); } @@ -506,15 +506,15 @@ void KMail::FolderDiaACLTab::startListing() { // List ACLs of folder - or its parent, if creating a new folder mImapAccount->getACL( mDlg->folder() ? mDlg->folder() : mDlg->parentFolder(), mImapPath ); - connect( mImapAccount, TQT_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )), - this, TQT_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) ); + connect( mImapAccount, TQ_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )), + this, TQ_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) ); } void KMail::FolderDiaACLTab::slotReceivedACL( KMFolder* folder, TDEIO::Job* job, const KMail::ACLList& aclList ) { if ( folder == ( mDlg->folder() ? mDlg->folder() : mDlg->parentFolder() ) ) { - disconnect( mImapAccount, TQT_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )), - this, TQT_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) ); + disconnect( mImapAccount, TQ_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )), + this, TQ_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) ); if ( job && job->error() ) { if ( job->error() == TDEIO::ERR_UNSUPPORTED_ACTION ) @@ -727,8 +727,8 @@ bool KMail::FolderDiaACLTab::save() if ( mDlg->isNewFolder() ) { // The folder isn't created yet, wait for it // It's a two-step process (mkdir+listDir) so we wait for the dir listing to be complete - connect( parentImap, TQT_SIGNAL( directoryListingFinished(KMFolderImap*) ), - this, TQT_SLOT( slotDirectoryListingFinished(KMFolderImap*) ) ); + connect( parentImap, TQ_SIGNAL( directoryListingFinished(KMFolderImap*) ), + this, TQ_SLOT( slotDirectoryListingFinished(KMFolderImap*) ) ); } else { slotDirectoryListingFinished( parentImap ); } @@ -756,10 +756,10 @@ void KMail::FolderDiaACLTab::slotDirectoryListingFinished(KMFolderImap* f) jd.total = 1; jd.done = 0; jd.parent = 0; mImapAccount->insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotMultiSetACLResult(TDEIO::Job *))); - connect(job, TQT_SIGNAL(aclChanged( const TQString&, int )), - TQT_SLOT(slotACLChanged( const TQString&, int )) ); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotMultiSetACLResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(aclChanged( const TQString&, int )), + TQ_SLOT(slotACLChanged( const TQString&, int )) ); } void KMail::FolderDiaACLTab::slotMultiSetACLResult(TDEIO::Job* job) diff --git a/kmail/folderdiaquotatab.cpp b/kmail/folderdiaquotatab.cpp index 2fd950b2..3afc0905 100644 --- a/kmail/folderdiaquotatab.cpp +++ b/kmail/folderdiaquotatab.cpp @@ -121,8 +121,8 @@ void KMail::FolderDiaQuotaTab::load() if ( state == ImapAccountBase::Error ) { // Cancelled by user, or slave can't start slotConnectionResult( -1, TQString() ); } else if ( state == ImapAccountBase::Connecting ) { - connect( mImapAccount, TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) ); + connect( mImapAccount, TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( slotConnectionResult(int, const TQString&) ) ); } else { // Connected slotConnectionResult( 0, TQString() ); } @@ -131,8 +131,8 @@ void KMail::FolderDiaQuotaTab::load() void KMail::FolderDiaQuotaTab::slotConnectionResult( int errorCode, const TQString& errorMsg ) { - disconnect( mImapAccount, TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) ); + disconnect( mImapAccount, TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( slotConnectionResult(int, const TQString&) ) ); if ( errorCode ) { if ( errorCode == -1 ) // unspecified error mLabel->setText( i18n( "Error connecting to server %1" ).arg( mImapAccount->host() ) ); @@ -141,8 +141,8 @@ void KMail::FolderDiaQuotaTab::slotConnectionResult( int errorCode, const TQStri mLabel->setText( TDEIO::buildErrorString( errorCode, errorMsg ) ); return; } - connect( mImapAccount, TQT_SIGNAL( receivedStorageQuotaInfo( KMFolder*, TDEIO::Job*, const KMail::QuotaInfo& ) ), - this, TQT_SLOT( slotReceivedQuotaInfo( KMFolder*, TDEIO::Job*, const KMail::QuotaInfo& ) ) ); + connect( mImapAccount, TQ_SIGNAL( receivedStorageQuotaInfo( KMFolder*, TDEIO::Job*, const KMail::QuotaInfo& ) ), + this, TQ_SLOT( slotReceivedQuotaInfo( KMFolder*, TDEIO::Job*, const KMail::QuotaInfo& ) ) ); KMFolder* folder = mDlg->folder() ? mDlg->folder() : mDlg->parentFolder(); mImapAccount->getStorageQuotaInfo( folder, mImapPath ); } @@ -154,8 +154,8 @@ void KMail::FolderDiaQuotaTab::slotReceivedQuotaInfo( KMFolder* folder, if ( folder == mDlg->folder() ? mDlg->folder() : mDlg->parentFolder() ) { //KMFolderImap* folderImap = static_cast<KMFolderImap*>( folder->storage() ); - disconnect( mImapAccount, TQT_SIGNAL(receivedStorageQuotaInfo( KMFolder*, TDEIO::Job*, const KMail::QuotaInfo& )), - this, TQT_SLOT(slotReceivedQuotaInfo( KMFolder*, TDEIO::Job*, const KMail::QuotaInfo& )) ); + disconnect( mImapAccount, TQ_SIGNAL(receivedStorageQuotaInfo( KMFolder*, TDEIO::Job*, const KMail::QuotaInfo& )), + this, TQ_SLOT(slotReceivedQuotaInfo( KMFolder*, TDEIO::Job*, const KMail::QuotaInfo& )) ); if ( job && job->error() ) { if ( job->error() == TDEIO::ERR_UNSUPPORTED_ACTION ) diff --git a/kmail/folderrequester.cpp b/kmail/folderrequester.cpp index 51fdd790..29c557f9 100644 --- a/kmail/folderrequester.cpp +++ b/kmail/folderrequester.cpp @@ -53,7 +53,7 @@ FolderRequester::FolderRequester( TQWidget *parent, KMFolderTree *tree ) TQToolButton* button = new TQToolButton( this ); button->setIconSet( TDEGlobal::iconLoader()->loadIconSet( "folder", TDEIcon::Small, 0 ) ); - connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOpenDialog()) ); + connect( button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotOpenDialog()) ); setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed ) ); diff --git a/kmail/foldershortcutdialog.cpp b/kmail/foldershortcutdialog.cpp index 1c4e79cf..75b77fb5 100644 --- a/kmail/foldershortcutdialog.cpp +++ b/kmail/foldershortcutdialog.cpp @@ -71,8 +71,8 @@ FolderShortcutDialog::FolderShortcutDialog( KMFolder *folder, mKeyButton = new KKeyButton( hb, "FolderShortcutSelector" ); new TQWidget(hb); - connect( mKeyButton, TQT_SIGNAL( capturedShortcut( const TDEShortcut& ) ), - this, TQT_SLOT( slotCapturedShortcut( const TDEShortcut& ) ) ); + connect( mKeyButton, TQ_SIGNAL( capturedShortcut( const TDEShortcut& ) ), + this, TQ_SLOT( slotCapturedShortcut( const TDEShortcut& ) ) ); mKeyButton->setShortcut( folder->shortcut(), false ); } diff --git a/kmail/folderstorage.cpp b/kmail/folderstorage.cpp index f6d1a358..f9605df3 100644 --- a/kmail/folderstorage.cpp +++ b/kmail/folderstorage.cpp @@ -80,20 +80,20 @@ FolderStorage::FolderStorage( KMFolder* folder, const char* aName ) mNoChildren = false; mRDict = 0; mDirtyTimer = new TQTimer(this, "mDirtyTimer"); - connect(mDirtyTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(updateIndex())); + connect(mDirtyTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(updateIndex())); mHasChildren = HasNoChildren; mContentsType = KMail::ContentsTypeMail; - connect(this, TQT_SIGNAL(closed(KMFolder*)), mFolder, TQT_SIGNAL(closed())); + connect(this, TQ_SIGNAL(closed(KMFolder*)), mFolder, TQ_SIGNAL(closed())); } //----------------------------------------------------------------------------- FolderStorage::~FolderStorage() { mJobList.setAutoDelete( true ); - TQObject::disconnect( TQT_SIGNAL(destroyed(TQObject*)), this, 0 ); + TQObject::disconnect( TQ_SIGNAL(destroyed(TQObject*)), this, 0 ); mJobList.clear(); KMMsgDict::deleteRentry(mRDict); } @@ -118,8 +118,8 @@ TQString FolderStorage::dotEscape(const TQString& aStr) void FolderStorage::addJob( FolderJob* job ) const { - TQObject::connect( job, TQT_SIGNAL(destroyed(TQObject*)), - TQT_SLOT(removeJob(TQObject*)) ); + TQObject::connect( job, TQ_SIGNAL(destroyed(TQObject*)), + TQ_SLOT(removeJob(TQObject*)) ); mJobList.append( job ); } @@ -212,8 +212,8 @@ void FolderStorage::quiet(bool beQuiet) */ if ( !mEmitChangedTimer) { mEmitChangedTimer= new TQTimer( this, "mEmitChangedTimer" ); - connect( mEmitChangedTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotEmitChangedTimer() ) ); + connect( mEmitChangedTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotEmitChangedTimer() ) ); } mQuiet++; } else { @@ -309,8 +309,8 @@ bool FolderStorage::canAddMsgNow(KMMessage* aMsg, int* aIndex_ret) if (!aMsg->isComplete() && msgParent && msgParent->folderType() == KMFolderTypeImap) { FolderJob *job = msgParent->createJob(aMsg); - connect(job, TQT_SIGNAL(messageRetrieved(KMMessage*)), - TQT_SLOT(reallyAddMsg(KMMessage*))); + connect(job, TQ_SIGNAL(messageRetrieved(KMMessage*)), + TQ_SLOT(reallyAddMsg(KMMessage*))); job->start(); aMsg->setTransferInProgress( true ); return false; @@ -1147,7 +1147,7 @@ void FolderStorage::slotProcessNextSearchBatch() bool complete = ( end >= count() ); emit searchResult( folder(), matchingSerNums, mSearchPattern, complete ); if ( !complete ) - TQTimer::singleShot( 0, this, TQT_SLOT(slotProcessNextSearchBatch()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotProcessNextSearchBatch()) ); } //----------------------------------------------------------------------------- diff --git a/kmail/globalsettings.cpp b/kmail/globalsettings.cpp index c09b0591..4a33d2cb 100644 --- a/kmail/globalsettings.cpp +++ b/kmail/globalsettings.cpp @@ -41,7 +41,7 @@ GlobalSettings *GlobalSettings::self() GlobalSettings::GlobalSettings() { mConfigSyncTimer = new TQTimer( this, "mConfigSyncTimer" ); - connect( mConfigSyncTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotSyncNow() ) ); + connect( mConfigSyncTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotSyncNow() ) ); } void GlobalSettings::requestSync() diff --git a/kmail/headerlistquicksearch.cpp b/kmail/headerlistquicksearch.cpp index dd93a952..ab2491aa 100644 --- a/kmail/headerlistquicksearch.cpp +++ b/kmail/headerlistquicksearch.cpp @@ -58,7 +58,7 @@ HeaderListQuickSearch::HeaderListQuickSearch( TQWidget *parent, ? "clear_left" : "locationbar_erase", 0, this, - TQT_SLOT( reset() ), + TQ_SLOT( reset() ), actionCollection, "reset_quicksearch" ); resetQuickSearch->plug( parent ); @@ -84,24 +84,24 @@ HeaderListQuickSearch::HeaderListQuickSearch( TQWidget *parent, inserStatus( StatusIgnored ); mStatusCombo->setCurrentItem( 0 ); mStatusCombo->installEventFilter( this ); - connect( mStatusCombo, TQT_SIGNAL ( activated( int ) ), - this, TQT_SLOT( slotStatusChanged( int ) ) ); + connect( mStatusCombo, TQ_SIGNAL ( activated( int ) ), + this, TQ_SLOT( slotStatusChanged( int ) ) ); label->setBuddy( mStatusCombo ); TDEToolBarButton * btn = new TDEToolBarButton( "mail_find", 0, parent, 0, i18n( "Open Full Search" ) ); - connect( btn, TQT_SIGNAL( clicked() ), TQT_SIGNAL( requestFullSearch() ) ); + connect( btn, TQ_SIGNAL( clicked() ), TQ_SIGNAL( requestFullSearch() ) ); /* Disable the signal connected by TDEListViewSearchLine since it will call * itemAdded during KMHeaders::readSortOrder() which will in turn result * in getMsgBaseForItem( item ) wanting to access items which are no longer * there. Rather rely on KMHeaders::msgAdded and its signal. */ - disconnect(listView, TQT_SIGNAL(itemAdded(TQListViewItem *)), - this, TQT_SLOT(itemAdded(TQListViewItem *))); + disconnect(listView, TQ_SIGNAL(itemAdded(TQListViewItem *)), + this, TQ_SLOT(itemAdded(TQListViewItem *))); KMHeaders *headers = static_cast<KMHeaders*>( listView ); - connect( headers, TQT_SIGNAL( msgAddedToListView( TQListViewItem* ) ), - this, TQT_SLOT( itemAdded( TQListViewItem* ) ) ); + connect( headers, TQ_SIGNAL( msgAddedToListView( TQListViewItem* ) ), + this, TQ_SLOT( itemAdded( TQListViewItem* ) ) ); } diff --git a/kmail/identitydialog.cpp b/kmail/identitydialog.cpp index 91b108c9..a5c9af36 100644 --- a/kmail/identitydialog.cpp +++ b/kmail/identitydialog.cpp @@ -396,8 +396,8 @@ namespace KMail { mTransportCombo->setEnabled( false ); // since !mTransportCheck->isChecked() mTransportCombo->insertStringList( KMail::TransportManager::transportNames() ); glay->addWidget( mTransportCombo, row, 1 ); - connect( mTransportCheck, TQT_SIGNAL(toggled(bool)), - mTransportCombo, TQT_SLOT(setEnabled(bool)) ); + connect( mTransportCheck, TQ_SIGNAL(toggled(bool)), + mTransportCombo, TQ_SLOT(setEnabled(bool)) ); // the last row is a spacer @@ -416,12 +416,12 @@ namespace KMail { mCopyGlobal = new KPushButton( i18n("&Copy global templates"), tab ); mCopyGlobal->setEnabled( false ); btns->addWidget( mCopyGlobal ); - connect( mCustom, TQT_SIGNAL( toggled( bool ) ), - mWidget, TQT_SLOT( setEnabled( bool ) ) ); - connect( mCustom, TQT_SIGNAL( toggled( bool ) ), - mCopyGlobal, TQT_SLOT( setEnabled( bool ) ) ); - connect( mCopyGlobal, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotCopyGlobal()) ); + connect( mCustom, TQ_SIGNAL( toggled( bool ) ), + mWidget, TQ_SLOT( setEnabled( bool ) ) ); + connect( mCustom, TQ_SIGNAL( toggled( bool ) ), + mCopyGlobal, TQ_SLOT( setEnabled( bool ) ) ); + connect( mCopyGlobal, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotCopyGlobal()) ); // // Tab Widget: Signature @@ -439,8 +439,8 @@ namespace KMail { resize( geometry.readSizeEntry( "Identity Dialog size" ) ); mNameEdit->setFocus(); - connect( tabWidget, TQT_SIGNAL(currentChanged(TQWidget*)), - TQT_SLOT(slotAboutToShow(TQWidget*)) ); + connect( tabWidget, TQ_SIGNAL(currentChanged(TQWidget*)), + TQ_SLOT(slotAboutToShow(TQWidget*)) ); } IdentityDialog::~IdentityDialog() { diff --git a/kmail/imapaccountbase.cpp b/kmail/imapaccountbase.cpp index bc197cee..47d169f9 100644 --- a/kmail/imapaccountbase.cpp +++ b/kmail/imapaccountbase.cpp @@ -105,12 +105,12 @@ namespace KMail { { mPort = imapDefaultPort; mBodyPartList.setAutoDelete(true); - TDEIO::Scheduler::connect(TQT_SIGNAL(slaveError(TDEIO::Slave *, int, const TQString &)), - this, TQT_SLOT(slotSchedulerSlaveError(TDEIO::Slave *, int, const TQString &))); - TDEIO::Scheduler::connect(TQT_SIGNAL(slaveConnected(TDEIO::Slave *)), - this, TQT_SLOT(slotSchedulerSlaveConnected(TDEIO::Slave *))); - connect(&mNoopTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotNoopTimeout())); - connect(&mIdleTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotIdleTimeout())); + TDEIO::Scheduler::connect(TQ_SIGNAL(slaveError(TDEIO::Slave *, int, const TQString &)), + this, TQ_SLOT(slotSchedulerSlaveError(TDEIO::Slave *, int, const TQString &))); + TDEIO::Scheduler::connect(TQ_SIGNAL(slaveConnected(TDEIO::Slave *)), + this, TQ_SLOT(slotSchedulerSlaveConnected(TDEIO::Slave *))); + connect(&mNoopTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotNoopTimeout())); + connect(&mIdleTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotIdleTimeout())); } ImapAccountBase::~ImapAccountBase() { @@ -385,8 +385,8 @@ namespace KMail { jd.quiet = quiet; insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotSubscriptionResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotSubscriptionResult(TDEIO::Job *))); } //----------------------------------------------------------------------------- @@ -437,8 +437,8 @@ namespace KMail { jd.cancellable = true; insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotGetUserRightsResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotGetUserRightsResult(TDEIO::Job *))); } void ImapAccountBase::slotGetUserRightsResult( TDEIO::Job* _job ) @@ -481,8 +481,8 @@ namespace KMail { jd.cancellable = true; insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotGetACLResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotGetACLResult(TDEIO::Job *))); } void ImapAccountBase::slotGetACLResult( TDEIO::Job* _job ) @@ -509,8 +509,8 @@ namespace KMail { jd.cancellable = true; insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotGetStorageQuotaInfoResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotGetStorageQuotaInfoResult(TDEIO::Job *))); } void ImapAccountBase::slotGetStorageQuotaInfoResult( TDEIO::Job* _job ) @@ -536,8 +536,8 @@ namespace KMail { TDEIO::SimpleJob *job = TDEIO::special( getUrl(), packedArgs, false ); TDEIO::Scheduler::assignJobToSlave(mSlave, job); - connect( job, TQT_SIGNAL(result( TDEIO::Job * ) ), - this, TQT_SLOT( slotSimpleResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL(result( TDEIO::Job * ) ), + this, TQ_SLOT( slotSimpleResult( TDEIO::Job * ) ) ); } else { /* Stop the timer, we have disconnected. We have to make sure it is started again when a new slave appears. */ @@ -596,8 +596,8 @@ namespace KMail { emit connectionResult( 0, TQString() ); // success if ( mNamespaces.isEmpty() || mNamespaceToDelimiter.isEmpty() ) { - connect( this, TQT_SIGNAL( namespacesFetched( const ImapAccountBase::nsDelimMap& ) ), - this, TQT_SLOT( slotSaveNamespaces( const ImapAccountBase::nsDelimMap& ) ) ); + connect( this, TQ_SIGNAL( namespacesFetched( const ImapAccountBase::nsDelimMap& ) ), + this, TQ_SLOT( slotSaveNamespaces( const ImapAccountBase::nsDelimMap& ) ) ); getNamespaces(); } @@ -607,8 +607,8 @@ namespace KMail { stream << (int) 'c'; TDEIO::SimpleJob *job = TDEIO::special( getUrl(), packedArgs, false ); TDEIO::Scheduler::assignJobToSlave( mSlave, job ); - connect( job, TQT_SIGNAL(infoMessage(TDEIO::Job*, const TQString&)), - TQT_SLOT(slotCapabilitiesResult(TDEIO::Job*, const TQString&)) ); + connect( job, TQ_SIGNAL(infoMessage(TDEIO::Job*, const TQString&)), + TQ_SLOT(slotCapabilitiesResult(TDEIO::Job*, const TQString&)) ); } //----------------------------------------------------------------------------- @@ -621,16 +621,16 @@ namespace KMail { //----------------------------------------------------------------------------- void ImapAccountBase::getNamespaces() { - disconnect( this, TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( getNamespaces() ) ); + disconnect( this, TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( getNamespaces() ) ); if ( makeConnection() != Connected || !mSlave ) { kdDebug(5006) << "getNamespaces - wait for connection" << endl; if ( mNamespaces.isEmpty() || mNamespaceToDelimiter.isEmpty() ) { // when the connection is established slotSchedulerSlaveConnected notifies us } else { // getNamespaces was called by someone else - connect( this, TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( getNamespaces() ) ); + connect( this, TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( getNamespaces() ) ); } return; } @@ -646,14 +646,14 @@ namespace KMail { TQString(), true, useSSL() || useTLS() ); jd.progressItem->setTotalItems( 1 ); connect ( jd.progressItem, - TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ), + TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ), this, - TQT_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) ); + TQ_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) ); TDEIO::SimpleJob *job = TDEIO::special( getUrl(), packedArgs, false ); TDEIO::Scheduler::assignJobToSlave( mSlave, job ); insertJob( job, jd ); - connect( job, TQT_SIGNAL( infoMessage(TDEIO::Job*, const TQString&) ), - TQT_SLOT( slotNamespaceResult(TDEIO::Job*, const TQString&) ) ); + connect( job, TQ_SIGNAL( infoMessage(TDEIO::Job*, const TQString&) ), + TQ_SLOT( slotNamespaceResult(TDEIO::Job*, const TQString&) ) ); } //----------------------------------------------------------------------------- @@ -1031,10 +1031,10 @@ namespace KMail { mCheckingSingleFolder = ( type == Single ); if ( checkingMail() ) { - disconnect( this, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), - this, TQT_SLOT( slotCheckQueuedFolders() ) ); - connect( this, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), - this, TQT_SLOT( slotCheckQueuedFolders() ) ); + disconnect( this, TQ_SIGNAL( finishedCheck( bool, CheckStatus ) ), + this, TQ_SLOT( slotCheckQueuedFolders() ) ); + connect( this, TQ_SIGNAL( finishedCheck( bool, CheckStatus ) ), + this, TQ_SLOT( slotCheckQueuedFolders() ) ); } else { slotCheckQueuedFolders(); } @@ -1043,8 +1043,8 @@ namespace KMail { //----------------------------------------------------------------------------- void ImapAccountBase::slotCheckQueuedFolders() { - disconnect( this, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), - this, TQT_SLOT( slotCheckQueuedFolders() ) ); + disconnect( this, TQ_SIGNAL( finishedCheck( bool, CheckStatus ) ), + this, TQ_SLOT( slotCheckQueuedFolders() ) ); TQValueList<TQGuardedPtr<KMFolder> > mSaveList = mMailCheckFolders; mMailCheckFolders = mFoldersQueuedForChecking; @@ -1214,8 +1214,8 @@ namespace KMail { ImapAccountBase::jobData jd( url.url(), folder ); jd.path = path; insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotSetStatusResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotSetStatusResult(TDEIO::Job *))); } void ImapAccountBase::setImapSeenStatus(KMFolder * folder, const TQString & path, bool seen) @@ -1236,8 +1236,8 @@ namespace KMail { ImapAccountBase::jobData jd( url.url(), folder ); jd.path = path; insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotSetStatusResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotSetStatusResult(TDEIO::Job *))); } //----------------------------------------------------------------------------- @@ -1299,9 +1299,9 @@ namespace KMail { true, useSSL() || useTLS() ); connect ( mListDirProgressItem, - TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ), + TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ), this, - TQT_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) ); + TQ_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) ); // Start with a guessed value of the old folder count plus 5%. As long // as the list of folders doesn't constantly change, that should be good // enough. diff --git a/kmail/imapjob.cpp b/kmail/imapjob.cpp index 1f7682b5..ecf2b5e7 100644 --- a/kmail/imapjob.cpp +++ b/kmail/imapjob.cpp @@ -155,19 +155,19 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder, true, account->useSSL() || account->useTLS() ); jd.progressItem->setTotalItems( jd.total ); - connect ( jd.progressItem, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem*)), - account, TQT_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) ); + connect ( jd.progressItem, TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem*)), + account, TQ_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) ); TDEIO::SimpleJob *job = TDEIO::put( url, 0, false, false, false ); TDEIO::Scheduler::assignJobToSlave( account->slave(), job ); account->insertJob( job, jd ); - connect( job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotPutMessageResult(TDEIO::Job *)) ); - connect( job, TQT_SIGNAL(dataReq(TDEIO::Job *, TQByteArray &)), - TQT_SLOT(slotPutMessageDataReq(TDEIO::Job *, TQByteArray &)) ); - connect( job, TQT_SIGNAL(infoMessage(TDEIO::Job *, const TQString &)), - TQT_SLOT(slotPutMessageInfoData(TDEIO::Job *, const TQString &)) ); - connect( job, TQT_SIGNAL(processedSize(TDEIO::Job *, TDEIO::filesize_t)), - TQT_SLOT(slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t))); + connect( job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotPutMessageResult(TDEIO::Job *)) ); + connect( job, TQ_SIGNAL(dataReq(TDEIO::Job *, TQByteArray &)), + TQ_SLOT(slotPutMessageDataReq(TDEIO::Job *, TQByteArray &)) ); + connect( job, TQ_SIGNAL(infoMessage(TDEIO::Job *, const TQString &)), + TQ_SLOT(slotPutMessageInfoData(TDEIO::Job *, const TQString &)) ); + connect( job, TQ_SIGNAL(processedSize(TDEIO::Job *, TDEIO::filesize_t)), + TQ_SLOT(slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t))); } } else if ( jt == tCopyMessage || jt == tMoveMessage ) @@ -196,18 +196,18 @@ void ImapJob::init( JobType jt, TQString sets, KMFolderImap* folder, true, account->useSSL() || account->useTLS() ); jd.progressItem->setTotalItems( jd.total ); - connect ( jd.progressItem, TQT_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), - account, TQT_SLOT( slotAbortRequested(KPIM::ProgressItem* ) ) ); + connect ( jd.progressItem, TQ_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), + account, TQ_SLOT( slotAbortRequested(KPIM::ProgressItem* ) ) ); TDEIO::SimpleJob *simpleJob = TDEIO::special( url, packedArgs, false ); TDEIO::Scheduler::assignJobToSlave( account->slave(), simpleJob ); mJob = simpleJob; account->insertJob( mJob, jd ); - connect( mJob, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotCopyMessageResult(TDEIO::Job *)) ); + connect( mJob, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotCopyMessageResult(TDEIO::Job *)) ); if ( jt == tMoveMessage ) { - connect( mJob, TQT_SIGNAL(infoMessage(TDEIO::Job *, const TQString &)), - TQT_SLOT(slotCopyMessageInfoData(TDEIO::Job *, const TQString &)) ); + connect( mJob, TQ_SIGNAL(infoMessage(TDEIO::Job *, const TQString &)), + TQ_SLOT(slotCopyMessageInfoData(TDEIO::Job *, const TQString &)) ); } } else { @@ -317,8 +317,8 @@ void ImapJob::slotGetNextMessage() TQStyleSheet::escape( msg->subject() ), true, account->useSSL() || account->useTLS() ); - connect ( jd.progressItem, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem*)), - account, TQT_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) ); + connect ( jd.progressItem, TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem*)), + account, TQ_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) ); jd.progressItem->setTotalItems( jd.total ); TDEIO::SimpleJob *simpleJob = TDEIO::get( url, false, false ); @@ -327,18 +327,18 @@ void ImapJob::slotGetNextMessage() account->insertJob( mJob, jd ); if ( mPartSpecifier.find( "STRUCTURE", 0, false ) != -1 ) { - connect( mJob, TQT_SIGNAL(result(TDEIO::Job *)), - this, TQT_SLOT(slotGetBodyStructureResult(TDEIO::Job *)) ); + connect( mJob, TQ_SIGNAL(result(TDEIO::Job *)), + this, TQ_SLOT(slotGetBodyStructureResult(TDEIO::Job *)) ); } else { - connect( mJob, TQT_SIGNAL(result(TDEIO::Job *)), - this, TQT_SLOT(slotGetMessageResult(TDEIO::Job *)) ); + connect( mJob, TQ_SIGNAL(result(TDEIO::Job *)), + this, TQ_SLOT(slotGetMessageResult(TDEIO::Job *)) ); } - connect( mJob, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - msgParent, TQT_SLOT(slotSimpleData(TDEIO::Job *, const TQByteArray &)) ); + connect( mJob, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + msgParent, TQ_SLOT(slotSimpleData(TDEIO::Job *, const TQByteArray &)) ); if ( jd.total > 1 ) { - connect(mJob, TQT_SIGNAL(processedSize(TDEIO::Job *, TDEIO::filesize_t)), - this, TQT_SLOT(slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t))); + connect(mJob, TQ_SIGNAL(processedSize(TDEIO::Job *, TDEIO::filesize_t)), + this, TQ_SLOT(slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t))); } } diff --git a/kmail/importjob.cpp b/kmail/importjob.cpp index 58f9d974..9fe9bbbe 100644 --- a/kmail/importjob.cpp +++ b/kmail/importjob.cpp @@ -174,7 +174,7 @@ void KMail::ImportJob::messageAdded() mCurrentMessage = 0; mCurrentMessageFile = 0; - TQTimer::singleShot( 0, this, TQT_SLOT( importNextMessage() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( importNextMessage() ) ); } void KMail::ImportJob::importNextMessage() @@ -239,8 +239,8 @@ void KMail::ImportJob::importNextMessage() else { ImapJob *imapJob = new ImapJob( mCurrentMessage, ImapJob::tPutMessage, dynamic_cast<KMFolderImap*>( mCurrentFolder->storage() ) ); - connect( imapJob, TQT_SIGNAL(result(KMail::FolderJob*)), - TQT_SLOT(messagePutResult(KMail::FolderJob*)) ); + connect( imapJob, TQ_SIGNAL(result(KMail::FolderJob*)), + TQ_SLOT(messagePutResult(KMail::FolderJob*)) ); imapJob->start(); } } @@ -383,8 +383,8 @@ void KMail::ImportJob::start() TQString(), true ); mProgressItem->setUsesBusyIndicator( true ); - connect( mProgressItem, TQT_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), - this, TQT_SLOT(cancelJob()) ); + connect( mProgressItem, TQ_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), + this, TQ_SLOT(cancelJob()) ); Folder nextFolder; nextFolder.archiveDir = mArchive->directory(); diff --git a/kmail/index.cpp b/kmail/index.cpp index af4f4cb5..c21e15d5 100644 --- a/kmail/index.cpp +++ b/kmail/index.cpp @@ -91,13 +91,13 @@ KMMsgIndex::KMMsgIndex( TQObject* parent ): mSlowDown( false ) { kdDebug( 5006 ) << "KMMsgIndex::KMMsgIndex()" << endl; - connect( kmkernel->folderMgr(), TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), TQT_SLOT( slotRemoveMessage( KMFolder*, TQ_UINT32 ) ) ); - connect( kmkernel->folderMgr(), TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), TQT_SLOT( slotAddMessage( KMFolder*, TQ_UINT32 ) ) ); - connect( kmkernel->dimapFolderMgr(), TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), TQT_SLOT( slotRemoveMessage( KMFolder*, TQ_UINT32 ) ) ); - connect( kmkernel->dimapFolderMgr(), TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), TQT_SLOT( slotAddMessage( KMFolder*, TQ_UINT32 ) ) ); + connect( kmkernel->folderMgr(), TQ_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), TQ_SLOT( slotRemoveMessage( KMFolder*, TQ_UINT32 ) ) ); + connect( kmkernel->folderMgr(), TQ_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), TQ_SLOT( slotAddMessage( KMFolder*, TQ_UINT32 ) ) ); + connect( kmkernel->dimapFolderMgr(), TQ_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), TQ_SLOT( slotRemoveMessage( KMFolder*, TQ_UINT32 ) ) ); + connect( kmkernel->dimapFolderMgr(), TQ_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), TQ_SLOT( slotAddMessage( KMFolder*, TQ_UINT32 ) ) ); - connect( mTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( act() ) ); - //connect( mSyncTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( syncIndex() ) ); + connect( mTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( act() ) ); + //connect( mSyncTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( syncIndex() ) ); #ifdef HAVE_INDEXLIB TDEConfigGroup cfg( KMKernel::config(), "text-index" ); @@ -116,11 +116,11 @@ KMMsgIndex::KMMsgIndex( TQObject* parent ): mIndex = indexlib::open( mIndexPath, indexlib::open_flags::fail_if_nonexistant ).release(); } if ( !mIndex ) { - TQTimer::singleShot( 8000, this, TQT_SLOT( create() ) ); + TQTimer::singleShot( 8000, this, TQ_SLOT( create() ) ); mState = s_willcreate; } else { if ( cfg.readBoolEntry( "creating" ) ) { - TQTimer::singleShot( 8000, this, TQT_SLOT( continueCreation() ) ); + TQTimer::singleShot( 8000, this, TQ_SLOT( continueCreation() ) ); mState = s_creating; } else { mPendingMsgs = TQValueListToVector( cfg.readIntListEntry( "pending" ) ); @@ -182,7 +182,7 @@ void KMMsgIndex::setEnabled( bool e ) { // nothing can be done, probably return; case s_disabled: - TQTimer::singleShot( 8000, this, TQT_SLOT( create() ) ); + TQTimer::singleShot( 8000, this, TQ_SLOT( create() ) ); mState = s_willcreate; } } else { @@ -265,7 +265,7 @@ void KMMsgIndex::clear() { void KMMsgIndex::maintenance() { #ifdef HAVE_INDEXLIB if ( mState != s_idle || kapp->hasPendingEvents() ) { - TQTimer::singleShot( 8000, this, TQT_SLOT( maintenance() ) ); + TQTimer::singleShot( 8000, this, TQ_SLOT( maintenance() ) ); return; } mIndex->maintenance(); @@ -404,10 +404,10 @@ bool KMMsgIndex::startQuery( KMSearch* s ) { kdDebug( 5006 ) << "KMMsgIndex::startQuery( . ) starting query" << endl; Search* search = new Search( s ); - connect( search, TQT_SIGNAL( finished( bool ) ), s, TQT_SIGNAL( finished( bool ) ) ); - connect( search, TQT_SIGNAL( finished( bool ) ), s, TQT_SLOT( indexFinished() ) ); - connect( search, TQT_SIGNAL( destroyed( TQObject* ) ), TQT_SLOT( removeSearch( TQObject* ) ) ); - connect( search, TQT_SIGNAL( found( TQ_UINT32 ) ), s, TQT_SIGNAL( found( TQ_UINT32 ) ) ); + connect( search, TQ_SIGNAL( finished( bool ) ), s, TQ_SIGNAL( finished( bool ) ) ); + connect( search, TQ_SIGNAL( finished( bool ) ), s, TQ_SLOT( indexFinished() ) ); + connect( search, TQ_SIGNAL( destroyed( TQObject* ) ), TQ_SLOT( removeSearch( TQObject* ) ) ); + connect( search, TQ_SIGNAL( found( TQ_UINT32 ) ), s, TQ_SIGNAL( found( TQ_UINT32 ) ) ); mSearches.push_back( search ); return true; } @@ -517,7 +517,7 @@ void KMMsgIndex::removeMessage( TQ_UINT32 serNum ) { mIndex->remove_doc( TQString::number( serNum ).latin1() ); ++mMaintenanceCount; if ( mMaintenanceCount > MaintenanceLimit && mRemovedMsgs.empty() ) { - TQTimer::singleShot( 100, this, TQT_SLOT( maintenance() ) ); + TQTimer::singleShot( 100, this, TQ_SLOT( maintenance() ) ); } #endif } @@ -535,7 +535,7 @@ KMMsgIndex::Search::Search( KMSearch* s ): mTimer( new TQTimer( this, "mTimer" ) ), mResidual( new KMSearchPattern ), mState( s_starting ) { - connect( mTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( act() ) ); + connect( mTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( act() ) ); mTimer->start( 0 ); } diff --git a/kmail/jobscheduler.cpp b/kmail/jobscheduler.cpp index d5374fe4..dc2ef506 100644 --- a/kmail/jobscheduler.cpp +++ b/kmail/jobscheduler.cpp @@ -39,7 +39,7 @@ JobScheduler::JobScheduler( TQObject* parent, const char* name ) mPendingImmediateTasks( 0 ), mCurrentTask( 0 ), mCurrentJob( 0 ) { - connect( &mTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotRunNextJob() ) ); + connect( &mTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotRunNextJob() ) ); // No need to start the internal timer yet, we wait for a task to be scheduled } @@ -212,7 +212,7 @@ void JobScheduler::runTaskNow( ScheduledTask* task ) } // Register the job in the folder. This makes it autodeleted if the folder is deleted. mCurrentTask->folder()->storage()->addJob( mCurrentJob ); - connect( mCurrentJob, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotJobFinished() ) ); + connect( mCurrentJob, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotJobFinished() ) ); mCurrentJob->start(); } diff --git a/kmail/kmaccount.cpp b/kmail/kmaccount.cpp index 825e0cef..a15def1f 100644 --- a/kmail/kmaccount.cpp +++ b/kmail/kmaccount.cpp @@ -51,8 +51,8 @@ KMPrecommand::KMPrecommand(const TQString &precommand, TQObject *parent) mPrecommandProcess.setUseShell(true); mPrecommandProcess << precommand; - connect(&mPrecommandProcess, TQT_SIGNAL(processExited(TDEProcess *)), - TQT_SLOT(precommandExited(TDEProcess *))); + connect(&mPrecommandProcess, TQ_SIGNAL(processExited(TDEProcess *)), + TQ_SLOT(precommandExited(TDEProcess *))); } //----------------------------------------------------------------------------- @@ -207,7 +207,7 @@ void KMAccount::sendReceipt(KMMessage* aMsg) KMMessage *newMsg = aMsg->createDeliveryReceipt(); if (newMsg) { mReceipts.append(newMsg); - TQTimer::singleShot( 0, this, TQT_SLOT( sendReceipts() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( sendReceipts() ) ); } } @@ -351,7 +351,7 @@ void KMAccount::installTimer() if(!mTimer) { mTimer = new TQTimer(0, "mTimer"); - connect(mTimer,TQT_SIGNAL(timeout()),TQT_SLOT(mailCheck())); + connect(mTimer,TQ_SIGNAL(timeout()),TQ_SLOT(mailCheck())); } else { @@ -380,8 +380,8 @@ bool KMAccount::runPrecommand(const TQString &precommand) BroadcastStatus::instance()->setStatusMsg( i18n("Executing precommand %1").arg(precommand )); - connect(&precommandProcess, TQT_SIGNAL(finished(bool)), - TQT_SLOT(precommandExited(bool))); + connect(&precommandProcess, TQ_SIGNAL(finished(bool)), + TQ_SLOT(precommandExited(bool))); kdDebug(5006) << "Running precommand " << precommand << endl; if (!precommandProcess.start()) return false; diff --git a/kmail/kmacctcachedimap.cpp b/kmail/kmacctcachedimap.cpp index 9de08019..4d07b152 100644 --- a/kmail/kmacctcachedimap.cpp +++ b/kmail/kmacctcachedimap.cpp @@ -186,8 +186,8 @@ void KMAcctCachedImap::slotCheckQueuedFolders() mMailCheckFolders.append( mFoldersQueuedForChecking.front() ); mFoldersQueuedForChecking.pop_front(); if ( mFoldersQueuedForChecking.isEmpty() ) - disconnect( this, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), - this, TQT_SLOT( slotCheckQueuedFolders() ) ); + disconnect( this, TQ_SIGNAL( finishedCheck( bool, CheckStatus ) ), + this, TQ_SLOT( slotCheckQueuedFolders() ) ); kmkernel->acctMgr()->singleCheckMail(this, true); mMailCheckFolders.clear(); @@ -246,20 +246,20 @@ void KMAcctCachedImap::processNewMail( KMFolderCachedImap* folder, TQString(), true, // can be cancelled useSSL() || useTLS() ); - connect( mMailCheckProgressItem, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ), - this, TQT_SLOT( slotProgressItemCanceled( KPIM::ProgressItem* ) ) ); + connect( mMailCheckProgressItem, TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ), + this, TQ_SLOT( slotProgressItemCanceled( KPIM::ProgressItem* ) ) ); folder->setAccount(this); - connect(folder, TQT_SIGNAL(folderComplete(KMFolderCachedImap*, bool)), - this, TQT_SLOT(postProcessNewMail(KMFolderCachedImap*, bool))); + connect(folder, TQ_SIGNAL(folderComplete(KMFolderCachedImap*, bool)), + this, TQ_SLOT(postProcessNewMail(KMFolderCachedImap*, bool))); folder->serverSync( recurse ); } void KMAcctCachedImap::postProcessNewMail( KMFolderCachedImap* folder, bool ) { mNoopTimer.start( 60000 ); // send a noop every minute to avoid "connection broken" errors - disconnect(folder, TQT_SIGNAL(folderComplete(KMFolderCachedImap*, bool)), - this, TQT_SLOT(postProcessNewMail(KMFolderCachedImap*, bool))); + disconnect(folder, TQ_SIGNAL(folderComplete(KMFolderCachedImap*, bool)), + this, TQ_SLOT(postProcessNewMail(KMFolderCachedImap*, bool))); mMailCheckProgressItem->setComplete(); mMailCheckProgressItem = 0; diff --git a/kmail/kmacctimap.cpp b/kmail/kmacctimap.cpp index 8fd2bea0..6ee04967 100644 --- a/kmail/kmacctimap.cpp +++ b/kmail/kmacctimap.cpp @@ -64,9 +64,9 @@ KMAcctImap::KMAcctImap(AccountManager* aOwner, const TQString& aAccountName, uin mScheduler = 0; mNoopTimer.start( 60000 ); // // send a noop every minute mOpenFolders.setAutoDelete(true); - connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(changed()), - this, TQT_SLOT(slotUpdateFolderList())); - connect(&mErrorTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotResetConnectionError())); + connect(kmkernel->imapFolderMgr(), TQ_SIGNAL(changed()), + this, TQ_SLOT(slotUpdateFolderList())); + connect(&mErrorTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotResetConnectionError())); TQString serNumUri = locateLocal( "data", "kmail/unfiltered." + TQString("%1").arg(KAccount::id()) ); @@ -304,9 +304,9 @@ void KMAcctImap::processNewMail(bool interactive) mMailCheckProgressItem->setTotalItems( mMailCheckFolders.count() ); connect ( mMailCheckProgressItem, - TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem*) ), + TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem*) ), this, - TQT_SLOT( slotMailCheckCanceled() ) ); + TQ_SLOT( slotMailCheckCanceled() ) ); TQValueList<TQGuardedPtr<KMFolder> >::Iterator it; // first get the current count of unread-messages @@ -336,8 +336,8 @@ void KMAcctImap::processNewMail(bool interactive) mCountRemainChecks++; if (imapFolder->isSelected()) { - connect(imapFolder, TQT_SIGNAL(folderComplete(KMFolderImap*, bool)), - this, TQT_SLOT(postProcessNewMail(KMFolderImap*, bool))); + connect(imapFolder, TQ_SIGNAL(folderComplete(KMFolderImap*, bool)), + this, TQ_SLOT(postProcessNewMail(KMFolderImap*, bool))); imapFolder->getFolder(); } else if ( kmkernel->filterMgr()->atLeastOneIncomingFilterAppliesTo( id() ) && imapFolder->folder()->isSystemFolder() && @@ -345,13 +345,13 @@ void KMAcctImap::processNewMail(bool interactive) imapFolder->open("acctimap"); // will be closed in the folderSelected slot // first get new headers before we select the folder imapFolder->setSelected( true ); - connect( imapFolder, TQT_SIGNAL( folderComplete( KMFolderImap*, bool ) ), - this, TQT_SLOT( slotFolderSelected( KMFolderImap*, bool) ) ); + connect( imapFolder, TQ_SIGNAL( folderComplete( KMFolderImap*, bool ) ), + this, TQ_SLOT( slotFolderSelected( KMFolderImap*, bool) ) ); imapFolder->getFolder(); } else { - connect(imapFolder, TQT_SIGNAL(numUnreadMsgsChanged(KMFolder*)), - this, TQT_SLOT(postProcessNewMail(KMFolder*))); + connect(imapFolder, TQ_SIGNAL(numUnreadMsgsChanged(KMFolder*)), + this, TQ_SLOT(postProcessNewMail(KMFolder*))); bool ok = imapFolder->processNewMail(interactive); if (!ok) { @@ -382,15 +382,15 @@ void KMAcctImap::processNewMail(bool interactive) //----------------------------------------------------------------------------- void KMAcctImap::postProcessNewMail(KMFolderImap* folder, bool) { - disconnect(folder, TQT_SIGNAL(folderComplete(KMFolderImap*, bool)), - this, TQT_SLOT(postProcessNewMail(KMFolderImap*, bool))); + disconnect(folder, TQ_SIGNAL(folderComplete(KMFolderImap*, bool)), + this, TQ_SLOT(postProcessNewMail(KMFolderImap*, bool))); postProcessNewMail(static_cast<KMFolder*>(folder->folder())); } void KMAcctImap::postProcessNewMail( KMFolder * folder ) { - disconnect( folder->storage(), TQT_SIGNAL(numUnreadMsgsChanged(KMFolder*)), - this, TQT_SLOT(postProcessNewMail(KMFolder*)) ); + disconnect( folder->storage(), TQ_SIGNAL(numUnreadMsgsChanged(KMFolder*)), + this, TQ_SLOT(postProcessNewMail(KMFolder*)) ); if ( mMailCheckProgressItem ) { mMailCheckProgressItem->incCompletedItems(); @@ -420,7 +420,7 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder ) if (!mScheduler) { mScheduler = new KMail::ActionScheduler( set, filters ); mScheduler->setAccountId( id() ); - connect( mScheduler, TQT_SIGNAL(filtered(TQ_UINT32)), this, TQT_SLOT(slotFiltered(TQ_UINT32)) ); + connect( mScheduler, TQ_SIGNAL(filtered(TQ_UINT32)), this, TQ_SLOT(slotFiltered(TQ_UINT32)) ); } else { mScheduler->setFilterList( filters ); } @@ -469,8 +469,8 @@ void KMAcctImap::postProcessNewMail( KMFolder * folder ) msg->setTransferInProgress(true); if ( !msg->isComplete() ) { FolderJob *job = folder->createJob(msg); - connect(job, TQT_SIGNAL(messageRetrieved(KMMessage*)), - TQT_SLOT(slotFilterMsg(KMMessage*))); + connect(job, TQ_SIGNAL(messageRetrieved(KMMessage*)), + TQ_SLOT(slotFilterMsg(KMMessage*))); job->start(); } else { mFilterSerNumsToSave.remove( TQString( "%1" ).arg( *filterIt ) ); @@ -571,8 +571,8 @@ void KMAcctImap::slotResetConnectionError() void KMAcctImap::slotFolderSelected( KMFolderImap* folder, bool ) { folder->setSelected( false ); - disconnect( folder, TQT_SIGNAL( folderComplete( KMFolderImap*, bool ) ), - this, TQT_SLOT( slotFolderSelected( KMFolderImap*, bool) ) ); + disconnect( folder, TQ_SIGNAL( folderComplete( KMFolderImap*, bool ) ), + this, TQ_SLOT( slotFolderSelected( KMFolderImap*, bool) ) ); postProcessNewMail( static_cast<KMFolder*>(folder->folder()) ); folder->close( "acctimap" ); } diff --git a/kmail/kmacctseldlg.cpp b/kmail/kmacctseldlg.cpp index 35f1fc42..cac1f81f 100644 --- a/kmail/kmacctseldlg.cpp +++ b/kmail/kmacctseldlg.cpp @@ -39,7 +39,7 @@ KMAcctSelDlg::KMAcctSelDlg( TQWidget *parent, const char *name, bool modal ) TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() ); TQButtonGroup *group = new TQButtonGroup( i18n("Account Type"), page ); - connect(group, TQT_SIGNAL(clicked(int)), TQT_SLOT(buttonClicked(int)) ); + connect(group, TQ_SIGNAL(clicked(int)), TQ_SLOT(buttonClicked(int)) ); topLayout->addWidget( group, 10 ); TQVBoxLayout *vlay = new TQVBoxLayout( group, spacingHint()*2, spacingHint() ); diff --git a/kmail/kmail_part.cpp b/kmail/kmail_part.cpp index 79eb175c..55722c3c 100644 --- a/kmail/kmail_part.cpp +++ b/kmail/kmail_part.cpp @@ -105,8 +105,8 @@ KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName, #if 0 //It's also possible to make a part out of a readerWin KMReaderWin *mReaderWin = new KMReaderWin( canvas, canvas, actionCollection() ); - connect(mReaderWin, TQT_SIGNAL(urlClicked(const KURL&,int)), - mReaderWin, TQT_SLOT(slotUrlClicked())); + connect(mReaderWin, TQ_SIGNAL(urlClicked(const KURL&,int)), + mReaderWin, TQ_SLOT(slotUrlClicked())); TQVBoxLayout *topLayout = new TQVBoxLayout(canvas); topLayout->addWidget(mReaderWin); mReaderWin->setAutoDelete( true ); @@ -134,20 +134,20 @@ KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName, // Get to know when the user clicked on a folder in the KMail part and update the headerWidget of Kontact KParts::InfoExtension *ie = new KParts::InfoExtension( this, "KMailInfo" ); - connect( mainWidget->folderTree(), TQT_SIGNAL(folderSelected(KMFolder*)), this, TQT_SLOT(exportFolder(KMFolder*)) ); - connect( mainWidget->folderTree(), TQT_SIGNAL(iconChanged(KMFolderTreeItem*)), - this, TQT_SLOT(slotIconChanged(KMFolderTreeItem*)) ); - connect( mainWidget->folderTree(), TQT_SIGNAL(nameChanged(KMFolderTreeItem*)), - this, TQT_SLOT(slotNameChanged(KMFolderTreeItem*)) ); - connect( this, TQT_SIGNAL(textChanged(const TQString&)), ie, TQT_SIGNAL(textChanged(const TQString&)) ); - connect( this, TQT_SIGNAL(iconChanged(const TQPixmap&)), ie, TQT_SIGNAL(iconChanged(const TQPixmap&)) ); + connect( mainWidget->folderTree(), TQ_SIGNAL(folderSelected(KMFolder*)), this, TQ_SLOT(exportFolder(KMFolder*)) ); + connect( mainWidget->folderTree(), TQ_SIGNAL(iconChanged(KMFolderTreeItem*)), + this, TQ_SLOT(slotIconChanged(KMFolderTreeItem*)) ); + connect( mainWidget->folderTree(), TQ_SIGNAL(nameChanged(KMFolderTreeItem*)), + this, TQ_SLOT(slotNameChanged(KMFolderTreeItem*)) ); + connect( this, TQ_SIGNAL(textChanged(const TQString&)), ie, TQ_SIGNAL(textChanged(const TQString&)) ); + connect( this, TQ_SIGNAL(iconChanged(const TQPixmap&)), ie, TQ_SIGNAL(iconChanged(const TQPixmap&)) ); TDEGlobal::iconLoader()->addAppDir( "kmail" ); setXMLFile( "kmail_part.rc" ); #endif KSettings::Dispatcher::self()->registerInstance( KMailFactory::instance(), mKMailKernel, - TQT_SLOT( slotConfigChanged() ) ); + TQ_SLOT( slotConfigChanged() ) ); } KMailPart::~KMailPart() diff --git a/kmail/kmailicalifaceimpl.cpp b/kmail/kmailicalifaceimpl.cpp index 8f10be35..a65b6cdd 100644 --- a/kmail/kmailicalifaceimpl.cpp +++ b/kmail/kmailicalifaceimpl.cpp @@ -161,9 +161,9 @@ KMailICalIfaceImpl::KMailICalIfaceImpl() mUseResourceIMAP( false ), mResourceQuiet( false ), mHideFolders( true ) { // Listen to config changes - connect( kmkernel, TQT_SIGNAL( configChanged() ), this, TQT_SLOT( readConfig() ) ); - connect( kmkernel, TQT_SIGNAL( folderRemoved( KMFolder* ) ), - this, TQT_SLOT( slotFolderRemoved( KMFolder* ) ) ); + connect( kmkernel, TQ_SIGNAL( configChanged() ), this, TQ_SLOT( readConfig() ) ); + connect( kmkernel, TQ_SIGNAL( folderRemoved( KMFolder* ) ), + this, TQ_SLOT( slotFolderRemoved( KMFolder* ) ) ); mExtraFolders.setAutoDelete( true ); mAccumulators.setAutoDelete( true ); @@ -1140,8 +1140,8 @@ void KMailICalIfaceImpl::slotIncidenceAdded( KMFolder* folder, // TODO: Till, port me if ( unget ) mTheUnGetMes.insert( msg->getMsgSerNum(), true ); FolderJob *job = msg->parent()->createJob( msg ); - connect( job, TQT_SIGNAL( messageRetrieved( KMMessage* ) ), - this, TQT_SLOT( slotMessageRetrieved( KMMessage* ) ) ); + connect( job, TQ_SIGNAL( messageRetrieved( KMMessage* ) ), + this, TQ_SLOT( slotMessageRetrieved( KMMessage* ) ) ); job->start(); return; } @@ -1717,10 +1717,10 @@ void KMailICalIfaceImpl::readConfig() Q_ASSERT( account ); if ( account ) { // just in case we were connected already - disconnect( account, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), - this, TQT_SLOT( slotCheckDone() ) ); - connect( account, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), - this, TQT_SLOT( slotCheckDone() ) ); + disconnect( account, TQ_SIGNAL( finishedCheck( bool, CheckStatus ) ), + this, TQ_SLOT( slotCheckDone() ) ); + connect( account, TQ_SIGNAL( finishedCheck( bool, CheckStatus ) ), + this, TQ_SLOT( slotCheckDone() ) ); } mUseResourceIMAP = false; // We can't really call cleanup(), if those folders were completely deleted. @@ -1966,8 +1966,8 @@ void KMailICalIfaceImpl::slotCheckDone() { KMAccount* account = kmkernel->acctMgr()->find( GlobalSettings::self()->theIMAPResourceAccount() ); if ( account ) - disconnect( account, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ), - this, TQT_SLOT( slotCheckDone() ) ); + disconnect( account, TQ_SIGNAL( finishedCheck( bool, CheckStatus ) ), + this, TQ_SLOT( slotCheckDone() ) ); readConfig(); } } @@ -2084,32 +2084,32 @@ KMFolder* KMailICalIfaceImpl::initScalixFolder( KMail::FolderContentsType conten void KMailICalIfaceImpl::connectFolder( KMFolder* folder ) { // avoid multiple connections - disconnect( folder, TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), - this, TQT_SLOT( slotIncidenceAdded( KMFolder*, TQ_UINT32 ) ) ); - disconnect( folder, TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), - this, TQT_SLOT( slotIncidenceDeleted( KMFolder*, TQ_UINT32 ) ) ); - disconnect( folder, TQT_SIGNAL( expunged( KMFolder* ) ), - this, TQT_SLOT( slotRefreshFolder( KMFolder* ) ) ); - disconnect( folder->storage(), TQT_SIGNAL( readOnlyChanged( KMFolder* ) ), - this, TQT_SLOT( slotFolderPropertiesChanged( KMFolder* ) ) ); - disconnect( folder, TQT_SIGNAL( nameChanged() ), - this, TQT_SLOT( slotFolderRenamed() ) ); - disconnect( folder->storage(), TQT_SIGNAL( locationChanged( const TQString&, const TQString&) ), - this, TQT_SLOT( slotFolderLocationChanged( const TQString&, const TQString&) ) ); + disconnect( folder, TQ_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), + this, TQ_SLOT( slotIncidenceAdded( KMFolder*, TQ_UINT32 ) ) ); + disconnect( folder, TQ_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), + this, TQ_SLOT( slotIncidenceDeleted( KMFolder*, TQ_UINT32 ) ) ); + disconnect( folder, TQ_SIGNAL( expunged( KMFolder* ) ), + this, TQ_SLOT( slotRefreshFolder( KMFolder* ) ) ); + disconnect( folder->storage(), TQ_SIGNAL( readOnlyChanged( KMFolder* ) ), + this, TQ_SLOT( slotFolderPropertiesChanged( KMFolder* ) ) ); + disconnect( folder, TQ_SIGNAL( nameChanged() ), + this, TQ_SLOT( slotFolderRenamed() ) ); + disconnect( folder->storage(), TQ_SIGNAL( locationChanged( const TQString&, const TQString&) ), + this, TQ_SLOT( slotFolderLocationChanged( const TQString&, const TQString&) ) ); // Setup the signals to listen for changes - connect( folder, TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), - this, TQT_SLOT( slotIncidenceAdded( KMFolder*, TQ_UINT32 ) ) ); - connect( folder, TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), - this, TQT_SLOT( slotIncidenceDeleted( KMFolder*, TQ_UINT32 ) ) ); - connect( folder, TQT_SIGNAL( expunged( KMFolder* ) ), - this, TQT_SLOT( slotRefreshFolder( KMFolder* ) ) ); - connect( folder->storage(), TQT_SIGNAL( readOnlyChanged( KMFolder* ) ), - this, TQT_SLOT( slotFolderPropertiesChanged( KMFolder* ) ) ); - connect( folder, TQT_SIGNAL( nameChanged() ), - this, TQT_SLOT( slotFolderRenamed() ) ); - connect( folder->storage(), TQT_SIGNAL( locationChanged( const TQString&, const TQString&) ), - this, TQT_SLOT( slotFolderLocationChanged( const TQString&, const TQString&) ) ); + connect( folder, TQ_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), + this, TQ_SLOT( slotIncidenceAdded( KMFolder*, TQ_UINT32 ) ) ); + connect( folder, TQ_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), + this, TQ_SLOT( slotIncidenceDeleted( KMFolder*, TQ_UINT32 ) ) ); + connect( folder, TQ_SIGNAL( expunged( KMFolder* ) ), + this, TQ_SLOT( slotRefreshFolder( KMFolder* ) ) ); + connect( folder->storage(), TQ_SIGNAL( readOnlyChanged( KMFolder* ) ), + this, TQ_SLOT( slotFolderPropertiesChanged( KMFolder* ) ) ); + connect( folder, TQ_SIGNAL( nameChanged() ), + this, TQ_SLOT( slotFolderRenamed() ) ); + connect( folder->storage(), TQ_SIGNAL( locationChanged( const TQString&, const TQString&) ), + this, TQ_SLOT( slotFolderLocationChanged( const TQString&, const TQString&) ) ); } diff --git a/kmail/kmatmlistview.cpp b/kmail/kmatmlistview.cpp index d6a9c4c4..f8a573ed 100644 --- a/kmail/kmatmlistview.cpp +++ b/kmail/kmatmlistview.cpp @@ -18,12 +18,12 @@ KMAtmListViewItem::KMAtmListViewItem( TQListView *parent ) mCBCompress->setShown( true ); updateAllCheckBoxes(); - connect( mCBCompress, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotCompress() ) ); - connect( listView()->header(), TQT_SIGNAL( sizeChange(int, int, int) ), - TQT_SLOT( slotHeaderChange( int, int, int ) ) ); - connect( listView()->header(), TQT_SIGNAL( indexChange(int, int, int) ), - TQT_SLOT( slotHeaderChange( int, int, int ) ) ); - connect( listView()->header(), TQT_SIGNAL( clicked( int ) ), TQT_SLOT( slotHeaderClick( int ) ) ); + connect( mCBCompress, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotCompress() ) ); + connect( listView()->header(), TQ_SIGNAL( sizeChange(int, int, int) ), + TQ_SLOT( slotHeaderChange( int, int, int ) ) ); + connect( listView()->header(), TQ_SIGNAL( indexChange(int, int, int) ), + TQ_SLOT( slotHeaderChange( int, int, int ) ) ); + connect( listView()->header(), TQ_SIGNAL( clicked( int ) ), TQ_SLOT( slotHeaderClick( int ) ) ); } KMAtmListViewItem::~KMAtmListViewItem() diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp index 5239ceda..26e62f7e 100644 --- a/kmail/kmcommands.cpp +++ b/kmail/kmcommands.cpp @@ -202,7 +202,7 @@ KMCommand::Result KMCommand::result() void KMCommand::start() { - TQTimer::singleShot( 0, this, TQT_SLOT( slotStart() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotStart() ) ); } @@ -225,8 +225,8 @@ int KMCommand::mCountJobs = 0; void KMCommand::slotStart() { - connect( this, TQT_SIGNAL( messagesTransfered( KMCommand::Result ) ), - this, TQT_SLOT( slotPostTransfer( KMCommand::Result ) ) ); + connect( this, TQ_SIGNAL( messagesTransfered( KMCommand::Result ) ), + this, TQ_SLOT( slotPostTransfer( KMCommand::Result ) ) ); kmkernel->filterMgr()->ref(); if (mMsgList.find(0) != -1) { @@ -261,8 +261,8 @@ void KMCommand::slotStart() void KMCommand::slotPostTransfer( KMCommand::Result result ) { - disconnect( this, TQT_SIGNAL( messagesTransfered( KMCommand::Result ) ), - this, TQT_SLOT( slotPostTransfer( KMCommand::Result ) ) ); + disconnect( this, TQ_SIGNAL( messagesTransfered( KMCommand::Result ) ), + this, TQ_SLOT( slotPostTransfer( KMCommand::Result ) ) ); if ( result == OK ) result = execute(); mResult = result; @@ -339,13 +339,13 @@ void KMCommand::transferSelectedMsgs() job->setCancellable( false ); totalSize += thisMsg->msgSizeServer(); // emitted when the message was transferred successfully - connect(job, TQT_SIGNAL(messageRetrieved(KMMessage*)), - this, TQT_SLOT(slotMsgTransfered(KMMessage*))); + connect(job, TQ_SIGNAL(messageRetrieved(KMMessage*)), + this, TQ_SLOT(slotMsgTransfered(KMMessage*))); // emitted when the job is destroyed - connect(job, TQT_SIGNAL(finished()), - this, TQT_SLOT(slotJobFinished())); - connect(job, TQT_SIGNAL(progress(unsigned long, unsigned long)), - this, TQT_SLOT(slotProgress(unsigned long, unsigned long))); + connect(job, TQ_SIGNAL(finished()), + this, TQ_SLOT(slotJobFinished())); + connect(job, TQ_SIGNAL(progress(unsigned long, unsigned long)), + this, TQ_SLOT(slotProgress(unsigned long, unsigned long))); // msg musn't be deleted thisMsg->setTransferInProgress(true); job->start(); @@ -363,8 +363,8 @@ void KMCommand::transferSelectedMsgs() } else { // wait for the transfer and tell the progressBar the necessary steps if ( mProgressDialog ) { - connect(mProgressDialog, TQT_SIGNAL(cancelClicked()), - this, TQT_SLOT(slotTransferCancelled())); + connect(mProgressDialog, TQ_SIGNAL(cancelClicked()), + this, TQ_SLOT(slotTransferCancelled())); mProgressDialog->progressBar()->setTotalSteps(totalSize); } } @@ -645,7 +645,7 @@ KMCommand::Result KMUrlSaveCommand::execute() return Canceled; } TDEIO::Job *job = TDEIO::file_copy(mUrl, saveUrl, -1, true); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotUrlSaveResult(TDEIO::Job*))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotUrlSaveResult(TDEIO::Job*))); setEmitsCompletedItself( true ); return OK; } @@ -845,10 +845,10 @@ KMCommand::Result KMSaveMsgCommand::execute() mJob->slotTotalSize( mTotalSize ); mJob->setAsyncDataEnabled( true ); mJob->setReportDataSent( true ); - connect(mJob, TQT_SIGNAL(dataReq(TDEIO::Job*, TQByteArray &)), - TQT_SLOT(slotSaveDataReq())); - connect(mJob, TQT_SIGNAL(result(TDEIO::Job*)), - TQT_SLOT(slotSaveResult(TDEIO::Job*))); + connect(mJob, TQ_SIGNAL(dataReq(TDEIO::Job*, TQByteArray &)), + TQ_SLOT(slotSaveDataReq())); + connect(mJob, TQ_SIGNAL(result(TDEIO::Job*)), + TQ_SLOT(slotSaveResult(TDEIO::Job*))); setEmitsCompletedItself( true ); return OK; } @@ -898,8 +898,8 @@ void KMSaveMsgCommand::slotSaveDataReq() if ( msg->parent() && !msg->isComplete() ) { FolderJob *job = msg->parent()->createJob( msg ); job->setCancellable( false ); - connect(job, TQT_SIGNAL( messageRetrieved( KMMessage* ) ), - this, TQT_SLOT( slotMessageRetrievedForSaving( KMMessage* ) ) ); + connect(job, TQ_SIGNAL( messageRetrieved( KMMessage* ) ), + this, TQ_SLOT( slotMessageRetrievedForSaving( KMMessage* ) ) ); job->start(); } } @@ -971,10 +971,10 @@ void KMSaveMsgCommand::slotSaveResult(TDEIO::Job *job) mJob->slotTotalSize( mTotalSize ); mJob->setAsyncDataEnabled( true ); mJob->setReportDataSent( true ); - connect(mJob, TQT_SIGNAL(dataReq(TDEIO::Job*, TQByteArray &)), - TQT_SLOT(slotSaveDataReq())); - connect(mJob, TQT_SIGNAL(result(TDEIO::Job*)), - TQT_SLOT(slotSaveResult(TDEIO::Job*))); + connect(mJob, TQ_SIGNAL(dataReq(TDEIO::Job*, TQByteArray &)), + TQ_SLOT(slotSaveDataReq())); + connect(mJob, TQ_SIGNAL(result(TDEIO::Job*)), + TQ_SLOT(slotSaveResult(TDEIO::Job*))); } } else @@ -1014,10 +1014,10 @@ KMCommand::Result KMOpenMsgCommand::execute() } mJob = TDEIO::get( mUrl, false, false ); mJob->setReportDataSent( true ); - connect( mJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - this, TQT_SLOT( slotDataArrived( TDEIO::Job*, const TQByteArray & ) ) ); - connect( mJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( mJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + this, TQ_SLOT( slotDataArrived( TDEIO::Job*, const TQByteArray & ) ) ); + connect( mJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotResult( TDEIO::Job * ) ) ); setEmitsCompletedItself( true ); return OK; } @@ -1904,15 +1904,15 @@ void KMMenuCommand::makeFolderMenu(KMFolderNode* node, bool move, // connect the signals if (move) { - disconnect(menu, TQT_SIGNAL(activated(int)), receiver, - TQT_SLOT(moveSelectedToFolder(int))); - connect(menu, TQT_SIGNAL(activated(int)), receiver, - TQT_SLOT(moveSelectedToFolder(int))); + disconnect(menu, TQ_SIGNAL(activated(int)), receiver, + TQ_SLOT(moveSelectedToFolder(int))); + connect(menu, TQ_SIGNAL(activated(int)), receiver, + TQ_SLOT(moveSelectedToFolder(int))); } else { - disconnect(menu, TQT_SIGNAL(activated(int)), receiver, - TQT_SLOT(copySelectedToFolder(int))); - connect(menu, TQT_SIGNAL(activated(int)), receiver, - TQT_SLOT(copySelectedToFolder(int))); + disconnect(menu, TQ_SIGNAL(activated(int)), receiver, + TQ_SLOT(copySelectedToFolder(int))); + connect(menu, TQ_SIGNAL(activated(int)), receiver, + TQ_SLOT(copySelectedToFolder(int))); } KMFolder *folder = 0; @@ -2036,10 +2036,10 @@ KMCommand::Result KMCopyCommand::execute() FolderJob *job = srcFolder->createJob(newMsg); job->setCancellable( false ); mPendingJobs << job; - connect(job, TQT_SIGNAL(messageRetrieved(KMMessage*)), - mDestFolder, TQT_SLOT(reallyAddCopyOfMsg(KMMessage*))); - connect( job, TQT_SIGNAL(result(KMail::FolderJob*)), - this, TQT_SLOT(slotJobFinished(KMail::FolderJob*)) ); + connect(job, TQ_SIGNAL(messageRetrieved(KMMessage*)), + mDestFolder, TQ_SLOT(reallyAddCopyOfMsg(KMMessage*))); + connect( job, TQ_SIGNAL(result(KMail::FolderJob*)), + this, TQ_SLOT(slotJobFinished(KMail::FolderJob*)) ); job->start(); } else { // local => others @@ -2067,8 +2067,8 @@ KMCommand::Result KMCopyCommand::execute() if ( mPendingJobs.isEmpty() ) { // wait for the end of the copy before closing the folder KMFolderImap *imapDestFolder = static_cast<KMFolderImap*>(mDestFolder->storage()); - connect( imapDestFolder, TQT_SIGNAL( folderComplete( KMFolderImap*, bool ) ), - this, TQT_SLOT( slotFolderComplete( KMFolderImap*, bool ) ) ); + connect( imapDestFolder, TQ_SIGNAL( folderComplete( KMFolderImap*, bool ) ), + this, TQ_SLOT( slotFolderComplete( KMFolderImap*, bool ) ) ); } } else { deleteNow = list.isEmpty() && mPendingJobs.isEmpty(); // we're done if there are no other mails we need to fetch @@ -2081,8 +2081,8 @@ KMCommand::Result KMCopyCommand::execute() { // copy the message(s); note: the list is empty afterwards! KMFolderImap *imapDestFolder = static_cast<KMFolderImap*>(mDestFolder->storage()); - connect( imapDestFolder, TQT_SIGNAL( folderComplete( KMFolderImap*, bool ) ), - this, TQT_SLOT( slotFolderComplete( KMFolderImap*, bool ) ) ); + connect( imapDestFolder, TQ_SIGNAL( folderComplete( KMFolderImap*, bool ) ), + this, TQ_SLOT( slotFolderComplete( KMFolderImap*, bool ) ) ); imapDestFolder->copyMsg(list); imapDestFolder->getFolder(); } @@ -2107,8 +2107,8 @@ void KMCopyCommand::slotJobFinished(KMail::FolderJob * job) kdDebug(5006) << k_funcinfo << "folder job failed: " << job->error() << endl; // kill all pending jobs for ( TQValueList<KMail::FolderJob*>::Iterator it = mPendingJobs.begin(); it != mPendingJobs.end(); ++it ) { - disconnect( (*it), TQT_SIGNAL(result(KMail::FolderJob*)), - this, TQT_SLOT(slotJobFinished(KMail::FolderJob*)) ); + disconnect( (*it), TQ_SIGNAL(result(KMail::FolderJob*)), + this, TQ_SLOT(slotJobFinished(KMail::FolderJob*)) ); (*it)->kill(); } mPendingJobs.clear(); @@ -2181,8 +2181,8 @@ KMCommand::Result KMMoveCommand::execute() ProgressManager::createProgressItem ( "move"+ProgressManager::getUniqueID(), mDestFolder ? i18n( "Moving messages" ) : i18n( "Deleting messages" ) ); - connect( mProgressItem, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ), - this, TQT_SLOT( slotMoveCanceled() ) ); + connect( mProgressItem, TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ), + this, TQ_SLOT( slotMoveCanceled() ) ); KMMessage *msg; int rc = 0; @@ -2192,8 +2192,8 @@ KMCommand::Result KMMoveCommand::execute() mCompleteWithAddedMsg = false; if (mDestFolder) { - connect (mDestFolder, TQT_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)), - this, TQT_SLOT(slotMsgAddedToDestFolder(KMFolder*, TQ_UINT32))); + connect (mDestFolder, TQ_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)), + this, TQ_SLOT(slotMsgAddedToDestFolder(KMFolder*, TQ_UINT32))); mLostBoys = mSerNumList; } mProgressItem->setTotalItems( mSerNumList.count() ); @@ -2235,11 +2235,11 @@ KMCommand::Result KMMoveCommand::execute() * signal so we notice when all the mails should have showed up in it * but haven't for some reason. */ KMFolderImap *imapFolder = static_cast<KMFolderImap*> ( mDestFolder->storage() ); - disconnect (imapFolder, TQT_SIGNAL(folderComplete( KMFolderImap*, bool )), - this, TQT_SLOT(slotImapFolderCompleted( KMFolderImap*, bool ))); + disconnect (imapFolder, TQ_SIGNAL(folderComplete( KMFolderImap*, bool )), + this, TQ_SLOT(slotImapFolderCompleted( KMFolderImap*, bool ))); - connect (imapFolder, TQT_SIGNAL(folderComplete( KMFolderImap*, bool )), - this, TQT_SLOT(slotImapFolderCompleted( KMFolderImap*, bool ))); + connect (imapFolder, TQ_SIGNAL(folderComplete( KMFolderImap*, bool )), + this, TQ_SLOT(slotImapFolderCompleted( KMFolderImap*, bool ))); list.append(msg); } else { // We are moving to a local folder. @@ -2297,8 +2297,8 @@ KMCommand::Result KMMoveCommand::execute() void KMMoveCommand::slotImapFolderCompleted(KMFolderImap* imapFolder, bool success) { - disconnect (imapFolder, TQT_SIGNAL(folderComplete( KMFolderImap*, bool )), - this, TQT_SLOT(slotImapFolderCompleted( KMFolderImap*, bool ))); + disconnect (imapFolder, TQ_SIGNAL(folderComplete( KMFolderImap*, bool )), + this, TQ_SLOT(slotImapFolderCompleted( KMFolderImap*, bool ))); if ( success ) { // the folder was checked successfully but we were still called, so check // if we are still waiting for messages to show up. If so, uidValidity @@ -2327,8 +2327,8 @@ void KMMoveCommand::slotMsgAddedToDestFolder(KMFolder *folder, TQ_UINT32 serNum) mLostBoys.remove(serNum); if ( mLostBoys.isEmpty() ) { // we are done. All messages transferred to the host succesfully - disconnect (mDestFolder, TQT_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)), - this, TQT_SLOT(slotMsgAddedToDestFolder(KMFolder*, TQ_UINT32))); + disconnect (mDestFolder, TQ_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)), + this, TQ_SLOT(slotMsgAddedToDestFolder(KMFolder*, TQ_UINT32))); if (mDestFolder && mDestFolder->folderType() != KMFolderTypeImap) { mDestFolder->sync(); } @@ -2526,8 +2526,8 @@ KMCommand::Result KMSaveAttachmentsCommand::execute() setDeletesItself( true ); // load all parts KMLoadPartsCommand *command = new KMLoadPartsCommand( mAttachmentMap ); - connect( command, TQT_SIGNAL( partsRetrieved() ), - this, TQT_SLOT( slotSaveAll() ) ); + connect( command, TQ_SIGNAL( partsRetrieved() ), + this, TQ_SLOT( slotSaveAll() ) ); command->start(); return OK; @@ -2832,8 +2832,8 @@ void KMLoadPartsCommand::slotStart() curFolder->createJob( it.data(), FolderJob::tGetMessage, 0, it.key()->msgPart().partSpecifier() ); job->setCancellable( false ); - connect( job, TQT_SIGNAL(messageUpdated(KMMessage*, TQString)), - this, TQT_SLOT(slotPartRetrieved(KMMessage*, TQString)) ); + connect( job, TQ_SIGNAL(messageUpdated(KMMessage*, TQString)), + this, TQ_SLOT(slotPartRetrieved(KMMessage*, TQString)) ); job->start(); } else kdWarning(5006) << "KMLoadPartsCommand - msg has no parent" << endl; @@ -2928,8 +2928,8 @@ KMCommand::Result KMMailingListCommand::execute() new KMUrlClickedCommand( lst.first(), mFolder->identity(), 0, false ); } if ( command ) { - connect( command, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( commandCompleted( KMCommand * ) ) ); + connect( command, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( commandCompleted( KMCommand * ) ) ); setDeletesItself( true ); setEmitsCompletedItself( true ); command->start(); @@ -3049,8 +3049,8 @@ void KMHandleAttachmentCommand::slotStart() // load the part kdDebug(5006) << "load part" << endl; KMLoadPartsCommand *command = new KMLoadPartsCommand( mNode, mMsg ); - connect( command, TQT_SIGNAL( partsRetrieved() ), - this, TQT_SLOT( slotPartComplete() ) ); + connect( command, TQ_SIGNAL( partsRetrieved() ), + this, TQ_SLOT( slotPartComplete() ) ); command->start(); } else { @@ -3306,8 +3306,8 @@ void KMHandleAttachmentCommand::atmEncryptWithChiasmus() } mJob = job; - connect( job, TQT_SIGNAL(result(const GpgME::Error&,const TQVariant&)), - this, TQT_SLOT(slotAtmDecryptWithChiasmusResult(const GpgME::Error&,const TQVariant&)) ); + connect( job, TQ_SIGNAL(result(const GpgME::Error&,const TQVariant&)), + this, TQ_SLOT(slotAtmDecryptWithChiasmusResult(const GpgME::Error&,const TQVariant&)) ); } static const TQString chomp( const TQString & base, const TQString & suffix, bool cs ) { @@ -3350,8 +3350,8 @@ void KMHandleAttachmentCommand::slotAtmDecryptWithChiasmusResult( const GpgME::E d.setDisabled( true ); // we got this far, don't delete yet TDEIO::Job * uploadJob = TDEIO::storedPut( result.toByteArray(), url, -1, overwrite, false /*resume*/ ); uploadJob->setWindow( parentWidget() ); - connect( uploadJob, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotAtmDecryptWithChiasmusUploadResult(TDEIO::Job*)) ); + connect( uploadJob, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotAtmDecryptWithChiasmusUploadResult(TDEIO::Job*)) ); } void KMHandleAttachmentCommand::slotAtmDecryptWithChiasmusUploadResult( TDEIO::Job * job ) @@ -3412,8 +3412,8 @@ void AttachmentModifyCommand::storeChangedMessage(KMMessage * msg) int res = mFolder->addMsg( msg ) != 0; if ( mFolder->folderType() == KMFolderTypeImap ) { KMFolderImap *f = static_cast<KMFolderImap*>( mFolder->storage() ); - connect( f, TQT_SIGNAL(folderComplete(KMFolderImap*,bool)), - TQT_SLOT(messageStoreResult(KMFolderImap*,bool)) ); + connect( f, TQ_SIGNAL(folderComplete(KMFolderImap*,bool)), + TQ_SLOT(messageStoreResult(KMFolderImap*,bool)) ); } else { messageStoreResult( 0, res == 0 ); } @@ -3424,7 +3424,7 @@ void AttachmentModifyCommand::messageStoreResult(KMFolderImap* folder, bool succ Q_UNUSED( folder ); if ( success ) { KMCommand *delCmd = new KMDeleteMsgCommand( mSernum ); - connect( delCmd, TQT_SIGNAL(completed(KMCommand*)), TQT_SLOT(messageDeleteResult(KMCommand*)) ); + connect( delCmd, TQ_SIGNAL(completed(KMCommand*)), TQ_SLOT(messageDeleteResult(KMCommand*)) ); delCmd->start(); return; } @@ -3515,7 +3515,7 @@ KMCommand::Result KMEditAttachmentCommand::doAttachmentModify() new KMail::EditorWatcher( KURL( mTempFile.file()->name() ), part.typeStr() + "/" + part.subtypeStr(), false, this, parentWidget() ); - connect( watcher, TQT_SIGNAL(editDone(KMail::EditorWatcher*)), TQT_SLOT(editDone(KMail::EditorWatcher*)) ); + connect( watcher, TQ_SIGNAL(editDone(KMail::EditorWatcher*)), TQ_SLOT(editDone(KMail::EditorWatcher*)) ); if ( !watcher->start() ) return Failed; setEmitsCompletedItself( true ); diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp index 9815a17b..794aa67c 100644 --- a/kmail/kmcomposewin.cpp +++ b/kmail/kmcomposewin.cpp @@ -225,8 +225,8 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id ) mEdtReplyTo = new KMLineEdit(true,mHeadersArea, "replyToLine"); TQToolTip::add( mEdtReplyTo, i18n( "Set the \"Reply-To:\" email address for this message" ) ); - connect(mEdtReplyTo,TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), - TQT_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion))); + connect(mEdtReplyTo,TQ_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), + TQ_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion))); if ( mClassicalRecipients ) { mRecipientsEditor = 0; @@ -254,17 +254,17 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id ) mBtnBcc->setFocusPolicy(TQWidget::NoFocus); //mBtnFrom->setFocusPolicy(TQWidget::NoFocus); - connect(mBtnTo,TQT_SIGNAL(clicked()),TQT_SLOT(slotAddrBookTo())); - connect(mBtnCc,TQT_SIGNAL(clicked()),TQT_SLOT(slotAddrBookTo())); - connect(mBtnBcc,TQT_SIGNAL(clicked()),TQT_SLOT(slotAddrBookTo())); - //connect(mBtnFrom,TQT_SIGNAL(clicked()),TQT_SLOT(slotAddrBookFrom())); + connect(mBtnTo,TQ_SIGNAL(clicked()),TQ_SLOT(slotAddrBookTo())); + connect(mBtnCc,TQ_SIGNAL(clicked()),TQ_SLOT(slotAddrBookTo())); + connect(mBtnBcc,TQ_SIGNAL(clicked()),TQ_SLOT(slotAddrBookTo())); + //connect(mBtnFrom,TQ_SIGNAL(clicked()),TQ_SLOT(slotAddrBookFrom())); - connect(mEdtTo,TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), - TQT_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion))); - connect(mEdtCc,TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), - TQT_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion))); - connect(mEdtBcc,TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), - TQT_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion))); + connect(mEdtTo,TQ_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), + TQ_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion))); + connect(mEdtCc,TQ_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), + TQ_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion))); + connect(mEdtBcc,TQ_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), + TQ_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion))); mEdtTo->setFocus(); } else { @@ -283,9 +283,9 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id ) mRecipientsEditor = new RecipientsEditor( mHeadersArea ); connect( mRecipientsEditor, - TQT_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion ) ), - TQT_SLOT( slotCompletionModeChanged( TDEGlobalSettings::Completion ) ) ); - connect( mRecipientsEditor, TQT_SIGNAL(sizeHintChanged()), TQT_SLOT(recipientEditorSizeHintChanged()) ); + TQ_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion ) ), + TQ_SLOT( slotCompletionModeChanged( TDEGlobalSettings::Completion ) ) ); + connect( mRecipientsEditor, TQ_SIGNAL(sizeHintChanged()), TQ_SLOT(recipientEditorSizeHintChanged()) ); mRecipientsEditor->setFocus(); } @@ -413,20 +413,20 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id ) mAtmListView->setAllColumnsShowFocus( true ); connect( mAtmListView, - TQT_SIGNAL( doubleClicked( TQListViewItem* ) ), - TQT_SLOT( slotAttachEdit() ) ); + TQ_SIGNAL( doubleClicked( TQListViewItem* ) ), + TQ_SLOT( slotAttachEdit() ) ); connect( mAtmListView, - TQT_SIGNAL( rightButtonPressed( TQListViewItem*, const TQPoint&, int ) ), - TQT_SLOT( slotAttachPopupMenu( TQListViewItem*, const TQPoint&, int ) ) ); + TQ_SIGNAL( rightButtonPressed( TQListViewItem*, const TQPoint&, int ) ), + TQ_SLOT( slotAttachPopupMenu( TQListViewItem*, const TQPoint&, int ) ) ); connect( mAtmListView, - TQT_SIGNAL( selectionChanged() ), - TQT_SLOT( slotUpdateAttachActions() ) ); + TQ_SIGNAL( selectionChanged() ), + TQ_SLOT( slotUpdateAttachActions() ) ); connect( mAtmListView, - TQT_SIGNAL( attachmentDeleted() ), - TQT_SLOT( slotAttachRemove() ) ); + TQ_SIGNAL( attachmentDeleted() ), + TQ_SLOT( slotAttachRemove() ) ); connect( mAtmListView, - TQT_SIGNAL( dragStarted() ), - TQT_SLOT( slotAttachmentDragStarted() ) ); + TQ_SIGNAL( dragStarted() ), + TQ_SLOT( slotAttachmentDragStarted() ) ); mAttachMenu = 0; readConfig(); @@ -437,32 +437,32 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id ) applyMainWindowSettings(KMKernel::config(), "Composer"); - connect( mEdtSubject, TQT_SIGNAL( subjectTextSpellChecked() ), - TQT_SLOT( slotSubjectTextSpellChecked() ) ); - connect(mEdtSubject,TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(slotUpdWinTitle(const TQString&))); - connect(mIdentity,TQT_SIGNAL(identityChanged(uint)), - TQT_SLOT(slotIdentityChanged(uint))); - connect( kmkernel->identityManager(), TQT_SIGNAL(changed(uint)), - TQT_SLOT(slotIdentityChanged(uint))); - - connect(mEdtFrom,TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), - TQT_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion))); - connect(kmkernel->folderMgr(),TQT_SIGNAL(folderRemoved(KMFolder*)), - TQT_SLOT(slotFolderRemoved(KMFolder*))); - connect(kmkernel->imapFolderMgr(),TQT_SIGNAL(folderRemoved(KMFolder*)), - TQT_SLOT(slotFolderRemoved(KMFolder*))); - connect(kmkernel->dimapFolderMgr(),TQT_SIGNAL(folderRemoved(KMFolder*)), - TQT_SLOT(slotFolderRemoved(KMFolder*))); - connect( kmkernel, TQT_SIGNAL( configChanged() ), - this, TQT_SLOT( slotConfigChanged() ) ); - - connect (mEditor, TQT_SIGNAL (spellcheck_done(int)), - this, TQT_SLOT (slotSpellcheckDone (int))); - connect (mEditor, TQT_SIGNAL( attachPNGImageData(const TQByteArray &) ), - this, TQT_SLOT ( slotAttachPNGImageData(const TQByteArray &) ) ); - connect (mEditor, TQT_SIGNAL( focusChanged(bool) ), - this, TQT_SLOT (editorFocusChanged(bool)) ); + connect( mEdtSubject, TQ_SIGNAL( subjectTextSpellChecked() ), + TQ_SLOT( slotSubjectTextSpellChecked() ) ); + connect(mEdtSubject,TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(slotUpdWinTitle(const TQString&))); + connect(mIdentity,TQ_SIGNAL(identityChanged(uint)), + TQ_SLOT(slotIdentityChanged(uint))); + connect( kmkernel->identityManager(), TQ_SIGNAL(changed(uint)), + TQ_SLOT(slotIdentityChanged(uint))); + + connect(mEdtFrom,TQ_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), + TQ_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion))); + connect(kmkernel->folderMgr(),TQ_SIGNAL(folderRemoved(KMFolder*)), + TQ_SLOT(slotFolderRemoved(KMFolder*))); + connect(kmkernel->imapFolderMgr(),TQ_SIGNAL(folderRemoved(KMFolder*)), + TQ_SLOT(slotFolderRemoved(KMFolder*))); + connect(kmkernel->dimapFolderMgr(),TQ_SIGNAL(folderRemoved(KMFolder*)), + TQ_SLOT(slotFolderRemoved(KMFolder*))); + connect( kmkernel, TQ_SIGNAL( configChanged() ), + this, TQ_SLOT( slotConfigChanged() ) ); + + connect (mEditor, TQ_SIGNAL (spellcheck_done(int)), + this, TQ_SLOT (slotSpellcheckDone (int))); + connect (mEditor, TQ_SIGNAL( attachPNGImageData(const TQByteArray &) ), + this, TQ_SLOT ( slotAttachPNGImageData(const TQByteArray &) ) ); + connect (mEditor, TQ_SIGNAL( focusChanged(bool) ), + this, TQ_SLOT (editorFocusChanged(bool)) ); mMainWidget->resize(480,510); setCentralWidget(mMainWidget); @@ -553,7 +553,7 @@ void KMComposeWin::addAttachmentsAndSend(const KURL::List &urls, const TQString } mAttachFilesSend = how; mAttachFilesPending = urls; - connect(this, TQT_SIGNAL(attachmentAdded(const KURL&, bool)), TQT_SLOT(slotAttachedFile(const KURL&))); + connect(this, TQ_SIGNAL(attachmentAdded(const KURL&, bool)), TQ_SLOT(slotAttachedFile(const KURL&))); for( KURL::List::ConstIterator itr = urls.begin(); itr != urls.end(); ++itr ) { if (!addAttach( *itr )) mAttachFilesPending.remove(mAttachFilesPending.find(*itr)); // only remove one copy of the url @@ -815,8 +815,8 @@ void KMComposeWin::autoSaveMessage() if ( mAutoSaveTimer ) mAutoSaveTimer->stop(); - connect( this, TQT_SIGNAL( applyChangesDone( bool ) ), - this, TQT_SLOT( slotContinueAutoSave() ) ); + connect( this, TQ_SIGNAL( applyChangesDone( bool ) ), + this, TQ_SLOT( slotContinueAutoSave() ) ); // This method is called when KMail crashed, so don't try signing/encryption // and don't disable controls because it is also called from a timer and // then the disabling is distracting. @@ -827,8 +827,8 @@ void KMComposeWin::autoSaveMessage() void KMComposeWin::slotContinueAutoSave() { - disconnect( this, TQT_SIGNAL( applyChangesDone( bool ) ), - this, TQT_SLOT( slotContinueAutoSave() ) ); + disconnect( this, TQ_SIGNAL( applyChangesDone( bool ) ), + this, TQ_SLOT( slotContinueAutoSave() ) ); // Ok, it's done now - continue dead letter saving if ( mComposedMessages.isEmpty() ) { @@ -1076,22 +1076,22 @@ void KMComposeWin::rethinkFields(bool fromSlot) ++row; if ( showHeaders & HDR_REPLY_TO ) { - connect( mEdtReplyTo, TQT_SIGNAL( focusDown() ), mRecipientsEditor, - TQT_SLOT( setFocusTop() ) ); + connect( mEdtReplyTo, TQ_SIGNAL( focusDown() ), mRecipientsEditor, + TQ_SLOT( setFocusTop() ) ); } else { - connect( mEdtFrom, TQT_SIGNAL( focusDown() ), mRecipientsEditor, - TQT_SLOT( setFocusTop() ) ); + connect( mEdtFrom, TQ_SIGNAL( focusDown() ), mRecipientsEditor, + TQ_SLOT( setFocusTop() ) ); } if ( showHeaders & HDR_REPLY_TO ) { - connect( mRecipientsEditor, TQT_SIGNAL( focusUp() ), mEdtReplyTo, TQT_SLOT( setFocus() ) ); + connect( mRecipientsEditor, TQ_SIGNAL( focusUp() ), mEdtReplyTo, TQ_SLOT( setFocus() ) ); } else { - connect( mRecipientsEditor, TQT_SIGNAL( focusUp() ), mEdtFrom, TQT_SLOT( setFocus() ) ); + connect( mRecipientsEditor, TQ_SIGNAL( focusUp() ), mEdtFrom, TQ_SLOT( setFocus() ) ); } - connect( mRecipientsEditor, TQT_SIGNAL( focusDown() ), mEdtSubject, - TQT_SLOT( setFocus() ) ); - connect( mEdtSubject, TQT_SIGNAL( focusUp() ), mRecipientsEditor, - TQT_SLOT( setFocusBottom() ) ); + connect( mRecipientsEditor, TQ_SIGNAL( focusDown() ), mEdtSubject, + TQ_SLOT( setFocus() ) ); + connect( mEdtSubject, TQ_SIGNAL( focusUp() ), mRecipientsEditor, + TQ_SLOT( setFocusBottom() ) ); prevFocus = mRecipientsEditor; } @@ -1131,8 +1131,8 @@ void KMComposeWin::rethinkFields(bool fromSlot) TQWidget *KMComposeWin::connectFocusMoving( TQWidget *prev, TQWidget *next ) { - connect( prev, TQT_SIGNAL( focusDown() ), next, TQT_SLOT( setFocus() ) ); - connect( next, TQT_SIGNAL( focusUp() ), prev, TQT_SLOT( setFocus() ) ); + connect( prev, TQ_SIGNAL( focusDown() ), next, TQ_SLOT( setFocus() ) ); + connect( next, TQ_SIGNAL( focusUp() ), prev, TQ_SLOT( setFocus() ) ); return next; } @@ -1233,14 +1233,14 @@ void KMComposeWin::setupActions(void) { //default = send now, alternative = queue ( void ) new TDEAction( i18n("&Send Mail"), "mail-send", CTRL+Key_Return, - this, TQT_SLOT(slotSendNow()), actionCollection(),"send_default"); + this, TQ_SLOT(slotSendNow()), actionCollection(),"send_default"); // FIXME: change to mail_send_via icon when this exits. actActionNowMenu = new TDEActionMenu (i18n("&Send Mail Via"), "mail-send", actionCollection(), "send_default_via" ); (void) new TDEAction (i18n("Send &Later"), "queue", 0, this, - TQT_SLOT(slotSendLater()), actionCollection(),"send_alternative"); + TQ_SLOT(slotSendLater()), actionCollection(),"send_alternative"); actActionLaterMenu = new TDEActionMenu (i18n("Send &Later Via"), "queue", actionCollection(), "send_alternative_via" ); @@ -1250,12 +1250,12 @@ void KMComposeWin::setupActions(void) //default = queue, alternative = send now (void) new TDEAction (i18n("Send &Later"), "queue", CTRL+Key_Return, - this, TQT_SLOT(slotSendLater()), actionCollection(),"send_default"); + this, TQ_SLOT(slotSendLater()), actionCollection(),"send_default"); actActionLaterMenu = new TDEActionMenu (i18n("Send &Later Via"), "queue", actionCollection(), "send_default_via" ); ( void ) new TDEAction( i18n("&Send Mail"), "mail-send", 0, - this, TQT_SLOT(slotSendNow()), actionCollection(),"send_alternative"); + this, TQ_SLOT(slotSendNow()), actionCollection(),"send_alternative"); // FIXME: change to mail_send_via icon when this exits. actActionNowMenu = new TDEActionMenu (i18n("&Send Mail Via"), "mail-send", @@ -1267,102 +1267,102 @@ void KMComposeWin::setupActions(void) actActionNowMenu->setDelayed(true); actActionLaterMenu->setDelayed(true); - connect( actActionNowMenu, TQT_SIGNAL( activated() ), this, - TQT_SLOT( slotSendNow() ) ); - connect( actActionLaterMenu, TQT_SIGNAL( activated() ), this, - TQT_SLOT( slotSendLater() ) ); + connect( actActionNowMenu, TQ_SIGNAL( activated() ), this, + TQ_SLOT( slotSendNow() ) ); + connect( actActionLaterMenu, TQ_SIGNAL( activated() ), this, + TQ_SLOT( slotSendLater() ) ); mActNowMenu = actActionNowMenu->popupMenu(); mActLaterMenu = actActionLaterMenu->popupMenu(); - connect( mActNowMenu, TQT_SIGNAL( activated( int ) ), this, - TQT_SLOT( slotSendNowVia( int ) ) ); - connect( mActNowMenu, TQT_SIGNAL( aboutToShow() ), this, - TQT_SLOT( getTransportMenu() ) ); + connect( mActNowMenu, TQ_SIGNAL( activated( int ) ), this, + TQ_SLOT( slotSendNowVia( int ) ) ); + connect( mActNowMenu, TQ_SIGNAL( aboutToShow() ), this, + TQ_SLOT( getTransportMenu() ) ); - connect( mActLaterMenu, TQT_SIGNAL( activated( int ) ), this, - TQT_SLOT( slotSendLaterVia( int ) ) ); - connect( mActLaterMenu, TQT_SIGNAL( aboutToShow() ), this, - TQT_SLOT( getTransportMenu() ) ); + connect( mActLaterMenu, TQ_SIGNAL( activated( int ) ), this, + TQ_SLOT( slotSendLaterVia( int ) ) ); + connect( mActLaterMenu, TQ_SIGNAL( aboutToShow() ), this, + TQ_SLOT( getTransportMenu() ) ); (void) new TDEAction (i18n("Save as &Draft"), "document-save", 0, - this, TQT_SLOT(slotSaveDraft()), + this, TQ_SLOT(slotSaveDraft()), actionCollection(), "save_in_drafts"); (void) new TDEAction (i18n("Save as &Template"), "document-save", 0, - this, TQT_SLOT(slotSaveTemplate()), + this, TQ_SLOT(slotSaveTemplate()), actionCollection(), "save_in_templates"); (void) new TDEAction (i18n("&Insert File..."), "document-open", 0, - this, TQT_SLOT(slotInsertFile()), + this, TQ_SLOT(slotInsertFile()), actionCollection(), "insert_file"); mRecentAction = new TDERecentFilesAction (i18n("&Insert File Recent"), "document-open", 0, - this, TQT_SLOT(slotInsertRecentFile(const KURL&)), + this, TQ_SLOT(slotInsertRecentFile(const KURL&)), actionCollection(), "insert_file_recent"); mRecentAction->loadEntries( KMKernel::config() ); (void) new TDEAction (i18n("&Address Book"), "contents",0, - this, TQT_SLOT(slotAddrBook()), + this, TQ_SLOT(slotAddrBook()), actionCollection(), "addressbook"); (void) new TDEAction (i18n("&New Composer"), "mail-message-new", TDEStdAccel::shortcut(TDEStdAccel::New), - this, TQT_SLOT(slotNewComposer()), + this, TQ_SLOT(slotNewComposer()), actionCollection(), "new_composer"); (void) new TDEAction (i18n("New Main &Window"), "window-new", 0, - this, TQT_SLOT(slotNewMailReader()), + this, TQ_SLOT(slotNewMailReader()), actionCollection(), "open_mailreader"); if ( !mClassicalRecipients ) { new TDEAction( i18n("Select &Recipients..."), CTRL + Key_L, mRecipientsEditor, - TQT_SLOT( selectRecipients() ), actionCollection(), "select_recipients" ); + TQ_SLOT( selectRecipients() ), actionCollection(), "select_recipients" ); new TDEAction( i18n("Save &Distribution List..."), 0, mRecipientsEditor, - TQT_SLOT( saveDistributionList() ), actionCollection(), + TQ_SLOT( saveDistributionList() ), actionCollection(), "save_distribution_list" ); } - //KStdAction::save(this, TQT_SLOT(), actionCollection(), "save_message"); - KStdAction::print (this, TQT_SLOT(slotPrint()), actionCollection()); - KStdAction::close (this, TQT_SLOT(slotClose()), actionCollection()); + //KStdAction::save(this, TQ_SLOT(), actionCollection(), "save_message"); + KStdAction::print (this, TQ_SLOT(slotPrint()), actionCollection()); + KStdAction::close (this, TQ_SLOT(slotClose()), actionCollection()); - KStdAction::undo (this, TQT_SLOT(slotUndo()), actionCollection()); - KStdAction::redo (this, TQT_SLOT(slotRedo()), actionCollection()); - KStdAction::cut (this, TQT_SLOT(slotCut()), actionCollection()); - KStdAction::copy (this, TQT_SLOT(slotCopy()), actionCollection()); - KStdAction::pasteText (this, TQT_SLOT(slotPasteClipboard()), actionCollection()); - KStdAction::selectAll (this, TQT_SLOT(slotMarkAll()), actionCollection()); + KStdAction::undo (this, TQ_SLOT(slotUndo()), actionCollection()); + KStdAction::redo (this, TQ_SLOT(slotRedo()), actionCollection()); + KStdAction::cut (this, TQ_SLOT(slotCut()), actionCollection()); + KStdAction::copy (this, TQ_SLOT(slotCopy()), actionCollection()); + KStdAction::pasteText (this, TQ_SLOT(slotPasteClipboard()), actionCollection()); + KStdAction::selectAll (this, TQ_SLOT(slotMarkAll()), actionCollection()); - KStdAction::find (this, TQT_SLOT(slotFind()), actionCollection()); - KStdAction::findNext(this, TQT_SLOT(slotSearchAgain()), actionCollection()); + KStdAction::find (this, TQ_SLOT(slotFind()), actionCollection()); + KStdAction::findNext(this, TQ_SLOT(slotSearchAgain()), actionCollection()); - KStdAction::replace (this, TQT_SLOT(slotReplace()), actionCollection()); - KStdAction::spelling (this, TQT_SLOT(slotSpellcheck()), actionCollection(), "tools-check-spelling"); + KStdAction::replace (this, TQ_SLOT(slotReplace()), actionCollection()); + KStdAction::spelling (this, TQ_SLOT(slotSpellcheck()), actionCollection(), "tools-check-spelling"); - mPasteQuotation = new TDEAction (i18n("Pa&ste as Quotation"),0,this,TQT_SLOT( slotPasteClipboardAsQuotation()), + mPasteQuotation = new TDEAction (i18n("Pa&ste as Quotation"),0,this,TQ_SLOT( slotPasteClipboardAsQuotation()), actionCollection(), "paste_quoted"); - (void) new TDEAction (i18n("Paste as Attac&hment"),0,this,TQT_SLOT( slotPasteClipboardAsAttachment()), + (void) new TDEAction (i18n("Paste as Attac&hment"),0,this,TQ_SLOT( slotPasteClipboardAsAttachment()), actionCollection(), "paste_att"); TDEAction * addq = new TDEAction(i18n("Add &Quote Characters"), 0, this, - TQT_SLOT(slotAddQuotes()), actionCollection(), "tools_quote"); - connect( mEditor, TQT_SIGNAL(selectionAvailable(bool)), - addq, TQT_SLOT(setEnabled(bool)) ); + TQ_SLOT(slotAddQuotes()), actionCollection(), "tools_quote"); + connect( mEditor, TQ_SIGNAL(selectionAvailable(bool)), + addq, TQ_SLOT(setEnabled(bool)) ); TDEAction * remq = new TDEAction(i18n("Re&move Quote Characters"), 0, this, - TQT_SLOT(slotRemoveQuotes()), actionCollection(), "tools_unquote"); - connect( mEditor, TQT_SIGNAL(selectionAvailable(bool)), - remq, TQT_SLOT(setEnabled(bool)) ); + TQ_SLOT(slotRemoveQuotes()), actionCollection(), "tools_unquote"); + connect( mEditor, TQ_SIGNAL(selectionAvailable(bool)), + remq, TQ_SLOT(setEnabled(bool)) ); - (void) new TDEAction (i18n("Cl&ean Spaces"), 0, this, TQT_SLOT(slotCleanSpace()), + (void) new TDEAction (i18n("Cl&ean Spaces"), 0, this, TQ_SLOT(slotCleanSpace()), actionCollection(), "clean_spaces"); mFixedFontAction = new TDEToggleAction( i18n("Use Fi&xed Font"), 0, this, - TQT_SLOT(slotUpdateFont()), actionCollection(), "toggle_fixedfont" ); + TQ_SLOT(slotUpdateFont()), actionCollection(), "toggle_fixedfont" ); mFixedFontAction->setChecked( GlobalSettings::self()->useFixedFont() ); //these are checkable!!! @@ -1375,16 +1375,16 @@ void KMComposeWin::setupActions(void) mRequestMDNAction->setChecked(GlobalSettings::self()->requestMDN()); //----- Message-Encoding Submenu mEncodingAction = new TDESelectAction( i18n( "Se&t Encoding" ), "charset", - 0, this, TQT_SLOT(slotSetCharset() ), + 0, this, TQ_SLOT(slotSetCharset() ), actionCollection(), "charsets" ); mWordWrapAction = new TDEToggleAction (i18n("&Wordwrap"), 0, actionCollection(), "wordwrap"); mWordWrapAction->setChecked(GlobalSettings::self()->wordWrap()); - connect(mWordWrapAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotWordWrapToggled(bool))); + connect(mWordWrapAction, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotWordWrapToggled(bool))); mSnippetAction = new TDEToggleAction ( i18n("&Snippets"), 0, actionCollection(), "snippets"); - connect(mSnippetAction, TQT_SIGNAL(toggled(bool)), mSnippetWidget, TQT_SLOT(setShown(bool)) ); + connect(mSnippetAction, TQ_SIGNAL(toggled(bool)), mSnippetWidget, TQ_SLOT(setShown(bool)) ); mSnippetAction->setChecked( GlobalSettings::self()->showSnippetManager() ); mAutoSpellCheckingAction = @@ -1394,8 +1394,8 @@ void KMComposeWin::setupActions(void) mAutoSpellCheckingAction->setEnabled( !GlobalSettings::self()->useExternalEditor() ); mAutoSpellCheckingAction->setChecked( !GlobalSettings::self()->useExternalEditor() && spellChecking ); slotAutoSpellCheckingToggled( !GlobalSettings::self()->useExternalEditor() && spellChecking ); - connect( mAutoSpellCheckingAction, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotAutoSpellCheckingToggled( bool ) ) ); + connect( mAutoSpellCheckingAction, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotAutoSpellCheckingToggled( bool ) ) ); TQStringList encodings = KMMsgBase::supportedEncodings(true); encodings.prepend( i18n("Auto-Detect")); @@ -1404,83 +1404,83 @@ void KMComposeWin::setupActions(void) //these are checkable!!! markupAction = new TDEToggleAction (i18n("Formatting (HTML)"), 0, this, - TQT_SLOT(slotToggleMarkup()), + TQ_SLOT(slotToggleMarkup()), actionCollection(), "html"); mAllFieldsAction = new TDEToggleAction (i18n("&All Fields"), 0, this, - TQT_SLOT(slotView()), + TQ_SLOT(slotView()), actionCollection(), "show_all_fields"); mIdentityAction = new TDEToggleAction (i18n("&Identity"), 0, this, - TQT_SLOT(slotView()), + TQ_SLOT(slotView()), actionCollection(), "show_identity"); mDictionaryAction = new TDEToggleAction (i18n("&Dictionary"), 0, this, - TQT_SLOT(slotView()), + TQ_SLOT(slotView()), actionCollection(), "show_dictionary"); mFccAction = new TDEToggleAction (i18n("&Sent-Mail Folder"), 0, this, - TQT_SLOT(slotView()), + TQ_SLOT(slotView()), actionCollection(), "show_fcc"); mTransportAction = new TDEToggleAction (i18n("&Mail Transport"), 0, this, - TQT_SLOT(slotView()), + TQ_SLOT(slotView()), actionCollection(), "show_transport"); mFromAction = new TDEToggleAction (i18n("&From"), 0, this, - TQT_SLOT(slotView()), + TQ_SLOT(slotView()), actionCollection(), "show_from"); mReplyToAction = new TDEToggleAction (i18n("&Reply To"), 0, this, - TQT_SLOT(slotView()), + TQ_SLOT(slotView()), actionCollection(), "show_reply_to"); if ( mClassicalRecipients ) { mToAction = new TDEToggleAction (i18n("&To"), 0, this, - TQT_SLOT(slotView()), + TQ_SLOT(slotView()), actionCollection(), "show_to"); mCcAction = new TDEToggleAction (i18n("&CC"), 0, this, - TQT_SLOT(slotView()), + TQ_SLOT(slotView()), actionCollection(), "show_cc"); mBccAction = new TDEToggleAction (i18n("&BCC"), 0, this, - TQT_SLOT(slotView()), + TQ_SLOT(slotView()), actionCollection(), "show_bcc"); } mSubjectAction = new TDEToggleAction (i18n("S&ubject"), 0, this, - TQT_SLOT(slotView()), + TQ_SLOT(slotView()), actionCollection(), "show_subject"); //end of checkable mAppendSignatureAction = new TDEAction (i18n("Append S&ignature"), 0, this, - TQT_SLOT(slotAppendSignature()), + TQ_SLOT(slotAppendSignature()), actionCollection(), "append_signature"); mPrependSignatureAction = new TDEAction (i18n("Prepend S&ignature"), 0, this, - TQT_SLOT(slotPrependSignature()), + TQ_SLOT(slotPrependSignature()), actionCollection(), "prepend_signature"); mInsertSignatureAction = new TDEAction (i18n("Insert Signature At C&ursor Position"), "edit", 0, this, - TQT_SLOT(slotInsertSignatureAtCursor()), + TQ_SLOT(slotInsertSignatureAtCursor()), actionCollection(), "insert_signature_at_cursor_position"); mAttachPK = new TDEAction (i18n("Attach &Public Key..."), 0, this, - TQT_SLOT(slotInsertPublicKey()), + TQ_SLOT(slotInsertPublicKey()), actionCollection(), "attach_public_key"); mAttachMPK = new TDEAction (i18n("Attach &My Public Key"), 0, this, - TQT_SLOT(slotInsertMyPublicKey()), + TQ_SLOT(slotInsertMyPublicKey()), actionCollection(), "attach_my_public_key"); (void) new TDEAction (i18n("&Attach File..."), "attach", - 0, this, TQT_SLOT(slotAttachFile()), + 0, this, TQ_SLOT(slotAttachFile()), actionCollection(), "attach"); mAttachRemoveAction = new TDEAction (i18n("&Remove Attachment"), 0, this, - TQT_SLOT(slotAttachRemove()), + TQ_SLOT(slotAttachRemove()), actionCollection(), "remove"); mAttachSaveAction = new TDEAction (i18n("&Save Attachment As..."), "document-save",0, - this, TQT_SLOT(slotAttachSave()), + this, TQ_SLOT(slotAttachSave()), actionCollection(), "attach_save"); mAttachPropertiesAction = new TDEAction (i18n("Attachment Pr&operties"), 0, this, - TQT_SLOT(slotAttachProperties()), + TQ_SLOT(slotAttachProperties()), actionCollection(), "attach_properties"); setStandardToolBarMenuEnabled(true); - KStdAction::keyBindings(this, TQT_SLOT(slotEditKeys()), actionCollection()); - KStdAction::configureToolbars(this, TQT_SLOT(slotEditToolbars()), actionCollection()); - KStdAction::preferences(kmkernel, TQT_SLOT(slotShowConfigurationDialog()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(slotEditKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(slotEditToolbars()), actionCollection()); + KStdAction::preferences(kmkernel, TQ_SLOT(slotShowConfigurationDialog()), actionCollection()); - (void) new TDEAction (i18n("&Spellchecker..."), 0, this, TQT_SLOT(slotSpellcheckConfig()), + (void) new TDEAction (i18n("&Spellchecker..."), 0, this, TQ_SLOT(slotSpellcheckConfig()), actionCollection(), "setup_spellchecker"); if ( Kleo::CryptoBackendFactory::instance()->protocol( "Chiasmus" ) ) { @@ -1489,8 +1489,8 @@ void KMComposeWin::setupActions(void) "encrypt_message_chiasmus" ); a->setCheckedState( KGuiItem( i18n( "Encrypt Message with Chiasmus..." ), "chiencrypted" ) ); mEncryptChiasmusAction = a; - connect( mEncryptChiasmusAction, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotEncryptChiasmusToggled(bool)) ); + connect( mEncryptChiasmusAction, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotEncryptChiasmusToggled(bool)) ); } else { mEncryptChiasmusAction = 0; } @@ -1536,17 +1536,17 @@ void KMComposeWin::setupActions(void) setSigning( ( canOpenPGPSign || canSMIMESign ) && GlobalSettings::self()->pgpAutoSign() ); } - connect(mEncryptAction, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(slotEncryptToggled( bool ))); - connect(mSignAction, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(slotSignToggled( bool ))); + connect(mEncryptAction, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(slotEncryptToggled( bool ))); + connect(mSignAction, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(slotSignToggled( bool ))); TQStringList l; for ( int i = 0 ; i < numCryptoMessageFormats ; ++i ) l.push_back( Kleo::cryptoMessageFormatToLabel( cryptoMessageFormats[i] ) ); mCryptoModuleAction = new TDESelectAction( i18n( "&Cryptographic Message Format" ), 0, - this, TQT_SLOT(slotSelectCryptoModule()), + this, TQ_SLOT(slotSelectCryptoModule()), actionCollection(), "options_select_crypto" ); mCryptoModuleAction->setItems( l ); mCryptoModuleAction->setCurrentItem( format2cb( ident.preferredCryptoMessageFormat() ) ); @@ -1566,50 +1566,50 @@ void KMComposeWin::setupActions(void) "text_list" ); listAction->setItems( styleItems ); listAction->setToolTip( i18n( "Select a list style" ) ); - connect( listAction, TQT_SIGNAL( activated( const TQString& ) ), - TQT_SLOT( slotListAction( const TQString& ) ) ); + connect( listAction, TQ_SIGNAL( activated( const TQString& ) ), + TQ_SLOT( slotListAction( const TQString& ) ) ); fontAction = new TDEFontAction( "Select Font", 0, actionCollection(), "text_font" ); fontAction->setToolTip( i18n( "Select a font" ) ); - connect( fontAction, TQT_SIGNAL( activated( const TQString& ) ), - TQT_SLOT( slotFontAction( const TQString& ) ) ); + connect( fontAction, TQ_SIGNAL( activated( const TQString& ) ), + TQ_SLOT( slotFontAction( const TQString& ) ) ); fontSizeAction = new TDEFontSizeAction( "Select Size", 0, actionCollection(), "text_size" ); fontSizeAction->setToolTip( i18n( "Select a font size" ) ); - connect( fontSizeAction, TQT_SIGNAL( fontSizeChanged( int ) ), - TQT_SLOT( slotSizeAction( int ) ) ); + connect( fontSizeAction, TQ_SIGNAL( fontSizeChanged( int ) ), + TQ_SLOT( slotSizeAction( int ) ) ); alignLeftAction = new TDEToggleAction (i18n("Align Left"), "format-text-direction-ltr", 0, - this, TQT_SLOT(slotAlignLeft()), actionCollection(), + this, TQ_SLOT(slotAlignLeft()), actionCollection(), "align_left"); alignLeftAction->setChecked( true ); alignRightAction = new TDEToggleAction (i18n("Align Right"), "format-text-direction-rtl", 0, - this, TQT_SLOT(slotAlignRight()), actionCollection(), + this, TQ_SLOT(slotAlignRight()), actionCollection(), "align_right"); alignCenterAction = new TDEToggleAction (i18n("Align Center"), "text_center", 0, - this, TQT_SLOT(slotAlignCenter()), actionCollection(), + this, TQ_SLOT(slotAlignCenter()), actionCollection(), "align_center"); textBoldAction = new TDEToggleAction( i18n("&Bold"), "format-text-bold", CTRL+Key_B, - this, TQT_SLOT(slotTextBold()), + this, TQ_SLOT(slotTextBold()), actionCollection(), "format-text-bold"); textItalicAction = new TDEToggleAction( i18n("&Italic"), "format-text-italic", CTRL+Key_I, - this, TQT_SLOT(slotTextItalic()), + this, TQ_SLOT(slotTextItalic()), actionCollection(), "format-text-italic"); textUnderAction = new TDEToggleAction( i18n("&Underline"), "format-text-underline", CTRL+Key_U, - this, TQT_SLOT(slotTextUnder()), + this, TQ_SLOT(slotTextUnder()), actionCollection(), "format-text-underline"); actionFormatReset = new TDEAction( i18n( "Reset Font Settings" ), "eraser", 0, - this, TQT_SLOT( slotFormatReset() ), + this, TQ_SLOT( slotFormatReset() ), actionCollection(), "format_reset"); actionFormatColor = new TDEAction( i18n( "Text Color..." ), "colorize", 0, - this, TQT_SLOT( slotTextColor() ), + this, TQ_SLOT( slotTextColor() ), actionCollection(), "format_color"); // editorFocusChanged(false); createGUI("kmcomposerui.rc"); - connect( toolBar("htmlToolBar"), TQT_SIGNAL( visibilityChanged(bool) ), - this, TQT_SLOT( htmlToolBarVisibilityChanged(bool) ) ); + connect( toolBar("htmlToolBar"), TQ_SIGNAL( visibilityChanged(bool) ), + this, TQ_SLOT( htmlToolBarVisibilityChanged(bool) ) ); // In Kontact, this entry would read "Configure Kontact", but bring // up KMail's config dialog. That's sensible, though, so fix the label. @@ -1663,28 +1663,28 @@ void KMComposeWin::setupEditor(void) menu = new TQPopupMenu(this); //#ifdef BROKEN menu->insertItem(i18n("Undo"),mEditor, - TQT_SLOT(undo()), TDEStdAccel::shortcut(TDEStdAccel::Undo)); + TQ_SLOT(undo()), TDEStdAccel::shortcut(TDEStdAccel::Undo)); menu->insertItem(i18n("Redo"),mEditor, - TQT_SLOT(redo()), TDEStdAccel::shortcut(TDEStdAccel::Redo)); + TQ_SLOT(redo()), TDEStdAccel::shortcut(TDEStdAccel::Redo)); menu->insertSeparator(); //#endif //BROKEN - menu->insertItem(i18n("Cut"), this, TQT_SLOT(slotCut())); - menu->insertItem(i18n("Copy"), this, TQT_SLOT(slotCopy())); - menu->insertItem(i18n("Paste"), this, TQT_SLOT(slotPasteClipboard())); - menu->insertItem(i18n("Mark All"),this, TQT_SLOT(slotMarkAll())); + menu->insertItem(i18n("Cut"), this, TQ_SLOT(slotCut())); + menu->insertItem(i18n("Copy"), this, TQ_SLOT(slotCopy())); + menu->insertItem(i18n("Paste"), this, TQ_SLOT(slotPasteClipboard())); + menu->insertItem(i18n("Mark All"),this, TQ_SLOT(slotMarkAll())); menu->insertSeparator(); - menu->insertItem(i18n("Find..."), this, TQT_SLOT(slotFind())); - menu->insertItem(i18n("Replace..."), this, TQT_SLOT(slotReplace())); + menu->insertItem(i18n("Find..."), this, TQ_SLOT(slotFind())); + menu->insertItem(i18n("Replace..."), this, TQ_SLOT(slotReplace())); menu->insertSeparator(); - menu->insertItem(i18n("Fixed Font Widths"), this, TQT_SLOT(slotUpdateFont())); + menu->insertItem(i18n("Fixed Font Widths"), this, TQ_SLOT(slotUpdateFont())); mEditor->installRBPopup(menu); */ updateCursorPosition(); - connect(mEditor,TQT_SIGNAL(CursorPositionChanged()),TQT_SLOT(updateCursorPosition())); - connect( mEditor, TQT_SIGNAL( currentFontChanged( const TQFont & ) ), - this, TQT_SLOT( fontChanged( const TQFont & ) ) ); - connect( mEditor, TQT_SIGNAL( currentAlignmentChanged( int ) ), - this, TQT_SLOT( alignmentChanged( int ) ) ); + connect(mEditor,TQ_SIGNAL(CursorPositionChanged()),TQ_SLOT(updateCursorPosition())); + connect( mEditor, TQ_SIGNAL( currentFontChanged( const TQFont & ) ), + this, TQ_SLOT( fontChanged( const TQFont & ) ) ); + connect( mEditor, TQ_SIGNAL( currentAlignmentChanged( int ) ), + this, TQ_SLOT( alignmentChanged( int ) ) ); } @@ -1874,15 +1874,15 @@ void KMComposeWin::setMsg(KMMessage* newMsg, bool mayAutoSign, // don't overwrite the header values with identity specific values // unless the identity is sticky if ( !stickyIdentity ) { - disconnect(mIdentity,TQT_SIGNAL(identityChanged(uint)), - this, TQT_SLOT(slotIdentityChanged(uint))); + disconnect(mIdentity,TQ_SIGNAL(identityChanged(uint)), + this, TQ_SLOT(slotIdentityChanged(uint))); } // load the mId into the gui, sticky or not, without emitting mIdentity->setCurrentIdentity( mId ); const uint idToApply = mId; if ( !stickyIdentity ) { - connect(mIdentity,TQT_SIGNAL(identityChanged(uint)), - this, TQT_SLOT(slotIdentityChanged(uint))); + connect(mIdentity,TQ_SIGNAL(identityChanged(uint)), + this, TQ_SLOT(slotIdentityChanged(uint))); } else { // load the message's state into the mId, without applying it to the gui // that's so we can detect that the id changed (because a sticky was set) @@ -2165,11 +2165,11 @@ void KMComposeWin::setMsg(KMMessage* newMsg, bool mayAutoSign, // Not user friendy if this modal fileseletor opens before the // composer. // - //TQTimer::singleShot( 200, this, TQT_SLOT(slotAppendSignature()) ); + //TQTimer::singleShot( 200, this, TQ_SLOT(slotAppendSignature()) ); if ( GlobalSettings::self()->prependSignature() ) { - TQTimer::singleShot( 0, this, TQT_SLOT(slotPrependSignature()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotPrependSignature()) ); } else { - TQTimer::singleShot( 0, this, TQT_SLOT(slotAppendSignature()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotAppendSignature()) ); } } @@ -2358,8 +2358,8 @@ void KMComposeWin::applyChanges( bool dontSignNorEncrypt, bool dontDisable ) // Make new job and execute it mComposer = new MessageComposer( this ); - connect( mComposer, TQT_SIGNAL( done( bool ) ), - this, TQT_SLOT( slotComposerDone( bool ) ) ); + connect( mComposer, TQ_SIGNAL( done( bool ) ), + this, TQ_SLOT( slotComposerDone( bool ) ) ); // TODO: Add a cancel button for the following operations? // Disable any input to the window, so that we have a snapshot of the @@ -2435,10 +2435,10 @@ bool KMComposeWin::addAttach(const KURL aUrl) mMapAtmLoadData.insert(job, ld); mAttachJobs[job] = aUrl; - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - this, TQT_SLOT(slotAttachFileResult(TDEIO::Job *))); - connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - this, TQT_SLOT(slotAttachFileData(TDEIO::Job *, const TQByteArray &))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + this, TQ_SLOT(slotAttachFileResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + this, TQ_SLOT(slotAttachFileData(TDEIO::Job *, const TQByteArray &))); return true; } @@ -2467,10 +2467,10 @@ void KMComposeWin::addAttach(const KMMessagePart* msgPart) mTempDir = 0; } - connect( lvi, TQT_SIGNAL( compress( int ) ), - this, TQT_SLOT( compressAttach( int ) ) ); - connect( lvi, TQT_SIGNAL( uncompress( int ) ), - this, TQT_SLOT( uncompressAttach( int ) ) ); + connect( lvi, TQ_SIGNAL( compress( int ) ), + this, TQ_SLOT( compressAttach( int ) ) ); + connect( lvi, TQ_SIGNAL( uncompress( int ) ), + this, TQ_SLOT( uncompressAttach( int ) ) ); slotUpdateAttachActions(); } @@ -3019,10 +3019,10 @@ void KMComposeWin::slotInsertRecentFile(const KURL& u) } } mMapAtmLoadData.insert(job, ld); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - this, TQT_SLOT(slotAttachFileResult(TDEIO::Job *))); - connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - this, TQT_SLOT(slotAttachFileData(TDEIO::Job *, const TQByteArray &))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + this, TQ_SLOT(slotAttachFileResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + this, TQ_SLOT(slotAttachFileData(TDEIO::Job *, const TQByteArray &))); } @@ -3149,8 +3149,8 @@ void KMComposeWin::startPublicKeyExport() { Kleo::ExportJob * job = Kleo::CryptoBackendFactory::instance()->openpgp()->publicKeyExportJob( true ); assert( job ); - connect( job, TQT_SIGNAL(result(const GpgME::Error&,const TQByteArray&)), - this, TQT_SLOT(slotPublicKeyExportResult(const GpgME::Error&,const TQByteArray&)) ); + connect( job, TQ_SIGNAL(result(const GpgME::Error&,const TQByteArray&)), + this, TQ_SLOT(slotPublicKeyExportResult(const GpgME::Error&,const TQByteArray&)) ); const GpgME::Error err = job->start( mFingerprint ); if ( err ) @@ -3206,21 +3206,21 @@ void KMComposeWin::slotAttachPopupMenu(TQListViewItem *, const TQPoint &, int) mAttachMenu = new TQPopupMenu(this); mOpenId = mAttachMenu->insertItem(i18n("to open", "Open"), this, - TQT_SLOT(slotAttachOpen())); + TQ_SLOT(slotAttachOpen())); mOpenWithId = mAttachMenu->insertItem(i18n("Open With..."), this, - TQT_SLOT(slotAttachOpenWith())); + TQ_SLOT(slotAttachOpenWith())); mViewId = mAttachMenu->insertItem(i18n("to view", "View"), this, - TQT_SLOT(slotAttachView())); - mEditId = mAttachMenu->insertItem( i18n("Edit"), this, TQT_SLOT(slotAttachEdit()) ); + TQ_SLOT(slotAttachView())); + mEditId = mAttachMenu->insertItem( i18n("Edit"), this, TQ_SLOT(slotAttachEdit()) ); mEditWithId = mAttachMenu->insertItem( i18n("Edit With..."), this, - TQT_SLOT(slotAttachEditWith()) ); - mRemoveId = mAttachMenu->insertItem(i18n("Remove"), this, TQT_SLOT(slotAttachRemove())); + TQ_SLOT(slotAttachEditWith()) ); + mRemoveId = mAttachMenu->insertItem(i18n("Remove"), this, TQ_SLOT(slotAttachRemove())); mSaveAsId = mAttachMenu->insertItem( SmallIconSet("document-save-as"), i18n("Save As..."), this, - TQT_SLOT( slotAttachSave() ) ); + TQ_SLOT( slotAttachSave() ) ); mPropertiesId = mAttachMenu->insertItem( i18n("Properties"), this, - TQT_SLOT( slotAttachProperties() ) ); + TQ_SLOT( slotAttachProperties() ) ); mAttachMenu->insertSeparator(); - mAttachMenu->insertItem(i18n("Add Attachment..."), this, TQT_SLOT(slotAttachFile())); + mAttachMenu->insertItem(i18n("Add Attachment..."), this, TQ_SLOT(slotAttachFile())); } int selectedCount = 0; @@ -3576,7 +3576,7 @@ void KMComposeWin::editAttach(int index, bool openWith) KMail::EditorWatcher *watcher = new KMail::EditorWatcher( KURL( atmTempFile->name() ), contentTypeStr, openWith, this, this ); - connect( watcher, TQT_SIGNAL(editDone(KMail::EditorWatcher*)), TQT_SLOT(slotEditDone(KMail::EditorWatcher*)) ); + connect( watcher, TQ_SIGNAL(editDone(KMail::EditorWatcher*)), TQ_SLOT(slotEditDone(KMail::EditorWatcher*)) ); if ( watcher->start() ) { mEditorMap.insert( watcher, msgPart ); mEditorTempFiles.insert( watcher, atmTempFile ); @@ -4082,15 +4082,15 @@ void KMComposeWin::ignoreStickyFields() void KMComposeWin::slotPrint() { mMessageWasModified = isModified(); - connect( this, TQT_SIGNAL( applyChangesDone( bool ) ), - this, TQT_SLOT( slotContinuePrint( bool ) ) ); + connect( this, TQ_SIGNAL( applyChangesDone( bool ) ), + this, TQ_SLOT( slotContinuePrint( bool ) ) ); applyChanges( true ); } void KMComposeWin::slotContinuePrint( bool rc ) { - disconnect( this, TQT_SIGNAL( applyChangesDone( bool ) ), - this, TQT_SLOT( slotContinuePrint( bool ) ) ); + disconnect( this, TQ_SIGNAL( applyChangesDone( bool ) ), + this, TQ_SLOT( slotContinuePrint( bool ) ) ); if( rc ) { if ( mComposedMessages.isEmpty() ) { @@ -4220,8 +4220,8 @@ void KMComposeWin::doSend( KMail::MessageSender::SendMethod method, const bool neverEncrypt = ( mDisableBreaking && GlobalSettings::self()->neverEncryptDrafts() ) || mSigningAndEncryptionExplicitlyDisabled; - connect( this, TQT_SIGNAL( applyChangesDone( bool ) ), - TQT_SLOT( slotContinueDoSend( bool ) ) ); + connect( this, TQ_SIGNAL( applyChangesDone( bool ) ), + TQ_SLOT( slotContinueDoSend( bool ) ) ); if ( mEditor->textFormat() == TQt::RichText ) mMsg->setHeaderField( "X-KMail-Markup", "true" ); @@ -4333,8 +4333,8 @@ void KMComposeWin::slotContinueDoSend( bool sentOk ) { kdDebug(5006) << "KMComposeWin::slotContinueDoSend( " << sentOk << " )" << endl; - disconnect( this, TQT_SIGNAL( applyChangesDone( bool ) ), - this, TQT_SLOT( slotContinueDoSend( bool ) ) ); + disconnect( this, TQ_SIGNAL( applyChangesDone( bool ) ), + this, TQ_SLOT( slotContinueDoSend( bool ) ) ); if ( !sentOk ) { mDisableBreaking = false; @@ -4735,8 +4735,8 @@ void KMComposeWin::slotSpellcheck() mSubjectTextWasSpellChecked = false; mSpellCheckInProgress=true; /* - connect (mEditor, TQT_SIGNAL (spellcheck_progress (unsigned)), - this, TQT_SLOT (spell_progress (unsigned))); + connect (mEditor, TQ_SIGNAL (spellcheck_progress (unsigned)), + this, TQ_SLOT (spell_progress (unsigned))); */ mEditor->spellcheck(); @@ -4791,7 +4791,7 @@ void KMComposeWin::slotSpellcheckDone(int result) statusBar()->changeItem(i18n(" Spell check complete."),0); break; } - TQTimer::singleShot( 2000, this, TQT_SLOT(slotSpellcheckDoneClearStatus()) ); + TQTimer::singleShot( 2000, this, TQ_SLOT(slotSpellcheckDoneClearStatus()) ); } void KMComposeWin::slotSpellcheckDoneClearStatus() @@ -5017,8 +5017,8 @@ void KMComposeWin::slotEditToolbars() saveMainWindowSettings(KMKernel::config(), "Composer"); KEditToolbar dlg(guiFactory(), this); - connect( &dlg, TQT_SIGNAL(newToolbarConfig()), - TQT_SLOT(slotUpdateToolbars()) ); + connect( &dlg, TQ_SIGNAL(newToolbarConfig()), + TQ_SLOT(slotUpdateToolbars()) ); dlg.exec(); } @@ -5078,8 +5078,8 @@ void KMComposeWin::updateAutoSave() else { if ( !mAutoSaveTimer ) { mAutoSaveTimer = new TQTimer( this, "mAutoSaveTimer" ); - connect( mAutoSaveTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( autoSaveMessage() ) ); + connect( mAutoSaveTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( autoSaveMessage() ) ); } mAutoSaveTimer->start( autoSaveInterval() ); } @@ -5410,7 +5410,7 @@ void KMComposeWin::slotAttachmentDragStarted() void KMComposeWin::recipientEditorSizeHintChanged() { - TQTimer::singleShot( 1, this, TQT_SLOT(setMaximumHeaderSize()) ); + TQTimer::singleShot( 1, this, TQ_SLOT(setMaximumHeaderSize()) ); } void KMComposeWin::setMaximumHeaderSize() diff --git a/kmail/kmedit.cpp b/kmail/kmedit.cpp index 6d8f8286..b66e6ee6 100644 --- a/kmail/kmedit.cpp +++ b/kmail/kmedit.cpp @@ -226,21 +226,21 @@ KMEdit::KMEdit(TQWidget *parent, KMComposeWin* composer, mSpellLineEdit( false ), mPasteMode( TQClipboard::Clipboard ) { - connect( this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()) ); + connect( this, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged()) ); installEventFilter(this); KCursor::setAutoHideCursor( this, true, true ); setOverwriteEnabled( true ); createSpellers(); - connect( mSpellConfig, TQT_SIGNAL( configChanged() ), - this, TQT_SLOT( createSpellers() ) ); - connect( mSpeller, TQT_SIGNAL( death() ), - this, TQT_SLOT( spellerDied() ) ); + connect( mSpellConfig, TQ_SIGNAL( configChanged() ), + this, TQ_SLOT( createSpellers() ) ); + connect( mSpeller, TQ_SIGNAL( death() ), + this, TQ_SLOT( spellerDied() ) ); } void KMEdit::createSpellers() { delete mSpeller; - mSpeller = new KMSpell( this, TQT_SLOT( spellerReady( KSpell * ) ), mSpellConfig ); + mSpeller = new KMSpell( this, TQ_SLOT( spellerReady( KSpell * ) ), mSpellConfig ); } void KMEdit::initializeAutoSpellChecking() @@ -270,8 +270,8 @@ void KMEdit::initializeAutoSpellChecking() col1, col2, col3, col4, mSpellConfig ); - connect( mHighlighter, TQT_SIGNAL(newSuggestions(const TQString&, const TQStringList&, unsigned int)), - this, TQT_SLOT(addSuggestion(const TQString&, const TQStringList&, unsigned int)) ); + connect( mHighlighter, TQ_SIGNAL(newSuggestions(const TQString&, const TQStringList&, unsigned int)), + this, TQ_SLOT(addSuggestion(const TQString&, const TQStringList&, unsigned int)) ); } @@ -449,8 +449,8 @@ bool KMEdit::eventFilter(TQObject*o, TQEvent* e) *mExtEditorProcess << sysLine.left(sysLine.find(" ")).local8Bit(); sysLine.remove(0, sysLine.find(" ") + 1); } - connect(mExtEditorProcess, TQT_SIGNAL(processExited(TDEProcess*)), - TQT_SLOT(slotExternalEditorDone(TDEProcess*))); + connect(mExtEditorProcess, TQ_SIGNAL(processExited(TDEProcess*)), + TQ_SLOT(slotExternalEditorDone(TDEProcess*))); if (!mExtEditorProcess->start()) { KMessageBox::error( topLevelWidget(), @@ -458,8 +458,8 @@ bool KMEdit::eventFilter(TQObject*o, TQEvent* e) killExternalEditor(); } else { mExtEditorTempFileWatcher = new KDirWatch( this, "mExtEditorTempFileWatcher" ); - connect( mExtEditorTempFileWatcher, TQT_SIGNAL(dirty(const TQString&)), - TQT_SLOT(slotExternalEditorTempFileChanged(const TQString&)) ); + connect( mExtEditorTempFileWatcher, TQ_SIGNAL(dirty(const TQString&)), + TQ_SLOT(slotExternalEditorTempFileChanged(const TQString&)) ); mExtEditorTempFileWatcher->addFile( mExtEditorTempFile->name() ); } return true; @@ -542,7 +542,7 @@ bool KMEdit::eventFilter(TQObject*o, TQEvent* e) if ( mHighlighter ) { // Wait a bit until reloading the highlighter, the mSpeller first needs to finish saving // the personal word list. - TQTimer::singleShot( 200, mHighlighter, TQT_SLOT( slotLocalSpellConfigChanged() ) ); + TQTimer::singleShot( 200, mHighlighter, TQ_SLOT( slotLocalSpellConfigChanged() ) ); } } else if( id > -1 ) @@ -651,28 +651,28 @@ void KMEdit::spellcheck() // if (textFormat() == TQt::RichText ) { // kdDebug(5006) << "KMEdit::spellcheck, spellchecking for RichText" << endl; // mKSpellForDialog = new KSpell(this, i18n("Spellcheck - KMail"), this, -// TQT_SLOT(slotSpellcheck2(KSpell*)),0,true,false,KSpell::HTML); +// TQ_SLOT(slotSpellcheck2(KSpell*)),0,true,false,KSpell::HTML); // } // else { // Don't use mSpellConfig here. Reason is that the spell dialog, KSpellDlg, uses its own // spell config, and therefore the two wouldn't be in sync. mKSpellForDialog = new KSpell( this, i18n("Spellcheck - KMail"), this, - TQT_SLOT(slotSpellcheck2(KSpell*))/*, mSpellConfig*/ ); + TQ_SLOT(slotSpellcheck2(KSpell*))/*, mSpellConfig*/ ); // } TQStringList l = KSpellingHighlighter::personalWords(); for ( TQStringList::Iterator it = l.begin(); it != l.end(); ++it ) { mKSpellForDialog->addPersonal( *it ); } - connect (mKSpellForDialog, TQT_SIGNAL( death()), - this, TQT_SLOT (slotSpellDone())); - connect (mKSpellForDialog, TQT_SIGNAL (misspelling (const TQString &, const TQStringList &, unsigned int)), - this, TQT_SLOT (slotMisspelling (const TQString &, const TQStringList &, unsigned int))); - connect (mKSpellForDialog, TQT_SIGNAL (corrected (const TQString &, const TQString &, unsigned int)), - this, TQT_SLOT (slotCorrected (const TQString &, const TQString &, unsigned int))); - connect (mKSpellForDialog, TQT_SIGNAL (done(const TQString &)), - this, TQT_SLOT (slotSpellResult (const TQString&))); + connect (mKSpellForDialog, TQ_SIGNAL( death()), + this, TQ_SLOT (slotSpellDone())); + connect (mKSpellForDialog, TQ_SIGNAL (misspelling (const TQString &, const TQStringList &, unsigned int)), + this, TQ_SLOT (slotMisspelling (const TQString &, const TQStringList &, unsigned int))); + connect (mKSpellForDialog, TQ_SIGNAL (corrected (const TQString &, const TQString &, unsigned int)), + this, TQ_SLOT (slotCorrected (const TQString &, const TQString &, unsigned int))); + connect (mKSpellForDialog, TQ_SIGNAL (done(const TQString &)), + this, TQ_SLOT (slotSpellResult (const TQString&))); } void KMEdit::cut() diff --git a/kmail/kmfawidgets.cpp b/kmail/kmfawidgets.cpp index fdd444b4..9aad593f 100644 --- a/kmail/kmfawidgets.cpp +++ b/kmail/kmfawidgets.cpp @@ -39,10 +39,10 @@ KMFilterActionWithAddressWidget::KMFilterActionWithAddressWidget( TQWidget* pare TQToolTip::add( mBtn, i18n( "Open Address Book" ) ); hbl->addWidget( mBtn ); - connect( mBtn, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotAddrBook()) ); - connect( mLineEdit, TQT_SIGNAL( textChanged(const TQString&) ), - this, TQT_SIGNAL( textChanged(const TQString&) ) ); + connect( mBtn, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotAddrBook()) ); + connect( mLineEdit, TQ_SIGNAL( textChanged(const TQString&) ), + this, TQ_SIGNAL( textChanged(const TQString&) ) ); } void KMFilterActionWithAddressWidget::slotAddrBook() @@ -75,14 +75,14 @@ KMSoundTestWidget::KMSoundTestWidget(TQWidget *parent, const char *name) TQHBoxLayout *lay1 = new TQHBoxLayout( this ); m_playButton = new TQPushButton( this, "m_playButton" ); m_playButton->setPixmap( SmallIcon( "1rightarrow" ) ); - connect( m_playButton, TQT_SIGNAL( clicked() ), TQT_SLOT( playSound() )); + connect( m_playButton, TQ_SIGNAL( clicked() ), TQ_SLOT( playSound() )); lay1->addWidget( m_playButton ); m_urlRequester = new KURLRequester( this ); lay1->addWidget( m_urlRequester ); - connect( m_urlRequester, TQT_SIGNAL( openFileDialog( KURLRequester * )), - TQT_SLOT( openSoundDialog( KURLRequester * ))); - connect( m_urlRequester->lineEdit(), TQT_SIGNAL( textChanged ( const TQString & )), TQT_SLOT( slotUrlChanged(const TQString & ))); + connect( m_urlRequester, TQ_SIGNAL( openFileDialog( KURLRequester * )), + TQ_SLOT( openSoundDialog( KURLRequester * ))); + connect( m_urlRequester->lineEdit(), TQ_SIGNAL( textChanged ( const TQString & )), TQ_SLOT( slotUrlChanged(const TQString & ))); slotUrlChanged(m_urlRequester->lineEdit()->text() ); } diff --git a/kmail/kmfilteraction.cpp b/kmail/kmfilteraction.cpp index d97e5fa7..b567446d 100644 --- a/kmail/kmfilteraction.cpp +++ b/kmail/kmfilteraction.cpp @@ -1423,8 +1423,8 @@ void KMFilterActionCopy::processAsync(KMMessage* msg) const ActionScheduler *handler = MessageProperty::filterHandler( msg ); KMCommand *cmd = new KMCopyCommand( mFolder, msg ); - TQObject::connect( cmd, TQT_SIGNAL( completed( KMCommand * ) ), - handler, TQT_SLOT( copyMessageFinished( KMCommand * ) ) ); + TQObject::connect( cmd, TQ_SIGNAL( completed( KMCommand * ) ), + handler, TQ_SLOT( copyMessageFinished( KMCommand * ) ) ); cmd->start(); } @@ -1816,7 +1816,7 @@ void KMFilterActionExtFilter::processAsync(KMMessage* aMsg) const inFile->close(); PipeJob *job = new PipeJob(0, 0, aMsg, commandLine, tempFileName); - TQObject::connect ( job, TQT_SIGNAL( done() ), handler, TQT_SLOT( actionMessage() ) ); + TQObject::connect ( job, TQ_SIGNAL( done() ), handler, TQ_SLOT( actionMessage() ) ); kmkernel->weaver()->enqueue(job); } diff --git a/kmail/kmfilterdlg.cpp b/kmail/kmfilterdlg.cpp index 32eb1492..e6d1668f 100644 --- a/kmail/kmfilterdlg.cpp +++ b/kmail/kmfilterdlg.cpp @@ -138,10 +138,10 @@ KMFilterDlg::KMFilterDlg(TQWidget* parent, const char* name, bool popFilter, boo setHelp( (bPopFilter)? KMPopFilterDlgHelpAnchor: KMFilterDlgHelpAnchor ); setButtonText( User1, i18n("Import") ); setButtonText( User2, i18n("Export") ); - connect( this, TQT_SIGNAL(user1Clicked()), - this, TQT_SLOT( slotImportFilters()) ); - connect( this, TQT_SIGNAL(user2Clicked()), - this, TQT_SLOT( slotExportFilters()) ); + connect( this, TQ_SIGNAL(user1Clicked()), + this, TQ_SLOT( slotImportFilters()) ); + connect( this, TQ_SIGNAL(user2Clicked()), + this, TQ_SLOT( slotExportFilters()) ); TQWidget *w = new TQWidget( this ); setMainWidget( w ); @@ -262,81 +262,81 @@ KMFilterDlg::KMFilterDlg(TQWidget* parent, const char* name, bool popFilter, boo vbl->addStretch( 1 ); // load the filter parts into the edit widgets - connect( mFilterList, TQT_SIGNAL(filterSelected(KMFilter*)), - this, TQT_SLOT(slotFilterSelected(KMFilter*)) ); + connect( mFilterList, TQ_SIGNAL(filterSelected(KMFilter*)), + this, TQ_SLOT(slotFilterSelected(KMFilter*)) ); if (bPopFilter){ // set the state of the global setting 'show later msgs' - connect( mShowLaterBtn, TQT_SIGNAL(toggled(bool)), - mFilterList, TQT_SLOT(slotShowLaterToggled(bool))); + connect( mShowLaterBtn, TQ_SIGNAL(toggled(bool)), + mFilterList, TQ_SLOT(slotShowLaterToggled(bool))); // set the action in the filter when changed - connect( mActionGroup, TQT_SIGNAL(actionChanged(const KMPopFilterAction)), - this, TQT_SLOT(slotActionChanged(const KMPopFilterAction)) ); + connect( mActionGroup, TQ_SIGNAL(actionChanged(const KMPopFilterAction)), + this, TQ_SLOT(slotActionChanged(const KMPopFilterAction)) ); } else { // transfer changes from the 'Apply this filter on...' // combo box to the filter - connect( mApplyOnIn, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotApplicabilityChanged()) ); - connect( mApplyOnForAll, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotApplicabilityChanged()) ); - connect( mApplyOnForTraditional, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotApplicabilityChanged()) ); - connect( mApplyOnForChecked, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotApplicabilityChanged()) ); - connect( mApplyOnOut, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotApplicabilityChanged()) ); - connect( mApplyOnCtrlJ, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotApplicabilityChanged()) ); - connect( mAccountList, TQT_SIGNAL(clicked(TQListViewItem*)), - this, TQT_SLOT(slotApplicableAccountsChanged()) ); - connect( mAccountList, TQT_SIGNAL(spacePressed(TQListViewItem*)), - this, TQT_SLOT(slotApplicableAccountsChanged()) ); + connect( mApplyOnIn, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotApplicabilityChanged()) ); + connect( mApplyOnForAll, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotApplicabilityChanged()) ); + connect( mApplyOnForTraditional, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotApplicabilityChanged()) ); + connect( mApplyOnForChecked, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotApplicabilityChanged()) ); + connect( mApplyOnOut, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotApplicabilityChanged()) ); + connect( mApplyOnCtrlJ, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotApplicabilityChanged()) ); + connect( mAccountList, TQ_SIGNAL(clicked(TQListViewItem*)), + this, TQ_SLOT(slotApplicableAccountsChanged()) ); + connect( mAccountList, TQ_SIGNAL(spacePressed(TQListViewItem*)), + this, TQ_SLOT(slotApplicableAccountsChanged()) ); // transfer changes from the 'stop processing here' // check box to the filter - connect( mStopProcessingHere, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotStopProcessingButtonToggled(bool)) ); + connect( mStopProcessingHere, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotStopProcessingButtonToggled(bool)) ); - connect( mConfigureShortcut, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotConfigureShortcutButtonToggled(bool)) ); + connect( mConfigureShortcut, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotConfigureShortcutButtonToggled(bool)) ); - connect( mKeyButton, TQT_SIGNAL( capturedShortcut( const TDEShortcut& ) ), - this, TQT_SLOT( slotCapturedShortcutChanged( const TDEShortcut& ) ) ); + connect( mKeyButton, TQ_SIGNAL( capturedShortcut( const TDEShortcut& ) ), + this, TQ_SLOT( slotCapturedShortcutChanged( const TDEShortcut& ) ) ); - connect( mConfigureToolbar, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotConfigureToolbarButtonToggled(bool)) ); + connect( mConfigureToolbar, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotConfigureToolbarButtonToggled(bool)) ); - connect( mFilterActionIconButton, TQT_SIGNAL( iconChanged( TQString ) ), - this, TQT_SLOT( slotFilterActionIconChanged( TQString ) ) ); + connect( mFilterActionIconButton, TQ_SIGNAL( iconChanged( TQString ) ), + this, TQ_SLOT( slotFilterActionIconChanged( TQString ) ) ); } // reset all widgets here - connect( mFilterList, TQT_SIGNAL(resetWidgets()), - this, TQT_SLOT(slotReset()) ); + connect( mFilterList, TQ_SIGNAL(resetWidgets()), + this, TQ_SLOT(slotReset()) ); - connect( mFilterList, TQT_SIGNAL( applyWidgets() ), - this, TQT_SLOT( slotUpdateFilter() ) ); + connect( mFilterList, TQ_SIGNAL( applyWidgets() ), + this, TQ_SLOT( slotUpdateFilter() ) ); // support auto-naming the filter - connect( mPatternEdit, TQT_SIGNAL(maybeNameChanged()), - mFilterList, TQT_SLOT(slotUpdateFilterName()) ); + connect( mPatternEdit, TQ_SIGNAL(maybeNameChanged()), + mFilterList, TQ_SLOT(slotUpdateFilterName()) ); // apply changes on 'Apply' - connect( this, TQT_SIGNAL(applyClicked()), - mFilterList, TQT_SLOT(slotApplyFilterChanges()) ); + connect( this, TQ_SIGNAL(applyClicked()), + mFilterList, TQ_SLOT(slotApplyFilterChanges()) ); // apply changes on 'OK' - connect( this, TQT_SIGNAL(okClicked()), - mFilterList, TQT_SLOT(slotApplyFilterChanges()) ); + connect( this, TQ_SIGNAL(okClicked()), + mFilterList, TQ_SLOT(slotApplyFilterChanges()) ); // save dialog size on 'OK' - connect( this, TQT_SIGNAL(okClicked()), - this, TQT_SLOT(slotSaveSize()) ); + connect( this, TQ_SIGNAL(okClicked()), + this, TQ_SLOT(slotSaveSize()) ); // destruct the dialog on OK, close and Cancel - connect( this, TQT_SIGNAL(finished()), - this, TQT_SLOT(slotFinished()) ); + connect( this, TQ_SIGNAL(finished()), + this, TQ_SLOT(slotFinished()) ); TDEConfigGroup geometry( KMKernel::config(), "Geometry"); const char * configKey @@ -642,31 +642,31 @@ KMFilterListBox::KMFilterListBox( const TQString & title, TQWidget *parent, cons hb = new TQHBox( this ); hb->setSpacing( 4 ); TQPushButton *btn = new TQPushButton( i18n("Select Source Folders"), hb ); - connect( btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectSourceFolders()) ); + connect( btn, TQ_SIGNAL(clicked()), TQ_SLOT(slotSelectSourceFolders()) ); } //----------- now connect everything - connect( mListBox, TQT_SIGNAL(highlighted(int)), - this, TQT_SLOT(slotSelected(int)) ); - connect( mListBox, TQT_SIGNAL( doubleClicked ( TQListBoxItem * )), - this, TQT_SLOT( slotRename()) ); - connect( mBtnTop, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotTop()) ); - connect( mBtnUp, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotUp()) ); - connect( mBtnDown, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotDown()) ); - connect( mBtnBot, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotBottom()) ); - connect( mBtnNew, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotNew()) ); - connect( mBtnCopy, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotCopy()) ); - connect( mBtnDelete, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotDelete()) ); - connect( mBtnRename, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRename()) ); + connect( mListBox, TQ_SIGNAL(highlighted(int)), + this, TQ_SLOT(slotSelected(int)) ); + connect( mListBox, TQ_SIGNAL( doubleClicked ( TQListBoxItem * )), + this, TQ_SLOT( slotRename()) ); + connect( mBtnTop, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotTop()) ); + connect( mBtnUp, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotUp()) ); + connect( mBtnDown, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotDown()) ); + connect( mBtnBot, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotBottom()) ); + connect( mBtnNew, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotNew()) ); + connect( mBtnCopy, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotCopy()) ); + connect( mBtnDelete, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotDelete()) ); + connect( mBtnRename, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRename()) ); // the dialog should call loadFilterList() // when all signals are connected. @@ -1152,8 +1152,8 @@ KMFilterActionWidget::KMFilterActionWidget( TQWidget *parent, const char* name ) setFocusProxy( mComboBox ); // now connect the combo box and the widget stack - connect( mComboBox, TQT_SIGNAL(activated(int)), - mWidgetStack, TQT_SLOT(raiseWidget(int)) ); + connect( mComboBox, TQ_SIGNAL(activated(int)), + mWidgetStack, TQ_SLOT(raiseWidget(int)) ); } void KMFilterActionWidget::setAction( const KMFilterAction* aAction ) @@ -1306,8 +1306,8 @@ KMPopFilterActionWidget::KMPopFilterActionWidget( const TQString& title, TQWidge mIdMap[id(mActionMap[Down])] = Down; mIdMap[id(mActionMap[Delete])] = Delete; - connect( this, TQT_SIGNAL(clicked(int)), - this, TQT_SLOT( slotActionClicked(int)) ); + connect( this, TQ_SIGNAL(clicked(int)), + this, TQ_SLOT( slotActionClicked(int)) ); } void KMPopFilterActionWidget::setAction( KMPopFilterAction aAction ) diff --git a/kmail/kmfiltermgr.cpp b/kmail/kmfiltermgr.cpp index 8c47afc0..f98a78dd 100644 --- a/kmail/kmfiltermgr.cpp +++ b/kmail/kmfiltermgr.cpp @@ -41,8 +41,8 @@ KMFilterMgr::KMFilterMgr( bool popFilter ) mBufferedFolderTarget( true ), mRefCount( 0 ) { - connect( kmkernel, TQT_SIGNAL( folderRemoved( KMFolder* ) ), - this, TQT_SLOT( slotFolderRemoved( KMFolder* ) ) ); + connect( kmkernel, TQ_SIGNAL( folderRemoved( KMFolder* ) ), + this, TQ_SLOT( slotFolderRemoved( KMFolder* ) ) ); } diff --git a/kmail/kmfolder.cpp b/kmail/kmfolder.cpp index b1b9c261..4bcd4992 100644 --- a/kmail/kmfolder.cpp +++ b/kmail/kmfolder.cpp @@ -87,53 +87,53 @@ KMFolder::KMFolder( KMFolderDir* aParent, const TQString& aFolderName, } if ( aParent ) { - connect( mStorage, TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), - aParent->manager(), TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ) ); - connect( mStorage, TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), - parent()->manager(), TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ) ); - connect( this, TQT_SIGNAL( msgChanged( KMFolder*, TQ_UINT32, int ) ), - parent()->manager(), TQT_SIGNAL( msgChanged( KMFolder*, TQ_UINT32, int ) ) ); - connect( this, TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ), - parent()->manager(), TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ) ); - connect( mStorage, TQT_SIGNAL( invalidated( KMFolder* ) ), - parent()->manager(), TQT_SIGNAL( folderInvalidated( KMFolder* ) ) ); + connect( mStorage, TQ_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), + aParent->manager(), TQ_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ) ); + connect( mStorage, TQ_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), + parent()->manager(), TQ_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ) ); + connect( this, TQ_SIGNAL( msgChanged( KMFolder*, TQ_UINT32, int ) ), + parent()->manager(), TQ_SIGNAL( msgChanged( KMFolder*, TQ_UINT32, int ) ) ); + connect( this, TQ_SIGNAL( msgHeaderChanged( KMFolder*, int ) ), + parent()->manager(), TQ_SIGNAL( msgHeaderChanged( KMFolder*, int ) ) ); + connect( mStorage, TQ_SIGNAL( invalidated( KMFolder* ) ), + parent()->manager(), TQ_SIGNAL( folderInvalidated( KMFolder* ) ) ); } // Resend all mStorage signals - connect( mStorage, TQT_SIGNAL( changed() ), TQT_SIGNAL( changed() ) ); - connect( mStorage, TQT_SIGNAL( cleared() ), TQT_SIGNAL( cleared() ) ); - connect( mStorage, TQT_SIGNAL( expunged( KMFolder* ) ), - TQT_SIGNAL( expunged( KMFolder* ) ) ); - connect( mStorage, TQT_SIGNAL( nameChanged() ), TQT_SIGNAL( nameChanged() ) ); - connect( mStorage, TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), - TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ) ); - connect( mStorage, TQT_SIGNAL( msgRemoved( int, TQString ) ), - TQT_SIGNAL( msgRemoved( int, TQString ) ) ); - connect( mStorage, TQT_SIGNAL( msgRemoved( KMFolder* ) ), - TQT_SIGNAL( msgRemoved( KMFolder* ) ) ); - connect( mStorage, TQT_SIGNAL( msgAdded( int ) ), TQT_SIGNAL( msgAdded( int ) ) ); - connect( mStorage, TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), - TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ) ); - connect( mStorage, TQT_SIGNAL( msgChanged( KMFolder*, TQ_UINT32 , int ) ), - TQT_SIGNAL( msgChanged( KMFolder*, TQ_UINT32 , int ) ) ); - connect( mStorage, TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ), - TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ) ); - connect( mStorage, TQT_SIGNAL( statusMsg( const TQString& ) ), - TQT_SIGNAL( statusMsg( const TQString& ) ) ); - connect( mStorage, TQT_SIGNAL( numUnreadMsgsChanged( KMFolder* ) ), - TQT_SIGNAL( numUnreadMsgsChanged( KMFolder* ) ) ); - connect( mStorage, TQT_SIGNAL( removed( KMFolder*, bool ) ), - TQT_SIGNAL( removed( KMFolder*, bool ) ) ); - connect( mStorage, TQT_SIGNAL(noContentChanged()), - TQT_SIGNAL(noContentChanged()) ); - connect( mStorage, TQT_SIGNAL(syncStateChanged()), - TQT_SIGNAL(syncStateChanged()) ); - - connect( mStorage, TQT_SIGNAL( contentsTypeChanged( KMail::FolderContentsType ) ), - this, TQT_SLOT( slotContentsTypeChanged( KMail::FolderContentsType ) ) ); - - connect( mStorage, TQT_SIGNAL( folderSizeChanged() ), - this, TQT_SLOT( slotFolderSizeChanged() ) ); + connect( mStorage, TQ_SIGNAL( changed() ), TQ_SIGNAL( changed() ) ); + connect( mStorage, TQ_SIGNAL( cleared() ), TQ_SIGNAL( cleared() ) ); + connect( mStorage, TQ_SIGNAL( expunged( KMFolder* ) ), + TQ_SIGNAL( expunged( KMFolder* ) ) ); + connect( mStorage, TQ_SIGNAL( nameChanged() ), TQ_SIGNAL( nameChanged() ) ); + connect( mStorage, TQ_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ), + TQ_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ) ); + connect( mStorage, TQ_SIGNAL( msgRemoved( int, TQString ) ), + TQ_SIGNAL( msgRemoved( int, TQString ) ) ); + connect( mStorage, TQ_SIGNAL( msgRemoved( KMFolder* ) ), + TQ_SIGNAL( msgRemoved( KMFolder* ) ) ); + connect( mStorage, TQ_SIGNAL( msgAdded( int ) ), TQ_SIGNAL( msgAdded( int ) ) ); + connect( mStorage, TQ_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ), + TQ_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ) ); + connect( mStorage, TQ_SIGNAL( msgChanged( KMFolder*, TQ_UINT32 , int ) ), + TQ_SIGNAL( msgChanged( KMFolder*, TQ_UINT32 , int ) ) ); + connect( mStorage, TQ_SIGNAL( msgHeaderChanged( KMFolder*, int ) ), + TQ_SIGNAL( msgHeaderChanged( KMFolder*, int ) ) ); + connect( mStorage, TQ_SIGNAL( statusMsg( const TQString& ) ), + TQ_SIGNAL( statusMsg( const TQString& ) ) ); + connect( mStorage, TQ_SIGNAL( numUnreadMsgsChanged( KMFolder* ) ), + TQ_SIGNAL( numUnreadMsgsChanged( KMFolder* ) ) ); + connect( mStorage, TQ_SIGNAL( removed( KMFolder*, bool ) ), + TQ_SIGNAL( removed( KMFolder*, bool ) ) ); + connect( mStorage, TQ_SIGNAL(noContentChanged()), + TQ_SIGNAL(noContentChanged()) ); + connect( mStorage, TQ_SIGNAL(syncStateChanged()), + TQ_SIGNAL(syncStateChanged()) ); + + connect( mStorage, TQ_SIGNAL( contentsTypeChanged( KMail::FolderContentsType ) ), + this, TQ_SLOT( slotContentsTypeChanged( KMail::FolderContentsType ) ) ); + + connect( mStorage, TQ_SIGNAL( folderSizeChanged() ), + this, TQ_SLOT( slotFolderSizeChanged() ) ); //FIXME: Centralize all the readConfig calls somehow - Zack // Meanwhile, readConfig must be done before registerWithMessageDict, since diff --git a/kmail/kmfoldercachedimap.cpp b/kmail/kmfoldercachedimap.cpp index dcfcbe7f..3b7bcc0a 100644 --- a/kmail/kmfoldercachedimap.cpp +++ b/kmail/kmfoldercachedimap.cpp @@ -153,10 +153,10 @@ DImapTroubleShootDialog::DImapTroubleShootDialog( TQWidget* parent, enableButtonSeparator( true ); - connect ( mIndexButton, TQT_SIGNAL(toggled(bool)), mIndexScope, TQT_SLOT(setEnabled(bool)) ); - connect ( mIndexButton, TQT_SIGNAL(toggled(bool)), scopeLabel, TQT_SLOT(setEnabled(bool)) ); - connect( mButtonGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( slotChanged() ) ); - connect( this, TQT_SIGNAL( okClicked () ), this, TQT_SLOT( slotDone() ) ); + connect ( mIndexButton, TQ_SIGNAL(toggled(bool)), mIndexScope, TQ_SLOT(setEnabled(bool)) ); + connect ( mIndexButton, TQ_SIGNAL(toggled(bool)), scopeLabel, TQ_SLOT(setEnabled(bool)) ); + connect( mButtonGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( slotChanged() ) ); + connect( this, TQ_SIGNAL( okClicked () ), this, TQ_SLOT( slotDone() ) ); enableButtonOK( false ); } @@ -908,8 +908,8 @@ void KMFolderCachedImap::serverSyncInternal() // kdDebug(5006) << "makeConnection said Connecting, waiting for signal." << endl; newState( mProgress, i18n("Connecting to %1").arg( mAccount->host() ) ); // We'll wait for the connectionResult signal from the account. - connect( mAccount, TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) ); + connect( mAccount, TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( slotConnectionResult(int, const TQString&) ) ); break; } else { // Connected @@ -932,8 +932,8 @@ void KMFolderCachedImap::serverSyncInternal() // Check the user's own rights. We do this every time in case they changed. mOldUserRights = mUserRights; newState( mProgress, i18n("Checking permissions")); - connect( mAccount, TQT_SIGNAL( receivedUserRights( KMFolder* ) ), - this, TQT_SLOT( slotReceivedUserRights( KMFolder* ) ) ); + connect( mAccount, TQ_SIGNAL( receivedUserRights( KMFolder* ) ), + this, TQ_SLOT( slotReceivedUserRights( KMFolder* ) ) ); mAccount->getUserRights( folder(), imapPath() ); // after connecting, due to the INBOX case break; } @@ -955,8 +955,8 @@ void KMFolderCachedImap::serverSyncInternal() if ( !newName.isEmpty() && !folder()->isSystemFolder() && !isResourceFolder ) { newState( mProgress, i18n("Renaming folder") ); CachedImapJob *job = new CachedImapJob( newName, CachedImapJob::tRenameFolder, this ); - connect( job, TQT_SIGNAL( result(KMail::FolderJob *) ), this, TQT_SLOT( slotIncreaseProgress() ) ); - connect( job, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotRenameFolderFinished() ) ); + connect( job, TQ_SIGNAL( result(KMail::FolderJob *) ), this, TQ_SLOT( slotIncreaseProgress() ) ); + connect( job, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotRenameFolderFinished() ) ); job->start(); break; } @@ -1043,8 +1043,8 @@ void KMFolderCachedImap::serverSyncInternal() newState( mProgress, i18n("Deleting folders from server")); CachedImapJob* job = new CachedImapJob( foldersForDeletionOnServer, CachedImapJob::tDeleteFolders, this ); - connect( job, TQT_SIGNAL( result(KMail::FolderJob *) ), this, TQT_SLOT( slotIncreaseProgress() ) ); - connect( job, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotFolderDeletionOnServerFinished() ) ); + connect( job, TQ_SIGNAL( result(KMail::FolderJob *) ), this, TQ_SLOT( slotIncreaseProgress() ) ); + connect( job, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotFolderDeletionOnServerFinished() ) ); job->start(); break; } @@ -1082,8 +1082,8 @@ void KMFolderCachedImap::serverSyncInternal() newState( mProgress, i18n("Expunging deleted messages")); CachedImapJob *job = new CachedImapJob( TQString(), CachedImapJob::tExpungeFolder, this ); - connect( job, TQT_SIGNAL( result(KMail::FolderJob *) ), this, TQT_SLOT( slotIncreaseProgress() ) ); - connect( job, TQT_SIGNAL( finished() ), this, TQT_SLOT( serverSyncInternal() ) ); + connect( job, TQ_SIGNAL( result(KMail::FolderJob *) ), this, TQ_SLOT( slotIncreaseProgress() ) ); + connect( job, TQ_SIGNAL( finished() ), this, TQ_SLOT( serverSyncInternal() ) ); job->start(); break; } @@ -1097,10 +1097,10 @@ void KMFolderCachedImap::serverSyncInternal() CachedImapJob *job = new CachedImapJob( mMsgsForDownload, CachedImapJob::tGetMessage, this ); - connect( job, TQT_SIGNAL( progress(unsigned long, unsigned long) ), - this, TQT_SLOT( slotProgress(unsigned long, unsigned long) ) ); - connect( job, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotUpdateLastUid() ) ); - connect( job, TQT_SIGNAL( finished() ), this, TQT_SLOT( serverSyncInternal() ) ); + connect( job, TQ_SIGNAL( progress(unsigned long, unsigned long) ), + this, TQ_SLOT( slotProgress(unsigned long, unsigned long) ) ); + connect( job, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotUpdateLastUid() ) ); + connect( job, TQ_SIGNAL( finished() ), this, TQ_SLOT( serverSyncInternal() ) ); job->start(); mMsgsForDownload.clear(); break; @@ -1153,8 +1153,8 @@ void KMFolderCachedImap::serverSyncInternal() ImapAccountBase::jobData jd( url.url(), folder() ); jd.cancellable = true; // we can always do so later mAccount->insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotTestAnnotationResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotTestAnnotationResult(TDEIO::Job *))); break; } @@ -1197,10 +1197,10 @@ void KMFolderCachedImap::serverSyncInternal() jd.cancellable = true; mAccount->insertJob(job, jd); - connect( job, TQT_SIGNAL(annotationResult(const TQString&, const TQString&, bool)), - TQT_SLOT(slotAnnotationResult(const TQString&, const TQString&, bool)) ); - connect( job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotGetAnnotationResult(TDEIO::Job *)) ); + connect( job, TQ_SIGNAL(annotationResult(const TQString&, const TQString&, bool)), + TQ_SLOT(slotAnnotationResult(const TQString&, const TQString&, bool)) ); + connect( job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotGetAnnotationResult(TDEIO::Job *)) ); break; } } @@ -1238,10 +1238,10 @@ void KMFolderCachedImap::serverSyncInternal() jd.cancellable = true; // we can always do so later mAccount->insertJob(job, jd); - connect(job, TQT_SIGNAL(annotationChanged( const TQString&, const TQString&, const TQString& ) ), - TQT_SLOT( slotAnnotationChanged( const TQString&, const TQString&, const TQString& ) )); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotSetAnnotationResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(annotationChanged( const TQString&, const TQString&, const TQString& ) ), + TQ_SLOT( slotAnnotationChanged( const TQString&, const TQString&, const TQString& ) )); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotSetAnnotationResult(TDEIO::Job *))); break; } } @@ -1264,10 +1264,10 @@ void KMFolderCachedImap::serverSyncInternal() ImapAccountBase::jobData jd( url.url(), folder() ); mAccount->insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotMultiSetACLResult(TDEIO::Job *))); - connect(job, TQT_SIGNAL(aclChanged( const TQString&, int )), - TQT_SLOT(slotACLChanged( const TQString&, int )) ); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotMultiSetACLResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(aclChanged( const TQString&, int )), + TQ_SLOT(slotACLChanged( const TQString&, int )) ); break; } } @@ -1278,8 +1278,8 @@ void KMFolderCachedImap::serverSyncInternal() if( !mQuotaOnly && !noContent() && mAccount->hasACLSupport() ) { newState( mProgress, i18n( "Retrieving permissions" ) ); mAccount->getACL( folder(), mImapPath ); - connect( mAccount, TQT_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )), - this, TQT_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) ); + connect( mAccount, TQ_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )), + this, TQ_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) ); break; } case SYNC_STATE_FIND_SUBFOLDERS: @@ -1309,10 +1309,10 @@ void KMFolderCachedImap::serverSyncInternal() TDEIO::Job* job = KMail::QuotaJobs::getStorageQuota( mAccount->slave(), url ); ImapAccountBase::jobData jd( url.url(), folder() ); mAccount->insertJob(job, jd); - connect( job, TQT_SIGNAL( storageQuotaResult( const QuotaInfo& ) ), - TQT_SLOT( slotStorageQuotaResult( const QuotaInfo& ) ) ); - connect( job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotQuotaResult(TDEIO::Job *)) ); + connect( job, TQ_SIGNAL( storageQuotaResult( const QuotaInfo& ) ), + TQ_SLOT( slotStorageQuotaResult( const QuotaInfo& ) ) ); + connect( job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotQuotaResult(TDEIO::Job *)) ); break; } case SYNC_STATE_CLOSE: @@ -1365,10 +1365,10 @@ void KMFolderCachedImap::syncNextSubFolder( bool secondSync ) mCurrentSubfolder = mSubfoldersForSync.front(); mSubfoldersForSync.pop_front(); if ( mCurrentSubfolder ) { - connect( mCurrentSubfolder, TQT_SIGNAL( folderComplete(KMFolderCachedImap*, bool) ), - this, TQT_SLOT( slotSubFolderComplete(KMFolderCachedImap*, bool) ) ); - connect( mCurrentSubfolder, TQT_SIGNAL( closeToQuotaChanged() ), - this, TQT_SLOT( slotSubFolderCloseToQuotaChanged() ) ); + connect( mCurrentSubfolder, TQ_SIGNAL( folderComplete(KMFolderCachedImap*, bool) ), + this, TQ_SLOT( slotSubFolderComplete(KMFolderCachedImap*, bool) ) ); + connect( mCurrentSubfolder, TQ_SIGNAL( closeToQuotaChanged() ), + this, TQ_SLOT( slotSubFolderCloseToQuotaChanged() ) ); //kdDebug(5006) << "Sync'ing subfolder " << mCurrentSubfolder->imapPath() << endl; assert( !mCurrentSubfolder->imapPath().isEmpty() ); @@ -1416,10 +1416,10 @@ void KMFolderCachedImap::buildSubFolderList() void KMFolderCachedImap::disconnectSubFolderSignals() { - disconnect( mCurrentSubfolder, TQT_SIGNAL( folderComplete(KMFolderCachedImap*, bool) ), - this, TQT_SLOT( slotSubFolderComplete(KMFolderCachedImap*, bool) ) ); - disconnect( mCurrentSubfolder, TQT_SIGNAL( closeToQuotaChanged() ), - this, TQT_SLOT( slotSubFolderCloseToQuotaChanged() ) ); + disconnect( mCurrentSubfolder, TQ_SIGNAL( folderComplete(KMFolderCachedImap*, bool) ), + this, TQ_SLOT( slotSubFolderComplete(KMFolderCachedImap*, bool) ) ); + disconnect( mCurrentSubfolder, TQ_SIGNAL( closeToQuotaChanged() ), + this, TQ_SLOT( slotSubFolderCloseToQuotaChanged() ) ); mCurrentSubfolder = 0; } @@ -1428,8 +1428,8 @@ void KMFolderCachedImap::disconnectSubFolderSignals() */ void KMFolderCachedImap::slotConnectionResult( int errorCode, const TQString& errorMsg ) { - disconnect( mAccount, TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) ); + disconnect( mAccount, TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( slotConnectionResult(int, const TQString&) ) ); if ( !errorCode ) { // Success mSyncState = SYNC_STATE_GET_USERRIGHTS; @@ -1463,15 +1463,15 @@ void KMFolderCachedImap::uploadNewMessages() if ( mUserRightsState != KMail::ACLJobs::Ok || ( mUserRights & ( KMail::ACLJobs::Insert ) ) ) { newState( mProgress, i18n("Uploading messages to server")); CachedImapJob *job = new CachedImapJob( newMsgs, CachedImapJob::tPutMessage, this ); - connect( job, TQT_SIGNAL( progress( unsigned long, unsigned long) ), - this, TQT_SLOT( slotPutProgress(unsigned long, unsigned long) ) ); - connect( job, TQT_SIGNAL( finished() ), this, TQT_SLOT( serverSyncInternal() ) ); + connect( job, TQ_SIGNAL( progress( unsigned long, unsigned long) ), + this, TQ_SLOT( slotPutProgress(unsigned long, unsigned long) ) ); + connect( job, TQ_SIGNAL( finished() ), this, TQ_SLOT( serverSyncInternal() ) ); job->start(); return; } else { KMCommand *command = rescueUnsyncedMessages(); - connect( command, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( serverSyncInternal() ) ); + connect( command, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( serverSyncInternal() ) ); } } else { // nothing to upload if ( mUserRights != mOldUserRights && (mOldUserRights & KMail::ACLJobs::Insert) @@ -1537,8 +1537,8 @@ void KMFolderCachedImap::uploadFlags() // FIXME END DUPLICATED FROM KMFOLDERIMAP if ( mStatusFlagsJobs ) { - connect( mAccount, TQT_SIGNAL( imapStatusChanged(KMFolder*, const TQString&, bool) ), - this, TQT_SLOT( slotImapStatusChanged(KMFolder*, const TQString&, bool) ) ); + connect( mAccount, TQ_SIGNAL( imapStatusChanged(KMFolder*, const TQString&, bool) ), + this, TQ_SLOT( slotImapStatusChanged(KMFolder*, const TQString&, bool) ) ); return; } } @@ -1588,8 +1588,8 @@ void KMFolderCachedImap::uploadSeenFlags() } if ( mStatusFlagsJobs ) { - connect( mAccount, TQT_SIGNAL( imapStatusChanged(KMFolder*, const TQString&, bool) ), - this, TQT_SLOT( slotImapStatusChanged(KMFolder*, const TQString&, bool) ) ); + connect( mAccount, TQ_SIGNAL( imapStatusChanged(KMFolder*, const TQString&, bool) ), + this, TQ_SLOT( slotImapStatusChanged(KMFolder*, const TQString&, bool) ) ); return; } } @@ -1607,8 +1607,8 @@ void KMFolderCachedImap::slotImapStatusChanged(KMFolder* folder, const TQString& if ( folder->storage() == this ) { --mStatusFlagsJobs; if ( mStatusFlagsJobs == 0 || !cont ) // done or aborting - disconnect( mAccount, TQT_SIGNAL( imapStatusChanged(KMFolder*, const TQString&, bool) ), - this, TQT_SLOT( slotImapStatusChanged(KMFolder*, const TQString&, bool) ) ); + disconnect( mAccount, TQ_SIGNAL( imapStatusChanged(KMFolder*, const TQString&, bool) ), + this, TQ_SLOT( slotImapStatusChanged(KMFolder*, const TQString&, bool) ) ); if ( mStatusFlagsJobs == 0 && cont ) { mProgress += 5; serverSyncInternal(); @@ -1646,8 +1646,8 @@ void KMFolderCachedImap::createNewFolders() if( !newFolders.isEmpty() ) { newState( mProgress, i18n("Creating subfolders on server")); CachedImapJob *job = new CachedImapJob( newFolders, CachedImapJob::tAddSubfolders, this ); - connect( job, TQT_SIGNAL( result(KMail::FolderJob *) ), this, TQT_SLOT( slotIncreaseProgress() ) ); - connect( job, TQT_SIGNAL( finished() ), this, TQT_SLOT( serverSyncInternal() ) ); + connect( job, TQ_SIGNAL( result(KMail::FolderJob *) ), this, TQ_SLOT( slotIncreaseProgress() ) ); + connect( job, TQ_SIGNAL( finished() ), this, TQ_SLOT( serverSyncInternal() ) ); job->start(); } else { serverSyncInternal(); @@ -1721,8 +1721,8 @@ bool KMFolderCachedImap::deleteMessages() uidsForDeletionOnServer.clear(); kdDebug(5006) << "Deleting " << sets.count() << " sets of messages from server folder " << imapPath() << endl; CachedImapJob *job = new CachedImapJob( sets, CachedImapJob::tDeleteMessage, this ); - connect( job, TQT_SIGNAL( result(KMail::FolderJob *) ), - this, TQT_SLOT( slotDeleteMessagesResult(KMail::FolderJob *) ) ); + connect( job, TQ_SIGNAL( result(KMail::FolderJob *) ), + this, TQ_SLOT( slotDeleteMessagesResult(KMail::FolderJob *) ) ); job->start(); return true; } else { @@ -1757,9 +1757,9 @@ void KMFolderCachedImap::checkUidValidity() { else { newState( mProgress, i18n("Checking folder validity")); CachedImapJob *job = new CachedImapJob( FolderJob::tCheckUidValidity, this ); - connect( job, TQT_SIGNAL(permanentFlags(int)), TQT_SLOT(slotPermanentFlags(int)) ); - connect( job, TQT_SIGNAL( result( KMail::FolderJob* ) ), - this, TQT_SLOT( slotCheckUidValidityResult( KMail::FolderJob* ) ) ); + connect( job, TQ_SIGNAL(permanentFlags(int)), TQ_SLOT(slotPermanentFlags(int)) ); + connect( job, TQ_SIGNAL( result( KMail::FolderJob* ) ), + this, TQ_SLOT( slotCheckUidValidityResult( KMail::FolderJob* ) ) ); job->start(); } } @@ -1808,8 +1808,8 @@ void KMFolderCachedImap::listMessages() { mFoundAnIMAPDigest = false; CachedImapJob* job = new CachedImapJob( FolderJob::tListMessages, this ); - connect( job, TQT_SIGNAL( result(KMail::FolderJob *) ), - this, TQT_SLOT( slotGetLastMessagesResult(KMail::FolderJob *) ) ); + connect( job, TQ_SIGNAL( result(KMail::FolderJob *) ), + this, TQ_SLOT( slotGetLastMessagesResult(KMail::FolderJob *) ) ); job->start(); } @@ -2038,9 +2038,9 @@ void KMFolderCachedImap::listNamespaces() } KMail::ListJob* job = new KMail::ListJob( mAccount, type, this, mAccount->addPathToNamespace( *it ) ); job->setHonorLocalSubscription( true ); - connect( job, TQT_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&, + connect( job, TQ_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&, const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&)), - this, TQT_SLOT(slotCheckNamespace(const TQStringList&, const TQStringList&, + this, TQ_SLOT(slotCheckNamespace(const TQStringList&, const TQStringList&, const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&))); job->start(); } @@ -2060,9 +2060,9 @@ void KMFolderCachedImap::listNamespaces() mAccount->addPathToNamespace( ns ) ); job->setNamespace( ns ); job->setHonorLocalSubscription( true ); - connect( job, TQT_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&, + connect( job, TQ_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&, const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&)), - this, TQT_SLOT(slotListResult(const TQStringList&, const TQStringList&, + this, TQ_SLOT(slotListResult(const TQStringList&, const TQStringList&, const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&))); job->start(); } @@ -2148,9 +2148,9 @@ bool KMFolderCachedImap::listDirectory() type = ImapAccountBase::ListSubscribed; KMail::ListJob* job = new KMail::ListJob( mAccount, type, this ); job->setHonorLocalSubscription( true ); - connect( job, TQT_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&, + connect( job, TQ_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&, const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&)), - this, TQT_SLOT(slotListResult(const TQStringList&, const TQStringList&, + this, TQ_SLOT(slotListResult(const TQStringList&, const TQStringList&, const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&))); job->start(); @@ -2347,8 +2347,8 @@ void KMFolderCachedImap::listDirectory2() ImapAccountBase::jobData jd( TQString(), folder() ); jd.cancellable = true; mAccount->insertJob(job, jd); - connect( job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotMultiUrlGetAnnotationResult(TDEIO::Job *)) ); + connect( job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotMultiUrlGetAnnotationResult(TDEIO::Job *)) ); } else { createFoldersNewOnServerAndFinishListing( foldersNewOnServer ); @@ -2493,8 +2493,8 @@ void KMFolderCachedImap::slotReceivedUserRights( KMFolder* folder ) { if ( folder->storage() == this ) { - disconnect( mAccount, TQT_SIGNAL( receivedUserRights( KMFolder* ) ), - this, TQT_SLOT( slotReceivedUserRights( KMFolder* ) ) ); + disconnect( mAccount, TQ_SIGNAL( receivedUserRights( KMFolder* ) ), + this, TQ_SLOT( slotReceivedUserRights( KMFolder* ) ) ); if ( mUserRightsState == KMail::ACLJobs::Ok ) { setReadOnly( ( mUserRights & KMail::ACLJobs::Insert ) == 0 ); } @@ -2516,8 +2516,8 @@ void KMFolderCachedImap::slotReceivedACL( KMFolder* folder, TDEIO::Job* job, const KMail::ACLList& aclList ) { if ( folder->storage() == this ) { - disconnect( mAccount, TQT_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )), - this, TQT_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) ); + disconnect( mAccount, TQ_SIGNAL(receivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )), + this, TQ_SLOT(slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& )) ); mACLListState = job->error() ? KMail::ACLJobs::FetchFailed : KMail::ACLJobs::Ok; mACLList = aclList; serverSyncInternal(); @@ -3166,8 +3166,8 @@ void KMFolderCachedImap::rescueUnsyncedMessagesAndDeleteFolder( KMFolder *folder if ( storage ) { KMCommand *command = storage->rescueUnsyncedMessages(); if ( command ) { - connect( command, TQT_SIGNAL(completed(KMCommand*)), - TQT_SLOT(slotRescueDone(KMCommand*)) ); + connect( command, TQ_SIGNAL(completed(KMCommand*)), + TQ_SLOT(slotRescueDone(KMCommand*)) ); ++mRescueCommandCount; } else { // nothing to rescue, close folder diff --git a/kmail/kmfoldercombobox.cpp b/kmail/kmfoldercombobox.cpp index 499d444f..4b722c75 100644 --- a/kmail/kmfoldercombobox.cpp +++ b/kmail/kmfoldercombobox.cpp @@ -32,15 +32,15 @@ void KMFolderComboBox::init() mOutboxShown = true; mImapShown = true; refreshFolders(); - connect( this, TQT_SIGNAL( activated(int) ), - this, TQT_SLOT( slotActivated(int) ) ); - connect( kmkernel->folderMgr(), TQT_SIGNAL(changed()), - this, TQT_SLOT(refreshFolders()) ); - connect( kmkernel->dimapFolderMgr(), TQT_SIGNAL(changed()), - this, TQT_SLOT(refreshFolders()) ); + connect( this, TQ_SIGNAL( activated(int) ), + this, TQ_SLOT( slotActivated(int) ) ); + connect( kmkernel->folderMgr(), TQ_SIGNAL(changed()), + this, TQ_SLOT(refreshFolders()) ); + connect( kmkernel->dimapFolderMgr(), TQ_SIGNAL(changed()), + this, TQ_SLOT(refreshFolders()) ); if (mImapShown) - connect( kmkernel->imapFolderMgr(), TQT_SIGNAL(changed()), - this, TQT_SLOT(refreshFolders()) ); + connect( kmkernel->imapFolderMgr(), TQ_SIGNAL(changed()), + this, TQ_SLOT(refreshFolders()) ); } @@ -59,11 +59,11 @@ void KMFolderComboBox::showImapFolders(bool shown) mImapShown = shown; refreshFolders(); if (shown) - connect( kmkernel->imapFolderMgr(), TQT_SIGNAL(changed()), - this, TQT_SLOT(refreshFolders()) ); + connect( kmkernel->imapFolderMgr(), TQ_SIGNAL(changed()), + this, TQ_SLOT(refreshFolders()) ); else - disconnect( kmkernel->imapFolderMgr(), TQT_SIGNAL(changed()), - this, TQT_SLOT(refreshFolders()) ); + disconnect( kmkernel->imapFolderMgr(), TQ_SIGNAL(changed()), + this, TQ_SLOT(refreshFolders()) ); } //----------------------------------------------------------------------------- diff --git a/kmail/kmfolderdia.cpp b/kmail/kmfolderdia.cpp index d34c731b..0ddcc5a5 100644 --- a/kmail/kmfolderdia.cpp +++ b/kmail/kmfolderdia.cpp @@ -149,12 +149,12 @@ KMFolderDialog::KMFolderDialog(KMFolder *aFolder, KMFolderDir *aFolderDir, void KMFolderDialog::addTab( FolderDiaTab* tab ) { - connect( tab, TQT_SIGNAL( readyForAccept() ), - this, TQT_SLOT( slotReadyForAccept() ) ); - connect( tab, TQT_SIGNAL( cancelAccept() ), - this, TQT_SLOT( slotCancelAccept() ) ); - //connect( tab, TQT_SIGNAL(changed( bool )), - // this, TQT_SLOT(slotChanged( bool )) ); + connect( tab, TQ_SIGNAL( readyForAccept() ), + this, TQ_SLOT( slotReadyForAccept() ) ); + connect( tab, TQ_SIGNAL( cancelAccept() ), + this, TQ_SLOT( slotCancelAccept() ) ); + //connect( tab, TQ_SIGNAL(changed( bool )), + // this, TQ_SLOT(slotChanged( bool )) ); mTabs.append( tab ); } @@ -343,8 +343,8 @@ KMail::FolderDiaGeneralTab::FolderDiaGeneralTab( KMFolderDialog* dlg, } label->setBuddy( mNameEdit ); hl->addWidget( mNameEdit ); - connect( mNameEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( slotFolderNameChanged( const TQString & ) ) ); + connect( mNameEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( slotFolderNameChanged( const TQString & ) ) ); //start icons group @@ -388,17 +388,17 @@ KMail::FolderDiaGeneralTab::FolderDiaGeneralTab( KMFolderDialog* dlg, ihl->addWidget( mUnreadIconButton ); ihl->addStretch( 1 ); - connect( mIconsCheckBox, TQT_SIGNAL(toggled(bool)), - mNormalIconButton, TQT_SLOT(setEnabled(bool)) ); - connect( mIconsCheckBox, TQT_SIGNAL(toggled(bool)), - mUnreadIconButton, TQT_SLOT(setEnabled(bool)) ); - connect( mIconsCheckBox, TQT_SIGNAL(toggled(bool)), - mNormalIconLabel, TQT_SLOT(setEnabled(bool)) ); - connect( mIconsCheckBox, TQT_SIGNAL(toggled(bool)), - mUnreadIconLabel, TQT_SLOT(setEnabled(bool)) ); + connect( mIconsCheckBox, TQ_SIGNAL(toggled(bool)), + mNormalIconButton, TQ_SLOT(setEnabled(bool)) ); + connect( mIconsCheckBox, TQ_SIGNAL(toggled(bool)), + mUnreadIconButton, TQ_SLOT(setEnabled(bool)) ); + connect( mIconsCheckBox, TQ_SIGNAL(toggled(bool)), + mNormalIconLabel, TQ_SLOT(setEnabled(bool)) ); + connect( mIconsCheckBox, TQ_SIGNAL(toggled(bool)), + mUnreadIconLabel, TQ_SLOT(setEnabled(bool)) ); - connect( mNormalIconButton, TQT_SIGNAL(iconChanged(TQString)), - this, TQT_SLOT(slotChangeIcon(TQString)) ); + connect( mNormalIconButton, TQ_SIGNAL(iconChanged(TQString)), + this, TQ_SLOT(slotChangeIcon(TQString)) ); //end icons group addLine( this, topLayout); @@ -510,8 +510,8 @@ KMail::FolderDiaGeneralTab::FolderDiaGeneralTab( KMFolderDialog* dlg, mContentsComboBox->insertItem( i18n( "Journal" ) ); if ( mDlg->folder() ) mContentsComboBox->setCurrentItem( mDlg->folder()->storage()->contentsType() ); - connect ( mContentsComboBox, TQT_SIGNAL ( activated( int ) ), - this, TQT_SLOT( slotFolderContentsSelectionChanged( int ) ) ); + connect ( mContentsComboBox, TQ_SIGNAL ( activated( int ) ), + this, TQ_SLOT( slotFolderContentsSelectionChanged( int ) ) ); if ( mDlg->folder()->isReadOnly() || mIsResourceFolder ) mContentsComboBox->setEnabled( false ); } else { @@ -816,18 +816,18 @@ KMail::FolderDiaTemplatesTab::FolderDiaTemplatesTab( KMFolderDialog* dlg, mCopyGlobal->setEnabled( false ); btns->addWidget( mCopyGlobal ); - connect( mCustom, TQT_SIGNAL(toggled(bool)), - mWidget, TQT_SLOT(setEnabled(bool)) ); - connect( mCustom, TQT_SIGNAL(toggled(bool)), - mCopyGlobal, TQT_SLOT(setEnabled(bool)) ); + connect( mCustom, TQ_SIGNAL(toggled(bool)), + mWidget, TQ_SLOT(setEnabled(bool)) ); + connect( mCustom, TQ_SIGNAL(toggled(bool)), + mCopyGlobal, TQ_SLOT(setEnabled(bool)) ); - connect( mCopyGlobal, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotCopyGlobal()) ); + connect( mCopyGlobal, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotCopyGlobal()) ); initializeWithValuesFromFolder( mDlg->folder() ); - connect( mWidget, TQT_SIGNAL( changed() ), - this, TQT_SLOT( slotEmitChanged( void ) ) ); + connect( mWidget, TQ_SIGNAL( changed() ), + this, TQ_SLOT( slotEmitChanged( void ) ) ); } void FolderDiaTemplatesTab::load() diff --git a/kmail/kmfolderimap.cpp b/kmail/kmfolderimap.cpp index b0686dbb..ee573c17 100644 --- a/kmail/kmfolderimap.cpp +++ b/kmail/kmfolderimap.cpp @@ -82,8 +82,8 @@ KMFolderImap::KMFolderImap(KMFolder* folder, const char* aName) mAddMessageProgressItem = 0; mReadOnly = false; - connect (this, TQT_SIGNAL( folderComplete( KMFolderImap*, bool ) ), - this, TQT_SLOT( slotCompleteMailCheckProgress()) ); + connect (this, TQ_SIGNAL( folderComplete( KMFolderImap*, bool ) ), + this, TQ_SLOT( slotCompleteMailCheckProgress()) ); } KMFolderImap::~KMFolderImap() @@ -249,8 +249,8 @@ void KMFolderImap::remove() false, account()->useSSL() || account()->useTLS() ); account()->insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - this, TQT_SLOT(slotRemoveFolderResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + this, TQ_SLOT(slotRemoveFolderResult(TDEIO::Job *))); } //----------------------------------------------------------------------------- @@ -417,10 +417,10 @@ int KMFolderImap::addMsg(TQPtrList<KMMessage>& msgList, TQValueList<int>& aIndex msg = msgParent->getMsg(idx); } imapJob = new ImapJob(msg, ImapJob::tPutMessage, this); - connect(imapJob, TQT_SIGNAL(messageStored(KMMessage*)), - TQT_SLOT(addMsgQuiet(KMMessage*))); - connect(imapJob, TQT_SIGNAL(result(KMail::FolderJob*)), - TQT_SLOT(slotCopyMsgResult(KMail::FolderJob*))); + connect(imapJob, TQ_SIGNAL(messageStored(KMMessage*)), + TQ_SLOT(addMsgQuiet(KMMessage*))); + connect(imapJob, TQ_SIGNAL(result(KMail::FolderJob*)), + TQ_SLOT(slotCopyMsgResult(KMail::FolderJob*))); imapJob->start(); } @@ -439,10 +439,10 @@ int KMFolderImap::addMsg(TQPtrList<KMMessage>& msgList, TQValueList<int>& aIndex TQPtrList<KMMessage> temp_msgs = splitMessageList(*it, msgList); if ( temp_msgs.isEmpty() ) kdDebug(5006) << "Wow! KMFolderImap::splitMessageList() returned an empty list!" << endl; imapJob = new ImapJob(temp_msgs, *it, ImapJob::tMoveMessage, this); - connect(imapJob, TQT_SIGNAL(messageCopied(TQPtrList<KMMessage>)), - TQT_SLOT(addMsgQuiet(TQPtrList<KMMessage>))); - connect(imapJob, TQT_SIGNAL(result(KMail::FolderJob*)), - TQT_SLOT(slotCopyMsgResult(KMail::FolderJob*))); + connect(imapJob, TQ_SIGNAL(messageCopied(TQPtrList<KMMessage>)), + TQ_SLOT(addMsgQuiet(TQPtrList<KMMessage>))); + connect(imapJob, TQ_SIGNAL(result(KMail::FolderJob*)), + TQ_SLOT(slotCopyMsgResult(KMail::FolderJob*))); imapJob->start(); } } @@ -492,14 +492,14 @@ int KMFolderImap::addMsg(TQPtrList<KMMessage>& msgList, TQValueList<int>& aIndex true, account()->useSSL() || account()->useTLS() ); mAddMessageProgressItem->setTotalItems( msgList.count() ); - connect ( mAddMessageProgressItem, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem*)), - account(), TQT_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) ); + connect ( mAddMessageProgressItem, TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem*)), + account(), TQ_SLOT( slotAbortRequested( KPIM::ProgressItem* ) ) ); imapJob->setParentProgressItem( mAddMessageProgressItem ); } - connect( imapJob, TQT_SIGNAL( messageCopied(TQPtrList<KMMessage>) ), - TQT_SLOT( addMsgQuiet(TQPtrList<KMMessage>) ) ); - connect( imapJob, TQT_SIGNAL(result(KMail::FolderJob*)), - TQT_SLOT(slotCopyMsgResult(KMail::FolderJob*)) ); + connect( imapJob, TQ_SIGNAL( messageCopied(TQPtrList<KMMessage>) ), + TQ_SLOT( addMsgQuiet(TQPtrList<KMMessage>) ) ); + connect( imapJob, TQ_SIGNAL(result(KMail::FolderJob*)), + TQ_SLOT(slotCopyMsgResult(KMail::FolderJob*)) ); imapJob->start(); } @@ -534,8 +534,8 @@ void KMFolderImap::copyMsg(TQPtrList<KMMessage>& msgList) TQPtrList<KMMessage> temp_msgs = splitMessageList(*it, msgList); ImapJob *job = new ImapJob(temp_msgs, *it, ImapJob::tCopyMessage, this); - connect(job, TQT_SIGNAL(result(KMail::FolderJob*)), - TQT_SLOT(slotCopyMsgResult(KMail::FolderJob*))); + connect(job, TQ_SIGNAL(result(KMail::FolderJob*)), + TQ_SLOT(slotCopyMsgResult(KMail::FolderJob*))); job->start(); } } @@ -603,8 +603,8 @@ void KMFolderImap::take(TQPtrList<KMMessage> msgList) //----------------------------------------------------------------------------- void KMFolderImap::slotListNamespaces() { - disconnect( account(), TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( slotListNamespaces() ) ); + disconnect( account(), TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( slotListNamespaces() ) ); if ( account()->makeConnection() == ImapAccountBase::Error ) { kdWarning(5006) << "slotListNamespaces - got no connection" << endl; @@ -613,8 +613,8 @@ void KMFolderImap::slotListNamespaces() { // wait for the connectionResult kdDebug(5006) << "slotListNamespaces - waiting for connection" << endl; - connect( account(), TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( slotListNamespaces() ) ); + connect( account(), TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( slotListNamespaces() ) ); return; } kdDebug(5006) << "slotListNamespaces" << endl; @@ -636,9 +636,9 @@ void KMFolderImap::slotListNamespaces() account()->addPathToNamespace( *it ) ); job->setNamespace( *it ); job->setHonorLocalSubscription( true ); - connect( job, TQT_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&, + connect( job, TQ_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&, const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&)), - this, TQT_SLOT(slotListResult(const TQStringList&, const TQStringList&, + this, TQ_SLOT(slotListResult(const TQStringList&, const TQStringList&, const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&))); job->start(); } @@ -650,9 +650,9 @@ void KMFolderImap::slotListNamespaces() { KMail::ListJob* job = new KMail::ListJob( account(), type, this, account()->addPathToNamespace( *it ) ); job->setHonorLocalSubscription( true ); - connect( job, TQT_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&, + connect( job, TQ_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&, const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&)), - this, TQT_SLOT(slotCheckNamespace(const TQStringList&, const TQStringList&, + this, TQ_SLOT(slotCheckNamespace(const TQStringList&, const TQStringList&, const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&))); job->start(); } @@ -754,9 +754,9 @@ bool KMFolderImap::listDirectory() KMail::ListJob* job = new KMail::ListJob( account(), type, this ); job->setParentProgressItem( account()->listDirProgressItem() ); job->setHonorLocalSubscription( true ); - connect( job, TQT_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&, + connect( job, TQ_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&, const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&)), - this, TQT_SLOT(slotListResult(const TQStringList&, const TQStringList&, + this, TQ_SLOT(slotListResult(const TQStringList&, const TQStringList&, const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&))); job->start(); @@ -1034,8 +1034,8 @@ void KMFolderImap::checkValidity() kdDebug(5006) << "KMFolderImap::checkValidity of: " << imapPath() << endl; // Start with a clean slate - disconnect( account(), TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( checkValidity() ) ); + disconnect( account(), TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( checkValidity() ) ); KMAcctImap::ConnectionState connectionState = account()->makeConnection(); if ( connectionState == ImapAccountBase::Error ) { @@ -1048,8 +1048,8 @@ void KMFolderImap::checkValidity() // We'll wait for the connectionResult signal from the account. If it // errors, the above will catch it. kdDebug(5006) << "CheckValidity - waiting for connection" << endl; - connect( account(), TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( checkValidity() ) ); + connect( account(), TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( checkValidity() ) ); return; } // Only check once at a time. @@ -1079,10 +1079,10 @@ void KMFolderImap::checkValidity() TDEIO::SimpleJob *job = TDEIO::get(url, false, false); TDEIO::Scheduler::assignJobToSlave(account()->slave(), job); account()->insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotCheckValidityResult(TDEIO::Job *))); - connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - TQT_SLOT(slotSimpleData(TDEIO::Job *, const TQByteArray &))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotCheckValidityResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + TQ_SLOT(slotSimpleData(TDEIO::Job *, const TQByteArray &))); // Only check once at a time. mCheckingValidity = true; } @@ -1238,10 +1238,10 @@ void KMFolderImap::reallyGetFolder(const TQString &startUid) ImapAccountBase::jobData jd( url.url(), folder() ); jd.cancellable = true; account()->insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - this, TQT_SLOT(slotListFolderResult(TDEIO::Job *))); - connect(job, TQT_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList &)), - this, TQT_SLOT(slotListFolderEntries(TDEIO::Job *, + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + this, TQ_SLOT(slotListFolderResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList &)), + this, TQ_SLOT(slotListFolderEntries(TDEIO::Job *, const TDEIO::UDSEntryList &))); } else { mContentState = imapDownloadInProgress; @@ -1254,10 +1254,10 @@ void KMFolderImap::reallyGetFolder(const TQString &startUid) ImapAccountBase::jobData jd( url.url(), folder() ); jd.cancellable = true; account()->insertJob(newJob, jd); - connect(newJob, TQT_SIGNAL(result(TDEIO::Job *)), - this, TQT_SLOT(slotGetLastMessagesResult(TDEIO::Job *))); - connect(newJob, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - this, TQT_SLOT(slotGetMessagesData(TDEIO::Job *, const TQByteArray &))); + connect(newJob, TQ_SIGNAL(result(TDEIO::Job *)), + this, TQ_SLOT(slotGetLastMessagesResult(TDEIO::Job *))); + connect(newJob, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + this, TQ_SLOT(slotGetMessagesData(TDEIO::Job *, const TQByteArray &))); } } @@ -1360,12 +1360,12 @@ void KMFolderImap::slotListFolderResult(TDEIO::Job * job) jd.url = url.url(); TDEIO::Scheduler::assignJobToSlave(account()->slave(), newJob); account()->insertJob(newJob, jd); - connect(newJob, TQT_SIGNAL(result(TDEIO::Job *)), + connect(newJob, TQ_SIGNAL(result(TDEIO::Job *)), this, (i == sets.at(sets.count() - 1)) - ? TQT_SLOT(slotGetLastMessagesResult(TDEIO::Job *)) - : TQT_SLOT(slotGetMessagesResult(TDEIO::Job *))); - connect(newJob, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - this, TQT_SLOT(slotGetMessagesData(TDEIO::Job *, const TQByteArray &))); + ? TQ_SLOT(slotGetLastMessagesResult(TDEIO::Job *)) + : TQ_SLOT(slotGetMessagesResult(TDEIO::Job *))); + connect(newJob, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + this, TQ_SLOT(slotGetMessagesData(TDEIO::Job *, const TQByteArray &))); } } @@ -1740,8 +1740,8 @@ void KMFolderImap::createFolder(const TQString &name, const TQString& parentPath ImapAccountBase::jobData jd( url.url(), folder() ); jd.items = name; account()->insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - this, TQT_SLOT(slotCreateFolderResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + this, TQ_SLOT(slotCreateFolderResult(TDEIO::Job *))); } @@ -1841,8 +1841,8 @@ void KMFolderImap::deleteMessage(KMMessage * msg) TDEIO::Scheduler::assignJobToSlave(account()->slave(), job); ImapAccountBase::jobData jd( url.url(), 0 ); account()->insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - account(), TQT_SLOT(slotSimpleResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + account(), TQ_SLOT(slotSimpleResult(TDEIO::Job *))); } void KMFolderImap::deleteMessage(const TQPtrList<KMMessage>& msgList) @@ -1874,8 +1874,8 @@ void KMFolderImap::deleteMessage(const TQPtrList<KMMessage>& msgList) TDEIO::Scheduler::assignJobToSlave(account()->slave(), job); ImapAccountBase::jobData jd( url.url(), 0 ); account()->insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - account(), TQT_SLOT(slotSimpleResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + account(), TQ_SLOT(slotSimpleResult(TDEIO::Job *))); } } @@ -1968,7 +1968,7 @@ void KMFolderImap::setStatus(TQValueList<int>& _ids, KMMsgStatus status, bool to // to make sure that we get the latest flags abort the current listing and // create a new one kdDebug(5006) << "Set status during folder listing, restarting listing." << endl; - disconnect(this, TQT_SLOT(slotListFolderResult(TDEIO::Job *))); + disconnect(this, TQ_SLOT(slotListFolderResult(TDEIO::Job *))); quiet( false ); reallyGetFolder( TQString() ); } @@ -2075,16 +2075,16 @@ void KMFolderImap::expungeFolder(KMFolderImap * aFolder, bool quiet) ImapAccountBase::jobData jd( url.url(), 0 ); jd.quiet = quiet; account()->insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - account(), TQT_SLOT(slotSimpleResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + account(), TQ_SLOT(slotSimpleResult(TDEIO::Job *))); } //----------------------------------------------------------------------------- void KMFolderImap::slotProcessNewMail( int errorCode, const TQString &errorMsg ) { Q_UNUSED( errorMsg ); - disconnect( account(), TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( slotProcessNewMail(int, const TQString&) ) ); + disconnect( account(), TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( slotProcessNewMail(int, const TQString&) ) ); if ( !errorCode ) processNewMail( false ); else @@ -2114,8 +2114,8 @@ bool KMFolderImap::processNewMail(bool) { // wait kdDebug(5006) << "KMFolderImap::processNewMail - waiting for connection: " << label() << endl; - connect( account(), TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( slotProcessNewMail(int, const TQString&) ) ); + connect( account(), TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( slotProcessNewMail(int, const TQString&) ) ); return true; } KURL url = account()->getUrl(); @@ -2137,8 +2137,8 @@ bool KMFolderImap::processNewMail(bool) ImapAccountBase::jobData jd(url.url(), folder() ); jd.cancellable = true; account()->insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotStatResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotStatResult(TDEIO::Job *))); return true; } @@ -2247,8 +2247,8 @@ int KMFolderImap::expungeContents() ImapAccountBase::jobData jd( url.url(), 0 ); jd.quiet = true; account()->insertJob(job, jd); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), - account(), TQT_SLOT(slotSimpleResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), + account(), TQ_SLOT(slotSimpleResult(TDEIO::Job *))); } /* Is the below correct? If we are expunging (in the folder sense, not the imap sense), why delete but not (imap-)expunge? Since the folder is not active there is no concept @@ -2328,8 +2328,8 @@ void KMFolderImap::setAlreadyRemoved( bool removed ) void KMFolderImap::slotCreatePendingFolders( int errorCode, const TQString& errorMsg ) { Q_UNUSED( errorMsg ); - disconnect( account(), TQT_SIGNAL( connectionResult( int, const TQString& ) ), - this, TQT_SLOT( slotCreatePendingFolders( int, const TQString& ) ) ); + disconnect( account(), TQ_SIGNAL( connectionResult( int, const TQString& ) ), + this, TQ_SLOT( slotCreatePendingFolders( int, const TQString& ) ) ); if ( !errorCode ) { TQStringList::Iterator it = mFoldersPendingCreation.begin(); for ( ; it != mFoldersPendingCreation.end(); ++it ) { @@ -2350,8 +2350,8 @@ void KMFolderImap::search( const KMSearchPattern* pattern ) return; } SearchJob* job = new SearchJob( this, account(), pattern ); - connect( job, TQT_SIGNAL( searchDone( TQValueList<TQ_UINT32>, const KMSearchPattern*, bool ) ), - this, TQT_SLOT( slotSearchDone( TQValueList<TQ_UINT32>, const KMSearchPattern*, bool ) ) ); + connect( job, TQ_SIGNAL( searchDone( TQValueList<TQ_UINT32>, const KMSearchPattern*, bool ) ), + this, TQ_SLOT( slotSearchDone( TQValueList<TQ_UINT32>, const KMSearchPattern*, bool ) ) ); job->start(); } @@ -2373,8 +2373,8 @@ void KMFolderImap::search( const KMSearchPattern* pattern, TQ_UINT32 serNum ) return; } SearchJob* job = new SearchJob( this, account(), pattern, serNum ); - connect( job, TQT_SIGNAL( searchDone( TQ_UINT32, const KMSearchPattern*, bool ) ), - this, TQT_SLOT( slotSearchDone( TQ_UINT32, const KMSearchPattern*, bool ) ) ); + connect( job, TQ_SIGNAL( searchDone( TQ_UINT32, const KMSearchPattern*, bool ) ), + this, TQ_SLOT( slotSearchDone( TQ_UINT32, const KMSearchPattern*, bool ) ) ); job->start(); } diff --git a/kmail/kmfoldermaildir.cpp b/kmail/kmfoldermaildir.cpp index 9862bb47..62228190 100644 --- a/kmail/kmfoldermaildir.cpp +++ b/kmail/kmfoldermaildir.cpp @@ -1131,8 +1131,8 @@ TQ_INT64 KMFolderMaildir::doFolderSize() const //kdDebug(5006) << k_funcinfo << "Starting dirSizeJob for folder " // << location() << endl; KDirSize* job = KDirSize::dirSizeJob( list ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( slotDirSizeJobResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( slotDirSizeJobResult( TDEIO::Job* ) ) ); } return -1; @@ -1163,8 +1163,8 @@ void KMFolderMaildir::slotDirSizeJobResult( TDEIO::Job* job ) //kdDebug(5006) << k_funcinfo << "Starting dirSizeJob for folder " // << entry.first->location() << endl; KDirSize* job = KDirSize::dirSizeJob( entry.second ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - entry.first, TQT_SLOT( slotDirSizeJobResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + entry.first, TQ_SLOT( slotDirSizeJobResult( TDEIO::Job* ) ) ); break; } else diff --git a/kmail/kmfoldermgr.cpp b/kmail/kmfoldermgr.cpp index d270e710..94bbc2b9 100644 --- a/kmail/kmfoldermgr.cpp +++ b/kmail/kmfoldermgr.cpp @@ -361,8 +361,8 @@ void KMFolderMgr::remove(KMFolder* aFolder) void KMFolderMgr::removeFolder(KMFolder* aFolder) { - connect(aFolder, TQT_SIGNAL(removed(KMFolder*, bool)), - this, TQT_SLOT(removeFolderAux(KMFolder*, bool))); + connect(aFolder, TQ_SIGNAL(removed(KMFolder*, bool)), + this, TQ_SLOT(removeFolderAux(KMFolder*, bool))); aFolder->remove(); } @@ -578,10 +578,10 @@ void KMFolderMgr::renameFolder( KMFolder* folder, const TQString& newName, KMFolderDir *newParent ) { RenameJob* job = new RenameJob( folder->storage(), newName, newParent ); - connect( job, TQT_SIGNAL( renameDone( TQString, bool ) ), - this, TQT_SLOT( slotRenameDone( TQString, bool ) ) ); - connect( job, TQT_SIGNAL( renameDone( TQString, bool ) ), - this, TQT_SIGNAL( folderMoveOrCopyOperationFinished() ) ); + connect( job, TQ_SIGNAL( renameDone( TQString, bool ) ), + this, TQ_SLOT( slotRenameDone( TQString, bool ) ) ); + connect( job, TQ_SIGNAL( renameDone( TQString, bool ) ), + this, TQ_SIGNAL( folderMoveOrCopyOperationFinished() ) ); job->start(); } @@ -590,8 +590,8 @@ void KMFolderMgr::copyFolder( KMFolder* folder, KMFolderDir *newParent ) { kdDebug(5006) << "Copy folder: " << folder->prettyURL() << endl; CopyFolderJob* job = new CopyFolderJob( folder->storage(), newParent ); - connect( job, TQT_SIGNAL( folderCopyComplete( bool ) ), - this, TQT_SIGNAL( folderMoveOrCopyOperationFinished() ) ); + connect( job, TQ_SIGNAL( folderCopyComplete( bool ) ), + this, TQ_SIGNAL( folderMoveOrCopyOperationFinished() ) ); job->start(); } diff --git a/kmail/kmfoldersearch.cpp b/kmail/kmfoldersearch.cpp index e2a72cb2..29c0c8ab 100644 --- a/kmail/kmfoldersearch.cpp +++ b/kmail/kmfoldersearch.cpp @@ -81,7 +81,7 @@ KMSearch::KMSearch(TQObject * parent, const char * name) mSearchCount = 0; mProcessNextBatchTimer = new TQTimer(0, "mProcessNextBatchTimer"); - connect(mProcessNextBatchTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotProcessNextBatch())); + connect(mProcessNextBatchTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotProcessNextBatch())); } KMSearch::~KMSearch() @@ -262,9 +262,9 @@ void KMSearch::slotProcessNextBatch() folder->open("kmsearch"); mOpenedFolders.append( folder ); connect( folder->storage(), - TQT_SIGNAL( searchResult( KMFolder*, TQValueList<TQ_UINT32>, const KMSearchPattern*, bool ) ), + TQ_SIGNAL( searchResult( KMFolder*, TQValueList<TQ_UINT32>, const KMSearchPattern*, bool ) ), this, - TQT_SLOT( slotSearchFolderResult( KMFolder*, TQValueList<TQ_UINT32>, const KMSearchPattern*, bool ) ) ); + TQ_SLOT( slotSearchFolderResult( KMFolder*, TQValueList<TQ_UINT32>, const KMSearchPattern*, bool ) ) ); folder->storage()->search( mSearchPattern ); } else --mRemainingFolders; @@ -291,10 +291,10 @@ void KMSearch::slotSearchFolderResult( KMFolder* folder, if ( complete ) { disconnect( folder->storage(), - TQT_SIGNAL( searchResult( KMFolder*, TQValueList<TQ_UINT32>, + TQ_SIGNAL( searchResult( KMFolder*, TQValueList<TQ_UINT32>, const KMSearchPattern*, bool ) ), this, - TQT_SLOT( slotSearchFolderResult( KMFolder*, TQValueList<TQ_UINT32>, + TQ_SLOT( slotSearchFolderResult( KMFolder*, TQValueList<TQ_UINT32>, const KMSearchPattern*, bool ) ) ); --mRemainingFolders; mSearchCount += folder->count(); @@ -325,54 +325,54 @@ KMFolderSearch::KMFolderSearch(KMFolder* folder, const char* name) //Hook up some slots for live updating of search folders //TODO: Optimize folderInvalidated, folderAdded, folderRemoved - connect(kmkernel->folderMgr(), TQT_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)), - this, TQT_SLOT(examineAddedMessage(KMFolder*, TQ_UINT32))); - connect(kmkernel->folderMgr(), TQT_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)), - this, TQT_SLOT(examineRemovedMessage(KMFolder*, TQ_UINT32))); - connect(kmkernel->folderMgr(), TQT_SIGNAL(msgChanged(KMFolder*, TQ_UINT32, int)), - this, TQT_SLOT(examineChangedMessage(KMFolder*, TQ_UINT32, int))); - connect(kmkernel->folderMgr(), TQT_SIGNAL(folderInvalidated(KMFolder*)), - this, TQT_SLOT(examineInvalidatedFolder(KMFolder*))); - connect(kmkernel->folderMgr(), TQT_SIGNAL(folderAdded(KMFolder*)), - this, TQT_SLOT(examineInvalidatedFolder(KMFolder*))); - connect(kmkernel->folderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)), - this, TQT_SLOT(examineRemovedFolder(KMFolder*))); - connect(kmkernel->folderMgr(), TQT_SIGNAL(msgHeaderChanged(KMFolder*,int)), - this, TQT_SLOT(propagateHeaderChanged(KMFolder*,int))); - - connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)), - this, TQT_SLOT(examineAddedMessage(KMFolder*, TQ_UINT32))); - connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)), - this, TQT_SLOT(examineRemovedMessage(KMFolder*, TQ_UINT32))); - connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(msgChanged(KMFolder*, TQ_UINT32, int)), - this, TQT_SLOT(examineChangedMessage(KMFolder*, TQ_UINT32, int))); - connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(folderInvalidated(KMFolder*)), - this, TQT_SLOT(examineInvalidatedFolder(KMFolder*))); - connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(folderAdded(KMFolder*)), - this, TQT_SLOT(examineInvalidatedFolder(KMFolder*))); - connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)), - this, TQT_SLOT(examineRemovedFolder(KMFolder*))); - connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(msgHeaderChanged(KMFolder*,int)), - this, TQT_SLOT(propagateHeaderChanged(KMFolder*,int))); - - connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)), - this, TQT_SLOT(examineAddedMessage(KMFolder*, TQ_UINT32))); - connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)), - this, TQT_SLOT(examineRemovedMessage(KMFolder*, TQ_UINT32))); - connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(msgChanged(KMFolder*, TQ_UINT32, int)), - this, TQT_SLOT(examineChangedMessage(KMFolder*, TQ_UINT32, int))); - connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(folderInvalidated(KMFolder*)), - this, TQT_SLOT(examineInvalidatedFolder(KMFolder*))); - connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(folderAdded(KMFolder*)), - this, TQT_SLOT(examineInvalidatedFolder(KMFolder*))); - connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)), - this, TQT_SLOT(examineRemovedFolder(KMFolder*))); - connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(msgHeaderChanged(KMFolder*,int)), - this, TQT_SLOT(propagateHeaderChanged(KMFolder*,int))); + connect(kmkernel->folderMgr(), TQ_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)), + this, TQ_SLOT(examineAddedMessage(KMFolder*, TQ_UINT32))); + connect(kmkernel->folderMgr(), TQ_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)), + this, TQ_SLOT(examineRemovedMessage(KMFolder*, TQ_UINT32))); + connect(kmkernel->folderMgr(), TQ_SIGNAL(msgChanged(KMFolder*, TQ_UINT32, int)), + this, TQ_SLOT(examineChangedMessage(KMFolder*, TQ_UINT32, int))); + connect(kmkernel->folderMgr(), TQ_SIGNAL(folderInvalidated(KMFolder*)), + this, TQ_SLOT(examineInvalidatedFolder(KMFolder*))); + connect(kmkernel->folderMgr(), TQ_SIGNAL(folderAdded(KMFolder*)), + this, TQ_SLOT(examineInvalidatedFolder(KMFolder*))); + connect(kmkernel->folderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)), + this, TQ_SLOT(examineRemovedFolder(KMFolder*))); + connect(kmkernel->folderMgr(), TQ_SIGNAL(msgHeaderChanged(KMFolder*,int)), + this, TQ_SLOT(propagateHeaderChanged(KMFolder*,int))); + + connect(kmkernel->imapFolderMgr(), TQ_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)), + this, TQ_SLOT(examineAddedMessage(KMFolder*, TQ_UINT32))); + connect(kmkernel->imapFolderMgr(), TQ_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)), + this, TQ_SLOT(examineRemovedMessage(KMFolder*, TQ_UINT32))); + connect(kmkernel->imapFolderMgr(), TQ_SIGNAL(msgChanged(KMFolder*, TQ_UINT32, int)), + this, TQ_SLOT(examineChangedMessage(KMFolder*, TQ_UINT32, int))); + connect(kmkernel->imapFolderMgr(), TQ_SIGNAL(folderInvalidated(KMFolder*)), + this, TQ_SLOT(examineInvalidatedFolder(KMFolder*))); + connect(kmkernel->imapFolderMgr(), TQ_SIGNAL(folderAdded(KMFolder*)), + this, TQ_SLOT(examineInvalidatedFolder(KMFolder*))); + connect(kmkernel->imapFolderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)), + this, TQ_SLOT(examineRemovedFolder(KMFolder*))); + connect(kmkernel->imapFolderMgr(), TQ_SIGNAL(msgHeaderChanged(KMFolder*,int)), + this, TQ_SLOT(propagateHeaderChanged(KMFolder*,int))); + + connect(kmkernel->dimapFolderMgr(), TQ_SIGNAL(msgAdded(KMFolder*, TQ_UINT32)), + this, TQ_SLOT(examineAddedMessage(KMFolder*, TQ_UINT32))); + connect(kmkernel->dimapFolderMgr(), TQ_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)), + this, TQ_SLOT(examineRemovedMessage(KMFolder*, TQ_UINT32))); + connect(kmkernel->dimapFolderMgr(), TQ_SIGNAL(msgChanged(KMFolder*, TQ_UINT32, int)), + this, TQ_SLOT(examineChangedMessage(KMFolder*, TQ_UINT32, int))); + connect(kmkernel->dimapFolderMgr(), TQ_SIGNAL(folderInvalidated(KMFolder*)), + this, TQ_SLOT(examineInvalidatedFolder(KMFolder*))); + connect(kmkernel->dimapFolderMgr(), TQ_SIGNAL(folderAdded(KMFolder*)), + this, TQ_SLOT(examineInvalidatedFolder(KMFolder*))); + connect(kmkernel->dimapFolderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)), + this, TQ_SLOT(examineRemovedFolder(KMFolder*))); + connect(kmkernel->dimapFolderMgr(), TQ_SIGNAL(msgHeaderChanged(KMFolder*,int)), + this, TQ_SLOT(propagateHeaderChanged(KMFolder*,int))); mExecuteSearchTimer = new TQTimer(0, "mExecuteSearchTimer"); - connect(mExecuteSearchTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(executeSearch())); + connect(mExecuteSearchTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(executeSearch())); } KMFolderSearch::~KMFolderSearch() @@ -399,10 +399,10 @@ void KMFolderSearch::setSearch(KMSearch *search) delete mSearch; mSearch = search; // take ownership if (mSearch) { - TQObject::connect(search, TQT_SIGNAL(found(TQ_UINT32)), - TQT_SLOT(addSerNum(TQ_UINT32))); - TQObject::connect(search, TQT_SIGNAL(finished(bool)), - TQT_SLOT(searchFinished(bool))); + TQObject::connect(search, TQ_SIGNAL(found(TQ_UINT32)), + TQ_SLOT(addSerNum(TQ_UINT32))); + TQObject::connect(search, TQ_SIGNAL(finished(bool)), + TQ_SLOT(searchFinished(bool))); } } if (mSearch) @@ -502,8 +502,8 @@ int KMFolderSearch::addMsg(KMMessage*, int* index_return) bool KMFolderSearch::readSearch() { mSearch = new KMSearch; - TQObject::connect(mSearch, TQT_SIGNAL(found(TQ_UINT32)), TQT_SLOT(addSerNum(TQ_UINT32))); - TQObject::connect(mSearch, TQT_SIGNAL(finished(bool)), TQT_SLOT(searchFinished(bool))); + TQObject::connect(mSearch, TQ_SIGNAL(found(TQ_UINT32)), TQ_SLOT(addSerNum(TQ_UINT32))); + TQObject::connect(mSearch, TQ_SIGNAL(finished(bool)), TQ_SLOT(searchFinished(bool))); return mSearch->read(location()); } @@ -603,8 +603,8 @@ int KMFolderSearch::create() clearIndex(); if (!mSearch) { mSearch = new KMSearch(); - TQObject::connect(mSearch, TQT_SIGNAL(found(TQ_UINT32)), TQT_SLOT(addSerNum(TQ_UINT32))); - TQObject::connect(mSearch, TQT_SIGNAL(finished(bool)), TQT_SLOT(searchFinished(bool))); + TQObject::connect(mSearch, TQ_SIGNAL(found(TQ_UINT32)), TQ_SLOT(addSerNum(TQ_UINT32))); + TQObject::connect(mSearch, TQ_SIGNAL(finished(bool)), TQ_SLOT(searchFinished(bool))); } mSearch->write(location()); mOpenCount++; @@ -959,9 +959,9 @@ void KMFolderSearch::examineAddedMessage(KMFolder *aFolder, TQ_UINT32 serNum) mFoldersCurrentlyBeingSearched.replace( folder, count+1 ); } else { connect( folder->storage(), - TQT_SIGNAL( searchDone( KMFolder*, TQ_UINT32, const KMSearchPattern*, bool ) ), + TQ_SIGNAL( searchDone( KMFolder*, TQ_UINT32, const KMSearchPattern*, bool ) ), this, - TQT_SLOT( slotSearchExamineMsgDone( KMFolder*, TQ_UINT32, + TQ_SLOT( slotSearchExamineMsgDone( KMFolder*, TQ_UINT32, const KMSearchPattern*, bool ) ) ); mFoldersCurrentlyBeingSearched.insert( folder, 1 ); } @@ -983,10 +983,10 @@ void KMFolderSearch::slotSearchExamineMsgDone( KMFolder* folder, unsigned int count = mFoldersCurrentlyBeingSearched[folder]; if ( count == 1 ) { disconnect( folder->storage(), - TQT_SIGNAL( searchDone( KMFolder*, TQ_UINT32, + TQ_SIGNAL( searchDone( KMFolder*, TQ_UINT32, const KMSearchPattern*, bool ) ), this, - TQT_SLOT( slotSearchExamineMsgDone( KMFolder*, TQ_UINT32, + TQ_SLOT( slotSearchExamineMsgDone( KMFolder*, TQ_UINT32, const KMSearchPattern*, bool ) ) ); mFoldersCurrentlyBeingSearched.remove( folder ); } else { @@ -1120,9 +1120,9 @@ void KMFolderSearch::propagateHeaderChanged(KMFolder *aFolder, int idx) mFoldersCurrentlyBeingSearched.replace( aFolder, count+1 ); } else { connect( aFolder->storage(), - TQT_SIGNAL( searchDone( KMFolder*, TQ_UINT32, const KMSearchPattern*, bool ) ), + TQ_SIGNAL( searchDone( KMFolder*, TQ_UINT32, const KMSearchPattern*, bool ) ), this, - TQT_SLOT( slotSearchExamineMsgDone( KMFolder*, TQ_UINT32, + TQ_SLOT( slotSearchExamineMsgDone( KMFolder*, TQ_UINT32, const KMSearchPattern*, bool ) ) ); mFoldersCurrentlyBeingSearched.insert( aFolder, 1 ); } diff --git a/kmail/kmfolderseldlg.cpp b/kmail/kmfolderseldlg.cpp index b4c9842b..496af0f8 100644 --- a/kmail/kmfolderseldlg.cpp +++ b/kmail/kmfolderseldlg.cpp @@ -62,10 +62,10 @@ KMFolderSelDlg::KMFolderSelDlg( TQWidget * parent, KMFolderTree * tree, void KMFolderSelDlg::init() { mTreeView->setFocus(); - connect( mTreeView, TQT_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ), - this, TQT_SLOT( slotSelect() ) ); - connect( mTreeView, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotUpdateBtnStatus() ) ); + connect( mTreeView, TQ_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ), + this, TQ_SLOT( slotSelect() ) ); + connect( mTreeView, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotUpdateBtnStatus() ) ); readConfig(); } diff --git a/kmail/kmfoldertree.cpp b/kmail/kmfoldertree.cpp index 64fc7778..00fcf6d4 100644 --- a/kmail/kmfoldertree.cpp +++ b/kmail/kmfoldertree.cpp @@ -281,7 +281,7 @@ void KMFolderTreeItem::slotNoContentChanged() { // reload the folder tree if the no content state changed, needed because // we hide no-content folders if their child nodes are hidden - TQTimer::singleShot( 0, static_cast<KMFolderTree*>( listView() ), TQT_SLOT(reload()) ); + TQTimer::singleShot( 0, static_cast<KMFolderTree*>( listView() ), TQ_SLOT(reload()) ); } //----------------------------------------------------------------------------- @@ -406,12 +406,12 @@ KMFolderTree::KMFolderTree( KMMainWidget *mainWidget, TQWidget *parent, mPopup = new TDEPopupMenu(this); mPopup->insertTitle(i18n("View Columns")); mPopup->setCheckable(true); - mUnreadPop = mPopup->insertItem(i18n("Unread Column"), this, TQT_SLOT(slotToggleUnreadColumn())); - mTotalPop = mPopup->insertItem(i18n("Total Column"), this, TQT_SLOT(slotToggleTotalColumn())); - mSizePop = mPopup->insertItem(i18n("Size Column"), this, TQT_SLOT(slotToggleSizeColumn())); + mUnreadPop = mPopup->insertItem(i18n("Unread Column"), this, TQ_SLOT(slotToggleUnreadColumn())); + mTotalPop = mPopup->insertItem(i18n("Total Column"), this, TQ_SLOT(slotToggleTotalColumn())); + mSizePop = mPopup->insertItem(i18n("Size Column"), this, TQ_SLOT(slotToggleSizeColumn())); - connect( this, TQT_SIGNAL( triggerRefresh() ), - this, TQT_SLOT( refresh() ) ); + connect( this, TQ_SIGNAL( triggerRefresh() ), + this, TQ_SLOT( refresh() ) ); new FolderViewToolTip( this ); } @@ -420,61 +420,61 @@ KMFolderTree::KMFolderTree( KMMainWidget *mainWidget, TQWidget *parent, // connects all needed signals to their slots void KMFolderTree::connectSignals() { - connect( mUpdateCountTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotUpdateCountTimeout()) ); + connect( mUpdateCountTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotUpdateCountTimeout()) ); - connect(&mUpdateTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(delayedUpdate())); + connect(&mUpdateTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(delayedUpdate())); - connect(kmkernel->folderMgr(), TQT_SIGNAL(changed()), - this, TQT_SLOT(doFolderListChanged())); + connect(kmkernel->folderMgr(), TQ_SIGNAL(changed()), + this, TQ_SLOT(doFolderListChanged())); - connect(kmkernel->folderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)), - this, TQT_SLOT(slotFolderRemoved(KMFolder*))); + connect(kmkernel->folderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)), + this, TQ_SLOT(slotFolderRemoved(KMFolder*))); - connect(kmkernel->folderMgr(), TQT_SIGNAL(folderMoveOrCopyOperationFinished()), - this, TQT_SLOT(slotFolderMoveOrCopyOperationFinished())); + connect(kmkernel->folderMgr(), TQ_SIGNAL(folderMoveOrCopyOperationFinished()), + this, TQ_SLOT(slotFolderMoveOrCopyOperationFinished())); - connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(changed()), - this, TQT_SLOT(doFolderListChanged())); + connect(kmkernel->imapFolderMgr(), TQ_SIGNAL(changed()), + this, TQ_SLOT(doFolderListChanged())); - connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)), - this, TQT_SLOT(slotFolderRemoved(KMFolder*))); + connect(kmkernel->imapFolderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)), + this, TQ_SLOT(slotFolderRemoved(KMFolder*))); - connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(changed()), - this, TQT_SLOT(doFolderListChanged())); + connect(kmkernel->dimapFolderMgr(), TQ_SIGNAL(changed()), + this, TQ_SLOT(doFolderListChanged())); - connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)), - this, TQT_SLOT(slotFolderRemoved(KMFolder*))); + connect(kmkernel->dimapFolderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)), + this, TQ_SLOT(slotFolderRemoved(KMFolder*))); - connect(kmkernel->searchFolderMgr(), TQT_SIGNAL(changed()), - this, TQT_SLOT(doFolderListChanged())); + connect(kmkernel->searchFolderMgr(), TQ_SIGNAL(changed()), + this, TQ_SLOT(doFolderListChanged())); - connect(kmkernel->acctMgr(), TQT_SIGNAL(accountRemoved(KMAccount*)), - this, TQT_SLOT(slotAccountRemoved(KMAccount*))); + connect(kmkernel->acctMgr(), TQ_SIGNAL(accountRemoved(KMAccount*)), + this, TQ_SLOT(slotAccountRemoved(KMAccount*))); - connect(kmkernel->acctMgr(), TQT_SIGNAL(accountAdded(KMAccount*)), - this, TQT_SLOT(slotUnhideLocalInbox())); + connect(kmkernel->acctMgr(), TQ_SIGNAL(accountAdded(KMAccount*)), + this, TQ_SLOT(slotUnhideLocalInbox())); - connect(kmkernel->searchFolderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)), - this, TQT_SLOT(slotFolderRemoved(KMFolder*))); + connect(kmkernel->searchFolderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)), + this, TQ_SLOT(slotFolderRemoved(KMFolder*))); - connect( &autoopen_timer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( openFolder() ) ); + connect( &autoopen_timer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( openFolder() ) ); - connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint &, int ) ), - this, TQT_SLOT( slotContextMenuRequested( TQListViewItem*, const TQPoint & ) ) ); + connect( this, TQ_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint &, int ) ), + this, TQ_SLOT( slotContextMenuRequested( TQListViewItem*, const TQPoint & ) ) ); - connect( this, TQT_SIGNAL( expanded( TQListViewItem* ) ), - this, TQT_SLOT( slotFolderExpanded( TQListViewItem* ) ) ); + connect( this, TQ_SIGNAL( expanded( TQListViewItem* ) ), + this, TQ_SLOT( slotFolderExpanded( TQListViewItem* ) ) ); - connect( this, TQT_SIGNAL( collapsed( TQListViewItem* ) ), - this, TQT_SLOT( slotFolderCollapsed( TQListViewItem* ) ) ); + connect( this, TQ_SIGNAL( collapsed( TQListViewItem* ) ), + this, TQ_SLOT( slotFolderCollapsed( TQListViewItem* ) ) ); - connect( this, TQT_SIGNAL( itemRenamed( TQListViewItem*, int, const TQString &)), - this, TQT_SLOT( slotRenameFolder( TQListViewItem*, int, const TQString &))); + connect( this, TQ_SIGNAL( itemRenamed( TQListViewItem*, int, const TQString &)), + this, TQ_SLOT( slotRenameFolder( TQListViewItem*, int, const TQString &))); - connect( this, TQT_SIGNAL(folderSelected(KMFolder*)), TQT_SLOT(updateCopyActions()) ); + connect( this, TQ_SIGNAL(folderSelected(KMFolder*)), TQ_SLOT(updateCopyActions()) ); } //----------------------------------------------------------------------------- @@ -598,7 +598,7 @@ void KMFolderTree::reload(bool openFolders) { // we open all folders to update the count mUpdateIterator = TQListViewItemIterator (this); - TQTimer::singleShot( 0, this, TQT_SLOT(slotUpdateOneCount()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotUpdateOneCount()) ); } for ( TQListViewItemIterator it( this ) ; it.current() ; ++it ) { @@ -606,53 +606,53 @@ void KMFolderTree::reload(bool openFolders) if ( !fti || !fti->folder() ) continue; - disconnect(fti->folder(),TQT_SIGNAL(iconsChanged()), - fti,TQT_SLOT(slotIconsChanged())); - connect(fti->folder(),TQT_SIGNAL(iconsChanged()), - fti,TQT_SLOT(slotIconsChanged())); + disconnect(fti->folder(),TQ_SIGNAL(iconsChanged()), + fti,TQ_SLOT(slotIconsChanged())); + connect(fti->folder(),TQ_SIGNAL(iconsChanged()), + fti,TQ_SLOT(slotIconsChanged())); - disconnect(fti->folder(),TQT_SIGNAL(nameChanged()), - fti,TQT_SLOT(slotNameChanged())); - connect(fti->folder(),TQT_SIGNAL(nameChanged()), - fti,TQT_SLOT(slotNameChanged())); + disconnect(fti->folder(),TQ_SIGNAL(nameChanged()), + fti,TQ_SLOT(slotNameChanged())); + connect(fti->folder(),TQ_SIGNAL(nameChanged()), + fti,TQ_SLOT(slotNameChanged())); - disconnect( fti->folder(), TQT_SIGNAL(noContentChanged()), - fti, TQT_SLOT(slotNoContentChanged()) ); - connect( fti->folder(), TQT_SIGNAL(noContentChanged()), - fti, TQT_SLOT(slotNoContentChanged()) ); + disconnect( fti->folder(), TQ_SIGNAL(noContentChanged()), + fti, TQ_SLOT(slotNoContentChanged()) ); + connect( fti->folder(), TQ_SIGNAL(noContentChanged()), + fti, TQ_SLOT(slotNoContentChanged()) ); - disconnect( fti->folder(), TQT_SIGNAL(syncStateChanged()), - this, TQT_SLOT(slotSyncStateChanged()) ); - connect( fti->folder(), TQT_SIGNAL(syncStateChanged()), - this, TQT_SLOT(slotSyncStateChanged()) ); + disconnect( fti->folder(), TQ_SIGNAL(syncStateChanged()), + this, TQ_SLOT(slotSyncStateChanged()) ); + connect( fti->folder(), TQ_SIGNAL(syncStateChanged()), + this, TQ_SLOT(slotSyncStateChanged()) ); // we want to be noticed of changes to update the unread/total columns - disconnect(fti->folder(), TQT_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)), - this,TQT_SLOT(slotUpdateCountsDelayed(KMFolder*))); - connect(fti->folder(), TQT_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)), - this,TQT_SLOT(slotUpdateCountsDelayed(KMFolder*))); + disconnect(fti->folder(), TQ_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)), + this,TQ_SLOT(slotUpdateCountsDelayed(KMFolder*))); + connect(fti->folder(), TQ_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)), + this,TQ_SLOT(slotUpdateCountsDelayed(KMFolder*))); //} - disconnect(fti->folder(), TQT_SIGNAL(numUnreadMsgsChanged(KMFolder*)), - this,TQT_SLOT(slotUpdateCountsDelayed(KMFolder*))); - connect(fti->folder(), TQT_SIGNAL(numUnreadMsgsChanged(KMFolder*)), - this,TQT_SLOT(slotUpdateCountsDelayed(KMFolder*))); - disconnect(fti->folder(), TQT_SIGNAL(msgRemoved(KMFolder*)), - this,TQT_SLOT(slotUpdateCountsDelayed(KMFolder*))); - connect(fti->folder(), TQT_SIGNAL(msgRemoved(KMFolder*)), - this,TQT_SLOT(slotUpdateCountsDelayed(KMFolder*))); + disconnect(fti->folder(), TQ_SIGNAL(numUnreadMsgsChanged(KMFolder*)), + this,TQ_SLOT(slotUpdateCountsDelayed(KMFolder*))); + connect(fti->folder(), TQ_SIGNAL(numUnreadMsgsChanged(KMFolder*)), + this,TQ_SLOT(slotUpdateCountsDelayed(KMFolder*))); + disconnect(fti->folder(), TQ_SIGNAL(msgRemoved(KMFolder*)), + this,TQ_SLOT(slotUpdateCountsDelayed(KMFolder*))); + connect(fti->folder(), TQ_SIGNAL(msgRemoved(KMFolder*)), + this,TQ_SLOT(slotUpdateCountsDelayed(KMFolder*))); - disconnect(fti->folder(), TQT_SIGNAL(folderSizeChanged( KMFolder* )), - this,TQT_SLOT(slotUpdateCountsDelayed(KMFolder*))); - connect(fti->folder(), TQT_SIGNAL(folderSizeChanged( KMFolder* )), - this,TQT_SLOT(slotUpdateCountsDelayed(KMFolder*))); + disconnect(fti->folder(), TQ_SIGNAL(folderSizeChanged( KMFolder* )), + this,TQ_SLOT(slotUpdateCountsDelayed(KMFolder*))); + connect(fti->folder(), TQ_SIGNAL(folderSizeChanged( KMFolder* )), + this,TQ_SLOT(slotUpdateCountsDelayed(KMFolder*))); - disconnect(fti->folder(), TQT_SIGNAL(shortcutChanged(KMFolder*)), - mMainWidget, TQT_SLOT( slotShortcutChanged(KMFolder*))); - connect(fti->folder(), TQT_SIGNAL(shortcutChanged(KMFolder*)), - mMainWidget, TQT_SLOT( slotShortcutChanged(KMFolder*))); + disconnect(fti->folder(), TQ_SIGNAL(shortcutChanged(KMFolder*)), + mMainWidget, TQ_SLOT( slotShortcutChanged(KMFolder*))); + connect(fti->folder(), TQ_SIGNAL(shortcutChanged(KMFolder*)), + mMainWidget, TQ_SLOT( slotShortcutChanged(KMFolder*))); if (!openFolders) @@ -696,7 +696,7 @@ void KMFolderTree::slotUpdateOneCount() ++mUpdateIterator; if ( !fti->folder() ) { // next one please - TQTimer::singleShot( 0, this, TQT_SLOT(slotUpdateOneCount()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotUpdateOneCount()) ); return; } @@ -707,7 +707,7 @@ void KMFolderTree::slotUpdateOneCount() // restore previous state if (!open) fti->folder()->close("updatecount"); - TQTimer::singleShot( 0, this, TQT_SLOT(slotUpdateOneCount()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotUpdateOneCount()) ); } //----------------------------------------------------------------------------- @@ -737,7 +737,7 @@ void KMFolderTree::addDirectory( KMFolderDir *fdir, KMFolderTreeItem* parent ) } else { // hide local inbox if unused if ( kmkernel->inboxFolder() == folder && hideLocalInbox() ) { - connect( kmkernel->inboxFolder(), TQT_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)), TQT_SLOT(slotUnhideLocalInbox()) ); + connect( kmkernel->inboxFolder(), TQ_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)), TQ_SLOT(slotUnhideLocalInbox()) ); continue; } @@ -765,14 +765,14 @@ void KMFolderTree::addDirectory( KMFolderDir *fdir, KMFolderTreeItem* parent ) removeFromFolderToItemMap( folder ); delete fti; // still, it might change in the future, so we better check the change signals - connect ( folder, TQT_SIGNAL(noContentChanged()), TQT_SLOT(delayedReload()) ); + connect ( folder, TQ_SIGNAL(noContentChanged()), TQ_SLOT(delayedReload()) ); continue; } - connect (fti, TQT_SIGNAL(iconChanged(KMFolderTreeItem*)), - this, TQT_SIGNAL(iconChanged(KMFolderTreeItem*))); - connect (fti, TQT_SIGNAL(nameChanged(KMFolderTreeItem*)), - this, TQT_SIGNAL(nameChanged(KMFolderTreeItem*))); + connect (fti, TQ_SIGNAL(iconChanged(KMFolderTreeItem*)), + this, TQ_SIGNAL(iconChanged(KMFolderTreeItem*))); + connect (fti, TQ_SIGNAL(nameChanged(KMFolderTreeItem*)), + this, TQ_SIGNAL(nameChanged(KMFolderTreeItem*))); } // restore last open-state fti->setOpen( readIsListViewItemOpen(fti) ); @@ -1094,7 +1094,7 @@ void KMFolderTree::slotContextMenuRequested( TQListViewItem *lvi, if ( ( fti->folder() || (fti->text(0) != i18n("Searches")) ) && !multiFolder) folderMenu->insertItem(SmallIconSet("folder-new"), createChild, this, - TQT_SLOT(addChildFolder())); + TQ_SLOT(addChildFolder())); if (!fti->folder()) { mMainWidget->action("compact_all_folders")->plug(folderMenu); @@ -1102,7 +1102,7 @@ void KMFolderTree::slotContextMenuRequested( TQListViewItem *lvi, } else if (fti->folder()->folderType() == KMFolderTypeImap) { folderMenu->insertItem(SmallIconSet("mail_get"), i18n("Check &Mail"), this, - TQT_SLOT(slotCheckMail())); + TQ_SLOT(slotCheckMail())); } } else { // regular folders @@ -1110,7 +1110,7 @@ void KMFolderTree::slotContextMenuRequested( TQListViewItem *lvi, if ( !fti->folder()->noChildren() && !multiFolder ) { folderMenu->insertItem(SmallIconSet("folder-new"), i18n("&New Subfolder..."), this, - TQT_SLOT(addChildFolder())); + TQ_SLOT(addChildFolder())); } // copy folder @@ -1139,7 +1139,7 @@ void KMFolderTree::slotContextMenuRequested( TQListViewItem *lvi, if ( GlobalSettings::self()->enableFavoriteFolderView() ) { folderMenu->insertItem( SmallIconSet("bookmark_add"), i18n("Add to Favorite Folders"), - this, TQT_SLOT(slotAddToFavorites()) ); + this, TQ_SLOT(slotAddToFavorites()) ); } folderMenu->insertSeparator(); @@ -1158,24 +1158,24 @@ void KMFolderTree::slotContextMenuRequested( TQListViewItem *lvi, { folderMenu->insertItem(SmallIconSet("bookmark_folder"), i18n("Serverside Subscription..."), mMainWidget, - TQT_SLOT(slotSubscriptionDialog())); + TQ_SLOT(slotSubscriptionDialog())); folderMenu->insertItem(SmallIcon("bookmark_folder"), i18n("Local Subscription..."), mMainWidget, - TQT_SLOT(slotLocalSubscriptionDialog())); + TQ_SLOT(slotLocalSubscriptionDialog())); if (!fti->folder()->noContent()) { mMainWidget->action("refresh_folder")->plug(folderMenu); if ( fti->folder()->folderType() == KMFolderTypeImap && !multiFolder ) { folderMenu->insertItem(SmallIconSet("reload"), i18n("Refresh Folder List"), this, - TQT_SLOT(slotResetFolderList())); + TQ_SLOT(slotResetFolderList())); } } if ( fti->folder()->folderType() == KMFolderTypeCachedImap && !multiFolder ) { KMFolderCachedImap * folder = static_cast<KMFolderCachedImap*>( fti->folder()->storage() ); folderMenu->insertItem( SmallIconSet("wizard"), i18n("&Troubleshoot IMAP Cache..."), - folder, TQT_SLOT(slotTroubleshoot()) ); + folder, TQ_SLOT(slotTroubleshoot()) ); } folderMenu->insertSeparator(); } @@ -1189,11 +1189,11 @@ void KMFolderTree::slotContextMenuRequested( TQListViewItem *lvi, folderMenu->insertItem(SmallIconSet("configure_shortcuts"), i18n("&Assign Shortcut..."), fti, - TQT_SLOT(assignShortcut())); + TQ_SLOT(assignShortcut())); if ( !fti->folder()->noContent() && fti->folder()->canDeleteMessages() ) { folderMenu->insertItem( i18n("Expire..."), fti, - TQT_SLOT( slotShowExpiryProperties() ) ); + TQ_SLOT( slotShowExpiryProperties() ) ); } mMainWidget->action("modify")->plug(folderMenu); } @@ -1860,15 +1860,15 @@ void KMFolderTree::folderToPopupMenu( MenuAction action, TQObject *receiver, // connect the signals if ( action == MoveMessage || action == MoveFolder ) { - disconnect( menu, TQT_SIGNAL(activated(int)), receiver, - TQT_SLOT(moveSelectedToFolder(int)) ); - connect( menu, TQT_SIGNAL(activated(int)), receiver, - TQT_SLOT(moveSelectedToFolder(int)) ); + disconnect( menu, TQ_SIGNAL(activated(int)), receiver, + TQ_SLOT(moveSelectedToFolder(int)) ); + connect( menu, TQ_SIGNAL(activated(int)), receiver, + TQ_SLOT(moveSelectedToFolder(int)) ); } else { - disconnect( menu, TQT_SIGNAL(activated(int)), receiver, - TQT_SLOT(copySelectedToFolder(int)) ); - connect( menu, TQT_SIGNAL(activated(int)), receiver, - TQT_SLOT(copySelectedToFolder(int)) ); + disconnect( menu, TQ_SIGNAL(activated(int)), receiver, + TQ_SLOT(copySelectedToFolder(int)) ); + connect( menu, TQ_SIGNAL(activated(int)), receiver, + TQ_SLOT(copySelectedToFolder(int)) ); } if ( !item ) { item = firstChild(); @@ -2176,14 +2176,14 @@ void KMFolderTree::slotAddToFavorites() void KMFolderTree::slotUnhideLocalInbox() { - disconnect( kmkernel->inboxFolder(), TQT_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)), - this, TQT_SLOT(slotUnhideLocalInbox()) ); + disconnect( kmkernel->inboxFolder(), TQ_SIGNAL(msgAdded(KMFolder*,TQ_UINT32)), + this, TQ_SLOT(slotUnhideLocalInbox()) ); reload(); } void KMFolderTree::delayedReload() { - TQTimer::singleShot( 0, this, TQT_SLOT(reload()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(reload()) ); } #include "kmfoldertree.moc" diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp index 073efe48..fe5531be 100644 --- a/kmail/kmheaders.cpp +++ b/kmail/kmheaders.cpp @@ -140,7 +140,7 @@ KMHeaders::KMHeaders(KMMainWidget *aOwner, TQWidget *parent, mPopup->insertItem(i18n("Size"), KPaintInfo::COL_SIZE); mPopup->insertItem(i18n("Receiver"), KPaintInfo::COL_RECEIVER); - connect(mPopup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotToggleColumn(int))); + connect(mPopup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotToggleColumn(int))); setShowSortIndicator(true); setFocusPolicy( TQWidget::WheelFocus ); @@ -203,18 +203,18 @@ KMHeaders::KMHeaders(KMMainWidget *aOwner, TQWidget *parent, header()->setResizeEnabled( true, mPaintInfo.senderCol ); header()->setResizeEnabled( true, mPaintInfo.dateCol ); - connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint &, int )), - this, TQT_SLOT( rightButtonPressed( TQListViewItem*, const TQPoint &, int ))); - connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem*)), - this,TQT_SLOT(selectMessage(TQListViewItem*))); - connect(this,TQT_SIGNAL(currentChanged(TQListViewItem*)), - this,TQT_SLOT(highlightMessage(TQListViewItem*))); + connect( this, TQ_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint &, int )), + this, TQ_SLOT( rightButtonPressed( TQListViewItem*, const TQPoint &, int ))); + connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem*)), + this,TQ_SLOT(selectMessage(TQListViewItem*))); + connect(this,TQ_SIGNAL(currentChanged(TQListViewItem*)), + this,TQ_SLOT(highlightMessage(TQListViewItem*))); resetCurrentTime(); mSubjectLists.setAutoDelete( true ); mMoveMessages = false; - connect( this, TQT_SIGNAL(selectionChanged()), TQT_SLOT(updateActions()) ); + connect( this, TQ_SIGNAL(selectionChanged()), TQ_SLOT(updateActions()) ); } @@ -698,28 +698,28 @@ void KMHeaders::setFolder( KMFolder *aFolder, bool forceJumpToUnread ) // from this folder, since it's msg's are about to be deleted. highlightMessage(0, false); - disconnect(mFolder, TQT_SIGNAL(numUnreadMsgsChanged(KMFolder*)), - this, TQT_SLOT(setFolderInfoStatus())); + disconnect(mFolder, TQ_SIGNAL(numUnreadMsgsChanged(KMFolder*)), + this, TQ_SLOT(setFolderInfoStatus())); mFolder->markNewAsUnread(); writeFolderConfig(); - disconnect(mFolder, TQT_SIGNAL(msgHeaderChanged(KMFolder*,int)), - this, TQT_SLOT(msgHeaderChanged(KMFolder*,int))); - disconnect(mFolder, TQT_SIGNAL(msgAdded(int)), - this, TQT_SLOT(msgAdded(int))); - disconnect(mFolder, TQT_SIGNAL( msgRemoved( int, TQString ) ), - this, TQT_SLOT( msgRemoved( int, TQString ) ) ); - disconnect(mFolder, TQT_SIGNAL(changed()), - this, TQT_SLOT(msgChanged())); - disconnect(mFolder, TQT_SIGNAL(cleared()), - this, TQT_SLOT(folderCleared())); - disconnect(mFolder, TQT_SIGNAL(expunged( KMFolder* )), - this, TQT_SLOT(folderCleared())); - disconnect(mFolder, TQT_SIGNAL(closed()), - this, TQT_SLOT(folderClosed())); - disconnect( mFolder, TQT_SIGNAL( statusMsg( const TQString& ) ), - BroadcastStatus::instance(), TQT_SLOT( setStatusMsg( const TQString& ) ) ); - disconnect(mFolder, TQT_SIGNAL(viewConfigChanged()), this, TQT_SLOT(reset())); + disconnect(mFolder, TQ_SIGNAL(msgHeaderChanged(KMFolder*,int)), + this, TQ_SLOT(msgHeaderChanged(KMFolder*,int))); + disconnect(mFolder, TQ_SIGNAL(msgAdded(int)), + this, TQ_SLOT(msgAdded(int))); + disconnect(mFolder, TQ_SIGNAL( msgRemoved( int, TQString ) ), + this, TQ_SLOT( msgRemoved( int, TQString ) ) ); + disconnect(mFolder, TQ_SIGNAL(changed()), + this, TQ_SLOT(msgChanged())); + disconnect(mFolder, TQ_SIGNAL(cleared()), + this, TQ_SLOT(folderCleared())); + disconnect(mFolder, TQ_SIGNAL(expunged( KMFolder* )), + this, TQ_SLOT(folderCleared())); + disconnect(mFolder, TQ_SIGNAL(closed()), + this, TQ_SLOT(folderClosed())); + disconnect( mFolder, TQ_SIGNAL( statusMsg( const TQString& ) ), + BroadcastStatus::instance(), TQ_SLOT( setStatusMsg( const TQString& ) ) ); + disconnect(mFolder, TQ_SIGNAL(viewConfigChanged()), this, TQ_SLOT(reset())); writeSortOrder(); mFolder->close("kmheaders"); // System folders remain open but we also should write the index from @@ -736,25 +736,25 @@ void KMHeaders::setFolder( KMFolder *aFolder, bool forceJumpToUnread ) mOwner->messageActions()->replyListAction()->setEnabled( mFolder ? mFolder->isMailingListEnabled() : false ); if ( mFolder ) { - connect(mFolder, TQT_SIGNAL(msgHeaderChanged(KMFolder*,int)), - this, TQT_SLOT(msgHeaderChanged(KMFolder*,int))); - connect(mFolder, TQT_SIGNAL(msgAdded(int)), - this, TQT_SLOT(msgAdded(int))); - connect(mFolder, TQT_SIGNAL(msgRemoved(int,TQString)), - this, TQT_SLOT(msgRemoved(int,TQString))); - connect(mFolder, TQT_SIGNAL(changed()), - this, TQT_SLOT(msgChanged())); - connect(mFolder, TQT_SIGNAL(cleared()), - this, TQT_SLOT(folderCleared())); - connect(mFolder, TQT_SIGNAL(expunged( KMFolder* )), - this, TQT_SLOT(folderCleared())); - connect(mFolder, TQT_SIGNAL(closed()), - this, TQT_SLOT(folderClosed())); - connect(mFolder, TQT_SIGNAL(statusMsg(const TQString&)), - BroadcastStatus::instance(), TQT_SLOT( setStatusMsg( const TQString& ) ) ); - connect(mFolder, TQT_SIGNAL(numUnreadMsgsChanged(KMFolder*)), - this, TQT_SLOT(setFolderInfoStatus())); - connect(mFolder, TQT_SIGNAL(viewConfigChanged()), this, TQT_SLOT(reset())); + connect(mFolder, TQ_SIGNAL(msgHeaderChanged(KMFolder*,int)), + this, TQ_SLOT(msgHeaderChanged(KMFolder*,int))); + connect(mFolder, TQ_SIGNAL(msgAdded(int)), + this, TQ_SLOT(msgAdded(int))); + connect(mFolder, TQ_SIGNAL(msgRemoved(int,TQString)), + this, TQ_SLOT(msgRemoved(int,TQString))); + connect(mFolder, TQ_SIGNAL(changed()), + this, TQ_SLOT(msgChanged())); + connect(mFolder, TQ_SIGNAL(cleared()), + this, TQ_SLOT(folderCleared())); + connect(mFolder, TQ_SIGNAL(expunged( KMFolder* )), + this, TQ_SLOT(folderCleared())); + connect(mFolder, TQ_SIGNAL(closed()), + this, TQ_SLOT(folderClosed())); + connect(mFolder, TQ_SIGNAL(statusMsg(const TQString&)), + BroadcastStatus::instance(), TQ_SLOT( setStatusMsg( const TQString& ) ) ); + connect(mFolder, TQ_SIGNAL(numUnreadMsgsChanged(KMFolder*)), + this, TQ_SLOT(setFolderInfoStatus())); + connect(mFolder, TQ_SIGNAL(viewConfigChanged()), this, TQ_SLOT(reset())); // Not very nice, but if we go from nested to non-nested // in the folderConfig below then we need to do this otherwise @@ -844,8 +844,8 @@ void KMHeaders::msgChanged() } // if (!isUpdatesEnabled()) return; // prevent IMAP messages from scrolling to top - disconnect(this,TQT_SIGNAL(currentChanged(TQListViewItem*)), - this,TQT_SLOT(highlightMessage(TQListViewItem*))); + disconnect(this,TQ_SIGNAL(currentChanged(TQListViewItem*)), + this,TQ_SLOT(highlightMessage(TQListViewItem*))); updateMessageList(); // do not change the selection @@ -866,8 +866,8 @@ void KMHeaders::msgChanged() } } - connect(this,TQT_SIGNAL(currentChanged(TQListViewItem*)), - this,TQT_SLOT(highlightMessage(TQListViewItem*))); + connect(this,TQ_SIGNAL(currentChanged(TQListViewItem*)), + this,TQ_SLOT(highlightMessage(TQListViewItem*))); // if the current message has changed then emit // the selected signal to force an update @@ -982,8 +982,8 @@ void KMHeaders::msgAdded(int id) /* In case the current item is taken during reparenting, prevent qlistview * from selecting some unrelated item as a result of take() emitting * currentChanged. */ - disconnect( this, TQT_SIGNAL(currentChanged(TQListViewItem*)), - this, TQT_SLOT(highlightMessage(TQListViewItem*))); + disconnect( this, TQ_SIGNAL(currentChanged(TQListViewItem*)), + this, TQ_SLOT(highlightMessage(TQListViewItem*))); if ( !msgId.isEmpty() ) { TQPtrListIterator<HeaderItem> it(mImperfectlyThreadedList); @@ -1052,7 +1052,7 @@ void KMHeaders::msgAdded(int id) sci->setItem(hi); } if (mSortInfo.fakeSort) { - TQObject::disconnect(header(), TQT_SIGNAL(clicked(int)), this, TQT_SLOT(dirtySortOrder(int))); + TQObject::disconnect(header(), TQ_SIGNAL(clicked(int)), this, TQ_SLOT(dirtySortOrder(int))); TDEListView::setSorting(mSortCol, !mSortDescending ); mSortInfo.fakeSort = 0; } @@ -1068,8 +1068,8 @@ void KMHeaders::msgAdded(int id) } /* restore signal */ - connect( this, TQT_SIGNAL(currentChanged(TQListViewItem*)), - this, TQT_SLOT(highlightMessage(TQListViewItem*))); + connect( this, TQ_SIGNAL(currentChanged(TQListViewItem*)), + this, TQ_SLOT(highlightMessage(TQListViewItem*))); emit msgAddedToListView( hi ); END_TIMER(msgAdded); @@ -1089,8 +1089,8 @@ void KMHeaders::msgRemoved(int id, TQString msgId ) * item once this one is removed. Sine we have already selected * something in prepare/finalizeMove that's counter productive */ - disconnect( this, TQT_SIGNAL(currentChanged(TQListViewItem*)), - this, TQT_SLOT(highlightMessage(TQListViewItem*))); + disconnect( this, TQ_SIGNAL(currentChanged(TQListViewItem*)), + this, TQ_SLOT(highlightMessage(TQListViewItem*))); HeaderItem *removedItem = mItems[id]; if (!removedItem) return; @@ -1137,7 +1137,7 @@ void KMHeaders::msgRemoved(int id, TQString msgId ) } item->setTempKey( key + item->key( mSortCol, !mSortDescending )); if (mSortInfo.fakeSort) { - TQObject::disconnect(header(), TQT_SIGNAL(clicked(int)), this, TQT_SLOT(dirtySortOrder(int))); + TQObject::disconnect(header(), TQ_SIGNAL(clicked(int)), this, TQ_SLOT(dirtySortOrder(int))); TDEListView::setSorting(mSortCol, !mSortDescending ); mSortInfo.fakeSort = 0; } @@ -1201,8 +1201,8 @@ void KMHeaders::msgRemoved(int id, TQString msgId ) } } /* restore signal */ - connect( this, TQT_SIGNAL(currentChanged(TQListViewItem*)), - this, TQT_SLOT(highlightMessage(TQListViewItem*))); + connect( this, TQ_SIGNAL(currentChanged(TQListViewItem*)), + this, TQ_SLOT(highlightMessage(TQListViewItem*))); } @@ -1467,8 +1467,8 @@ void KMHeaders::applyFiltersOnMsg() msg->setTransferInProgress(true); if (!msg->isComplete()) { FolderJob *job = mFolder->createJob(msg); - connect(job, TQT_SIGNAL(messageRetrieved(KMMessage*)), - this, TQT_SLOT(slotFilterMsg(KMMessage*))); + connect(job, TQ_SIGNAL(messageRetrieved(KMMessage*)), + this, TQ_SLOT(slotFilterMsg(KMMessage*))); job->start(); } else { if (slotFilterMsg(msg) == 2) @@ -1518,8 +1518,8 @@ void KMHeaders::deleteMsg () finalizeMove( nextItem, contentX, contentY ); KMCommand *command = new KMDeleteMsgCommand( mFolder, msgList ); - connect( command, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( slotMoveCompleted( KMCommand * ) ) ); + connect( command, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( slotMoveCompleted( KMCommand * ) ) ); command->start(); BroadcastStatus::instance()->setStatusMsg(""); @@ -1540,8 +1540,8 @@ HeaderItem* KMHeaders::prepareMove( int *contentX, int *contentY ) HeaderItem *ret = 0; emit maybeDeleting(); - disconnect( this, TQT_SIGNAL(currentChanged(TQListViewItem*)), - this, TQT_SLOT(highlightMessage(TQListViewItem*))); + disconnect( this, TQ_SIGNAL(currentChanged(TQListViewItem*)), + this, TQ_SLOT(highlightMessage(TQListViewItem*))); TQListViewItem *curItem; HeaderItem *item; @@ -1577,8 +1577,8 @@ void KMHeaders::finalizeMove( HeaderItem *item, int contentX, int contentY ) setContentsPos( contentX, contentY ); makeHeaderVisible(); - connect( this, TQT_SIGNAL(currentChanged(TQListViewItem*)), - this, TQT_SLOT(highlightMessage(TQListViewItem*))); + connect( this, TQ_SIGNAL(currentChanged(TQListViewItem*)), + this, TQ_SLOT(highlightMessage(TQListViewItem*))); } @@ -1607,8 +1607,8 @@ void KMHeaders::moveMsgToFolder ( KMFolder* destFolder, bool askForConfirmation finalizeMove( nextItem, contentX, contentY ); KMCommand *command = new KMMoveCommand( destFolder, msgList ); - connect( command, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( slotMoveCompleted( KMCommand * ) ) ); + connect( command, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( slotMoveCompleted( KMCommand * ) ) ); command->start(); } @@ -1884,13 +1884,13 @@ void KMHeaders::incCurrentMessage() TQListViewItem *lvi = currentItem(); if ( lvi && lvi->itemBelow() ) { - disconnect(this,TQT_SIGNAL(currentChanged(TQListViewItem*)), - this,TQT_SLOT(highlightMessage(TQListViewItem*))); + disconnect(this,TQ_SIGNAL(currentChanged(TQListViewItem*)), + this,TQ_SLOT(highlightMessage(TQListViewItem*))); setCurrentItem( lvi->itemBelow() ); ensureCurrentItemVisible(); setFocus(); - connect(this,TQT_SIGNAL(currentChanged(TQListViewItem*)), - this,TQT_SLOT(highlightMessage(TQListViewItem*))); + connect(this,TQ_SIGNAL(currentChanged(TQListViewItem*)), + this,TQ_SLOT(highlightMessage(TQListViewItem*))); } } @@ -1901,13 +1901,13 @@ void KMHeaders::decCurrentMessage() return; TQListViewItem *lvi = currentItem(); if ( lvi && lvi->itemAbove() ) { - disconnect(this,TQT_SIGNAL(currentChanged(TQListViewItem*)), - this,TQT_SLOT(highlightMessage(TQListViewItem*))); + disconnect(this,TQ_SIGNAL(currentChanged(TQListViewItem*)), + this,TQ_SLOT(highlightMessage(TQListViewItem*))); setCurrentItem( lvi->itemAbove() ); ensureCurrentItemVisible(); setFocus(); - connect(this,TQT_SIGNAL(currentChanged(TQListViewItem*)), - this,TQT_SLOT(highlightMessage(TQListViewItem*))); + connect(this,TQ_SIGNAL(currentChanged(TQListViewItem*)), + this,TQ_SLOT(highlightMessage(TQListViewItem*))); } } @@ -2159,7 +2159,7 @@ void KMHeaders::resetCurrentTime() mDate.reset(); // only reset exactly during minute switch TQTimer::singleShot( ( 60-TQTime::currentTime().second() ) * 1000, - this, TQT_SLOT( resetCurrentTime() ) ); + this, TQ_SLOT( resetCurrentTime() ) ); } //----------------------------------------------------------------------------- @@ -2240,8 +2240,8 @@ void KMHeaders::keyPressEvent( TQKeyEvent * e ) if (cntrl) { if (!shft) - disconnect(this,TQT_SIGNAL(currentChanged(TQListViewItem*)), - this,TQT_SLOT(highlightMessage(TQListViewItem*))); + disconnect(this,TQ_SIGNAL(currentChanged(TQListViewItem*)), + this,TQ_SLOT(highlightMessage(TQListViewItem*))); switch (e->key()) { case Key_Down: case Key_Up: @@ -2253,8 +2253,8 @@ void KMHeaders::keyPressEvent( TQKeyEvent * e ) TDEListView::keyPressEvent( e ); } if (!shft) - connect(this,TQT_SIGNAL(currentChanged(TQListViewItem*)), - this,TQT_SLOT(highlightMessage(TQListViewItem*))); + connect(this,TQ_SIGNAL(currentChanged(TQListViewItem*)), + this,TQ_SLOT(highlightMessage(TQListViewItem*))); } } @@ -2623,7 +2623,7 @@ void KMHeaders::setSorting( int column, bool ascending ) // if (column != mSortCol) // setColumnText( mSortCol, TQIconSet( TQPixmap()), columnText( mSortCol )); if(mSortInfo.dirty || column != mSortInfo.column || ascending != mSortInfo.ascending) { //dirtied - TQObject::disconnect(header(), TQT_SIGNAL(clicked(int)), this, TQT_SLOT(dirtySortOrder(int))); + TQObject::disconnect(header(), TQ_SIGNAL(clicked(int)), this, TQ_SLOT(dirtySortOrder(int))); mSortInfo.dirty = true; } @@ -2865,7 +2865,7 @@ void KMHeaders::appendItemToSortFile(HeaderItem *khi) void KMHeaders::dirtySortOrder(int column) { mSortInfo.dirty = true; - TQObject::disconnect(header(), TQT_SIGNAL(clicked(int)), this, TQT_SLOT(dirtySortOrder(int))); + TQObject::disconnect(header(), TQ_SIGNAL(clicked(int)), this, TQ_SLOT(dirtySortOrder(int))); setSorting(column, mSortInfo.column == column ? !mSortInfo.ascending : true); } @@ -3109,7 +3109,7 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread ) //Hackyness to work around qlistview problems TDEListView::setSorting(-1); header()->setSortIndicator(column, ascending); - TQObject::connect(header(), TQT_SIGNAL(clicked(int)), this, TQT_SLOT(dirtySortOrder(int))); + TQObject::connect(header(), TQ_SIGNAL(clicked(int)), this, TQ_SLOT(dirtySortOrder(int))); //setup mSortInfo here now, as above may change it mSortInfo.dirty = false; mSortInfo.column = (short)column; diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp index 473188e6..0f1d34ed 100644 --- a/kmail/kmkernel.cpp +++ b/kmail/kmkernel.cpp @@ -173,8 +173,8 @@ KMKernel::KMKernel (TQObject *parent, const char *name) : #ifdef __TDE_HAVE_TDEHWLIB mNetworkManager = TDEGlobal::networkManager(); if (mNetworkManager) { - connect( mNetworkManager, TQT_SIGNAL( networkDeviceStateChanged( TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString ) ), - this, TQT_SLOT( slotNetworkStateChanged( TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString ) ) ); + connect( mNetworkManager, TQ_SIGNAL( networkDeviceStateChanged( TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString ) ), + this, TQ_SLOT( slotNetworkStateChanged( TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString ) ) ); if (networkStateConnected()) { resumeNetworkJobs(); } @@ -1582,17 +1582,17 @@ void KMKernel::init() the_weaverLogger->attach (the_weaver); //#endif - connect( the_folderMgr, TQT_SIGNAL( folderRemoved(KMFolder*) ), - this, TQT_SIGNAL( folderRemoved(KMFolder*) ) ); - connect( the_dimapFolderMgr, TQT_SIGNAL( folderRemoved(KMFolder*) ), - this, TQT_SIGNAL( folderRemoved(KMFolder*) ) ); - connect( the_imapFolderMgr, TQT_SIGNAL( folderRemoved(KMFolder*) ), - this, TQT_SIGNAL( folderRemoved(KMFolder*) ) ); - connect( the_searchFolderMgr, TQT_SIGNAL( folderRemoved(KMFolder*) ), - this, TQT_SIGNAL( folderRemoved(KMFolder*) ) ); + connect( the_folderMgr, TQ_SIGNAL( folderRemoved(KMFolder*) ), + this, TQ_SIGNAL( folderRemoved(KMFolder*) ) ); + connect( the_dimapFolderMgr, TQ_SIGNAL( folderRemoved(KMFolder*) ), + this, TQ_SIGNAL( folderRemoved(KMFolder*) ) ); + connect( the_imapFolderMgr, TQ_SIGNAL( folderRemoved(KMFolder*) ), + this, TQ_SIGNAL( folderRemoved(KMFolder*) ) ); + connect( the_searchFolderMgr, TQ_SIGNAL( folderRemoved(KMFolder*) ), + this, TQ_SIGNAL( folderRemoved(KMFolder*) ) ); mBackgroundTasksTimer = new TQTimer( this, "mBackgroundTasksTimer" ); - connect( mBackgroundTasksTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotRunBackgroundTasks() ) ); + connect( mBackgroundTasksTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotRunBackgroundTasks() ) ); #ifdef DEBUG_SCHEDULER // for debugging, see jobscheduler.h mBackgroundTasksTimer->start( 10000, true ); // 10s, singleshot #else @@ -2020,10 +2020,10 @@ void KMKernel::byteArrayToRemoteFile(const TQByteArray &aData, const KURL &aURL, TDEIO::Job *job = TDEIO::put(aURL, -1, overwrite, false); putData pd; pd.url = aURL; pd.data = aData; pd.offset = 0; mPutJobs.insert(job, pd); - connect(job, TQT_SIGNAL(dataReq(TDEIO::Job*,TQByteArray&)), - TQT_SLOT(slotDataReq(TDEIO::Job*,TQByteArray&))); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), - TQT_SLOT(slotResult(TDEIO::Job*))); + connect(job, TQ_SIGNAL(dataReq(TDEIO::Job*,TQByteArray&)), + TQ_SLOT(slotDataReq(TDEIO::Job*,TQByteArray&))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), + TQ_SLOT(slotResult(TDEIO::Job*))); } void KMKernel::slotDataReq(TDEIO::Job *job, TQByteArray &data) @@ -2079,8 +2079,8 @@ void KMKernel::slotShowConfigurationDialog() { if( !mConfigureDialog ) { mConfigureDialog = new ConfigureDialog( 0, "configure", false ); - connect( mConfigureDialog, TQT_SIGNAL( configChanged() ), - this, TQT_SLOT( slotConfigChanged() ) ); + connect( mConfigureDialog, TQ_SIGNAL( configChanged() ), + this, TQ_SLOT( slotConfigChanged() ) ); } if( KMKernel::getKMMainWidget() == 0 ) diff --git a/kmail/kmlineeditspell.cpp b/kmail/kmlineeditspell.cpp index 45585147..92cc4f7f 100644 --- a/kmail/kmlineeditspell.cpp +++ b/kmail/kmlineeditspell.cpp @@ -156,7 +156,7 @@ TQPopupMenu *KMLineEdit::createPopupMenu() menu->insertSeparator(); menu->insertItem( i18n( "Edit Recent Addresses..." ), - this, TQT_SLOT( editRecentAddresses() ) ); + this, TQ_SLOT( editRecentAddresses() ) ); return menu; } diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp index c6299ec7..bdae84d2 100644 --- a/kmail/kmmainwidget.cpp +++ b/kmail/kmmainwidget.cpp @@ -203,41 +203,41 @@ KMMainWidget::KMMainWidget(TQWidget *parent, const char *name, activatePanners(); - TQTimer::singleShot( 0, this, TQT_SLOT( slotShowStartupFolder() )); + TQTimer::singleShot( 0, this, TQ_SLOT( slotShowStartupFolder() )); - connect( kmkernel->acctMgr(), TQT_SIGNAL( checkedMail( bool, bool, const TQMap<TQString, int> & ) ), - this, TQT_SLOT( slotMailChecked( bool, bool, const TQMap<TQString, int> & ) ) ); + connect( kmkernel->acctMgr(), TQ_SIGNAL( checkedMail( bool, bool, const TQMap<TQString, int> & ) ), + this, TQ_SLOT( slotMailChecked( bool, bool, const TQMap<TQString, int> & ) ) ); - connect( kmkernel->acctMgr(), TQT_SIGNAL( accountAdded( KMAccount* ) ), - this, TQT_SLOT( initializeIMAPActions() ) ); - connect( kmkernel->acctMgr(), TQT_SIGNAL( accountRemoved( KMAccount* ) ), - this, TQT_SLOT( initializeIMAPActions() ) ); + connect( kmkernel->acctMgr(), TQ_SIGNAL( accountAdded( KMAccount* ) ), + this, TQ_SLOT( initializeIMAPActions() ) ); + connect( kmkernel->acctMgr(), TQ_SIGNAL( accountRemoved( KMAccount* ) ), + this, TQ_SLOT( initializeIMAPActions() ) ); - connect(kmkernel, TQT_SIGNAL( configChanged() ), - this, TQT_SLOT( slotConfigChanged() )); + connect(kmkernel, TQ_SIGNAL( configChanged() ), + this, TQ_SLOT( slotConfigChanged() )); // display the full path to the folder in the caption - connect(mFolderTree, TQT_SIGNAL(currentChanged(TQListViewItem*)), - this, TQT_SLOT(slotChangeCaption(TQListViewItem*))); - connect(mFolderTree, TQT_SIGNAL(selectionChanged()), - TQT_SLOT(updateFolderMenu()) ); - connect( mFolderTree, TQT_SIGNAL(syncStateChanged()), - TQT_SLOT(updateFolderMenu()) ); + connect(mFolderTree, TQ_SIGNAL(currentChanged(TQListViewItem*)), + this, TQ_SLOT(slotChangeCaption(TQListViewItem*))); + connect(mFolderTree, TQ_SIGNAL(selectionChanged()), + TQ_SLOT(updateFolderMenu()) ); + connect( mFolderTree, TQ_SIGNAL(syncStateChanged()), + TQ_SLOT(updateFolderMenu()) ); - connect(kmkernel->folderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)), - this, TQT_SLOT(slotFolderRemoved(KMFolder*))); + connect(kmkernel->folderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)), + this, TQ_SLOT(slotFolderRemoved(KMFolder*))); - connect(kmkernel->imapFolderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)), - this, TQT_SLOT(slotFolderRemoved(KMFolder*))); + connect(kmkernel->imapFolderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)), + this, TQ_SLOT(slotFolderRemoved(KMFolder*))); - connect(kmkernel->dimapFolderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)), - this, TQT_SLOT(slotFolderRemoved(KMFolder*))); + connect(kmkernel->dimapFolderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)), + this, TQ_SLOT(slotFolderRemoved(KMFolder*))); - connect(kmkernel->searchFolderMgr(), TQT_SIGNAL(folderRemoved(KMFolder*)), - this, TQT_SLOT(slotFolderRemoved(KMFolder*))); + connect(kmkernel->searchFolderMgr(), TQ_SIGNAL(folderRemoved(KMFolder*)), + this, TQ_SLOT(slotFolderRemoved(KMFolder*))); - connect( kmkernel, TQT_SIGNAL( onlineStatusChanged( GlobalSettings::EnumNetworkState::type ) ), - this, TQT_SLOT( slotUpdateOnlineStatus( GlobalSettings::EnumNetworkState::type ) ) ); + connect( kmkernel, TQ_SIGNAL( onlineStatusChanged( GlobalSettings::EnumNetworkState::type ) ), + this, TQ_SLOT( slotUpdateOnlineStatus( GlobalSettings::EnumNetworkState::type ) ) ); toggleSystemTray(); @@ -249,9 +249,9 @@ KMMainWidget::KMMainWidget(TQWidget *parent, const char *name, KStatusBar *sb = mainWin ? mainWin->statusBar() : 0; mVacationScriptIndicator = new KStatusBarLabel( TQString(), 0, sb ); mVacationScriptIndicator->hide(); - connect( mVacationScriptIndicator, TQT_SIGNAL(itemReleased(int)), TQT_SLOT(slotEditVacation()) ); + connect( mVacationScriptIndicator, TQ_SIGNAL(itemReleased(int)), TQ_SLOT(slotEditVacation()) ); if ( GlobalSettings::checkOutOfOfficeOnStartup() ) - TQTimer::singleShot( 0, this, TQT_SLOT(slotCheckVacation()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotCheckVacation()) ); } @@ -468,7 +468,7 @@ void KMMainWidget::readConfig(void) bool check = config->readBoolEntry("checkmail-startup", false); if (check) // do it after building the kmmainwin, so that the progressdialog is available - TQTimer::singleShot( 0, this, TQT_SLOT( slotCheckMail() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotCheckMail() ) ); } } @@ -609,26 +609,26 @@ void KMMainWidget::createWidgets(void) actionCollection(), "headers quick search line" ); #endif label->setBuddy( mQuickSearchLine ); - connect( mQuickSearchLine, TQT_SIGNAL( requestFullSearch() ), - this, TQT_SLOT( slotRequestFullSearchFromQuickSearch() ) ); + connect( mQuickSearchLine, TQ_SIGNAL( requestFullSearch() ), + this, TQ_SLOT( slotRequestFullSearchFromQuickSearch() ) ); mSearchToolBar->setStretchableWidget( mQuickSearchLine ); - connect( mHeaders, TQT_SIGNAL( messageListUpdated() ), - mQuickSearchLine, TQT_SLOT( updateSearch() ) ); + connect( mHeaders, TQ_SIGNAL( messageListUpdated() ), + mQuickSearchLine, TQ_SLOT( updateSearch() ) ); if ( !GlobalSettings::self()->quickSearchActive() ) mSearchToolBar->hide(); if (mReaderWindowActive) { - connect(mHeaders, TQT_SIGNAL(selected(KMMessage*)), - this, TQT_SLOT(slotMsgSelected(KMMessage*))); + connect(mHeaders, TQ_SIGNAL(selected(KMMessage*)), + this, TQ_SLOT(slotMsgSelected(KMMessage*))); } - connect(mHeaders, TQT_SIGNAL(activated(KMMessage*)), - this, TQT_SLOT(slotMsgActivated(KMMessage*))); - connect( mHeaders, TQT_SIGNAL( selectionChanged() ), - TQT_SLOT( startUpdateMessageActionsTimer() ) ); + connect(mHeaders, TQ_SIGNAL(activated(KMMessage*)), + this, TQ_SLOT(slotMsgActivated(KMMessage*))); + connect( mHeaders, TQ_SIGNAL( selectionChanged() ), + TQ_SLOT( startUpdateMessageActionsTimer() ) ); TQAccel *accel = actionCollection()->tdeaccel(); accel->connectItem(accel->insertItem(SHIFT+Key_Left), - mHeaders, TQT_SLOT(selectPrevMessage())); + mHeaders, TQ_SLOT(selectPrevMessage())); accel->connectItem(accel->insertItem(SHIFT+Key_Right), - mHeaders, TQT_SLOT(selectNextMessage())); + mHeaders, TQ_SLOT(selectNextMessage())); if (mReaderWindowActive) { mMsgView = new KMReaderWin(messageParent, this, actionCollection(), 0 ); @@ -636,24 +636,24 @@ void KMMainWidget::createWidgets(void) mMsgActions->setMessageView( mMsgView ); } - connect(mMsgView, TQT_SIGNAL(replaceMsgByUnencryptedVersion()), - this, TQT_SLOT(slotReplaceMsgByUnencryptedVersion())); - connect(mMsgView, TQT_SIGNAL(popupMenu(KMMessage&,const KURL&,const TQPoint&)), - this, TQT_SLOT(slotMsgPopup(KMMessage&,const KURL&,const TQPoint&))); - connect(mMsgView, TQT_SIGNAL(urlClicked(const KURL&,int)), - mMsgView, TQT_SLOT(slotUrlClicked())); - connect(mHeaders, TQT_SIGNAL(maybeDeleting()), - mMsgView, TQT_SLOT(clearCache())); - connect(mMsgView, TQT_SIGNAL(noDrag()), - mHeaders, TQT_SLOT(slotNoDrag())); + connect(mMsgView, TQ_SIGNAL(replaceMsgByUnencryptedVersion()), + this, TQ_SLOT(slotReplaceMsgByUnencryptedVersion())); + connect(mMsgView, TQ_SIGNAL(popupMenu(KMMessage&,const KURL&,const TQPoint&)), + this, TQ_SLOT(slotMsgPopup(KMMessage&,const KURL&,const TQPoint&))); + connect(mMsgView, TQ_SIGNAL(urlClicked(const KURL&,int)), + mMsgView, TQ_SLOT(slotUrlClicked())); + connect(mHeaders, TQ_SIGNAL(maybeDeleting()), + mMsgView, TQ_SLOT(clearCache())); + connect(mMsgView, TQ_SIGNAL(noDrag()), + mHeaders, TQ_SLOT(slotNoDrag())); accel->connectItem(accel->insertItem(Key_Up), - mMsgView, TQT_SLOT(slotScrollUp())); + mMsgView, TQ_SLOT(slotScrollUp())); accel->connectItem(accel->insertItem(Key_Down), - mMsgView, TQT_SLOT(slotScrollDown())); + mMsgView, TQ_SLOT(slotScrollDown())); accel->connectItem(accel->insertItem(Key_Prior), - mMsgView, TQT_SLOT(slotScrollPrior())); + mMsgView, TQ_SLOT(slotScrollPrior())); accel->connectItem(accel->insertItem(Key_Next), - mMsgView, TQT_SLOT(slotScrollNext())); + mMsgView, TQ_SLOT(slotScrollNext())); } else { mMsgView = NULL; } @@ -661,17 +661,17 @@ void KMMainWidget::createWidgets(void) TDEAction *action; mMoveMsgToFolderAction = new TDEAction( i18n("Move Message to Folder"), Key_M, this, - TQT_SLOT(slotMoveMsg()), actionCollection(), + TQ_SLOT(slotMoveMsg()), actionCollection(), "move_message_to_folder" ); mMoveMsgToFolderAction->plugAccel( actionCollection()->tdeaccel() ); action = new TDEAction( i18n("Copy Message to Folder"), Key_C, this, - TQT_SLOT(slotCopyMsg()), actionCollection(), + TQ_SLOT(slotCopyMsg()), actionCollection(), "copy_message_to_folder" ); action->plugAccel( actionCollection()->tdeaccel() ); action = new TDEAction( i18n("Jump to Folder"), Key_J, this, - TQT_SLOT(slotJumpToFolder()), actionCollection(), + TQ_SLOT(slotJumpToFolder()), actionCollection(), "jump_to_folder" ); action->plugAccel( actionCollection()->tdeaccel() ); @@ -680,7 +680,7 @@ void KMMainWidget::createWidgets(void) mFolderViewSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() ); mFavoriteFolderView = new KMail::FavoriteFolderView( this, mFolderViewSplitter ); if ( mFavoritesCheckMailAction ) - connect( mFavoritesCheckMailAction, TQT_SIGNAL(activated()), mFavoriteFolderView, TQT_SLOT(checkMail()) ); + connect( mFavoritesCheckMailAction, TQ_SIGNAL(activated()), mFavoriteFolderView, TQ_SLOT(checkMail()) ); TQWidget *folderTreeParent = mFolderViewParent; if ( GlobalSettings::enableFavoriteFolderView() ) { folderTreeParent = mFolderViewSplitter; @@ -690,72 +690,72 @@ void KMMainWidget::createWidgets(void) if ( !GlobalSettings::enableFavoriteFolderView() ) { mFolderView = mFolderTree; } - connect( mFolderTree, TQT_SIGNAL(folderSelected(KMFolder*)), - mFavoriteFolderView, TQT_SLOT(folderTreeSelectionChanged(KMFolder*)) ); - - connect(mFolderTree, TQT_SIGNAL(folderSelected(KMFolder*)), - this, TQT_SLOT(folderSelected(KMFolder*))); - connect( mFolderTree, TQT_SIGNAL( folderSelected( KMFolder* ) ), - mQuickSearchLine, TQT_SLOT( reset() ) ); - connect(mFolderTree, TQT_SIGNAL(folderSelectedUnread(KMFolder*)), - this, TQT_SLOT(folderSelectedUnread(KMFolder*))); - connect(mFolderTree, TQT_SIGNAL(folderDrop(KMFolder*)), - this, TQT_SLOT(slotMoveMsgToFolder(KMFolder*))); - connect(mFolderTree, TQT_SIGNAL(folderDropCopy(KMFolder*)), - this, TQT_SLOT(slotCopyMsgToFolder(KMFolder*))); - connect(mFolderTree, TQT_SIGNAL(columnsChanged()), - this, TQT_SLOT(slotFolderTreeColumnsChanged())); + connect( mFolderTree, TQ_SIGNAL(folderSelected(KMFolder*)), + mFavoriteFolderView, TQ_SLOT(folderTreeSelectionChanged(KMFolder*)) ); + + connect(mFolderTree, TQ_SIGNAL(folderSelected(KMFolder*)), + this, TQ_SLOT(folderSelected(KMFolder*))); + connect( mFolderTree, TQ_SIGNAL( folderSelected( KMFolder* ) ), + mQuickSearchLine, TQ_SLOT( reset() ) ); + connect(mFolderTree, TQ_SIGNAL(folderSelectedUnread(KMFolder*)), + this, TQ_SLOT(folderSelectedUnread(KMFolder*))); + connect(mFolderTree, TQ_SIGNAL(folderDrop(KMFolder*)), + this, TQ_SLOT(slotMoveMsgToFolder(KMFolder*))); + connect(mFolderTree, TQ_SIGNAL(folderDropCopy(KMFolder*)), + this, TQ_SLOT(slotCopyMsgToFolder(KMFolder*))); + connect(mFolderTree, TQ_SIGNAL(columnsChanged()), + this, TQ_SLOT(slotFolderTreeColumnsChanged())); if ( mFavoriteFolderView ) { - connect( mFavoriteFolderView, TQT_SIGNAL(folderDrop(KMFolder*)), TQT_SLOT(slotMoveMsgToFolder(KMFolder*)) ); - connect( mFavoriteFolderView, TQT_SIGNAL(folderDropCopy(KMFolder*)), TQT_SLOT(slotCopyMsgToFolder(KMFolder*)) ); + connect( mFavoriteFolderView, TQ_SIGNAL(folderDrop(KMFolder*)), TQ_SLOT(slotMoveMsgToFolder(KMFolder*)) ); + connect( mFavoriteFolderView, TQ_SIGNAL(folderDropCopy(KMFolder*)), TQ_SLOT(slotCopyMsgToFolder(KMFolder*)) ); } //Commands not worthy of menu items, but that deserve configurable keybindings mRemoveDuplicatesAction = new TDEAction( i18n("Remove Duplicate Messages"), CTRL+Key_Asterisk, this, - TQT_SLOT(removeDuplicates()), actionCollection(), "remove_duplicate_messages"); + TQ_SLOT(removeDuplicates()), actionCollection(), "remove_duplicate_messages"); action->plugAccel( actionCollection()->tdeaccel() ); action = new TDEAction( i18n("Abort Current Operation"), Key_Escape, ProgressManager::instance(), - TQT_SLOT(slotAbortAll()), actionCollection(), "cancel" ); + TQ_SLOT(slotAbortAll()), actionCollection(), "cancel" ); action->plugAccel( actionCollection()->tdeaccel() ); action = new TDEAction( i18n("Focus on Next Folder"), CTRL+Key_Right, mFolderTree, - TQT_SLOT(incCurrentFolder()), actionCollection(), "inc_current_folder"); + TQ_SLOT(incCurrentFolder()), actionCollection(), "inc_current_folder"); action->plugAccel( actionCollection()->tdeaccel() ); action = new TDEAction( i18n("Focus on Previous Folder"), CTRL+Key_Left, mFolderTree, - TQT_SLOT(decCurrentFolder()), actionCollection(), "dec_current_folder"); + TQ_SLOT(decCurrentFolder()), actionCollection(), "dec_current_folder"); action->plugAccel( actionCollection()->tdeaccel() ); action = new TDEAction( i18n("Select Folder with Focus"), CTRL+Key_Space, mFolderTree, - TQT_SLOT(selectCurrentFolder()), actionCollection(), "select_current_folder"); + TQ_SLOT(selectCurrentFolder()), actionCollection(), "select_current_folder"); action->plugAccel( actionCollection()->tdeaccel() ); action = new TDEAction( i18n("Focus on Next Message"), ALT+Key_Right, mHeaders, - TQT_SLOT(incCurrentMessage()), actionCollection(), "inc_current_message"); + TQ_SLOT(incCurrentMessage()), actionCollection(), "inc_current_message"); action->plugAccel( actionCollection()->tdeaccel() ); action = new TDEAction( i18n("Focus on Previous Message"), ALT+Key_Left, mHeaders, - TQT_SLOT(decCurrentMessage()), actionCollection(), "dec_current_message"); + TQ_SLOT(decCurrentMessage()), actionCollection(), "dec_current_message"); action->plugAccel( actionCollection()->tdeaccel() ); action = new TDEAction( i18n("Select Message with Focus"), ALT+Key_Space, mHeaders, - TQT_SLOT( selectCurrentMessage() ), actionCollection(), "select_current_message"); + TQ_SLOT( selectCurrentMessage() ), actionCollection(), "select_current_message"); action->plugAccel( actionCollection()->tdeaccel() ); - connect( kmkernel->outboxFolder(), TQT_SIGNAL( msgRemoved(int, TQString) ), - TQT_SLOT( startUpdateMessageActionsTimer() ) ); - connect( kmkernel->outboxFolder(), TQT_SIGNAL( msgAdded(int) ), - TQT_SLOT( startUpdateMessageActionsTimer() ) ); + connect( kmkernel->outboxFolder(), TQ_SIGNAL( msgRemoved(int, TQString) ), + TQ_SLOT( startUpdateMessageActionsTimer() ) ); + connect( kmkernel->outboxFolder(), TQ_SIGNAL( msgAdded(int) ), + TQ_SLOT( startUpdateMessageActionsTimer() ) ); } @@ -764,8 +764,8 @@ void KMMainWidget::activatePanners(void) { if (mMsgView) { TQObject::disconnect( mMsgView->copyAction(), - TQT_SIGNAL( activated() ), - mMsgView, TQT_SLOT( slotCopySelectedText() )); + TQ_SIGNAL( activated() ), + mMsgView, TQ_SLOT( slotCopySelectedText() )); } setupFolderView(); @@ -800,8 +800,8 @@ void KMMainWidget::activatePanners(void) if (mMsgView) { TQObject::connect( mMsgView->copyAction(), - TQT_SIGNAL( activated() ), - mMsgView, TQT_SLOT( slotCopySelectedText() )); + TQ_SIGNAL( activated() ), + mMsgView, TQ_SLOT( slotCopySelectedText() )); } } @@ -825,8 +825,8 @@ void KMMainWidget::slotSearch() if(!mSearchWin) { mSearchWin = new SearchWindow(this, "Search", mFolder, false); - connect(mSearchWin, TQT_SIGNAL(destroyed()), - this, TQT_SLOT(slotSearchClosed())); + connect(mSearchWin, TQ_SIGNAL(destroyed()), + this, TQ_SLOT(slotSearchClosed())); } else { @@ -1717,7 +1717,7 @@ void KMMainWidget::slotCheckVacation() return; Vacation *vac = new Vacation( this, true /* check only */ ); - connect( vac, TQT_SIGNAL(scriptActive(bool)), TQT_SLOT(updateVactionScripStatus(bool)) ); + connect( vac, TQ_SIGNAL(scriptActive(bool)), TQ_SLOT(updateVactionScripStatus(bool)) ); } void KMMainWidget::slotEditVacation() @@ -1730,9 +1730,9 @@ void KMMainWidget::slotEditVacation() return; mVacation = new Vacation( this ); - connect( mVacation, TQT_SIGNAL(scriptActive(bool)), TQT_SLOT(updateVactionScripStatus(bool)) ); + connect( mVacation, TQ_SIGNAL(scriptActive(bool)), TQ_SLOT(updateVactionScripStatus(bool)) ); if ( mVacation->isUsable() ) { - connect( mVacation, TQT_SIGNAL(result(bool)), mVacation, TQT_SLOT(deleteLater()) ); + connect( mVacation, TQ_SIGNAL(result(bool)), mVacation, TQ_SLOT(deleteLater()) ); } else { TQString msg = i18n("KMail's Out of Office Reply functionality relies on " "server-side filtering. You have not yet configured an " @@ -1838,7 +1838,7 @@ void KMMainWidget::slotPrintMsg() //----------------------------------------------------------------------------- void KMMainWidget::setupForwardActions() { - disconnect( mForwardActionMenu, TQT_SIGNAL( activated() ), 0, 0 ); + disconnect( mForwardActionMenu, TQ_SIGNAL( activated() ), 0, 0 ); mForwardActionMenu->remove( mForwardInlineAction ); mForwardActionMenu->remove( mForwardAttachedAction ); @@ -1847,16 +1847,16 @@ void KMMainWidget::setupForwardActions() mForwardActionMenu->insert( mForwardAttachedAction, 1 ); mForwardInlineAction->setShortcut( Key_F ); mForwardAttachedAction->setShortcut( SHIFT+Key_F ); - connect( mForwardActionMenu, TQT_SIGNAL(activated()), this, - TQT_SLOT(slotForwardInlineMsg()) ); + connect( mForwardActionMenu, TQ_SIGNAL(activated()), this, + TQ_SLOT(slotForwardInlineMsg()) ); } else { mForwardActionMenu->insert( mForwardAttachedAction, 0 ); mForwardActionMenu->insert( mForwardInlineAction, 1 ); mForwardInlineAction->setShortcut( SHIFT+Key_F ); mForwardAttachedAction->setShortcut( Key_F ); - connect( mForwardActionMenu, TQT_SIGNAL(activated()), this, - TQT_SLOT(slotForwardAttachedMsg()) ); + connect( mForwardActionMenu, TQ_SIGNAL(activated()), this, + TQ_SLOT(slotForwardAttachedMsg()) ); } } @@ -2025,14 +2025,14 @@ void KMMainWidget::folderSelected( KMFolder* aFolder, bool forceJumpToUnread ) if ( newFolder ) writeFolderConfig(); if ( mFolder ) { - disconnect( mFolder, TQT_SIGNAL( changed() ), - this, TQT_SLOT( updateMarkAsReadAction() ) ); - disconnect( mFolder, TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ), - this, TQT_SLOT( updateMarkAsReadAction() ) ); - disconnect( mFolder, TQT_SIGNAL( msgAdded( int ) ), - this, TQT_SLOT( updateMarkAsReadAction() ) ); - disconnect( mFolder, TQT_SIGNAL( msgRemoved( KMFolder * ) ), - this, TQT_SLOT( updateMarkAsReadAction() ) ); + disconnect( mFolder, TQ_SIGNAL( changed() ), + this, TQ_SLOT( updateMarkAsReadAction() ) ); + disconnect( mFolder, TQ_SIGNAL( msgHeaderChanged( KMFolder*, int ) ), + this, TQ_SLOT( updateMarkAsReadAction() ) ); + disconnect( mFolder, TQ_SIGNAL( msgAdded( int ) ), + this, TQ_SLOT( updateMarkAsReadAction() ) ); + disconnect( mFolder, TQ_SIGNAL( msgRemoved( KMFolder * ) ), + this, TQ_SLOT( updateMarkAsReadAction() ) ); } mFolder = aFolder; @@ -2049,8 +2049,8 @@ void KMMainWidget::folderSelected( KMFolder* aFolder, bool forceJumpToUnread ) imap->open("mainwidget"); // will be closed in the folderSelected slot // first get new headers before we select the folder imap->setSelected( true ); - connect( imap, TQT_SIGNAL( folderComplete( KMFolderImap*, bool ) ), - this, TQT_SLOT( folderSelected() ) ); + connect( imap, TQ_SIGNAL( folderComplete( KMFolderImap*, bool ) ), + this, TQ_SLOT( folderSelected() ) ); imap->getAndCheckFolder(); mHeaders->setFolder( 0 ); updateFolderMenu(); @@ -2059,26 +2059,26 @@ void KMMainWidget::folderSelected( KMFolder* aFolder, bool forceJumpToUnread ) // Set a timer to show a splash screen if fetching folder contents // takes more than the amount of seconds configured in the kmailrc (default 1000 msec) mShowBusySplashTimer = new TQTimer( this ); - connect( mShowBusySplashTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotShowBusySplash() ) ); + connect( mShowBusySplashTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotShowBusySplash() ) ); mShowBusySplashTimer->start( GlobalSettings::self()->folderLoadingTimeout(), true ); return; } else { // the folder is complete now - so go ahead - disconnect( imap, TQT_SIGNAL( folderComplete( KMFolderImap*, bool ) ), - this, TQT_SLOT( folderSelected() ) ); + disconnect( imap, TQ_SIGNAL( folderComplete( KMFolderImap*, bool ) ), + this, TQ_SLOT( folderSelected() ) ); forceJumpToUnread = mForceJumpToUnread; } } if ( mFolder ) { // == 0 -> pointing to toplevel ("Welcome to KMail") folder - connect( mFolder, TQT_SIGNAL( changed() ), - this, TQT_SLOT( updateMarkAsReadAction() ) ); - connect( mFolder, TQT_SIGNAL( msgHeaderChanged( KMFolder*, int ) ), - this, TQT_SLOT( updateMarkAsReadAction() ) ); - connect( mFolder, TQT_SIGNAL( msgAdded( int ) ), - this, TQT_SLOT( updateMarkAsReadAction() ) ); - connect( mFolder, TQT_SIGNAL( msgRemoved(KMFolder *) ), - this, TQT_SLOT( updateMarkAsReadAction() ) ); + connect( mFolder, TQ_SIGNAL( changed() ), + this, TQ_SLOT( updateMarkAsReadAction() ) ); + connect( mFolder, TQ_SIGNAL( msgHeaderChanged( KMFolder*, int ) ), + this, TQ_SLOT( updateMarkAsReadAction() ) ); + connect( mFolder, TQ_SIGNAL( msgAdded( int ) ), + this, TQ_SLOT( updateMarkAsReadAction() ) ); + connect( mFolder, TQ_SIGNAL( msgRemoved(KMFolder *) ), + this, TQ_SLOT( updateMarkAsReadAction() ) ); } readFolderConfig(); if (mMsgView) @@ -2132,8 +2132,8 @@ void KMMainWidget::slotMsgSelected(KMMessage *msg) } mJob = msg->parent()->createJob( msg, FolderJob::tGetMessage, 0, "STRUCTURE", mMsgView->attachmentStrategy() ); - connect(mJob, TQT_SIGNAL(messageRetrieved(KMMessage*)), - mMsgView, TQT_SLOT(slotMessageArrived(KMMessage*))); + connect(mJob, TQ_SIGNAL(messageRetrieved(KMMessage*)), + mMsgView, TQ_SLOT(slotMessageArrived(KMMessage*))); mJob->start(); } else { mMsgView->setMsg(msg); @@ -2318,8 +2318,8 @@ void KMMainWidget::slotMsgActivated(KMMessage *msg) if ( !msg ) return; if ( msg->parent() && !msg->isComplete() ) { FolderJob *job = msg->parent()->createJob( msg ); - connect( job, TQT_SIGNAL( messageRetrieved( KMMessage* ) ), - TQT_SLOT( slotMsgActivated( KMMessage* ) ) ); + connect( job, TQ_SIGNAL( messageRetrieved( KMMessage* ) ), + TQ_SLOT( slotMsgActivated( KMMessage* ) ) ); job->start(); return; } @@ -2510,16 +2510,16 @@ void KMMainWidget::updateCustomTemplateMenus() "mail_custom_forward", actionCollection(), "custom_forward" ); TQSignalMapper *mCustomForwardMapper = new TQSignalMapper( this ); - connect( mCustomForwardMapper, TQT_SIGNAL( mapped( int ) ), - this, TQT_SLOT( slotCustomForwardMsg( int ) ) ); + connect( mCustomForwardMapper, TQ_SIGNAL( mapped( int ) ), + this, TQ_SLOT( slotCustomForwardMsg( int ) ) ); mForwardActionMenu->insert( mCustomForwardActionMenu ); mCustomReplyActionMenu = new TDEActionMenu( i18n("Reply With Custom Template"), "mail_custom_reply", actionCollection(), "custom_reply" ); TQSignalMapper *mCustomReplyMapper = new TQSignalMapper( this ); - connect( mCustomReplyMapper, TQT_SIGNAL( mapped( int ) ), - this, TQT_SLOT( slotCustomReplyToMsg( int ) ) ); + connect( mCustomReplyMapper, TQ_SIGNAL( mapped( int ) ), + this, TQ_SLOT( slotCustomReplyToMsg( int ) ) ); mMsgActions->replyMenu()->insert( mCustomReplyActionMenu ); mCustomReplyAllActionMenu = @@ -2527,8 +2527,8 @@ void KMMainWidget::updateCustomTemplateMenus() "mail_custom_reply_all", actionCollection(), "custom_reply_all" ); TQSignalMapper *mCustomReplyAllMapper = new TQSignalMapper( this ); - connect( mCustomReplyAllMapper, TQT_SIGNAL( mapped( int ) ), - this, TQT_SLOT( slotCustomReplyAllToMsg( int ) ) ); + connect( mCustomReplyAllMapper, TQ_SIGNAL( mapped( int ) ), + this, TQ_SLOT( slotCustomReplyAllToMsg( int ) ) ); mMsgActions->replyMenu()->insert( mCustomReplyAllActionMenu ); mCustomTemplates.clear(); @@ -2549,7 +2549,7 @@ void KMMainWidget::updateCustomTemplateMenus() action = new TDEAction( (*it).replace( "&", "&&" ), TDEShortcut( t.shortcut() ), mCustomReplyMapper, - TQT_SLOT( map() ), + TQ_SLOT( map() ), actionCollection(), (*it).utf8() ); mCustomReplyMapper->setMapping( action, idx ); @@ -2561,7 +2561,7 @@ void KMMainWidget::updateCustomTemplateMenus() action = new TDEAction( (*it).replace( "&", "&&" ), TDEShortcut( t.shortcut() ), mCustomReplyAllMapper, - TQT_SLOT( map() ), + TQ_SLOT( map() ), actionCollection(), (*it).utf8() ); mCustomReplyAllMapper->setMapping( action, idx ); @@ -2573,7 +2573,7 @@ void KMMainWidget::updateCustomTemplateMenus() action = new TDEAction( (*it).replace( "&", "&&" ), TDEShortcut( t.shortcut() ), mCustomForwardMapper, - TQT_SLOT( map() ), + TQ_SLOT( map() ), actionCollection(), (*it).utf8() ); mCustomForwardMapper->setMapping( action, idx ); @@ -2585,7 +2585,7 @@ void KMMainWidget::updateCustomTemplateMenus() action = new TDEAction( (*it).replace( "&", "&&" ), TDEShortcut::null(), mCustomReplyMapper, - TQT_SLOT( map() ), + TQ_SLOT( map() ), actionCollection(), (*it).utf8() ); mCustomReplyMapper->setMapping( action, idx ); @@ -2595,7 +2595,7 @@ void KMMainWidget::updateCustomTemplateMenus() action = new TDEAction( (*it).replace( "&", "&&" ), TDEShortcut::null(), mCustomReplyAllMapper, - TQT_SLOT( map() ), + TQ_SLOT( map() ), actionCollection(), (*it).utf8() ); mCustomReplyAllMapper->setMapping( action, idx ); @@ -2605,7 +2605,7 @@ void KMMainWidget::updateCustomTemplateMenus() action = new TDEAction( (*it).replace( "&", "&&" ), TDEShortcut::null(), mCustomForwardMapper, - TQT_SLOT( map() ), + TQ_SLOT( map() ), actionCollection(), (*it).utf8() ); mCustomForwardMapper->setMapping( action, idx ); @@ -2645,53 +2645,53 @@ void KMMainWidget::setupActions() //----- File Menu mSaveAsAction = new TDEAction( i18n("Save &As..."), "document-save", TDEStdAccel::shortcut(TDEStdAccel::Save), - this, TQT_SLOT(slotSaveMsg()), actionCollection(), "file_save_as" ); + this, TQ_SLOT(slotSaveMsg()), actionCollection(), "file_save_as" ); - mOpenAction = KStdAction::open( this, TQT_SLOT( slotOpenMsg() ), + mOpenAction = KStdAction::open( this, TQ_SLOT( slotOpenMsg() ), actionCollection() ); (void) new TDEAction( i18n("&Compact All Folders"), 0, - this, TQT_SLOT(slotCompactAll()), + this, TQ_SLOT(slotCompactAll()), actionCollection(), "compact_all_folders" ); (void) new TDEAction( i18n("&Expire All Folders"), 0, - this, TQT_SLOT(slotExpireAll()), + this, TQ_SLOT(slotExpireAll()), actionCollection(), "expire_all_folders" ); (void) new TDEAction( i18n("&Refresh Local IMAP Cache"), "refresh", - this, TQT_SLOT(slotInvalidateIMAPFolders()), + this, TQ_SLOT(slotInvalidateIMAPFolders()), actionCollection(), "file_invalidate_imap_cache" ); (void) new TDEAction( i18n("Empty All &Trash Folders"), 0, - KMKernel::self(), TQT_SLOT(slotEmptyTrash()), + KMKernel::self(), TQ_SLOT(slotEmptyTrash()), actionCollection(), "empty_trash" ); (void) new TDEAction( i18n("Check &Mail"), "mail_get", CTRL+Key_L, - this, TQT_SLOT(slotCheckMail()), + this, TQ_SLOT(slotCheckMail()), actionCollection(), "check_mail" ); mFavoritesCheckMailAction = new TDEAction( i18n("Check Mail in Favorite Folders"), "mail_get", CTRL+SHIFT+Key_L, 0, 0, actionCollection(), "favorite_check_mail" ); if ( mFavoriteFolderView ) - connect( mFavoritesCheckMailAction, TQT_SIGNAL(activated()), mFavoriteFolderView, TQT_SLOT(checkMail()) ); + connect( mFavoritesCheckMailAction, TQ_SIGNAL(activated()), mFavoriteFolderView, TQ_SLOT(checkMail()) ); TDEActionMenu *actActionMenu = new TDEActionMenu( i18n("Check Mail &In"), "mail_get", actionCollection(), "check_mail_in" ); actActionMenu->setDelayed(true); //needed for checking "all accounts" - connect(actActionMenu,TQT_SIGNAL(activated()),this,TQT_SLOT(slotCheckMail())); + connect(actActionMenu,TQ_SIGNAL(activated()),this,TQ_SLOT(slotCheckMail())); mActMenu = actActionMenu->popupMenu(); - connect(mActMenu,TQT_SIGNAL(activated(int)),this,TQT_SLOT(slotCheckOneAccount(int))); - connect(mActMenu,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(getAccountMenu())); + connect(mActMenu,TQ_SIGNAL(activated(int)),this,TQ_SLOT(slotCheckOneAccount(int))); + connect(mActMenu,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(getAccountMenu())); (void) new TDEAction( i18n("&Send Queued Messages"), "mail-send", 0, this, - TQT_SLOT(slotSendQueued()), actionCollection(), "send_queued"); + TQ_SLOT(slotSendQueued()), actionCollection(), "send_queued"); (void) new TDEAction( i18n("Online Status (unknown)"), "online_status", 0, this, - TQT_SLOT(slotOnlineStatus()), actionCollection(), "online_status"); + TQ_SLOT(slotOnlineStatus()), actionCollection(), "online_status"); TDEActionMenu *sendActionMenu = new TDEActionMenu( i18n("Send Queued Messages Via"), "mail_send_via", actionCollection(), @@ -2699,56 +2699,56 @@ void KMMainWidget::setupActions() sendActionMenu->setDelayed(true); mSendMenu = sendActionMenu->popupMenu(); - connect(mSendMenu,TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSendQueuedVia(int))); - connect(mSendMenu,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(getTransportMenu())); + connect(mSendMenu,TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSendQueuedVia(int))); + connect(mSendMenu,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(getTransportMenu())); TDEAction *act; //----- Tools menu if (parent()->inherits("KMMainWin")) { act = new TDEAction( i18n("&Address Book..."), "contents", 0, this, - TQT_SLOT(slotAddrBook()), actionCollection(), "addressbook" ); + TQ_SLOT(slotAddrBook()), actionCollection(), "addressbook" ); if (TDEStandardDirs::findExe("kaddressbook").isEmpty()) act->setEnabled(false); } act = new TDEAction( i18n("Certificate Manager..."), "pgp-keys", 0, this, - TQT_SLOT(slotStartCertManager()), actionCollection(), "tools_start_certman"); + TQ_SLOT(slotStartCertManager()), actionCollection(), "tools_start_certman"); // disable action if no certman binary is around if (TDEStandardDirs::findExe("kleopatra").isEmpty()) act->setEnabled(false); act = new TDEAction( i18n("GnuPG Log Viewer..."), "pgp-keys", 0, this, - TQT_SLOT(slotStartWatchGnuPG()), actionCollection(), "tools_start_kwatchgnupg"); + TQ_SLOT(slotStartWatchGnuPG()), actionCollection(), "tools_start_kwatchgnupg"); // disable action if no kwatchgnupg binary is around if (TDEStandardDirs::findExe("kwatchgnupg").isEmpty()) act->setEnabled(false); act = new TDEAction( i18n("&Import Messages..."), "document-open", 0, this, - TQT_SLOT(slotImport()), actionCollection(), "import" ); + TQ_SLOT(slotImport()), actionCollection(), "import" ); if (TDEStandardDirs::findExe("kmailcvt").isEmpty()) act->setEnabled(false); #if !defined(NDEBUG) (void) new TDEAction( i18n("&Debug Sieve..."), - "idea", 0, this, TQT_SLOT(slotDebugSieve()), + "idea", 0, this, TQ_SLOT(slotDebugSieve()), actionCollection(), "tools_debug_sieve" ); #endif if ( GlobalSettings::allowOutOfOfficeSettings() ) { (void) new TDEAction( i18n("Edit \"Out of Office\" Replies..."), - "configure", 0, this, TQT_SLOT(slotEditVacation()), + "configure", 0, this, TQ_SLOT(slotEditVacation()), actionCollection(), "tools_edit_vacation" ); } (void) new TDEAction( i18n("Filter &Log Viewer..."), 0, this, - TQT_SLOT(slotFilterLogViewer()), actionCollection(), "filter_log_viewer" ); + TQ_SLOT(slotFilterLogViewer()), actionCollection(), "filter_log_viewer" ); (void) new TDEAction( i18n("&Anti-Spam Wizard..."), 0, this, - TQT_SLOT(slotAntiSpamWizard()), actionCollection(), "antiSpamWizard" ); + TQ_SLOT(slotAntiSpamWizard()), actionCollection(), "antiSpamWizard" ); (void) new TDEAction( i18n("&Anti-Virus Wizard..."), 0, this, - TQT_SLOT(slotAntiVirusWizard()), actionCollection(), "antiVirusWizard" ); + TQ_SLOT(slotAntiVirusWizard()), actionCollection(), "antiVirusWizard" ); //----- Edit Menu mTrashAction = new TDEAction( KGuiItem( i18n("&Move to Trash"), "edittrash", i18n("Move message to trashcan") ), - Key_Delete, this, TQT_SLOT(slotTrashMsg()), + Key_Delete, this, TQ_SLOT(slotTrashMsg()), actionCollection(), "move_to_trash" ); /* The delete action is nowhere in the gui, by default, so we need to make @@ -2756,109 +2756,109 @@ void KMMainWidget::setupActions() * XMLGui construction or manual ->plug(). This is only a problem when run * as a part, though. */ mDeleteAction = new TDEAction( i18n("&Delete"), "edit-delete", SHIFT+Key_Delete, this, - TQT_SLOT(slotDeleteMsg()), actionCollection(), "delete" ); + TQ_SLOT(slotDeleteMsg()), actionCollection(), "delete" ); mDeleteAction->plugAccel( actionCollection()->tdeaccel() ); mTrashThreadAction = new TDEAction( KGuiItem( i18n("M&ove Thread to Trash"), "edittrash", i18n("Move thread to trashcan") ), - CTRL+Key_Delete, this, TQT_SLOT(slotTrashThread()), + CTRL+Key_Delete, this, TQ_SLOT(slotTrashThread()), actionCollection(), "move_thread_to_trash" ); mDeleteThreadAction = new TDEAction( i18n("Delete T&hread"), "edit-delete", CTRL+SHIFT+Key_Delete, this, - TQT_SLOT(slotDeleteThread()), actionCollection(), "delete_thread" ); + TQ_SLOT(slotDeleteThread()), actionCollection(), "delete_thread" ); (void) new TDEAction( i18n("&Find Messages..."), "mail_find", Key_S, this, - TQT_SLOT(slotRequestFullSearchFromQuickSearch()), actionCollection(), "search_messages" ); + TQ_SLOT(slotRequestFullSearchFromQuickSearch()), actionCollection(), "search_messages" ); mFindInMessageAction = new TDEAction( i18n("&Find in Message..."), "edit-find", TDEStdAccel::shortcut(TDEStdAccel::Find), this, - TQT_SLOT(slotFind()), actionCollection(), "find_in_messages" ); + TQ_SLOT(slotFind()), actionCollection(), "find_in_messages" ); (void) new TDEAction( i18n("Select &All Messages"), TDEStdAccel::selectAll(), this, - TQT_SLOT(slotMarkAll()), actionCollection(), "mark_all_messages" ); + TQ_SLOT(slotMarkAll()), actionCollection(), "mark_all_messages" ); //----- Folder Menu mNewFolderAction = new TDEAction( i18n("&New Folder..."), "folder-new", 0, mFolderTree, - TQT_SLOT(addChildFolder()), actionCollection(), "new_folder" ); + TQ_SLOT(addChildFolder()), actionCollection(), "new_folder" ); mModifyFolderAction = new TDEAction( i18n("&Properties"), "configure", 0, this, - TQT_SLOT(slotModifyFolder()), actionCollection(), "modify" ); + TQ_SLOT(slotModifyFolder()), actionCollection(), "modify" ); mFolderMailingListPropertiesAction = new TDEAction( i18n("&Mailing List Management..."), - /*"folder_mailinglist_properties",*/ 0, this, TQT_SLOT( slotFolderMailingListProperties() ), + /*"folder_mailinglist_properties",*/ 0, this, TQ_SLOT( slotFolderMailingListProperties() ), actionCollection(), "folder_mailinglist_properties" ); mFolderShortCutCommandAction = new TDEAction( i18n("&Assign Shortcut..."), "configure_shortcuts", - 0, this, TQT_SLOT( slotFolderShortcutCommand() ), actionCollection(), + 0, this, TQ_SLOT( slotFolderShortcutCommand() ), actionCollection(), "folder_shortcut_command" ); mMarkAllAsReadAction = new TDEAction( i18n("Mark All Messages as &Read"), "goto", 0, this, - TQT_SLOT(slotMarkAllAsRead()), actionCollection(), "mark_all_as_read" ); + TQ_SLOT(slotMarkAllAsRead()), actionCollection(), "mark_all_as_read" ); - mExpireFolderAction = new TDEAction(i18n("&Expiration Settings"), 0, this, TQT_SLOT(slotExpireFolder()), + mExpireFolderAction = new TDEAction(i18n("&Expiration Settings"), 0, this, TQ_SLOT(slotExpireFolder()), actionCollection(), "expire"); mCompactFolderAction = new TDEAction( i18n("&Compact Folder"), 0, this, - TQT_SLOT(slotCompactFolder()), actionCollection(), "compact" ); + TQ_SLOT(slotCompactFolder()), actionCollection(), "compact" ); mRefreshFolderAction = new TDEAction( i18n("Check Mail &in This Folder"), "reload", TDEStdAccel::shortcut( TDEStdAccel::Reload ), this, - TQT_SLOT(slotRefreshFolder()), + TQ_SLOT(slotRefreshFolder()), actionCollection(), "refresh_folder" ); mTroubleshootFolderAction = 0; // set in initializeIMAPActions mEmptyFolderAction = new TDEAction( "foo" /*set in updateFolderMenu*/, "edittrash", 0, this, - TQT_SLOT(slotEmptyFolder()), actionCollection(), "empty" ); + TQ_SLOT(slotEmptyFolder()), actionCollection(), "empty" ); mRemoveFolderAction = new TDEAction( "foo" /*set in updateFolderMenu*/, "edit-delete", 0, this, - TQT_SLOT(slotRemoveFolder()), actionCollection(), "delete_folder" ); + TQ_SLOT(slotRemoveFolder()), actionCollection(), "delete_folder" ); mArchiveFolderAction = new TDEAction( i18n( "&Archive Folder..." ), "document-save", 0, this, - TQT_SLOT( slotArchiveFolder() ), actionCollection(), + TQ_SLOT( slotArchiveFolder() ), actionCollection(), "archive_folder" ); mPreferHtmlAction = new TDEToggleAction( i18n("Prefer &HTML to Plain Text"), 0, this, - TQT_SLOT(slotOverrideHtml()), actionCollection(), "prefer_html" ); + TQ_SLOT(slotOverrideHtml()), actionCollection(), "prefer_html" ); mPreferHtmlLoadExtAction = new TDEToggleAction( i18n("Load E&xternal References"), 0, this, - TQT_SLOT(slotOverrideHtmlLoadExt()), actionCollection(), "prefer_html_external_refs" ); + TQ_SLOT(slotOverrideHtmlLoadExt()), actionCollection(), "prefer_html_external_refs" ); mThreadMessagesAction = new TDEToggleAction( i18n("&Thread Messages"), 0, this, - TQT_SLOT(slotOverrideThread()), actionCollection(), "thread_messages" ); + TQ_SLOT(slotOverrideThread()), actionCollection(), "thread_messages" ); mThreadBySubjectAction = new TDEToggleAction( i18n("Thread Messages also by &Subject"), 0, this, - TQT_SLOT(slotToggleSubjectThreading()), actionCollection(), "thread_messages_by_subject" ); + TQ_SLOT(slotToggleSubjectThreading()), actionCollection(), "thread_messages_by_subject" ); new TDEAction( i18n("Copy Folder"), "edit-copy", SHIFT+CTRL+Key_C, folderTree(), - TQT_SLOT(copyFolder()), actionCollection(), "copy_folder" ); + TQ_SLOT(copyFolder()), actionCollection(), "copy_folder" ); new TDEAction( i18n("Cut Folder"), "edit-cut", SHIFT+CTRL+Key_X, folderTree(), - TQT_SLOT(cutFolder()), actionCollection(), "cut_folder" ); + TQ_SLOT(cutFolder()), actionCollection(), "cut_folder" ); new TDEAction( i18n("Paste Folder"), "edit-paste", SHIFT+CTRL+Key_V, folderTree(), - TQT_SLOT(pasteFolder()), actionCollection(), "paste_folder" ); + TQ_SLOT(pasteFolder()), actionCollection(), "paste_folder" ); new TDEAction( i18n("Copy Messages"), "edit-copy", ALT+CTRL+Key_C, headers(), - TQT_SLOT(copyMessages()), actionCollection(), "copy_messages" ); + TQ_SLOT(copyMessages()), actionCollection(), "copy_messages" ); new TDEAction( i18n("Cut Messages"), "edit-cut", ALT+CTRL+Key_X, headers(), - TQT_SLOT(cutMessages()), actionCollection(), "cut_messages" ); + TQ_SLOT(cutMessages()), actionCollection(), "cut_messages" ); new TDEAction( i18n("Paste Messages"), "edit-paste", ALT+CTRL+Key_V, headers(), - TQT_SLOT(pasteMessages()), actionCollection(), "paste_messages" ); + TQ_SLOT(pasteMessages()), actionCollection(), "paste_messages" ); //----- Message Menu (void) new TDEAction( i18n("&New Message..."), "mail-message-new", TDEStdAccel::shortcut(TDEStdAccel::New), this, - TQT_SLOT(slotCompose()), actionCollection(), "new_message" ); + TQ_SLOT(slotCompose()), actionCollection(), "new_message" ); mTemplateMenu = new TDEActionMenu( i18n("New Message From &Template"), "document-new", actionCollection(), "new_from_template" ); mTemplateMenu->setDelayed( true ); - connect( mTemplateMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, - TQT_SLOT( slotShowNewFromTemplate() ) ); - connect( mTemplateMenu->popupMenu(), TQT_SIGNAL( activated(int) ), this, - TQT_SLOT( slotNewFromTemplate(int) ) ); + connect( mTemplateMenu->popupMenu(), TQ_SIGNAL( aboutToShow() ), this, + TQ_SLOT( slotShowNewFromTemplate() ) ); + connect( mTemplateMenu->popupMenu(), TQ_SIGNAL( activated(int) ), this, + TQ_SLOT( slotNewFromTemplate(int) ) ); TDEAction* newToML = new TDEAction( i18n("New Message t&o Mailing-List..."), "mail_post_to", CTRL+SHIFT+Key_N, this, - TQT_SLOT(slotPostToML()), actionCollection(), "post_message" ); + TQ_SLOT(slotPostToML()), actionCollection(), "post_message" ); newToML->plugAccel( actionCollection()->tdeaccel() ); mForwardActionMenu = new TDEActionMenu( i18n("Message->","&Forward"), @@ -2867,25 +2867,25 @@ void KMMainWidget::setupActions() mForwardInlineAction = new TDEAction( i18n("&Inline..."), "mail-forward", 0, this, - TQT_SLOT(slotForwardInlineMsg()), + TQ_SLOT(slotForwardInlineMsg()), actionCollection(), "message_forward_inline" ); mForwardAttachedAction = new TDEAction( i18n("Message->Forward->","As &Attachment..."), "mail-forward", 0, this, - TQT_SLOT(slotForwardAttachedMsg()), + TQ_SLOT(slotForwardAttachedMsg()), actionCollection(), "message_forward_as_attachment" ); mForwardDigestAction = new TDEAction( i18n("Message->Forward->","As Di&gest..."), "mail-forward", 0, this, - TQT_SLOT(slotForwardDigestMsg()), + TQ_SLOT(slotForwardDigestMsg()), actionCollection(), "message_forward_as_digest" ); mRedirectAction = new TDEAction( i18n("Message->Forward->","&Redirect..."), "mail-forward", Key_E, this, - TQT_SLOT(slotRedirectMsg()), + TQ_SLOT(slotRedirectMsg()), actionCollection(), "message_forward_redirect" ); @@ -2896,37 +2896,37 @@ void KMMainWidget::setupActions() mForwardActionMenu->insert( mRedirectAction ); mSendAgainAction = new TDEAction( i18n("Send A&gain..."), 0, this, - TQT_SLOT(slotResendMsg()), actionCollection(), "send_again" ); + TQ_SLOT(slotResendMsg()), actionCollection(), "send_again" ); //----- Create filter actions mFilterMenu = new TDEActionMenu( i18n("&Create Filter"), "filter", actionCollection(), "create_filter" ); - connect( mFilterMenu, TQT_SIGNAL(activated()), this, - TQT_SLOT(slotFilter()) ); + connect( mFilterMenu, TQ_SIGNAL(activated()), this, + TQ_SLOT(slotFilter()) ); mSubjectFilterAction = new TDEAction( i18n("Filter on &Subject..."), 0, this, - TQT_SLOT(slotSubjectFilter()), + TQ_SLOT(slotSubjectFilter()), actionCollection(), "subject_filter"); mFilterMenu->insert( mSubjectFilterAction ); mFromFilterAction = new TDEAction( i18n("Filter on &From..."), 0, this, - TQT_SLOT(slotFromFilter()), + TQ_SLOT(slotFromFilter()), actionCollection(), "from_filter"); mFilterMenu->insert( mFromFilterAction ); mToFilterAction = new TDEAction( i18n("Filter on &To..."), 0, this, - TQT_SLOT(slotToFilter()), + TQ_SLOT(slotToFilter()), actionCollection(), "to_filter"); mFilterMenu->insert( mToFilterAction ); mListFilterAction = new TDEAction( i18n("Filter on Mailing-&List..."), 0, this, - TQT_SLOT(slotMailingListFilter()), actionCollection(), + TQ_SLOT(slotMailingListFilter()), actionCollection(), "mlist_filter"); mFilterMenu->insert( mListFilterAction ); - mPrintAction = KStdAction::print (this, TQT_SLOT(slotPrintMsg()), actionCollection()); + mPrintAction = KStdAction::print (this, TQ_SLOT(slotPrintMsg()), actionCollection()); mUseAction = new TDEAction( i18n("New Message From &Template"), "document-new", - Key_N, this, TQT_SLOT( slotUseTemplate() ), + Key_N, this, TQ_SLOT( slotUseTemplate() ), actionCollection(), "use_template" ); mUseAction->plugAccel( actionCollection()->tdeaccel() ); @@ -2936,19 +2936,19 @@ void KMMainWidget::setupActions() mMarkThreadAsReadAction = new TDEAction(KGuiItem(i18n("Mark Thread as &Read"), "kmmsgread", i18n("Mark all messages in the selected thread as read")), - 0, this, TQT_SLOT(slotSetThreadStatusRead()), + 0, this, TQ_SLOT(slotSetThreadStatusRead()), actionCollection(), "thread_read"); mThreadStatusMenu->insert( mMarkThreadAsReadAction ); mMarkThreadAsNewAction = new TDEAction(KGuiItem(i18n("Mark Thread as &New"), "kmmsgnew", i18n("Mark all messages in the selected thread as new")), - 0, this, TQT_SLOT(slotSetThreadStatusNew()), + 0, this, TQ_SLOT(slotSetThreadStatusNew()), actionCollection(), "thread_new"); mThreadStatusMenu->insert( mMarkThreadAsNewAction ); mMarkThreadAsUnreadAction = new TDEAction(KGuiItem(i18n("Mark Thread as &Unread"), "kmmsgunseen", i18n("Mark all messages in the selected thread as unread")), - 0, this, TQT_SLOT(slotSetThreadStatusUnread()), + 0, this, TQ_SLOT(slotSetThreadStatusUnread()), actionCollection(), "thread_unread"); mThreadStatusMenu->insert( mMarkThreadAsUnreadAction ); @@ -2956,24 +2956,24 @@ void KMMainWidget::setupActions() //----- "Mark Thread" toggle actions mToggleThreadFlagAction = new TDEToggleAction(i18n("Mark Thread as &Important"), "mail_flag", - 0, this, TQT_SLOT(slotSetThreadStatusFlag()), + 0, this, TQ_SLOT(slotSetThreadStatusFlag()), actionCollection(), "thread_flag"); mToggleThreadFlagAction->setCheckedState( i18n("Remove &Important Thread Mark") ); mThreadStatusMenu->insert( mToggleThreadFlagAction ); mToggleThreadTodoAction = new TDEToggleAction(i18n("Mark Thread as &Action Item"), "mail_todo", - 0, this, TQT_SLOT(slotSetThreadStatusTodo()), + 0, this, TQ_SLOT(slotSetThreadStatusTodo()), actionCollection(), "thread_todo"); mToggleThreadTodoAction->setCheckedState( i18n("Remove &Action Item Thread Mark") ); mThreadStatusMenu->insert( mToggleThreadTodoAction ); //------- "Watch and ignore thread" actions mWatchThreadAction = new TDEToggleAction(i18n("&Watch Thread"), "kmmsgwatched", - 0, this, TQT_SLOT(slotSetThreadStatusWatched()), + 0, this, TQ_SLOT(slotSetThreadStatusWatched()), actionCollection(), "thread_watched"); mIgnoreThreadAction = new TDEToggleAction(i18n("&Ignore Thread"), "mail_ignore", - 0, this, TQT_SLOT(slotSetThreadStatusIgnored()), + 0, this, TQ_SLOT(slotSetThreadStatusIgnored()), actionCollection(), "thread_ignored"); mThreadStatusMenu->insert( new TDEActionSeparator( this ) ); @@ -2981,7 +2981,7 @@ void KMMainWidget::setupActions() mThreadStatusMenu->insert( mIgnoreThreadAction ); mSaveAttachmentsAction = new TDEAction( i18n("Save A&ttachments..."), "attach", - 0, this, TQT_SLOT(slotSaveAttachments()), + 0, this, TQ_SLOT(slotSaveAttachments()), actionCollection(), "file_save_attachments" ); mMoveActionMenu = new TDEActionMenu( i18n("&Move To" ), @@ -2992,7 +2992,7 @@ void KMMainWidget::setupActions() mApplyAllFiltersAction = new TDEAction( i18n("Appl&y All Filters"), "filter", CTRL+Key_J, this, - TQT_SLOT(slotApplyFilters()), + TQ_SLOT(slotApplyFilters()), actionCollection(), "apply_filters" ); mApplyFilterActionsMenu = new TDEActionMenu( i18n("A&pply Filter" ), @@ -3007,25 +3007,25 @@ void KMMainWidget::setupActions() unreadMenu->setToolTip( i18n("Choose how to display the count of unread messages") ); mUnreadColumnToggle = new TDERadioAction( i18n("View->Unread Count", "View in &Separate Column"), 0, this, - TQT_SLOT(slotToggleUnread()), + TQ_SLOT(slotToggleUnread()), actionCollection(), "view_unread_column" ); mUnreadColumnToggle->setExclusiveGroup( "view_unread_group" ); unreadMenu->insert( mUnreadColumnToggle ); mUnreadTextToggle = new TDERadioAction( i18n("View->Unread Count", "View After &Folder Name"), 0, this, - TQT_SLOT(slotToggleUnread()), + TQ_SLOT(slotToggleUnread()), actionCollection(), "view_unread_text" ); mUnreadTextToggle->setExclusiveGroup( "view_unread_group" ); unreadMenu->insert( mUnreadTextToggle ); // toggle for total column mTotalColumnToggle = new TDEToggleAction( i18n("View->", "&Total Column"), 0, this, - TQT_SLOT(slotToggleTotalColumn()), + TQ_SLOT(slotToggleTotalColumn()), actionCollection(), "view_columns_total" ); mTotalColumnToggle->setToolTip( i18n("Toggle display of column showing the " "total number of messages in folders.") ); mSizeColumnToggle = new TDEToggleAction( i18n("View->", "&Size Column"), 0, this, - TQT_SLOT(slotToggleSizeColumn()), + TQ_SLOT(slotToggleSizeColumn()), actionCollection(), "view_columns_size" ); mSizeColumnToggle->setToolTip( i18n("Toggle display of column showing the " "total size of messages in folders.") ); @@ -3033,77 +3033,77 @@ void KMMainWidget::setupActions() (void)new TDEAction( KGuiItem( i18n("View->","&Expand Thread"), TQString(), i18n("Expand the current thread") ), Key_Period, this, - TQT_SLOT(slotExpandThread()), + TQ_SLOT(slotExpandThread()), actionCollection(), "expand_thread" ); (void)new TDEAction( KGuiItem( i18n("View->","&Collapse Thread"), TQString(), i18n("Collapse the current thread") ), Key_Comma, this, - TQT_SLOT(slotCollapseThread()), + TQ_SLOT(slotCollapseThread()), actionCollection(), "collapse_thread" ); (void)new TDEAction( KGuiItem( i18n("View->","Ex&pand All Threads"), TQString(), i18n("Expand all threads in the current folder") ), CTRL+Key_Period, this, - TQT_SLOT(slotExpandAllThreads()), + TQ_SLOT(slotExpandAllThreads()), actionCollection(), "expand_all_threads" ); (void)new TDEAction( KGuiItem( i18n("View->","C&ollapse All Threads"), TQString(), i18n("Collapse all threads in the current folder") ), CTRL+Key_Comma, this, - TQT_SLOT(slotCollapseAllThreads()), + TQ_SLOT(slotCollapseAllThreads()), actionCollection(), "collapse_all_threads" ); mViewSourceAction = new TDEAction( i18n("&View Source"), Key_V, this, - TQT_SLOT(slotShowMsgSrc()), actionCollection(), + TQ_SLOT(slotShowMsgSrc()), actionCollection(), "view_source" ); TDEAction* dukeOfMonmoth = new TDEAction( i18n("&Display Message"), Key_Return, this, - TQT_SLOT( slotDisplayCurrentMessage() ), actionCollection(), + TQ_SLOT( slotDisplayCurrentMessage() ), actionCollection(), "display_message" ); dukeOfMonmoth->plugAccel( actionCollection()->tdeaccel() ); //----- Go Menu new TDEAction( KGuiItem( i18n("&Next Message"), TQString(), i18n("Go to the next message") ), - "N;Right", this, TQT_SLOT(slotNextMessage()), + "N;Right", this, TQ_SLOT(slotNextMessage()), actionCollection(), "go_next_message" ); new TDEAction( KGuiItem( i18n("Next &Unread Message"), TQApplication::reverseLayout() ? "go-previous" : "go-next", i18n("Go to the next unread message") ), - Key_Plus, this, TQT_SLOT(slotNextUnreadMessage()), + Key_Plus, this, TQ_SLOT(slotNextUnreadMessage()), actionCollection(), "go_next_unread_message" ); /* ### needs better support from folders: new TDEAction( KGuiItem( i18n("Next &Important Message"), TQString(), i18n("Go to the next important message") ), - 0, this, TQT_SLOT(slotNextImportantMessage()), + 0, this, TQ_SLOT(slotNextImportantMessage()), actionCollection(), "go_next_important_message" ); */ new TDEAction( KGuiItem( i18n("&Previous Message"), TQString(), i18n("Go to the previous message") ), - "P;Left", this, TQT_SLOT(slotPrevMessage()), + "P;Left", this, TQ_SLOT(slotPrevMessage()), actionCollection(), "go_prev_message" ); new TDEAction( KGuiItem( i18n("Previous Unread &Message"), TQApplication::reverseLayout() ? "go-next" : "go-previous", i18n("Go to the previous unread message") ), - Key_Minus, this, TQT_SLOT(slotPrevUnreadMessage()), + Key_Minus, this, TQ_SLOT(slotPrevUnreadMessage()), actionCollection(), "go_prev_unread_message" ); /* needs better support from folders: new TDEAction( KGuiItem( i18n("Previous I&mportant Message"), TQString(), i18n("Go to the previous important message") ), - 0, this, TQT_SLOT(slotPrevImportantMessage()), + 0, this, TQ_SLOT(slotPrevImportantMessage()), actionCollection(), "go_prev_important_message" ); */ TDEAction *action = new TDEAction( KGuiItem( i18n("Next Unread &Folder"), TQString(), i18n("Go to the next folder with unread messages") ), - ALT+Key_Plus, this, TQT_SLOT(slotNextUnreadFolder()), + ALT+Key_Plus, this, TQ_SLOT(slotNextUnreadFolder()), actionCollection(), "go_next_unread_folder" ); TDEShortcut shortcut = action->shortcut(); shortcut.append( KKey( CTRL+Key_Plus ) ); @@ -3112,7 +3112,7 @@ void KMMainWidget::setupActions() action = new TDEAction( KGuiItem( i18n("Previous Unread F&older"), TQString(), i18n("Go to the previous folder with unread messages") ), - ALT+Key_Minus, this, TQT_SLOT(slotPrevUnreadFolder()), + ALT+Key_Minus, this, TQ_SLOT(slotPrevUnreadFolder()), actionCollection(), "go_prev_unread_folder" ); shortcut = action->shortcut(); shortcut.append( KKey( CTRL+Key_Minus ) ); @@ -3123,49 +3123,49 @@ void KMMainWidget::setupActions() i18n("Scroll down current message. " "If at end of current message, " "go to next unread message.") ), - Key_Space, this, TQT_SLOT(slotReadOn()), + Key_Space, this, TQ_SLOT(slotReadOn()), actionCollection(), "go_next_unread_text" ); //----- Settings Menu mToggleShowQuickSearchAction = new TDEToggleAction(i18n("Show Quick Search"), TQString(), - 0, this, TQT_SLOT(slotToggleShowQuickSearch()), + 0, this, TQ_SLOT(slotToggleShowQuickSearch()), actionCollection(), "show_quick_search"); mToggleShowQuickSearchAction->setChecked( GlobalSettings::self()->quickSearchActive() ); mToggleShowQuickSearchAction->setWhatsThis( i18n( GlobalSettings::self()->quickSearchActiveItem()->whatsThis().utf8() ) ); (void) new TDEAction( i18n("Configure &Filters..."), 0, this, - TQT_SLOT(slotFilter()), actionCollection(), "filter" ); + TQ_SLOT(slotFilter()), actionCollection(), "filter" ); (void) new TDEAction( i18n("Configure &POP Filters..."), 0, this, - TQT_SLOT(slotPopFilter()), actionCollection(), "popFilter" ); + TQ_SLOT(slotPopFilter()), actionCollection(), "popFilter" ); (void) new TDEAction( i18n("Manage &Sieve Scripts..."), 0, this, - TQT_SLOT(slotManageSieveScripts()), actionCollection(), "sieveFilters" ); + TQ_SLOT(slotManageSieveScripts()), actionCollection(), "sieveFilters" ); (void) new TDEAction( KGuiItem( i18n("KMail &Introduction"), 0, i18n("Display KMail's Welcome Page") ), - 0, this, TQT_SLOT(slotIntro()), + 0, this, TQ_SLOT(slotIntro()), actionCollection(), "help_kmail_welcomepage" ); // ----- Standard Actions -// KStdAction::configureNotifications(this, TQT_SLOT(slotEditNotifications()), actionCollection()); +// KStdAction::configureNotifications(this, TQ_SLOT(slotEditNotifications()), actionCollection()); (void) new TDEAction( i18n("Configure &Notifications..."), "knotify", 0, this, - TQT_SLOT(slotEditNotifications()), actionCollection(), + TQ_SLOT(slotEditNotifications()), actionCollection(), "kmail_configure_notifications" ); -// KStdAction::preferences(this, TQT_SLOT(slotSettings()), actionCollection()); +// KStdAction::preferences(this, TQ_SLOT(slotSettings()), actionCollection()); (void) new TDEAction( i18n("&Configure KMail..."), "configure", 0, kmkernel, - TQT_SLOT(slotShowConfigurationDialog()), actionCollection(), + TQ_SLOT(slotShowConfigurationDialog()), actionCollection(), "kmail_configure_kmail" ); - KStdAction::undo(this, TQT_SLOT(slotUndo()), actionCollection(), "kmail_undo"); + KStdAction::undo(this, TQ_SLOT(slotUndo()), actionCollection(), "kmail_undo"); - KStdAction::tipOfDay( this, TQT_SLOT( slotShowTip() ), actionCollection() ); + KStdAction::tipOfDay( this, TQ_SLOT( slotShowTip() ), actionCollection() ); menutimer = new TQTimer( this, "menutimer" ); - connect( menutimer, TQT_SIGNAL( timeout() ), TQT_SLOT( updateMessageActions() ) ); + connect( menutimer, TQ_SIGNAL( timeout() ), TQ_SLOT( updateMessageActions() ) ); connect( kmkernel->undoStack(), - TQT_SIGNAL( undoStackChanged() ), this, TQT_SLOT( slotUpdateUndo() )); + TQ_SIGNAL( undoStackChanged() ), this, TQ_SLOT( slotUpdateUndo() )); initializeIMAPActions( false ); // don't set state, config not read yet updateMessageActions(); @@ -3547,8 +3547,8 @@ void KMMainWidget::slotShowStartupFolder() mFolderTree->cleanupConfigFile(); } - connect( kmkernel->filterMgr(), TQT_SIGNAL( filterListUpdated() ), - this, TQT_SLOT( initializeFilterActions() )); + connect( kmkernel->filterMgr(), TQ_SIGNAL( filterListUpdated() ), + this, TQ_SLOT( initializeFilterActions() )); // plug shortcut filter actions now initializeFilterActions(); @@ -3724,7 +3724,7 @@ void KMMainWidget::initializeFilterActions() if ( icon.isEmpty() ) icon = "gear"; filterAction = new TDEAction(as, icon, (*it)->shortcut(), filterCommand, - TQT_SLOT(start()), actionCollection(), + TQ_SLOT(start()), actionCollection(), normalizedName.local8Bit()); if(!addedSeparator) { mApplyFilterActionsMenu->popupMenu()->insertSeparator(); @@ -3770,7 +3770,7 @@ void KMMainWidget::initializeIMAPActions( bool setState /* false the first time, if ( !mTroubleshootFolderAction ) { mTroubleshootFolderAction = new TDEAction( i18n("&Troubleshoot IMAP Cache..."), "wizard", 0, - this, TQT_SLOT(slotTroubleshootFolder()), actionCollection(), "troubleshoot_folder" ); + this, TQ_SLOT(slotTroubleshootFolder()), actionCollection(), "troubleshoot_folder" ); if ( setState ) updateFolderMenu(); // set initial state of the action } else { @@ -3806,7 +3806,7 @@ void KMMainWidget::slotShortcutChanged( KMFolder *folder ) TQString actionname = TQString( "FolderShortcut %1").arg( folder->idString() ); TQString normalizedName = actionname.replace(" ", "_"); TDEAction* action = - new TDEAction(actionlabel, folder->shortcut(), c, TQT_SLOT(start()), + new TDEAction(actionlabel, folder->shortcut(), c, TQ_SLOT(start()), actionCollection(), normalizedName.local8Bit()); action->setIcon( folder->unreadIconPath() ); c->setAction( action ); // will be deleted along with the command diff --git a/kmail/kmmainwin.cpp b/kmail/kmmainwin.cpp index e1a2467d..d1abdab6 100644 --- a/kmail/kmmainwin.cpp +++ b/kmail/kmmainwin.cpp @@ -36,7 +36,7 @@ KMMainWin::KMMainWin(TQWidget *) kapp->ref(); (void) new TDEAction( i18n("New &Window"), "window-new", 0, - this, TQT_SLOT(slotNewMailReader()), + this, TQ_SLOT(slotNewMailReader()), actionCollection(), "new_mail_client" ); mKMMainWidget = new KMMainWidget( this, "KMMainWidget", this, actionCollection() ); @@ -47,17 +47,17 @@ KMMainWin::KMMainWin(TQWidget *) setInstance( kmkernel->xmlGuiInstance() ); if ( kmkernel->firstInstance() ) - TQTimer::singleShot( 200, this, TQT_SLOT(slotShowTipOnStart()) ); + TQTimer::singleShot( 200, this, TQ_SLOT(slotShowTipOnStart()) ); setStandardToolBarMenuEnabled(true); - KStdAction::configureToolbars(this, TQT_SLOT(slotEditToolbars()), + KStdAction::configureToolbars(this, TQ_SLOT(slotEditToolbars()), actionCollection()); - KStdAction::keyBindings(mKMMainWidget, TQT_SLOT(slotEditKeys()), + KStdAction::keyBindings(mKMMainWidget, TQ_SLOT(slotEditKeys()), actionCollection()); - KStdAction::quit( this, TQT_SLOT(slotQuit()), actionCollection()); + KStdAction::quit( this, TQ_SLOT(slotQuit()), actionCollection()); createGUI( "kmmainwin.rc", false ); // Don't use conserveMemory() because this renders dynamic plugging // of actions unusable! @@ -66,14 +66,14 @@ KMMainWin::KMMainWin(TQWidget *) applyMainWindowSettings(KMKernel::config(), "Main Window"); - connect( KPIM::BroadcastStatus::instance(), TQT_SIGNAL( statusMsg( const TQString& ) ), - this, TQT_SLOT( displayStatusMsg(const TQString&) ) ); + connect( KPIM::BroadcastStatus::instance(), TQ_SIGNAL( statusMsg( const TQString& ) ), + this, TQ_SLOT( displayStatusMsg(const TQString&) ) ); - connect(kmkernel, TQT_SIGNAL(configChanged()), - this, TQT_SLOT(slotConfigChanged())); + connect(kmkernel, TQ_SIGNAL(configChanged()), + this, TQ_SLOT(slotConfigChanged())); - connect(mKMMainWidget, TQT_SIGNAL(captionChangeRequest(const TQString&)), - TQT_SLOT(setCaption(const TQString&)) ); + connect(mKMMainWidget, TQ_SIGNAL(captionChangeRequest(const TQString&)), + TQ_SLOT(setCaption(const TQString&)) ); // Enable mail checks again (see destructor) kmkernel->enableMailCheck(); @@ -145,8 +145,8 @@ void KMMainWin::slotEditToolbars() saveMainWindowSettings(KMKernel::config(), "Main Window"); KEditToolbar dlg(actionCollection(), "kmmainwin.rc"); - connect( &dlg, TQT_SIGNAL(newToolbarConfig()), - TQT_SLOT(slotUpdateToolbars()) ); + connect( &dlg, TQ_SIGNAL(newToolbarConfig()), + TQ_SLOT(slotUpdateToolbars()) ); dlg.exec(); } diff --git a/kmail/kmmimeparttree.cpp b/kmail/kmmimeparttree.cpp index 779fffd4..91d8592f 100644 --- a/kmail/kmmimeparttree.cpp +++ b/kmail/kmmimeparttree.cpp @@ -68,11 +68,11 @@ KMMimePartTree::KMMimePartTree( KMReaderWin* readerWin, setColumnAlignment( 3, TQt::AlignRight ); restoreLayoutIfPresent(); - connect( this, TQT_SIGNAL( clicked( TQListViewItem* ) ), - this, TQT_SLOT( itemClicked( TQListViewItem* ) ) ); - connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem*, + connect( this, TQ_SIGNAL( clicked( TQListViewItem* ) ), + this, TQ_SLOT( itemClicked( TQListViewItem* ) ) ); + connect( this, TQ_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int ) ), - this, TQT_SLOT( itemRightClicked( TQListViewItem*, const TQPoint& ) ) ); + this, TQ_SLOT( itemRightClicked( TQListViewItem*, const TQPoint& ) ) ); setSelectionMode( TQListView::Extended ); setRootIsDecorated( false ); setAllColumnsShowFocus( true ); @@ -132,31 +132,31 @@ void KMMimePartTree::itemRightClicked( TQListViewItem* item, TQPopupMenu* popup = new TQPopupMenu; if ( mCurrentContextMenuItem->node()->nodeId() > 2 && mCurrentContextMenuItem->node()->typeString() != "Multipart" ) { - popup->insertItem( SmallIcon("document-open"), i18n("to open", "Open"), this, TQT_SLOT(slotOpen()) ); - popup->insertItem( i18n("Open With..."), this, TQT_SLOT(slotOpenWith()) ); - popup->insertItem( i18n("to view something", "View"), this, TQT_SLOT(slotView()) ); + popup->insertItem( SmallIcon("document-open"), i18n("to open", "Open"), this, TQ_SLOT(slotOpen()) ); + popup->insertItem( i18n("Open With..."), this, TQ_SLOT(slotOpenWith()) ); + popup->insertItem( i18n("to view something", "View"), this, TQ_SLOT(slotView()) ); } - popup->insertItem( SmallIcon("document-save-as"),i18n( "Save &As..." ), this, TQT_SLOT( slotSaveAs() ) ); + popup->insertItem( SmallIcon("document-save-as"),i18n( "Save &As..." ), this, TQ_SLOT( slotSaveAs() ) ); /* * FIXME mkae optional? popup->insertItem( i18n( "Save as &Encoded..." ), this, - TQT_SLOT( slotSaveAsEncoded() ) ); + TQ_SLOT( slotSaveAsEncoded() ) ); */ popup->insertItem( i18n( "Save All Attachments..." ), this, - TQT_SLOT( slotSaveAll() ) ); + TQ_SLOT( slotSaveAll() ) ); // edit + delete only for attachments if ( mCurrentContextMenuItem->node()->nodeId() > 2 && mCurrentContextMenuItem->node()->typeString() != "Multipart" ) { - popup->insertItem( SmallIcon("edit-copy"), i18n("Copy"), this, TQT_SLOT(slotCopy()) ); + popup->insertItem( SmallIcon("edit-copy"), i18n("Copy"), this, TQ_SLOT(slotCopy()) ); if ( GlobalSettings::self()->allowAttachmentDeletion() ) popup->insertItem( SmallIcon("edit-delete"), i18n( "Delete Attachment" ), - this, TQT_SLOT( slotDelete() ) ); + this, TQ_SLOT( slotDelete() ) ); if ( GlobalSettings::self()->allowAttachmentEditing() ) popup->insertItem( SmallIcon( "edit" ), i18n( "Edit Attachment" ), - this, TQT_SLOT( slotEdit() ) ); + this, TQ_SLOT( slotEdit() ) ); } if ( mCurrentContextMenuItem->node()->nodeId() > 0 ) - popup->insertItem( i18n("Properties"), this, TQT_SLOT(slotProperties()) ); + popup->insertItem( i18n("Properties"), this, TQ_SLOT(slotProperties()) ); popup->exec( point ); delete popup; mCurrentContextMenuItem = 0; @@ -295,8 +295,8 @@ void KMMimePartTree::startHandleAttachmentCommand(int type) KMHandleAttachmentCommand* command = new KMHandleAttachmentCommand( node, mReaderWin->message(), node->nodeId(), name, KMHandleAttachmentCommand::AttachmentAction( type ), 0, this ); - connect( command, TQT_SIGNAL( showAttachment( int, const TQString& ) ), - mReaderWin, TQT_SLOT( slotAtmView( int, const TQString& ) ) ); + connect( command, TQ_SIGNAL( showAttachment( int, const TQString& ) ), + mReaderWin, TQ_SLOT( slotAtmView( int, const TQString& ) ) ); command->start(); } diff --git a/kmail/kmmsgpartdlg.cpp b/kmail/kmmsgpartdlg.cpp index 9df9ff6b..9cf26fbe 100644 --- a/kmail/kmmsgpartdlg.cpp +++ b/kmail/kmmsgpartdlg.cpp @@ -81,8 +81,8 @@ KMMsgPartDialog::KMMsgPartDialog( const TQString & caption, << TQString::fromLatin1("application/octet-stream") << TQString::fromLatin1("application/x-gunzip") << TQString::fromLatin1("application/zip") ); - connect( mMimeType, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotMimeTypeChanged(const TQString&)) ); + connect( mMimeType, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotMimeTypeChanged(const TQString&)) ); glay->addWidget( mMimeType, 0, 1 ); msg = i18n("<qt><p>The <em>MIME type</em> of the file:</p>" diff --git a/kmail/kmpopfiltercnfrmdlg.cpp b/kmail/kmpopfiltercnfrmdlg.cpp index 3689e663..9e18532d 100644 --- a/kmail/kmpopfiltercnfrmdlg.cpp +++ b/kmail/kmpopfiltercnfrmdlg.cpp @@ -61,8 +61,8 @@ KMPopHeadersView::KMPopHeadersView(TQWidget *aParent, KMPopFilterCnfrmDlg *aDial //we rely on fixed column order, so we forbid this header()->setMovingEnabled(false); - connect(this, TQT_SIGNAL(pressed(TQListViewItem*, const TQPoint&, int)), - TQT_SLOT(slotPressed(TQListViewItem*, const TQPoint&, int))); + connect(this, TQ_SIGNAL(pressed(TQListViewItem*, const TQPoint&, int)), + TQ_SLOT(slotPressed(TQListViewItem*, const TQPoint&, int))); } KMPopHeadersView::~KMPopHeadersView() @@ -363,15 +363,15 @@ KMPopFilterCnfrmDlg::KMPopFilterCnfrmDlg(TQPtrList<KMPopHeaders> *aHeaders, cons lowerBox->setTitle(i18n("Ruleset Filtered Messages: %1").arg(rulesetCount)); // connect signals and slots - connect(lv, TQT_SIGNAL(pressed(TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(slotPressed(TQListViewItem*, const TQPoint&, int))); - connect(mFilteredHeaders, TQT_SIGNAL(pressed(TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(slotPressed(TQListViewItem*, const TQPoint&, int))); - connect(cb, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotToggled(bool))); + connect(lv, TQ_SIGNAL(pressed(TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(slotPressed(TQListViewItem*, const TQPoint&, int))); + connect(mFilteredHeaders, TQ_SIGNAL(pressed(TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(slotPressed(TQListViewItem*, const TQPoint&, int))); + connect(cb, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotToggled(bool))); adjustSize(); - TQTimer::singleShot(0, this, TQT_SLOT(slotUpdateMinimumSize())); + TQTimer::singleShot(0, this, TQ_SLOT(slotUpdateMinimumSize())); } KMPopFilterCnfrmDlg::~KMPopFilterCnfrmDlg() @@ -459,7 +459,7 @@ void KMPopFilterCnfrmDlg::slotToggled(bool aOn) mFilteredHeaders->hide(); } } - TQTimer::singleShot(0, this, TQT_SLOT(slotUpdateMinimumSize())); + TQTimer::singleShot(0, this, TQ_SLOT(slotUpdateMinimumSize())); } void KMPopFilterCnfrmDlg::slotUpdateMinimumSize() diff --git a/kmail/kmreadermainwin.cpp b/kmail/kmreadermainwin.cpp index b3a2dbc3..db42f3fa 100644 --- a/kmail/kmreadermainwin.cpp +++ b/kmail/kmreadermainwin.cpp @@ -103,8 +103,8 @@ void KMReaderMainWin::initKMReaderMainWin() { toolBar( "mainToolBar" )->hide(); } - connect( kmkernel, TQT_SIGNAL( configChanged() ), - this, TQT_SLOT( slotConfigChanged() ) ); + connect( kmkernel, TQ_SIGNAL( configChanged() ), + this, TQ_SLOT( slotConfigChanged() ) ); } void KMReaderMainWin::setupForwardingActionsList() @@ -156,7 +156,7 @@ void KMReaderMainWin::showMsg( const TQString & encoding, KMMessage *msg, menuBar()->show(); toolBar( "mainToolBar" )->show(); - connect ( msg->parent(), TQT_SIGNAL( destroyed( TQObject* ) ), this, TQT_SLOT( slotFolderRemoved( TQObject* ) ) ); + connect ( msg->parent(), TQ_SIGNAL( destroyed( TQObject* ) ), this, TQ_SLOT( slotFolderRemoved( TQObject* ) ) ); } @@ -241,8 +241,8 @@ void KMReaderMainWin::slotForwardInlineMsg() } else { command = new KMForwardInlineCommand( this, mReaderWin->message() ); } - connect( command, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( slotReplyOrForwardFinished() ) ); + connect( command, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( slotReplyOrForwardFinished() ) ); command->start(); } @@ -256,8 +256,8 @@ void KMReaderMainWin::slotForwardAttachedMsg() } else { command = new KMForwardAttachedCommand( this, mReaderWin->message() ); } - connect( command, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( slotReplyOrForwardFinished() ) ); + connect( command, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( slotReplyOrForwardFinished() ) ); command->start(); } @@ -271,8 +271,8 @@ void KMReaderMainWin::slotForwardDigestMsg() } else { command = new KMForwardDigestCommand( this, mReaderWin->message() ); } - connect( command, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( slotReplyOrForwardFinished() ) ); + connect( command, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( slotReplyOrForwardFinished() ) ); command->start(); } @@ -280,8 +280,8 @@ void KMReaderMainWin::slotForwardDigestMsg() void KMReaderMainWin::slotRedirectMsg() { KMCommand *command = new KMRedirectCommand( this, mReaderWin->message() ); - connect( command, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( slotReplyOrForwardFinished() ) ); + connect( command, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( slotReplyOrForwardFinished() ) ); command->start(); } @@ -299,7 +299,7 @@ void KMReaderMainWin::slotShowMsgSrc() //----------------------------------------------------------------------------- void KMReaderMainWin::setupForwardActions() { - disconnect( mForwardActionMenu, TQT_SIGNAL( activated() ), 0, 0 ); + disconnect( mForwardActionMenu, TQ_SIGNAL( activated() ), 0, 0 ); mForwardActionMenu->remove( mForwardInlineAction ); mForwardActionMenu->remove( mForwardAttachedAction ); @@ -308,16 +308,16 @@ void KMReaderMainWin::setupForwardActions() mForwardActionMenu->insert( mForwardAttachedAction, 1 ); mForwardInlineAction->setShortcut( Key_F ); mForwardAttachedAction->setShortcut( SHIFT+Key_F ); - connect( mForwardActionMenu, TQT_SIGNAL(activated()), this, - TQT_SLOT(slotForwardInlineMsg()) ); + connect( mForwardActionMenu, TQ_SIGNAL(activated()), this, + TQ_SLOT(slotForwardInlineMsg()) ); } else { mForwardActionMenu->insert( mForwardAttachedAction, 0 ); mForwardActionMenu->insert( mForwardInlineAction, 1 ); mForwardInlineAction->setShortcut( SHIFT+Key_F ); mForwardAttachedAction->setShortcut( Key_F ); - connect( mForwardActionMenu, TQT_SIGNAL(activated()), this, - TQT_SLOT(slotForwardAttachedMsg()) ); + connect( mForwardActionMenu, TQ_SIGNAL(activated()), this, + TQ_SLOT(slotForwardAttachedMsg()) ); } } @@ -336,42 +336,42 @@ void KMReaderMainWin::setupAccel() mMsgActions = new KMail::MessageActions( actionCollection(), this ); mMsgActions->setMessageView( mReaderWin ); - connect( mMsgActions, TQT_SIGNAL( replyActionFinished() ), - this, TQT_SLOT( slotReplyOrForwardFinished() ) ); + connect( mMsgActions, TQ_SIGNAL( replyActionFinished() ), + this, TQ_SLOT( slotReplyOrForwardFinished() ) ); //----- File Menu - //mOpenAction = KStdAction::open( this, TQT_SLOT( slotOpenMsg() ), + //mOpenAction = KStdAction::open( this, TQ_SLOT( slotOpenMsg() ), // actionCollection() ); //mSaveAsAction = new TDEAction( i18n("Save &As..."), "document-save", // TDEStdAccel::shortcut( TDEStdAccel::Save ), - // this, TQT_SLOT( slotSaveMsg() ), + // this, TQ_SLOT( slotSaveMsg() ), // actionCollection(), "file_save_as" ); - mSaveAsAction = KStdAction::saveAs( mReaderWin, TQT_SLOT( slotSaveMsg() ), + mSaveAsAction = KStdAction::saveAs( mReaderWin, TQ_SLOT( slotSaveMsg() ), actionCollection() ); mSaveAsAction->setShortcut( TDEStdAccel::shortcut( TDEStdAccel::Save ) ); - mPrintAction = KStdAction::print( this, TQT_SLOT( slotPrintMsg() ), + mPrintAction = KStdAction::print( this, TQ_SLOT( slotPrintMsg() ), actionCollection() ); - TDEAction *closeAction = KStdAction::close( this, TQT_SLOT( close() ), actionCollection() ); + TDEAction *closeAction = KStdAction::close( this, TQ_SLOT( close() ), actionCollection() ); TDEShortcut closeShortcut = closeAction->shortcut(); closeShortcut.append( KKey(Key_Escape)); closeAction->setShortcut(closeShortcut); //----- Edit Menu - KStdAction::copy( this, TQT_SLOT( slotCopy() ), actionCollection() ); - KStdAction::selectAll( this, TQT_SLOT( slotMarkAll() ), actionCollection() ); - KStdAction::find( this, TQT_SLOT(slotFind()), actionCollection() ); - KStdAction::findNext( this, TQT_SLOT( slotFindNext() ), actionCollection() ); + KStdAction::copy( this, TQ_SLOT( slotCopy() ), actionCollection() ); + KStdAction::selectAll( this, TQ_SLOT( slotMarkAll() ), actionCollection() ); + KStdAction::find( this, TQ_SLOT(slotFind()), actionCollection() ); + KStdAction::findNext( this, TQ_SLOT( slotFindNext() ), actionCollection() ); mTrashAction = new TDEAction( KGuiItem( i18n( "&Move to Trash" ), "edittrash", i18n( "Move message to trashcan" ) ), - Key_Delete, this, TQT_SLOT( slotTrashMsg() ), + Key_Delete, this, TQ_SLOT( slotTrashMsg() ), actionCollection(), "move_to_trash" ); //----- View Menu mViewSourceAction = new TDEAction( i18n("&View Source"), Key_V, this, - TQT_SLOT(slotShowMsgSrc()), actionCollection(), + TQ_SLOT(slotShowMsgSrc()), actionCollection(), "view_source" ); @@ -380,25 +380,25 @@ void KMReaderMainWin::setupAccel() "message_forward" ); mForwardInlineAction = new TDEAction( i18n("&Inline..."), "mail-forward", SHIFT+Key_F, this, - TQT_SLOT(slotForwardInlineMsg()), + TQ_SLOT(slotForwardInlineMsg()), actionCollection(), "message_forward_inline" ); mForwardAttachedAction = new TDEAction( i18n("Message->Forward->","As &Attachment..."), "mail-forward", Key_F, this, - TQT_SLOT(slotForwardAttachedMsg()), + TQ_SLOT(slotForwardAttachedMsg()), actionCollection(), "message_forward_as_attachment" ); mForwardDigestAction = new TDEAction( i18n("Message->Forward->","As Di&gest..."), "mail-forward", 0, this, - TQT_SLOT(slotForwardDigestMsg()), + TQ_SLOT(slotForwardDigestMsg()), actionCollection(), "message_forward_as_digest" ); mRedirectAction = new TDEAction( i18n("Message->Forward->","&Redirect..."), "mail-forward", Key_E, this, - TQT_SLOT(slotRedirectMsg()), + TQ_SLOT(slotRedirectMsg()), actionCollection(), "message_forward_redirect" ); @@ -410,32 +410,32 @@ void KMReaderMainWin::setupAccel() fontAction = new TDEFontAction( "Select Font", 0, actionCollection(), "text_font" ); fontAction->setFont( mReaderWin->cssHelper()->bodyFont().family() ); - connect( fontAction, TQT_SIGNAL( activated( const TQString& ) ), - TQT_SLOT( slotFontAction( const TQString& ) ) ); + connect( fontAction, TQ_SIGNAL( activated( const TQString& ) ), + TQ_SLOT( slotFontAction( const TQString& ) ) ); fontSizeAction = new TDEFontSizeAction( "Select Size", 0, actionCollection(), "text_size" ); fontSizeAction->setFontSize( mReaderWin->cssHelper()->bodyFont().pointSize() ); - connect( fontSizeAction, TQT_SIGNAL( fontSizeChanged( int ) ), - TQT_SLOT( slotSizeAction( int ) ) ); + connect( fontSizeAction, TQ_SIGNAL( fontSizeChanged( int ) ), + TQ_SLOT( slotSizeAction( int ) ) ); TQAccel *accel = new TQAccel(mReaderWin, "showMsg()"); accel->connectItem(accel->insertItem(Key_Up), - mReaderWin, TQT_SLOT(slotScrollUp())); + mReaderWin, TQ_SLOT(slotScrollUp())); accel->connectItem(accel->insertItem(Key_Down), - mReaderWin, TQT_SLOT(slotScrollDown())); + mReaderWin, TQ_SLOT(slotScrollDown())); accel->connectItem(accel->insertItem(Key_Prior), - mReaderWin, TQT_SLOT(slotScrollPrior())); + mReaderWin, TQ_SLOT(slotScrollPrior())); accel->connectItem(accel->insertItem(Key_Next), - mReaderWin, TQT_SLOT(slotScrollNext())); + mReaderWin, TQ_SLOT(slotScrollNext())); accel->connectItem(accel->insertItem(TDEStdAccel::shortcut(TDEStdAccel::Copy)), - mReaderWin, TQT_SLOT(slotCopySelectedText())); - connect( mReaderWin, TQT_SIGNAL(popupMenu(KMMessage&,const KURL&,const TQPoint&)), - this, TQT_SLOT(slotMsgPopup(KMMessage&,const KURL&,const TQPoint&))); - connect(mReaderWin, TQT_SIGNAL(urlClicked(const KURL&,int)), - mReaderWin, TQT_SLOT(slotUrlClicked())); + mReaderWin, TQ_SLOT(slotCopySelectedText())); + connect( mReaderWin, TQ_SIGNAL(popupMenu(KMMessage&,const KURL&,const TQPoint&)), + this, TQ_SLOT(slotMsgPopup(KMMessage&,const KURL&,const TQPoint&))); + connect(mReaderWin, TQ_SIGNAL(urlClicked(const KURL&,int)), + mReaderWin, TQ_SLOT(slotUrlClicked())); setStandardToolBarMenuEnabled(true); - KStdAction::configureToolbars(this, TQT_SLOT(slotEditToolbars()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(slotEditToolbars()), actionCollection()); } @@ -513,7 +513,7 @@ void KMReaderMainWin::slotMsgPopup(KMMessage &aMsg, const KURL &aUrl, const TQPo menu->insertSeparator(); mPrintAction->plug( menu ); mSaveAsAction->plug( menu ); - menu->insertItem( i18n("Save Attachments..."), mReaderWin, TQT_SLOT(slotSaveAttachments()) ); + menu->insertItem( i18n("Save Attachments..."), mReaderWin, TQ_SLOT(slotSaveAttachments()) ); mMsgActions->createTodoAction()->plug( menu ); } menu->exec(aPoint, 0); @@ -561,7 +561,7 @@ void KMReaderMainWin::slotEditToolbars() { saveMainWindowSettings( KMKernel::config(), "ReaderWindow" ); KEditToolbar dlg( guiFactory(), this ); - connect( &dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(slotUpdateToolbars()) ); + connect( &dlg, TQ_SIGNAL(newToolbarConfig()), TQ_SLOT(slotUpdateToolbars()) ); dlg.exec(); } diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp index 0692ec7b..feac1d07 100644 --- a/kmail/kmreaderwin.cpp +++ b/kmail/kmreaderwin.cpp @@ -469,14 +469,14 @@ KMReaderWin::KMReaderWin(TQWidget *aParent, mLevelQuote = GlobalSettings::self()->collapseQuoteLevelSpin() - 1; - connect( &mUpdateReaderWinTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(updateReaderWin()) ); - connect( &mResizeTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotDelayedResize()) ); - connect( &mDelayedMarkTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotTouchMessage()) ); - connect( &mHeaderRefreshTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(updateHeader()) ); + connect( &mUpdateReaderWinTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(updateReaderWin()) ); + connect( &mResizeTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotDelayedResize()) ); + connect( &mDelayedMarkTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotTouchMessage()) ); + connect( &mHeaderRefreshTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(updateHeader()) ); } @@ -491,46 +491,46 @@ void KMReaderWin::createActions( TDEActionCollection * ac ) { new TDEActionMenu( i18n("View->", "&Headers"), ac, "view_headers" ); headerMenu->setToolTip( i18n("Choose display style of message headers") ); - connect( headerMenu, TQT_SIGNAL(activated()), - this, TQT_SLOT(slotCycleHeaderStyles()) ); + connect( headerMenu, TQ_SIGNAL(activated()), + this, TQ_SLOT(slotCycleHeaderStyles()) ); raction = new TDERadioAction( i18n("View->headers->", "&Enterprise Headers"), 0, - this, TQT_SLOT(slotEnterpriseHeaders()), + this, TQ_SLOT(slotEnterpriseHeaders()), ac, "view_headers_enterprise" ); raction->setToolTip( i18n("Show the list of headers in Enterprise style") ); raction->setExclusiveGroup( "view_headers_group" ); headerMenu->insert(raction); raction = new TDERadioAction( i18n("View->headers->", "&Fancy Headers"), 0, - this, TQT_SLOT(slotFancyHeaders()), + this, TQ_SLOT(slotFancyHeaders()), ac, "view_headers_fancy" ); raction->setToolTip( i18n("Show the list of headers in a fancy format") ); raction->setExclusiveGroup( "view_headers_group" ); headerMenu->insert( raction ); raction = new TDERadioAction( i18n("View->headers->", "&Brief Headers"), 0, - this, TQT_SLOT(slotBriefHeaders()), + this, TQ_SLOT(slotBriefHeaders()), ac, "view_headers_brief" ); raction->setToolTip( i18n("Show brief list of message headers") ); raction->setExclusiveGroup( "view_headers_group" ); headerMenu->insert( raction ); raction = new TDERadioAction( i18n("View->headers->", "&Standard Headers"), 0, - this, TQT_SLOT(slotStandardHeaders()), + this, TQ_SLOT(slotStandardHeaders()), ac, "view_headers_standard" ); raction->setToolTip( i18n("Show standard list of message headers") ); raction->setExclusiveGroup( "view_headers_group" ); headerMenu->insert( raction ); raction = new TDERadioAction( i18n("View->headers->", "&Long Headers"), 0, - this, TQT_SLOT(slotLongHeaders()), + this, TQ_SLOT(slotLongHeaders()), ac, "view_headers_long" ); raction->setToolTip( i18n("Show long list of message headers") ); raction->setExclusiveGroup( "view_headers_group" ); headerMenu->insert( raction ); raction = new TDERadioAction( i18n("View->headers->", "&All Headers"), 0, - this, TQT_SLOT(slotAllHeaders()), + this, TQ_SLOT(slotAllHeaders()), ac, "view_headers_all" ); raction->setToolTip( i18n("Show all message headers") ); raction->setExclusiveGroup( "view_headers_group" ); @@ -540,39 +540,39 @@ void KMReaderWin::createActions( TDEActionCollection * ac ) { TDEActionMenu *attachmentMenu = new TDEActionMenu( i18n("View->", "&Attachments"), ac, "view_attachments" ); attachmentMenu->setToolTip( i18n("Choose display style of attachments") ); - connect( attachmentMenu, TQT_SIGNAL(activated()), - this, TQT_SLOT(slotCycleAttachmentStrategy()) ); + connect( attachmentMenu, TQ_SIGNAL(activated()), + this, TQ_SLOT(slotCycleAttachmentStrategy()) ); raction = new TDERadioAction( i18n("View->attachments->", "&As Icons"), 0, - this, TQT_SLOT(slotIconicAttachments()), + this, TQ_SLOT(slotIconicAttachments()), ac, "view_attachments_as_icons" ); raction->setToolTip( i18n("Show all attachments as icons. Click to see them.") ); raction->setExclusiveGroup( "view_attachments_group" ); attachmentMenu->insert( raction ); raction = new TDERadioAction( i18n("View->attachments->", "&Smart"), 0, - this, TQT_SLOT(slotSmartAttachments()), + this, TQ_SLOT(slotSmartAttachments()), ac, "view_attachments_smart" ); raction->setToolTip( i18n("Show attachments as suggested by sender.") ); raction->setExclusiveGroup( "view_attachments_group" ); attachmentMenu->insert( raction ); raction = new TDERadioAction( i18n("View->attachments->", "&Inline"), 0, - this, TQT_SLOT(slotInlineAttachments()), + this, TQ_SLOT(slotInlineAttachments()), ac, "view_attachments_inline" ); raction->setToolTip( i18n("Show all attachments inline (if possible)") ); raction->setExclusiveGroup( "view_attachments_group" ); attachmentMenu->insert( raction ); raction = new TDERadioAction( i18n("View->attachments->", "&Hide"), 0, - this, TQT_SLOT(slotHideAttachments()), + this, TQ_SLOT(slotHideAttachments()), ac, "view_attachments_hide" ); raction->setToolTip( i18n("Do not show attachments in the message viewer") ); raction->setExclusiveGroup( "view_attachments_group" ); attachmentMenu->insert( raction ); mHeaderOnlyAttachmentsAction = new TDERadioAction( i18n( "View->attachments->", "In Header &Only" ), 0, - this, TQT_SLOT( slotHeaderOnlyAttachments() ), + this, TQ_SLOT( slotHeaderOnlyAttachments() ), ac, "view_attachments_headeronly" ); mHeaderOnlyAttachmentsAction->setToolTip( i18n( "Show Attachments only in the header of the mail" ) ); mHeaderOnlyAttachmentsAction->setExclusiveGroup( "view_attachments_group" ); @@ -580,7 +580,7 @@ void KMReaderWin::createActions( TDEActionCollection * ac ) { // Set Encoding submenu mSelectEncodingAction = new TDESelectAction( i18n( "&Set Encoding" ), "charset", 0, - this, TQT_SLOT( slotSetEncoding() ), + this, TQ_SLOT( slotSetEncoding() ), ac, "encoding" ); TQStringList encodings = KMMsgBase::supportedEncodings( false ); encodings.prepend( i18n( "Auto" ) ); @@ -588,45 +588,45 @@ void KMReaderWin::createActions( TDEActionCollection * ac ) { mSelectEncodingAction->setCurrentItem( 0 ); mMailToComposeAction = new TDEAction( i18n("New Message To..."), "mail-message-new", - 0, this, TQT_SLOT(slotMailtoCompose()), ac, + 0, this, TQ_SLOT(slotMailtoCompose()), ac, "mailto_compose" ); mMailToReplyAction = new TDEAction( i18n("Reply To..."), "mail-reply-sender", - 0, this, TQT_SLOT(slotMailtoReply()), ac, + 0, this, TQ_SLOT(slotMailtoReply()), ac, "mailto_reply" ); mMailToForwardAction = new TDEAction( i18n("Forward To..."), "mail-forward", - 0, this, TQT_SLOT(slotMailtoForward()), ac, + 0, this, TQ_SLOT(slotMailtoForward()), ac, "mailto_forward" ); mAddAddrBookAction = new TDEAction( i18n("Add to Address Book"), - 0, this, TQT_SLOT(slotMailtoAddAddrBook()), + 0, this, TQ_SLOT(slotMailtoAddAddrBook()), ac, "add_addr_book" ); mOpenAddrBookAction = new TDEAction( i18n("Open in Address Book"), - 0, this, TQT_SLOT(slotMailtoOpenAddrBook()), + 0, this, TQ_SLOT(slotMailtoOpenAddrBook()), ac, "openin_addr_book" ); - mCopyAction = KStdAction::copy( this, TQT_SLOT(slotCopySelectedText()), ac, "kmail_copy"); + mCopyAction = KStdAction::copy( this, TQ_SLOT(slotCopySelectedText()), ac, "kmail_copy"); mSelectAllAction = new TDEAction( i18n("Select All Text"), CTRL+SHIFT+Key_A, this, - TQT_SLOT(selectAll()), ac, "mark_all_text" ); + TQ_SLOT(selectAll()), ac, "mark_all_text" ); mCopyURLAction = new TDEAction( i18n("Copy Link Address"), 0, this, - TQT_SLOT(slotUrlCopy()), ac, "copy_url" ); + TQ_SLOT(slotUrlCopy()), ac, "copy_url" ); mUrlOpenAction = new TDEAction( i18n("Open URL"), 0, this, - TQT_SLOT(slotUrlOpen()), ac, "open_url" ); + TQ_SLOT(slotUrlOpen()), ac, "open_url" ); mAddBookmarksAction = new TDEAction( i18n("Bookmark This Link"), "bookmark_add", - 0, this, TQT_SLOT(slotAddBookmarks()), + 0, this, TQ_SLOT(slotAddBookmarks()), ac, "add_bookmarks" ); mUrlSaveAsAction = new TDEAction( i18n("Save Link As..."), 0, this, - TQT_SLOT(slotUrlSave()), ac, "saveas_url" ); + TQ_SLOT(slotUrlSave()), ac, "saveas_url" ); mToggleFixFontAction = new TDEToggleAction( i18n("Use Fi&xed Font"), - Key_X, this, TQT_SLOT(slotToggleFixedFont()), + Key_X, this, TQ_SLOT(slotToggleFixedFont()), ac, "toggle_fixedfont" ); mToggleMimePartTreeAction = new TDEToggleAction( i18n("Show Message Structure"), 0, ac, "toggle_mimeparttree" ); - connect(mToggleMimePartTreeAction, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotToggleMimePartTree())); + connect(mToggleMimePartTreeAction, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotToggleMimePartTree())); mStartIMChatAction = new TDEAction( i18n("Chat &With..."), 0, this, - TQT_SLOT(slotIMChat()), ac, "start_im_chat" ); + TQ_SLOT(slotIMChat()), ac, "start_im_chat" ); } // little helper function @@ -1021,17 +1021,17 @@ void KMReaderWin::initHtmlWidget(void) #endif connect(mViewer->browserExtension(), - TQT_SIGNAL(openURLRequest(const KURL &, const KParts::URLArgs &)),this, - TQT_SLOT(slotUrlOpen(const KURL &))); + TQ_SIGNAL(openURLRequest(const KURL &, const KParts::URLArgs &)),this, + TQ_SLOT(slotUrlOpen(const KURL &))); connect(mViewer->browserExtension(), - TQT_SIGNAL(createNewWindow(const KURL &, const KParts::URLArgs &)),this, - TQT_SLOT(slotUrlOpen(const KURL &))); - connect(mViewer,TQT_SIGNAL(popupMenu(const TQString &, const TQPoint &)), - TQT_SLOT(slotUrlPopup(const TQString &, const TQPoint &))); - connect( kmkernel->imProxy(), TQT_SIGNAL( sigContactPresenceChanged( const TQString & ) ), - this, TQT_SLOT( contactStatusChanged( const TQString & ) ) ); - connect( kmkernel->imProxy(), TQT_SIGNAL( sigPresenceInfoExpired() ), - this, TQT_SLOT( updateReaderWin() ) ); + TQ_SIGNAL(createNewWindow(const KURL &, const KParts::URLArgs &)),this, + TQ_SLOT(slotUrlOpen(const KURL &))); + connect(mViewer,TQ_SIGNAL(popupMenu(const TQString &, const TQPoint &)), + TQ_SLOT(slotUrlPopup(const TQString &, const TQPoint &))); + connect( kmkernel->imProxy(), TQ_SIGNAL( sigContactPresenceChanged( const TQString & ) ), + this, TQ_SLOT( contactStatusChanged( const TQString & ) ) ); + connect( kmkernel->imProxy(), TQ_SIGNAL( sigPresenceInfoExpired() ), + this, TQ_SLOT( updateReaderWin() ) ); } void KMReaderWin::contactStatusChanged( const TQString &uid) @@ -1497,7 +1497,7 @@ void KMReaderWin::displayMessage() { htmlWriter()->queue("</body></html>"); htmlWriter()->flush(); - TQTimer::singleShot( 1, this, TQT_SLOT(injectAttachments()) ); + TQTimer::singleShot( 1, this, TQ_SLOT(injectAttachments()) ); } static bool message_was_saved_decrypted_before( const KMMessage * msg ) { @@ -2065,7 +2065,7 @@ void KMReaderWin::showAttachmentPopup( int id, const TQString & name, const TQPo menu->insertItem( i18n("Scroll To"), 10 ); } - connect(menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHandleAttachment(int))); + connect(menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotHandleAttachment(int))); menu->exec( p ,0 ); delete menu; } @@ -2105,8 +2105,8 @@ void KMReaderWin::slotHandleAttachment( int choice ) KMHandleAttachmentCommand* command = new KMHandleAttachmentCommand( node, message(), mAtmCurrent, mAtmCurrentName, KMHandleAttachmentCommand::AttachmentAction( choice ), 0, this ); - connect( command, TQT_SIGNAL( showAttachment( int, const TQString& ) ), - this, TQT_SLOT( slotAtmView( int, const TQString& ) ) ); + connect( command, TQ_SIGNAL( showAttachment( int, const TQString& ) ), + this, TQ_SLOT( slotAtmView( int, const TQString& ) ) ); command->start(); } else if ( choice == 7 ) { slotDeleteAttachment( node ); @@ -2393,8 +2393,8 @@ void KMReaderWin::openAttachment( int id, const TQString & name ) KMHandleAttachmentCommand* command = new KMHandleAttachmentCommand( node, message(), mAtmCurrent, mAtmCurrentName, KMHandleAttachmentCommand::Save, offer, this ); - connect( command, TQT_SIGNAL( showAttachment( int, const TQString& ) ), - this, TQT_SLOT( slotAtmView( int, const TQString& ) ) ); + connect( command, TQ_SIGNAL( showAttachment( int, const TQString& ) ), + this, TQ_SLOT( slotAtmView( int, const TQString& ) ) ); command->start(); } else if( choice == KMessageBox::No ) { // Open @@ -2403,8 +2403,8 @@ void KMReaderWin::openAttachment( int id, const TQString & name ) mAtmUpdate = true; KMHandleAttachmentCommand* command = new KMHandleAttachmentCommand( node, message(), mAtmCurrent, mAtmCurrentName, action, offer, this ); - connect( command, TQT_SIGNAL( showAttachment( int, const TQString& ) ), - this, TQT_SLOT( slotAtmView( int, const TQString& ) ) ); + connect( command, TQ_SIGNAL( showAttachment( int, const TQString& ) ), + this, TQ_SLOT( slotAtmView( int, const TQString& ) ) ); command->start(); } else { // Cancel kdDebug(5006) << "Canceled opening attachment" << endl; @@ -2853,10 +2853,10 @@ void KMReaderWin::slotDeleteAttachment(partNode * node) if ( msg && nodeId != -1 ) { KMDeleteAttachmentCommand* command = new KMDeleteAttachmentCommand( nodeId, msg, this ); command->start(); - connect( command, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( updateReaderWin() ) ); - connect( command, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SLOT( disconnectMsgAdded() ) ); + connect( command, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( updateReaderWin() ) ); + connect( command, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SLOT( disconnectMsgAdded() ) ); // ### HACK: Since the command will do delete + add, a new message will arrive. However, we don't // want the selection to change. Therefore, as soon as a new message arrives, select it, and then @@ -2864,8 +2864,8 @@ void KMReaderWin::slotDeleteAttachment(partNode * node) // Of course the are races, another message can arrive before ours, but we take the risk. // And it won't work properly with multiple main windows const KMHeaders * const headers = KMKernel::self()->getKMMainWidget()->headers(); - connect( headers, TQT_SIGNAL( msgAddedToListView( TQListViewItem* ) ), - this, TQT_SLOT( msgAdded( TQListViewItem* ) ) ); + connect( headers, TQ_SIGNAL( msgAddedToListView( TQListViewItem* ) ), + this, TQ_SLOT( msgAdded( TQListViewItem* ) ) ); } // If we are operating on a copy of parts of the message, make sure to update the copy as well. @@ -2890,8 +2890,8 @@ void KMReaderWin::msgAdded( TQListViewItem *item ) void KMReaderWin::disconnectMsgAdded() { const KMHeaders *const headers = KMKernel::self()->getKMMainWidget()->headers(); - disconnect( headers, TQT_SIGNAL( msgAddedToListView( TQListViewItem* ) ), - this, TQT_SLOT( msgAdded( TQListViewItem* ) ) ); + disconnect( headers, TQ_SIGNAL( msgAddedToListView( TQListViewItem* ) ), + this, TQ_SLOT( msgAdded( TQListViewItem* ) ) ); } void KMReaderWin::slotEditAttachment(partNode * node) diff --git a/kmail/kmsearchpatternedit.cpp b/kmail/kmsearchpatternedit.cpp index 4a8c82bd..43f56e95 100644 --- a/kmail/kmsearchpatternedit.cpp +++ b/kmail/kmsearchpatternedit.cpp @@ -121,12 +121,12 @@ void KMSearchRuleWidget::initWidget() // redirect focus to the header field combo box setFocusProxy( mRuleField ); - connect( mRuleField, TQT_SIGNAL( activated( const TQString & ) ), - this, TQT_SLOT( slotRuleFieldChanged( const TQString & ) ) ); - connect( mRuleField, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( slotRuleFieldChanged( const TQString & ) ) ); - connect( mRuleField, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( fieldChanged( const TQString & ) ) ); + connect( mRuleField, TQ_SIGNAL( activated( const TQString & ) ), + this, TQ_SLOT( slotRuleFieldChanged( const TQString & ) ) ); + connect( mRuleField, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( slotRuleFieldChanged( const TQString & ) ) ); + connect( mRuleField, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( fieldChanged( const TQString & ) ) ); } void KMSearchRuleWidget::setRule( KMSearchRule *aRule ) @@ -426,15 +426,15 @@ void KMSearchPatternEdit::initLayout(bool headersOnly, bool absoluteDates) mRuleLister->slotClear(); //------------connect a few signals - connect( bg, TQT_SIGNAL(clicked(int)), - this, TQT_SLOT(slotRadioClicked(int)) ); + connect( bg, TQ_SIGNAL(clicked(int)), + this, TQ_SLOT(slotRadioClicked(int)) ); KMSearchRuleWidget *srw = (KMSearchRuleWidget*)mRuleLister->mWidgetList.first(); if ( srw ) { - connect( srw, TQT_SIGNAL(fieldChanged(const TQString &)), - this, TQT_SLOT(slotAutoNameHack()) ); - connect( srw, TQT_SIGNAL(contentsChanged(const TQString &)), - this, TQT_SLOT(slotAutoNameHack()) ); + connect( srw, TQ_SIGNAL(fieldChanged(const TQString &)), + this, TQ_SLOT(slotAutoNameHack()) ); + connect( srw, TQ_SIGNAL(contentsChanged(const TQString &)), + this, TQ_SLOT(slotAutoNameHack()) ); } else kdDebug(5006) << "KMSearchPatternEdit: no first KMSearchRuleWidget, though slotClear() has been called!" << endl; } diff --git a/kmail/kmsender.cpp b/kmail/kmsender.cpp index e63add04..5e8e4b41 100644 --- a/kmail/kmsender.cpp +++ b/kmail/kmsender.cpp @@ -231,8 +231,8 @@ bool KMSender::doSendQueued( const TQString &customTransport ) for( int i = 0 ; i<mTotalMessages ; ++i ) mTotalBytes += mOutboxFolder->getMsgBase(i)->msgSize(); - connect( mOutboxFolder, TQT_SIGNAL(msgAdded(int)), - this, TQT_SLOT(outboxMsgAdded(int)) ); + connect( mOutboxFolder, TQ_SIGNAL(msgAdded(int)), + this, TQ_SLOT(outboxMsgAdded(int)) ); mCurrentMsg = 0; mSentFolder = kmkernel->sentFolder(); @@ -472,8 +472,8 @@ void KMSender::doSendMsg() i18n( "Sending messages" ), i18n("Initiating sender process..."), true ); - connect( mProgressItem, TQT_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), - this, TQT_SLOT( slotAbortSend() ) ); + connect( mProgressItem, TQ_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), + this, TQ_SLOT( slotAbortSend() ) ); kapp->ref(); mSendInProgress = true; } @@ -520,8 +520,8 @@ void KMSender::doSendMsg() if (!mSendProc) sendProcStarted(false); else { - connect(mSendProc, TQT_SIGNAL(idle()), TQT_SLOT(slotIdle())); - connect(mSendProc, TQT_SIGNAL(started(bool)), TQT_SLOT(sendProcStarted(bool))); + connect(mSendProc, TQ_SIGNAL(idle()), TQ_SLOT(slotIdle())); + connect(mSendProc, TQ_SIGNAL(started(bool)), TQ_SLOT(sendProcStarted(bool))); // Run the precommand if there is one if ( !mTransportInfo->precommand.isEmpty() ) { @@ -541,8 +541,8 @@ void KMSender::doSendMsg() bool KMSender::runPrecommand( const TQString & cmd ) { setStatusMsg( i18n("Executing precommand %1").arg( cmd ) ); mPrecommand = new KMPrecommand( cmd ); - connect( mPrecommand, TQT_SIGNAL(finished(bool)), - TQT_SLOT(slotPrecommandFinished(bool)) ); + connect( mPrecommand, TQ_SIGNAL(finished(bool)), + TQ_SLOT(slotPrecommandFinished(bool)) ); if ( !mPrecommand->start() ) { delete mPrecommand; mPrecommand = 0; return false; @@ -644,8 +644,8 @@ void KMSender::cleanup(void) mSentFolder = 0; } if ( mOutboxFolder ) { - disconnect( mOutboxFolder, TQT_SIGNAL(msgAdded(int)), - this, TQT_SLOT(outboxMsgAdded(int)) ); + disconnect( mOutboxFolder, TQ_SIGNAL(msgAdded(int)), + this, TQ_SLOT(outboxMsgAdded(int)) ); mOutboxFolder->close("dosendoutbox"); if ( mOutboxFolder->count( true ) == 0 ) { mOutboxFolder->expunge(); @@ -947,12 +947,12 @@ bool KMSendSendmail::doStart() { { mMailerProc = new TDEProcess; assert(mMailerProc != 0); - connect(mMailerProc,TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(sendmailExited(TDEProcess*))); - connect(mMailerProc,TQT_SIGNAL(wroteStdin(TDEProcess*)), - this, TQT_SLOT(wroteStdin(TDEProcess*))); - connect(mMailerProc,TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), - this, TQT_SLOT(receivedStderr(TDEProcess*, char*, int))); + connect(mMailerProc,TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(sendmailExited(TDEProcess*))); + connect(mMailerProc,TQ_SIGNAL(wroteStdin(TDEProcess*)), + this, TQ_SLOT(wroteStdin(TDEProcess*))); + connect(mMailerProc,TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + this, TQ_SLOT(receivedStderr(TDEProcess*, char*, int))); } return true; } @@ -1046,8 +1046,8 @@ KMSendSMTP::KMSendSMTP(KMSender *sender) mJob(0), mSlave(0) { - TDEIO::Scheduler::connect(TQT_SIGNAL(slaveError(TDEIO::Slave *, int, - const TQString &)), this, TQT_SLOT(slaveError(TDEIO::Slave *, int, + TDEIO::Scheduler::connect(TQ_SIGNAL(slaveError(TDEIO::Slave *, int, + const TQString &)), this, TQ_SLOT(slaveError(TDEIO::Slave *, int, const TQString &))); } @@ -1154,9 +1154,9 @@ bool KMSendSMTP::doSend( const TQString & sender, const TQStringList & to, const } mJob->addMetaData( "lf2crlf+dotstuff", "slave" ); TDEIO::Scheduler::assignJobToSlave(mSlave, mJob); - connect(mJob, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(result(TDEIO::Job *))); - connect(mJob, TQT_SIGNAL(dataReq(TDEIO::Job *, TQByteArray &)), - this, TQT_SLOT(dataReq(TDEIO::Job *, TQByteArray &))); + connect(mJob, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(result(TDEIO::Job *))); + connect(mJob, TQ_SIGNAL(dataReq(TDEIO::Job *, TQByteArray &)), + this, TQ_SLOT(dataReq(TDEIO::Job *, TQByteArray &))); mSendOk = true; mInProcess = true; return true; diff --git a/kmail/kmservertest.cpp b/kmail/kmservertest.cpp index 9a9fc52c..7383060d 100644 --- a/kmail/kmservertest.cpp +++ b/kmail/kmservertest.cpp @@ -51,8 +51,8 @@ KMServerTest::KMServerTest( const TQString & protocol, const TQString & host, in mSSL( false ), mJob( 0 ), mSlave( 0 ), mConnectionErrorCount( 0 ) { TDEIO::Scheduler::connect( - TQT_SIGNAL(slaveError(TDEIO::Slave *, int, const TQString &)), - this, TQT_SLOT(slotSlaveResult(TDEIO::Slave *, int, const TQString &))); + TQ_SIGNAL(slaveError(TDEIO::Slave *, int, const TQString &)), + this, TQ_SLOT(slotSlaveResult(TDEIO::Slave *, int, const TQString &))); if ( port == 993 || port == 995 || port == 465 ) port = 0; @@ -85,8 +85,8 @@ void KMServerTest::startOffSlave( int port ) { slotSlaveResult( 0, 1 ); return; } - connect( mSlave, TQT_SIGNAL(metaData(const TDEIO::MetaData&)), - TQT_SLOT(slotMetaData(const TDEIO::MetaData&)) ); + connect( mSlave, TQ_SIGNAL(metaData(const TDEIO::MetaData&)), + TQ_SLOT(slotMetaData(const TDEIO::MetaData&)) ); TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); @@ -95,9 +95,9 @@ void KMServerTest::startOffSlave( int port ) { mJob = TDEIO::special( url, packedArgs, false ); TDEIO::Scheduler::assignJobToSlave( mSlave, mJob ); - connect( mJob, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotResult(TDEIO::Job*)) ); - connect( mJob, TQT_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)), - TQT_SLOT(slotData(TDEIO::Job*,const TQString&)) ); + connect( mJob, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotResult(TDEIO::Job*)) ); + connect( mJob, TQ_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)), + TQ_SLOT(slotData(TDEIO::Job*,const TQString&)) ); } diff --git a/kmail/kmsystemtray.cpp b/kmail/kmsystemtray.cpp index f9041222..b6e1f969 100644 --- a/kmail/kmsystemtray.cpp +++ b/kmail/kmsystemtray.cpp @@ -71,7 +71,7 @@ KMSystemTray::KMSystemTray(TQWidget *parent, const char *name) mLastUpdate = time( 0 ); mUpdateTimer = new TQTimer( this, "systraytimer" ); - connect( mUpdateTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( updateNewMessages() ) ); + connect( mUpdateTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( updateNewMessages() ) ); mDefaultIcon = loadIcon( "kmail" ); mLightIconImage = loadIcon( "kmaillight" ).convertToImage(); @@ -94,15 +94,15 @@ KMSystemTray::KMSystemTray(TQWidget *parent, const char *name) /** Initiate connections between folders and this object */ foldersChanged(); - connect( kmkernel->folderMgr(), TQT_SIGNAL(changed()), TQT_SLOT(foldersChanged())); - connect( kmkernel->imapFolderMgr(), TQT_SIGNAL(changed()), TQT_SLOT(foldersChanged())); - connect( kmkernel->dimapFolderMgr(), TQT_SIGNAL(changed()), TQT_SLOT(foldersChanged())); - connect( kmkernel->searchFolderMgr(), TQT_SIGNAL(changed()), TQT_SLOT(foldersChanged())); + connect( kmkernel->folderMgr(), TQ_SIGNAL(changed()), TQ_SLOT(foldersChanged())); + connect( kmkernel->imapFolderMgr(), TQ_SIGNAL(changed()), TQ_SLOT(foldersChanged())); + connect( kmkernel->dimapFolderMgr(), TQ_SIGNAL(changed()), TQ_SLOT(foldersChanged())); + connect( kmkernel->searchFolderMgr(), TQ_SIGNAL(changed()), TQ_SLOT(foldersChanged())); - connect( kmkernel->acctMgr(), TQT_SIGNAL( checkedMail( bool, bool, const TQMap<TQString, int> & ) ), - TQT_SLOT( updateNewMessages() ) ); + connect( kmkernel->acctMgr(), TQ_SIGNAL( checkedMail( bool, bool, const TQMap<TQString, int> & ) ), + TQ_SLOT( updateNewMessages() ) ); - connect( this, TQT_SIGNAL( quitSelected() ), TQT_SLOT( tray_quit() ) ); + connect( this, TQ_SIGNAL( quitSelected() ), TQ_SLOT( tray_quit() ) ); } void KMSystemTray::buildPopupMenu() @@ -132,7 +132,7 @@ void KMSystemTray::buildPopupMenu() action->plug( mPopupMenu ); mPopupMenu->insertSeparator(); - mPopupMenu->insertItem( SmallIcon("system-log-out"), i18n("&Quit"), this, TQT_SLOT(maybeQuit()) ); + mPopupMenu->insertItem( SmallIcon("system-log-out"), i18n("&Quit"), this, TQ_SLOT(maybeQuit()) ); } void KMSystemTray::tray_quit() @@ -275,7 +275,7 @@ void KMSystemTray::foldersChanged() } /** Disconnect all previous connections */ - disconnect(this, TQT_SLOT(updateNewMessageNotification(KMFolder *))); + disconnect(this, TQ_SLOT(updateNewMessageNotification(KMFolder *))); TQStringList folderNames; TQValueList<TQGuardedPtr<KMFolder> > folderList; @@ -297,14 +297,14 @@ void KMSystemTray::foldersChanged() !currentFolder->ignoreNewMail() ) { /** If this is a new folder, start listening for messages */ - connect(currentFolder, TQT_SIGNAL(numUnreadMsgsChanged(KMFolder *)), - this, TQT_SLOT(updateNewMessageNotification(KMFolder *))); + connect(currentFolder, TQ_SIGNAL(numUnreadMsgsChanged(KMFolder *)), + this, TQ_SLOT(updateNewMessageNotification(KMFolder *))); /** Check all new folders to see if we started with any new messages */ updateNewMessageNotification(currentFolder); } else { - disconnect(currentFolder, TQT_SIGNAL(numUnreadMsgsChanged(KMFolder *)), this, TQT_SLOT(updateNewMessageNotification(KMFolder *)) ); + disconnect(currentFolder, TQ_SIGNAL(numUnreadMsgsChanged(KMFolder *)), this, TQ_SLOT(updateNewMessageNotification(KMFolder *)) ); } } } @@ -349,7 +349,7 @@ void KMSystemTray::mousePressEvent(TQMouseEvent *e) kdDebug(5006) << "Adding folder" << endl; mPopupFolders.append( it.key() ); TQString item = prettyName(it.key()) + " (" + TQString::number(it.data()) + ")"; - newMessagesPopup->insertItem(item, this, TQT_SLOT(selectedAccount(int)), 0, i); + newMessagesPopup->insertItem(item, this, TQ_SLOT(selectedAccount(int)), 0, i); ++it; } @@ -545,7 +545,7 @@ void KMSystemTray::updateNewMessages() if(mFoldersWithUnread.count() == 0) { mPopupFolders.clear(); - disconnect(this, TQT_SLOT(selectedAccount(int))); + disconnect(this, TQ_SLOT(selectedAccount(int))); mCount = 0; diff --git a/kmail/kmtransport.cpp b/kmail/kmtransport.cpp index 7d38aadf..764c1720 100644 --- a/kmail/kmtransport.cpp +++ b/kmail/kmtransport.cpp @@ -251,7 +251,7 @@ KMTransportSelDlg::KMTransportSelDlg( TQWidget *parent, const char *name, TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() ); TQButtonGroup *group = new TQButtonGroup( i18n("Transport"), page ); - connect(group, TQT_SIGNAL(clicked(int)), TQT_SLOT(buttonClicked(int)) ); + connect(group, TQ_SIGNAL(clicked(int)), TQ_SLOT(buttonClicked(int)) ); topLayout->addWidget( group, 10 ); TQVBoxLayout *vlay = new TQVBoxLayout( group, spacingHint()*2, spacingHint() ); @@ -339,11 +339,11 @@ void KMTransportDialog::makeSendmailPage() grid->addWidget( mSendmail.locationEdit, 1, 1 ); mSendmail.chooseButton = new TQPushButton( i18n("Choos&e..."), page ); - connect( mSendmail.chooseButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSendmailChooser()) ); + connect( mSendmail.chooseButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSendmailChooser()) ); - connect( mSendmail.locationEdit, TQT_SIGNAL(textChanged ( const TQString & )), - this, TQT_SLOT(slotSendmailEditPath(const TQString &)) ); + connect( mSendmail.locationEdit, TQ_SIGNAL(textChanged ( const TQString & )), + this, TQ_SLOT(slotSendmailEditPath(const TQString &)) ); mSendmail.chooseButton->setAutoDefault( false ); grid->addWidget( mSendmail.chooseButton, 1, 2 ); @@ -430,8 +430,8 @@ void KMTransportDialog::makeSmtpPage() "requires authentication before accepting " "mail. This is known as " "'Authenticated SMTP' or simply ASMTP.")); - connect(mSmtp.authCheck, TQT_SIGNAL(clicked()), - TQT_SLOT(slotRequiresAuthClicked())); + connect(mSmtp.authCheck, TQ_SIGNAL(clicked()), + TQ_SLOT(slotRequiresAuthClicked())); grid->addMultiCellWidget( mSmtp.authCheck, 7, 7, 0, 1 ); mSmtp.loginLabel = new TQLabel( i18n("&Login:"), page1 ); @@ -490,10 +490,10 @@ void KMTransportDialog::makeSmtpPage() "identifying itself to the server.")); mSmtp.localHostnameLabel->setBuddy( mSmtp.localHostnameEdit ); grid->addWidget( mSmtp.localHostnameEdit, 13, 1 ); - connect( mSmtp.specifyHostnameCheck, TQT_SIGNAL(toggled(bool)), - mSmtp.localHostnameEdit, TQT_SLOT(setEnabled(bool))); - connect( mSmtp.specifyHostnameCheck, TQT_SIGNAL(toggled(bool)), - mSmtp.localHostnameLabel, TQT_SLOT(setEnabled(bool))); + connect( mSmtp.specifyHostnameCheck, TQ_SIGNAL(toggled(bool)), + mSmtp.localHostnameEdit, TQ_SLOT(setEnabled(bool))); + connect( mSmtp.specifyHostnameCheck, TQ_SIGNAL(toggled(bool)), + mSmtp.localHostnameLabel, TQ_SLOT(setEnabled(bool))); TQWidget *page2 = new TQWidget( tabWidget ); tabWidget->addTab( page2, i18n("S&ecurity") ); @@ -506,8 +506,8 @@ void KMTransportDialog::makeSmtpPage() new TQRadioButton( i18n("&SSL"), mSmtp.encryptionGroup ); mSmtp.encryptionTLS = new TQRadioButton( i18n("&TLS"), mSmtp.encryptionGroup ); - connect(mSmtp.encryptionGroup, TQT_SIGNAL(clicked(int)), - TQT_SLOT(slotSmtpEncryptionChanged(int))); + connect(mSmtp.encryptionGroup, TQ_SIGNAL(clicked(int)), + TQ_SLOT(slotSmtpEncryptionChanged(int))); vlay->addWidget( mSmtp.encryptionGroup ); mSmtp.authGroup = new TQButtonGroup( 1, TQt::Horizontal, @@ -533,8 +533,8 @@ void KMTransportDialog::makeSmtpPage() TQHBoxLayout *buttonLay = new TQHBoxLayout( vlay ); mSmtp.checkCapabilities = new TQPushButton( i18n("Check &What the Server Supports"), page2 ); - connect(mSmtp.checkCapabilities, TQT_SIGNAL(clicked()), - TQT_SLOT(slotCheckSmtpCapabilities())); + connect(mSmtp.checkCapabilities, TQ_SIGNAL(clicked()), + TQ_SLOT(slotCheckSmtpCapabilities())); buttonLay->addStretch(); buttonLay->addWidget( mSmtp.checkCapabilities ); } @@ -720,11 +720,11 @@ void KMTransportDialog::slotCheckSmtpCapabilities() mServerTest = new KMServerTest(SMTP_PROTOCOL, mSmtp.hostEdit->text(), mSmtp.portEdit->text().toInt()); connect( mServerTest, - TQT_SIGNAL( capabilities( const TQStringList &, const TQStringList &, + TQ_SIGNAL( capabilities( const TQStringList &, const TQStringList &, const TQString &, const TQString &, const TQString & )), this, - TQT_SLOT( slotSmtpCapabilities( const TQStringList &, + TQ_SLOT( slotSmtpCapabilities( const TQStringList &, const TQStringList &, const TQString &, const TQString &, const TQString & ) ) ); mSmtp.checkCapabilities->setEnabled(false); diff --git a/kmail/listjob.cpp b/kmail/listjob.cpp index 75e4dee5..6c189293 100644 --- a/kmail/listjob.cpp +++ b/kmail/listjob.cpp @@ -76,8 +76,8 @@ void ListJob::execute() { // We'll wait for the connectionResult signal from the account. kdDebug(5006) << "ListJob - waiting for connection" << endl; - connect( mAccount, TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) ); + connect( mAccount, TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( slotConnectionResult(int, const TQString&) ) ); return; } // this is needed until we have a common base class for d(imap) @@ -145,10 +145,10 @@ void ListJob::execute() TDEIO::SimpleJob *job = TDEIO::listDir( url, false ); TDEIO::Scheduler::assignJobToSlave( mAccount->slave(), job ); mAccount->insertJob( job, jd ); - connect( job, TQT_SIGNAL(result(TDEIO::Job *)), - this, TQT_SLOT(slotListResult(TDEIO::Job *)) ); - connect( job, TQT_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList &)), - this, TQT_SLOT(slotListEntries(TDEIO::Job *, const TDEIO::UDSEntryList &)) ); + connect( job, TQ_SIGNAL(result(TDEIO::Job *)), + this, TQ_SLOT(slotListResult(TDEIO::Job *)) ); + connect( job, TQ_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList &)), + this, TQ_SLOT(slotListEntries(TDEIO::Job *, const TDEIO::UDSEntryList &)) ); } void ListJob::slotConnectionResult( int errorCode, const TQString& errorMsg ) diff --git a/kmail/localsubscriptiondialog.cpp b/kmail/localsubscriptiondialog.cpp index 2f6e839e..166cd406 100644 --- a/kmail/localsubscriptiondialog.cpp +++ b/kmail/localsubscriptiondialog.cpp @@ -76,7 +76,7 @@ void LocalSubscriptionDialog::processFolderListing() if (done == 1000) { emit listChanged(); - TQTimer::singleShot(0, this, TQT_SLOT(processItems())); + TQTimer::singleShot(0, this, TQ_SLOT(processItems())); return; } ++mCount; diff --git a/kmail/maildirjob.cpp b/kmail/maildirjob.cpp index 4c3b520c..11f6edfb 100644 --- a/kmail/maildirjob.cpp +++ b/kmail/maildirjob.cpp @@ -74,7 +74,7 @@ void MaildirJob::setParentFolder( const KMFolderMaildir* parent ) //----------------------------------------------------------------------------- void MaildirJob::execute() { - TQTimer::singleShot( 0, this, TQT_SLOT(startJob()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(startJob()) ); } //----------------------------------------------------------------------------- diff --git a/kmail/mailinglistpropertiesdialog.cpp b/kmail/mailinglistpropertiesdialog.cpp index 08d76a58..ab984161 100644 --- a/kmail/mailinglistpropertiesdialog.cpp +++ b/kmail/mailinglistpropertiesdialog.cpp @@ -65,23 +65,23 @@ MailingListFolderPropertiesDialog::MailingListFolderPropertiesDialog( TQWidget* setMainWidget( mlGroup ); mHoldsMailingList = new TQCheckBox( i18n("&Folder holds a mailing list"), mlGroup ); - connect( mHoldsMailingList, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(slotHoldsML(bool)) ); + connect( mHoldsMailingList, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(slotHoldsML(bool)) ); groupLayout->addMultiCellWidget( mHoldsMailingList, 0, 0, 0, 2 ); groupLayout->addItem( new TQSpacerItem( 0, 10 ), 1, 0 ); mDetectButton = new TQPushButton( i18n("Detect Automatically"), mlGroup ); mDetectButton->setEnabled( false ); - connect( mDetectButton, TQT_SIGNAL(pressed()), TQT_SLOT(slotDetectMailingList()) ); + connect( mDetectButton, TQ_SIGNAL(pressed()), TQ_SLOT(slotDetectMailingList()) ); groupLayout->addWidget( mDetectButton, 2, 1 ); groupLayout->addItem( new TQSpacerItem( 0, 10 ), 3, 0 ); label = new TQLabel( i18n("Mailing list description:"), mlGroup ); label->setEnabled( false ); - connect( mHoldsMailingList, TQT_SIGNAL(toggled(bool)), - label, TQT_SLOT(setEnabled(bool)) ); + connect( mHoldsMailingList, TQ_SIGNAL(toggled(bool)), + label, TQ_SLOT(setEnabled(bool)) ); groupLayout->addWidget( label, 4, 0 ); mMLId = new TQLabel( label, "", mlGroup ); groupLayout->addMultiCellWidget( mMLId, 4, 4, 1, 2 ); @@ -90,22 +90,22 @@ MailingListFolderPropertiesDialog::MailingListFolderPropertiesDialog( TQWidget* //FIXME: add TQWhatsThis label = new TQLabel( i18n("Preferred handler:"), mlGroup ); label->setEnabled(false); - connect( mHoldsMailingList, TQT_SIGNAL(toggled(bool)), - label, TQT_SLOT(setEnabled(bool)) ); + connect( mHoldsMailingList, TQ_SIGNAL(toggled(bool)), + label, TQ_SLOT(setEnabled(bool)) ); groupLayout->addWidget( label, 5, 0 ); mMLHandlerCombo = new TQComboBox( mlGroup ); mMLHandlerCombo->insertItem( i18n("KMail"), MailingList::KMail ); mMLHandlerCombo->insertItem( i18n("Browser"), MailingList::Browser ); mMLHandlerCombo->setEnabled( false ); groupLayout->addMultiCellWidget( mMLHandlerCombo, 5, 5, 1, 2 ); - connect( mMLHandlerCombo, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotMLHandling(int)) ); + connect( mMLHandlerCombo, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotMLHandling(int)) ); label->setBuddy( mMLHandlerCombo ); label = new TQLabel( i18n("&Address type:"), mlGroup ); label->setEnabled(false); - connect( mHoldsMailingList, TQT_SIGNAL(toggled(bool)), - label, TQT_SLOT(setEnabled(bool)) ); + connect( mHoldsMailingList, TQ_SIGNAL(toggled(bool)), + label, TQ_SLOT(setEnabled(bool)) ); groupLayout->addWidget( label, 6, 0 ); mAddressCombo = new TQComboBox( mlGroup ); label->setBuddy( mAddressCombo ); @@ -119,10 +119,10 @@ MailingListFolderPropertiesDialog::MailingListFolderPropertiesDialog( TQWidget* handleButton->setEnabled( false ); if( mFolder) { - connect( mHoldsMailingList, TQT_SIGNAL(toggled(bool)), - handleButton, TQT_SLOT(setEnabled(bool)) ); - connect( handleButton, TQT_SIGNAL(clicked()), - TQT_SLOT(slotInvokeHandler()) ); + connect( mHoldsMailingList, TQ_SIGNAL(toggled(bool)), + handleButton, TQ_SLOT(setEnabled(bool)) ); + connect( handleButton, TQ_SIGNAL(clicked()), + TQ_SLOT(slotInvokeHandler()) ); } groupLayout->addWidget( handleButton, 6, 2 ); @@ -140,8 +140,8 @@ MailingListFolderPropertiesDialog::MailingListFolderPropertiesDialog( TQWidget* << i18n( "List Archives" ) << i18n( "List Help" ); mAddressCombo->insertStringList( el ); - connect( mAddressCombo, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotAddressChanged(int)) ); + connect( mAddressCombo, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotAddressChanged(int)) ); load(); resize( TQSize(295, 204).expandedTo(minimumSizeHint()) ); diff --git a/kmail/mailsourceviewer.cpp b/kmail/mailsourceviewer.cpp index 7a06f970..d55fe0af 100644 --- a/kmail/mailsourceviewer.cpp +++ b/kmail/mailsourceviewer.cpp @@ -58,8 +58,8 @@ MailSourceViewer::MailSourceViewer( TQWidget *parent, const char *name ) { setWFlags( WDestructiveClose ); TQAccel *accel = new TQAccel( this, "browser close-accel" ); - accel->connectItem( accel->insertItem( TQt::Key_Escape ), this , TQT_SLOT( close() )); - accel->connectItem( accel->insertItem( TQt::Key_W+CTRL ), this , TQT_SLOT( close() )); + accel->connectItem( accel->insertItem( TQt::Key_Escape ), this , TQ_SLOT( close() )); + accel->connectItem( accel->insertItem( TQt::Key_W+CTRL ), this , TQ_SLOT( close() )); setWordWrap( KTextBrowser::NoWrap ); KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon()); } diff --git a/kmail/managesievescriptsdialog.cpp b/kmail/managesievescriptsdialog.cpp index 560fac90..bd8d9955 100644 --- a/kmail/managesievescriptsdialog.cpp +++ b/kmail/managesievescriptsdialog.cpp @@ -46,12 +46,12 @@ KMail::ManageSieveScriptsDialog::ManageSieveScriptsDialog( TQWidget * parent, co mListView->setResizeMode( TQListView::LastColumn ); mListView->setRootIsDecorated( true ); mListView->setSelectionMode( TQListView::Single ); - connect( mListView, TQT_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&,int)), - this, TQT_SLOT(slotContextMenuRequested(TQListViewItem*, const TQPoint&)) ); - connect( mListView, TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)), - this, TQT_SLOT(slotDoubleClicked(TQListViewItem*)) ); - connect( mListView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(slotSelectionChanged(TQListViewItem*)) ); + connect( mListView, TQ_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&,int)), + this, TQ_SLOT(slotContextMenuRequested(TQListViewItem*, const TQPoint&)) ); + connect( mListView, TQ_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)), + this, TQ_SLOT(slotDoubleClicked(TQListViewItem*)) ); + connect( mListView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(slotSelectionChanged(TQListViewItem*)) ); vlay->addWidget( mListView ); resize( 2 * sizeHint().width(), sizeHint().height() ); @@ -111,10 +111,10 @@ void KMail::ManageSieveScriptsDialog::slotRefresh() { if ( u.isEmpty() ) continue; SieveJob * job = SieveJob::list( u ); - connect( job, TQT_SIGNAL(item(KMail::SieveJob*,const TQString&,bool)), - this, TQT_SLOT(slotItem(KMail::SieveJob*,const TQString&,bool)) ); - connect( job, TQT_SIGNAL(result(KMail::SieveJob*,bool,const TQString&,bool)), - this, TQT_SLOT(slotResult(KMail::SieveJob*,bool,const TQString&,bool)) ); + connect( job, TQ_SIGNAL(item(KMail::SieveJob*,const TQString&,bool)), + this, TQ_SLOT(slotItem(KMail::SieveJob*,const TQString&,bool)) ); + connect( job, TQ_SIGNAL(result(KMail::SieveJob*,bool,const TQString&,bool)), + this, TQ_SLOT(slotResult(KMail::SieveJob*,bool,const TQString&,bool)) ); mJobs.insert( job, last ); mUrls.insert( last, u ); } else { @@ -162,12 +162,12 @@ void KMail::ManageSieveScriptsDialog::slotContextMenuRequested( TQListViewItem * mContextMenuItem = item; if ( item->depth() ) { // script items: - menu.insertItem( i18n( "Delete Script" ), this, TQT_SLOT(slotDeleteScript()) ); - menu.insertItem( i18n( "Edit Script..." ), this, TQT_SLOT(slotEditScript()) ); - menu.insertItem( i18n( "Deactivate Script" ), this, TQT_SLOT(slotDeactivateScript()) ); + menu.insertItem( i18n( "Delete Script" ), this, TQ_SLOT(slotDeleteScript()) ); + menu.insertItem( i18n( "Edit Script..." ), this, TQ_SLOT(slotEditScript()) ); + menu.insertItem( i18n( "Deactivate Script" ), this, TQ_SLOT(slotDeactivateScript()) ); } else { // top-levels: - menu.insertItem( i18n( "New Script..." ), this, TQT_SLOT(slotNewScript()) ); + menu.insertItem( i18n( "New Script..." ), this, TQ_SLOT(slotNewScript()) ); } menu.exec( p ); mContextMenuItem = 0; @@ -219,8 +219,8 @@ void KMail::ManageSieveScriptsDialog::changeActiveScript( TQCheckListItem * item job = SieveJob::activate( u ); else job = SieveJob::desactivate( u ); - connect( job, TQT_SIGNAL(result(KMail::SieveJob*,bool,const TQString&,bool)), - this, TQT_SLOT(slotRefresh()) ); + connect( job, TQ_SIGNAL(result(KMail::SieveJob*,bool,const TQString&,bool)), + this, TQ_SLOT(slotRefresh()) ); } void KMail::ManageSieveScriptsDialog::slotDoubleClicked( TQListViewItem * i ) { @@ -259,8 +259,8 @@ void KMail::ManageSieveScriptsDialog::slotDeleteScript() { != KMessageBox::Continue ) return; SieveJob * job = SieveJob::del( u ); - connect( job, TQT_SIGNAL(result(KMail::SieveJob*,bool,const TQString&,bool)), - this, TQT_SLOT(slotRefresh()) ); + connect( job, TQ_SIGNAL(result(KMail::SieveJob*,bool,const TQString&,bool)), + this, TQ_SLOT(slotRefresh()) ); } void KMail::ManageSieveScriptsDialog::slotEditScript() { @@ -277,8 +277,8 @@ void KMail::ManageSieveScriptsDialog::slotEditScript() { url.setFileName( mContextMenuItem->text( 0 ) ); mCurrentURL = url; SieveJob * job = SieveJob::get( url ); - connect( job, TQT_SIGNAL(result(KMail::SieveJob*,bool,const TQString&,bool)), - this, TQT_SLOT(slotGetResult(KMail::SieveJob*,bool,const TQString&,bool)) ); + connect( job, TQ_SIGNAL(result(KMail::SieveJob*,bool,const TQString&,bool)), + this, TQ_SLOT(slotGetResult(KMail::SieveJob*,bool,const TQString&,bool)) ); } void KMail::ManageSieveScriptsDialog::slotNewScript() { @@ -321,7 +321,7 @@ KMail::SieveEditor::SieveEditor( TQWidget * parent, const char * name ) mTextEdit->setTextFormat( TQTextEdit::PlainText ); mTextEdit->setWordWrap( TQTextEdit::NoWrap ); mTextEdit->setFont( TDEGlobalSettings::fixedFont() ); - connect( mTextEdit, TQT_SIGNAL( textChanged () ), TQT_SLOT( slotTextChanged() ) ); + connect( mTextEdit, TQ_SIGNAL( textChanged () ), TQ_SLOT( slotTextChanged() ) ); resize( 3 * sizeHint() ); } @@ -342,8 +342,8 @@ void KMail::ManageSieveScriptsDialog::slotGetResult( KMail::SieveJob *, bool suc mSieveEditor = new SieveEditor( this ); mSieveEditor->setScript( script ); - connect( mSieveEditor, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotSieveEditorOkClicked()) ); - connect( mSieveEditor, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(slotSieveEditorCancelClicked()) ); + connect( mSieveEditor, TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotSieveEditorOkClicked()) ); + connect( mSieveEditor, TQ_SIGNAL(cancelClicked()), this, TQ_SLOT(slotSieveEditorCancelClicked()) ); mSieveEditor->show(); mWasActive = isActive; } @@ -352,8 +352,8 @@ void KMail::ManageSieveScriptsDialog::slotSieveEditorOkClicked() { if ( !mSieveEditor ) return; SieveJob * job = SieveJob::put( mCurrentURL,mSieveEditor->script(), mWasActive, mWasActive ); - connect( job, TQT_SIGNAL(result(KMail::SieveJob*,bool,const TQString&,bool)), - this, TQT_SLOT(slotPutResult(KMail::SieveJob*,bool)) ); + connect( job, TQ_SIGNAL(result(KMail::SieveJob*,bool,const TQString&,bool)), + this, TQ_SLOT(slotPutResult(KMail::SieveJob*,bool)) ); } void KMail::ManageSieveScriptsDialog::slotSieveEditorCancelClicked() { diff --git a/kmail/mboxjob.cpp b/kmail/mboxjob.cpp index df25a8ad..b591108f 100644 --- a/kmail/mboxjob.cpp +++ b/kmail/mboxjob.cpp @@ -67,7 +67,7 @@ MboxJob::~MboxJob() void MboxJob::execute() { - TQTimer::singleShot( 0, this, TQT_SLOT(startJob()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(startJob()) ); } //----------------------------------------------------------------------------- diff --git a/kmail/messageactions.cpp b/kmail/messageactions.cpp index be2d4c9d..e7233d3e 100644 --- a/kmail/messageactions.cpp +++ b/kmail/messageactions.cpp @@ -42,36 +42,36 @@ MessageActions::MessageActions( TDEActionCollection *ac, TQWidget * parent ) : mReplyActionMenu = new TDEActionMenu( i18n("Message->","&Reply"), "mail-reply-sender", mActionCollection, "message_reply_menu" ); - connect( mReplyActionMenu, TQT_SIGNAL(activated()), this, - TQT_SLOT(slotReplyToMsg()) ); + connect( mReplyActionMenu, TQ_SIGNAL(activated()), this, + TQ_SLOT(slotReplyToMsg()) ); mReplyAction = new TDEAction( i18n("&Reply..."), "mail-reply-sender", Key_R, this, - TQT_SLOT(slotReplyToMsg()), mActionCollection, "reply" ); + TQ_SLOT(slotReplyToMsg()), mActionCollection, "reply" ); mReplyActionMenu->insert( mReplyAction ); mReplyAuthorAction = new TDEAction( i18n("Reply to A&uthor..."), "mail-reply-sender", SHIFT+Key_A, this, - TQT_SLOT(slotReplyAuthorToMsg()), + TQ_SLOT(slotReplyAuthorToMsg()), mActionCollection, "reply_author" ); mReplyActionMenu->insert( mReplyAuthorAction ); mReplyAllAction = new TDEAction( i18n("Reply to &All..."), "mail-reply-all", - Key_A, this, TQT_SLOT(slotReplyAllToMsg()), + Key_A, this, TQ_SLOT(slotReplyAllToMsg()), mActionCollection, "reply_all" ); mReplyActionMenu->insert( mReplyAllAction ); mReplyListAction = new TDEAction( i18n("Reply to Mailing-&List..."), "mail_replylist", Key_L, this, - TQT_SLOT(slotReplyListToMsg()), mActionCollection, + TQ_SLOT(slotReplyListToMsg()), mActionCollection, "reply_list" ); mReplyActionMenu->insert( mReplyListAction ); mNoQuoteReplyAction = new TDEAction( i18n("Reply Without &Quote..."), SHIFT+Key_R, - this, TQT_SLOT(slotNoQuoteReplyToMsg()), mActionCollection, "noquotereply" ); + this, TQ_SLOT(slotNoQuoteReplyToMsg()), mActionCollection, "noquotereply" ); mCreateTodoAction = new TDEAction( i18n("Create Task/Reminder..."), "mail_todo", - 0, this, TQT_SLOT(slotCreateTodo()), mActionCollection, + 0, this, TQ_SLOT(slotCreateTodo()), mActionCollection, "create_todo" ); @@ -80,35 +80,35 @@ MessageActions::MessageActions( TDEActionCollection *ac, TQWidget * parent ) : mStatusMenu->insert(new TDEAction(KGuiItem(i18n("Mark Message as &Read"), "kmmsgread", i18n("Mark selected messages as read")), - 0, this, TQT_SLOT(slotSetMsgStatusRead()), + 0, this, TQ_SLOT(slotSetMsgStatusRead()), mActionCollection, "status_read")); mStatusMenu->insert(new TDEAction(KGuiItem(i18n("Mark Message as &New"), "kmmsgnew", i18n("Mark selected messages as new")), - 0, this, TQT_SLOT(slotSetMsgStatusNew()), + 0, this, TQ_SLOT(slotSetMsgStatusNew()), mActionCollection, "status_new" )); mStatusMenu->insert(new TDEAction(KGuiItem(i18n("Mark Message as &Unread"), "kmmsgunseen", i18n("Mark selected messages as unread")), - 0, this, TQT_SLOT(slotSetMsgStatusUnread()), + 0, this, TQ_SLOT(slotSetMsgStatusUnread()), mActionCollection, "status_unread")); mStatusMenu->insert( new TDEActionSeparator( this ) ); mToggleFlagAction = new TDEToggleAction(i18n("Mark Message as &Important"), "mail_flag", - 0, this, TQT_SLOT(slotSetMsgStatusFlag()), + 0, this, TQ_SLOT(slotSetMsgStatusFlag()), mActionCollection, "status_flag"); mToggleFlagAction->setCheckedState( i18n("Remove &Important Message Mark") ); mStatusMenu->insert( mToggleFlagAction ); mToggleTodoAction = new TDEToggleAction(i18n("Mark Message as &Action Item"), "mail_todo", - 0, this, TQT_SLOT(slotSetMsgStatusTodo()), + 0, this, TQ_SLOT(slotSetMsgStatusTodo()), mActionCollection, "status_todo"); mToggleTodoAction->setCheckedState( i18n("Remove &Action Item Message Mark") ); mStatusMenu->insert( mToggleTodoAction ); mEditAction = new TDEAction( i18n("&Edit Message"), "edit", Key_T, this, - TQT_SLOT(editCurrentMessage()), mActionCollection, "edit" ); + TQ_SLOT(editCurrentMessage()), mActionCollection, "edit" ); mEditAction->plugAccel( mActionCollection->tdeaccel() ); updateActions(); @@ -174,8 +174,8 @@ template<typename T> void MessageActions::replyCommand() return; const TQString text = mMessageView ? mMessageView->copyText() : ""; KMCommand *command = new T( mParent, mCurrentMessage, text ); - connect( command, TQT_SIGNAL( completed( KMCommand * ) ), - this, TQT_SIGNAL( replyActionFinished() ) ); + connect( command, TQ_SIGNAL( completed( KMCommand * ) ), + this, TQ_SIGNAL( replyActionFinished() ) ); command->start(); } diff --git a/kmail/messagecomposer.cpp b/kmail/messagecomposer.cpp index 60ceed94..c98289e0 100644 --- a/kmail/messagecomposer.cpp +++ b/kmail/messagecomposer.cpp @@ -373,7 +373,7 @@ void MessageComposer::doNextJob() } // We have more jobs to do, but allow others to come first - TQTimer::singleShot( 0, this, TQT_SLOT( slotDoNextJob() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotDoNextJob() ) ); } void MessageComposer::emitDone( bool b ) diff --git a/kmail/messagecopyhelper.cpp b/kmail/messagecopyhelper.cpp index 0257aa0b..4b46141f 100644 --- a/kmail/messagecopyhelper.cpp +++ b/kmail/messagecopyhelper.cpp @@ -62,7 +62,7 @@ MessageCopyHelper::MessageCopyHelper( const TQValueList< TQ_UINT32 > & msgs, command = new KMCopyCommand( dest, list ); } - connect( command, TQT_SIGNAL(completed(KMCommand*)), TQT_SLOT(copyCompleted(KMCommand*)) ); + connect( command, TQ_SIGNAL(completed(KMCommand*)), TQ_SLOT(copyCompleted(KMCommand*)) ); command->start(); } diff --git a/kmail/newfolderdialog.cpp b/kmail/newfolderdialog.cpp index 0643cbbc..862833f0 100644 --- a/kmail/newfolderdialog.cpp +++ b/kmail/newfolderdialog.cpp @@ -86,7 +86,7 @@ NewFolderDialog::NewFolderDialog( TQWidget* parent, KMFolder *folder ) mNameLineEdit->setFocus(); mNameHBox->addWidget( mNameLineEdit ); mTopLevelLayout->addLayout( mNameHBox ); - connect( mNameLineEdit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotFolderNameChanged( const TQString & ) ) ); + connect( mNameLineEdit, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotFolderNameChanged( const TQString & ) ) ); if ( !mFolder || ( mFolder->folderType() != KMFolderTypeImap && diff --git a/kmail/objecttreeparser_p.cpp b/kmail/objecttreeparser_p.cpp index 683d3c4c..fbd2b4df 100644 --- a/kmail/objecttreeparser_p.cpp +++ b/kmail/objecttreeparser_p.cpp @@ -89,8 +89,8 @@ bool DecryptVerifyBodyPartMemento::start() { m_dr = DecryptionResult( err ); return false; } - connect( m_job, TQT_SIGNAL(result(const GpgME::DecryptionResult&,const GpgME::VerificationResult&,const TQByteArray&)), - this, TQT_SLOT(slotResult(const GpgME::DecryptionResult&,const GpgME::VerificationResult&,const TQByteArray&)) ); + connect( m_job, TQ_SIGNAL(result(const GpgME::DecryptionResult&,const GpgME::VerificationResult&,const TQByteArray&)), + this, TQ_SLOT(slotResult(const GpgME::DecryptionResult&,const GpgME::VerificationResult&,const TQByteArray&)) ); setRunning( true ); return true; } @@ -155,8 +155,8 @@ bool VerifyDetachedBodyPartMemento::start() { m_vr = VerificationResult( err ); return false; } - connect( m_job, TQT_SIGNAL(result(const GpgME::VerificationResult&)), - this, TQT_SLOT(slotResult(const GpgME::VerificationResult&)) ); + connect( m_job, TQ_SIGNAL(result(const GpgME::VerificationResult&)), + this, TQ_SLOT(slotResult(const GpgME::VerificationResult&)) ); setRunning( true ); return true; } @@ -218,9 +218,9 @@ bool VerifyDetachedBodyPartMemento::startKeyListJob() assert( canStartKeyListJob() ); if ( const GpgME::Error err = m_keylistjob->start( keyListPattern() ) ) return false; - connect( m_keylistjob, TQT_SIGNAL(done()), this, TQT_SLOT(slotKeyListJobDone()) ); - connect( m_keylistjob, TQT_SIGNAL(nextKey(const GpgME::Key&)), - this, TQT_SLOT(slotNextKey(const GpgME::Key&)) ); + connect( m_keylistjob, TQ_SIGNAL(done()), this, TQ_SLOT(slotKeyListJobDone()) ); + connect( m_keylistjob, TQ_SIGNAL(nextKey(const GpgME::Key&)), + this, TQ_SLOT(slotNextKey(const GpgME::Key&)) ); return true; } @@ -261,8 +261,8 @@ bool VerifyOpaqueBodyPartMemento::start() { m_vr = VerificationResult( err ); return false; } - connect( m_job, TQT_SIGNAL(result(const GpgME::VerificationResult&,const TQByteArray&)), - this, TQT_SLOT(slotResult(const GpgME::VerificationResult&,const TQByteArray&)) ); + connect( m_job, TQ_SIGNAL(result(const GpgME::VerificationResult&,const TQByteArray&)), + this, TQ_SLOT(slotResult(const GpgME::VerificationResult&,const TQByteArray&)) ); setRunning( true ); return true; } @@ -328,9 +328,9 @@ bool VerifyOpaqueBodyPartMemento::startKeyListJob() assert( canStartKeyListJob() ); if ( const GpgME::Error err = m_keylistjob->start( keyListPattern() ) ) return false; - connect( m_keylistjob, TQT_SIGNAL(done()), this, TQT_SLOT(slotKeyListJobDone()) ); - connect( m_keylistjob, TQT_SIGNAL(nextKey(const GpgME::Key&)), - this, TQT_SLOT(slotNextKey(const GpgME::Key&)) ); + connect( m_keylistjob, TQ_SIGNAL(done()), this, TQ_SLOT(slotKeyListJobDone()) ); + connect( m_keylistjob, TQ_SIGNAL(nextKey(const GpgME::Key&)), + this, TQ_SLOT(slotNextKey(const GpgME::Key&)) ); return true; } diff --git a/kmail/popaccount.cpp b/kmail/popaccount.cpp index b455cc54..97ec2b6c 100644 --- a/kmail/popaccount.cpp +++ b/kmail/popaccount.cpp @@ -72,10 +72,10 @@ PopAccount::PopAccount(AccountManager* aOwner, const TQString& aAccountName, uin mUidsOfNextSeenMsgsDict.setAutoDelete( false ); headersOnServer.setAutoDelete(true); - connect(&processMsgsTimer,TQT_SIGNAL(timeout()),TQT_SLOT(slotProcessPendingMsgs())); + connect(&processMsgsTimer,TQ_SIGNAL(timeout()),TQ_SLOT(slotProcessPendingMsgs())); TDEIO::Scheduler::connect( - TQT_SIGNAL(slaveError(TDEIO::Slave *, int, const TQString &)), - this, TQT_SLOT(slotSlaveError(TDEIO::Slave *, int, const TQString &))); + TQ_SIGNAL(slaveError(TDEIO::Slave *, int, const TQString &)), + this, TQ_SLOT(slotSlaveError(TDEIO::Slave *, int, const TQString &))); mHeaderDeleteUids.clear(); mHeaderDownUids.clear(); @@ -286,12 +286,12 @@ void PopAccount::setFilterOnServerCheckSize(unsigned int aSize) //----------------------------------------------------------------------------- void PopAccount::connectJob() { TDEIO::Scheduler::assignJobToSlave(mSlave, job); - connect(job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray &)), - TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray &))); - connect(job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotResult( TDEIO::Job * ) ) ); - connect(job, TQT_SIGNAL(infoMessage( TDEIO::Job*, const TQString & )), - TQT_SLOT( slotMsgRetrieved(TDEIO::Job*, const TQString &))); + connect(job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray &)), + TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray &))); + connect(job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotResult( TDEIO::Job * ) ) ); + connect(job, TQ_SIGNAL(infoMessage( TDEIO::Job*, const TQString & )), + TQ_SLOT( slotMsgRetrieved(TDEIO::Job*, const TQString &))); } @@ -353,8 +353,8 @@ void PopAccount::slotAbortRequested() { if (stage == Idle) return; if ( mMailCheckProgressItem ) - disconnect( mMailCheckProgressItem, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ), - this, TQT_SLOT( slotAbortRequested() ) ); + disconnect( mMailCheckProgressItem, TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ), + this, TQ_SLOT( slotAbortRequested() ) ); stage = Quit; if (job) job->kill(); job = 0; @@ -404,8 +404,8 @@ void PopAccount::startJob() i18n("Preparing transmission from \"%1\"...").arg( escapedName ), true, // can be canceled useSSL() || useTLS() ); - connect( mMailCheckProgressItem, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ), - this, TQT_SLOT( slotAbortRequested() ) ); + connect( mMailCheckProgressItem, TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem* ) ), + this, TQ_SLOT( slotAbortRequested() ) ); numBytes = 0; numBytesRead = 0; @@ -1064,7 +1064,7 @@ void PopAccount::slotSlaveError(TDEIO::Slave *aSlave, int error, /* We need a timer, otherwise slotSlaveError of the next account is also executed, if it reuses the slave, because the slave member variable is changed too early */ - TQTimer::singleShot(0, this, TQT_SLOT(slotCancel())); + TQTimer::singleShot(0, this, TQ_SLOT(slotCancel())); } //----------------------------------------------------------------------------- diff --git a/kmail/quotajobs.cpp b/kmail/quotajobs.cpp index f8272cac..215a657c 100644 --- a/kmail/quotajobs.cpp +++ b/kmail/quotajobs.cpp @@ -51,8 +51,8 @@ QuotaJobs::GetQuotarootJob::GetQuotarootJob( const KURL& url, bool showProgressInfo ) : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo ) { - connect( this, TQT_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)), - TQT_SLOT(slotInfoMessage(TDEIO::Job*,const TQString&)) ); + connect( this, TQ_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)), + TQ_SLOT(slotInfoMessage(TDEIO::Job*,const TQString&)) ); } void QuotaJobs::GetQuotarootJob::slotInfoMessage( TDEIO::Job*, const TQString& str ) @@ -106,10 +106,10 @@ QuotaJobs::GetStorageQuotaJob::GetStorageQuotaJob( TDEIO::Slave* slave, const KU QuotaJobs::GetQuotarootJob *job = new QuotaJobs::GetQuotarootJob( url, packedArgs, false ); - connect(job, TQT_SIGNAL(quotaInfoReceived(const QuotaInfoList&)), - TQT_SLOT(slotQuotaInfoReceived(const QuotaInfoList&))); - connect(job, TQT_SIGNAL(quotaRootResult(const TQStringList&)), - TQT_SLOT(slotQuotarootResult(const TQStringList&))); + connect(job, TQ_SIGNAL(quotaInfoReceived(const QuotaInfoList&)), + TQ_SLOT(slotQuotaInfoReceived(const QuotaInfoList&))); + connect(job, TQ_SIGNAL(quotaRootResult(const TQStringList&)), + TQ_SLOT(slotQuotarootResult(const TQStringList&))); TDEIO::Scheduler::assignJobToSlave( slave, job ); addSubjob( job ); } diff --git a/kmail/recipientseditor.cpp b/kmail/recipientseditor.cpp index 7497a460..4525bb97 100644 --- a/kmail/recipientseditor.cpp +++ b/kmail/recipientseditor.cpp @@ -162,24 +162,24 @@ RecipientLine::RecipientLine( TQWidget *parent ) TQToolTip::add( mEdit, i18n( "Set the list of email addresses to receive this message" ) ); topLayout->addWidget( mEdit ); - connect( mEdit, TQT_SIGNAL( returnPressed() ), TQT_SLOT( slotReturnPressed() ) ); - connect( mEdit, TQT_SIGNAL( deleteMe() ), TQT_SLOT( slotPropagateDeletion() ) ); - connect( mEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SLOT( analyzeLine( const TQString & ) ) ); - connect( mEdit, TQT_SIGNAL( focusUp() ), TQT_SLOT( slotFocusUp() ) ); - connect( mEdit, TQT_SIGNAL( focusDown() ), TQT_SLOT( slotFocusDown() ) ); - connect( mEdit, TQT_SIGNAL( rightPressed() ), TQT_SIGNAL( rightPressed() ) ); + connect( mEdit, TQ_SIGNAL( returnPressed() ), TQ_SLOT( slotReturnPressed() ) ); + connect( mEdit, TQ_SIGNAL( deleteMe() ), TQ_SLOT( slotPropagateDeletion() ) ); + connect( mEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SLOT( analyzeLine( const TQString & ) ) ); + connect( mEdit, TQ_SIGNAL( focusUp() ), TQ_SLOT( slotFocusUp() ) ); + connect( mEdit, TQ_SIGNAL( focusDown() ), TQ_SLOT( slotFocusDown() ) ); + connect( mEdit, TQ_SIGNAL( rightPressed() ), TQ_SIGNAL( rightPressed() ) ); - connect( mEdit, TQT_SIGNAL( leftPressed() ), mCombo, TQT_SLOT( setFocus() ) ); - connect( mCombo, TQT_SIGNAL( rightPressed() ), mEdit, TQT_SLOT( setFocus() ) ); + connect( mEdit, TQ_SIGNAL( leftPressed() ), mCombo, TQ_SLOT( setFocus() ) ); + connect( mCombo, TQ_SIGNAL( rightPressed() ), mEdit, TQ_SLOT( setFocus() ) ); - connect( mCombo, TQT_SIGNAL( activated ( int ) ), - this, TQT_SLOT( slotTypeModified() ) ); + connect( mCombo, TQ_SIGNAL( activated ( int ) ), + this, TQ_SLOT( slotTypeModified() ) ); mRemoveButton = new TQPushButton( this ); mRemoveButton->setIconSet( TDEApplication::reverseLayout() ? SmallIconSet("locationbar_erase") : SmallIconSet( "clear_left" ) ); topLayout->addWidget( mRemoveButton ); - connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotPropagateDeletion() ) ); + connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotPropagateDeletion() ) ); TQToolTip::add( mRemoveButton, i18n("Remove recipient line") ); } @@ -357,20 +357,20 @@ RecipientLine *RecipientsView::addLine() addChild( line, 0, mLines.count() * mLineHeight ); line->mEdit->setCompletionMode( mCompletionMode ); line->show(); - connect( line, TQT_SIGNAL( returnPressed( RecipientLine * ) ), - TQT_SLOT( slotReturnPressed( RecipientLine * ) ) ); - connect( line, TQT_SIGNAL( upPressed( RecipientLine * ) ), - TQT_SLOT( slotUpPressed( RecipientLine * ) ) ); - connect( line, TQT_SIGNAL( downPressed( RecipientLine * ) ), - TQT_SLOT( slotDownPressed( RecipientLine * ) ) ); - connect( line, TQT_SIGNAL( rightPressed() ), TQT_SIGNAL( focusRight() ) ); - connect( line, TQT_SIGNAL( deleteLine( RecipientLine * ) ), - TQT_SLOT( slotDecideLineDeletion( RecipientLine * ) ) ); - connect( line, TQT_SIGNAL( countChanged() ), TQT_SLOT( calculateTotal() ) ); - connect( line, TQT_SIGNAL( typeModified( RecipientLine * ) ), - TQT_SLOT( slotTypeModified( RecipientLine * ) ) ); - connect( line->mEdit, TQT_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion ) ), - TQT_SLOT( setCompletionMode( TDEGlobalSettings::Completion ) ) ); + connect( line, TQ_SIGNAL( returnPressed( RecipientLine * ) ), + TQ_SLOT( slotReturnPressed( RecipientLine * ) ) ); + connect( line, TQ_SIGNAL( upPressed( RecipientLine * ) ), + TQ_SLOT( slotUpPressed( RecipientLine * ) ) ); + connect( line, TQ_SIGNAL( downPressed( RecipientLine * ) ), + TQ_SLOT( slotDownPressed( RecipientLine * ) ) ); + connect( line, TQ_SIGNAL( rightPressed() ), TQ_SIGNAL( focusRight() ) ); + connect( line, TQ_SIGNAL( deleteLine( RecipientLine * ) ), + TQ_SLOT( slotDecideLineDeletion( RecipientLine * ) ) ); + connect( line, TQ_SIGNAL( countChanged() ), TQ_SLOT( calculateTotal() ) ); + connect( line, TQ_SIGNAL( typeModified( RecipientLine * ) ), + TQ_SLOT( slotTypeModified( RecipientLine * ) ) ); + connect( line->mEdit, TQ_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion ) ), + TQ_SLOT( setCompletionMode( TDEGlobalSettings::Completion ) ) ); if ( mLines.last() ) { if ( mLines.count() == 1 ) { @@ -482,7 +482,7 @@ void RecipientsView::slotDecideLineDeletion( RecipientLine *line ) line->clear(); } else { mCurDelLine = line; - TQTimer::singleShot( 0, this, TQT_SLOT( slotDeleteLine( ) ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotDeleteLine( ) ) ); } } @@ -538,7 +538,7 @@ void RecipientsView::resizeView() parentWidget()->layout()->activate(); emit sizeHintChanged(); - TQTimer::singleShot( 0, this, TQT_SLOT(moveCompletionPopup()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(moveCompletionPopup()) ); } void RecipientsView::activateLine( RecipientLine *line ) @@ -768,14 +768,14 @@ SideWidget::SideWidget( RecipientsView *view, TQWidget *parent ) mDistributionListButton = new TQPushButton( i18n("Save List..."), this ); topLayout->addWidget( mDistributionListButton ); mDistributionListButton->hide(); - connect( mDistributionListButton, TQT_SIGNAL( clicked() ), - TQT_SIGNAL( saveDistributionList() ) ); + connect( mDistributionListButton, TQ_SIGNAL( clicked() ), + TQ_SIGNAL( saveDistributionList() ) ); TQToolTip::add( mDistributionListButton, i18n("Save recipients as distribution list") ); mSelectButton = new TQPushButton( i18n("Se&lect..."), this ); topLayout->addWidget( mSelectButton ); - connect( mSelectButton, TQT_SIGNAL( clicked() ), TQT_SLOT( pickRecipient() ) ); + connect( mSelectButton, TQ_SIGNAL( clicked() ), TQ_SLOT( pickRecipient() ) ); TQToolTip::add( mSelectButton, i18n("Select recipients from address book") ); } @@ -789,8 +789,8 @@ RecipientsPicker* SideWidget::picker() const // hacks to allow picker() to be const in the presence of lazy loading SideWidget *non_const_this = const_cast<SideWidget*>( this ); mRecipientPicker = new RecipientsPicker( non_const_this ); - connect( mRecipientPicker, TQT_SIGNAL( pickedRecipient( const Recipient & ) ), - non_const_this, TQT_SIGNAL( pickedRecipient( const Recipient & ) ) ); + connect( mRecipientPicker, TQ_SIGNAL( pickedRecipient( const Recipient & ) ), + non_const_this, TQ_SIGNAL( pickedRecipient( const Recipient & ) ) ); mPickerPositioner = new KWindowPositioner( non_const_this, mRecipientPicker ); } return mRecipientPicker; @@ -845,25 +845,25 @@ RecipientsEditor::RecipientsEditor( TQWidget *parent ) mRecipientsView = new RecipientsView( this ); topLayout->addWidget( mRecipientsView ); - connect( mRecipientsView, TQT_SIGNAL( focusUp() ), TQT_SIGNAL( focusUp() ) ); - connect( mRecipientsView, TQT_SIGNAL( focusDown() ), TQT_SIGNAL( focusDown() ) ); - connect( mRecipientsView, TQT_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion ) ), - TQT_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion ) ) ); + connect( mRecipientsView, TQ_SIGNAL( focusUp() ), TQ_SIGNAL( focusUp() ) ); + connect( mRecipientsView, TQ_SIGNAL( focusDown() ), TQ_SIGNAL( focusDown() ) ); + connect( mRecipientsView, TQ_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion ) ), + TQ_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion ) ) ); mSideWidget = new SideWidget( mRecipientsView, this ); topLayout->addWidget( mSideWidget ); - connect( mSideWidget, TQT_SIGNAL( pickedRecipient( const Recipient & ) ), - TQT_SLOT( slotPickedRecipient( const Recipient & ) ) ); - connect( mSideWidget, TQT_SIGNAL( saveDistributionList() ), - TQT_SLOT( saveDistributionList() ) ); - - connect( mRecipientsView, TQT_SIGNAL( totalChanged( int, int ) ), - mSideWidget, TQT_SLOT( setTotal( int, int ) ) ); - connect( mRecipientsView, TQT_SIGNAL( focusRight() ), - mSideWidget, TQT_SLOT( setFocus() ) ); - - connect( mRecipientsView, TQT_SIGNAL(sizeHintChanged()), - TQT_SIGNAL(sizeHintChanged()) ); + connect( mSideWidget, TQ_SIGNAL( pickedRecipient( const Recipient & ) ), + TQ_SLOT( slotPickedRecipient( const Recipient & ) ) ); + connect( mSideWidget, TQ_SIGNAL( saveDistributionList() ), + TQ_SLOT( saveDistributionList() ) ); + + connect( mRecipientsView, TQ_SIGNAL( totalChanged( int, int ) ), + mSideWidget, TQ_SLOT( setTotal( int, int ) ) ); + connect( mRecipientsView, TQ_SIGNAL( focusRight() ), + mSideWidget, TQ_SLOT( setFocus() ) ); + + connect( mRecipientsView, TQ_SIGNAL(sizeHintChanged()), + TQ_SIGNAL(sizeHintChanged()) ); } RecipientsEditor::~RecipientsEditor() diff --git a/kmail/recipientseditortest.cpp b/kmail/recipientseditortest.cpp index 50ea58a2..8c3a4d64 100644 --- a/kmail/recipientseditortest.cpp +++ b/kmail/recipientseditortest.cpp @@ -64,7 +64,7 @@ Composer::Composer( TQWidget *parent ) TQPushButton *button = new TQPushButton( "&Close", this ); topLayout->addMultiCellWidget( button, 3, 3, 0, 1 ); - connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( slotClose() ) ); + connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( slotClose() ) ); } void Composer::slotClose() @@ -96,7 +96,7 @@ int main( int argc, char **argv ) TDEApplication app; - TQObject::connect( &app, TQT_SIGNAL( lastWindowClosed() ), &app, TQT_SLOT( quit() ) ); + TQObject::connect( &app, TQ_SIGNAL( lastWindowClosed() ), &app, TQ_SLOT( quit() ) ); TQWidget *wid = new Composer( 0 ); diff --git a/kmail/recipientspicker.cpp b/kmail/recipientspicker.cpp index e549c789..24679d8e 100644 --- a/kmail/recipientspicker.cpp +++ b/kmail/recipientspicker.cpp @@ -364,10 +364,10 @@ RecipientsPicker::RecipientsPicker( TQWidget *parent ) resLayout->addWidget( mCollectionCombo ); resLayout->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Expanding)); -// connect( mCollectionCombo, TQT_SIGNAL( highlighted( int ) ), -// TQT_SLOT( updateList() ) ); - connect( mCollectionCombo, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( updateList() ) ); +// connect( mCollectionCombo, TQ_SIGNAL( highlighted( int ) ), +// TQ_SLOT( updateList() ) ); + connect( mCollectionCombo, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( updateList() ) ); TQBoxLayout *searchLayout = new TQHBoxLayout( topLayout ); @@ -375,7 +375,7 @@ RecipientsPicker::RecipientsPicker( TQWidget *parent ) button->setIconSet( TDEGlobal::iconLoader()->loadIconSet( TDEApplication::reverseLayout() ? "clear_left":"locationbar_erase", TDEIcon::Small, 0 ) ); searchLayout->addWidget( button ); - connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( resetSearch() ) ); + connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( resetSearch() ) ); label = new TQLabel( i18n("&Search:"), this ); searchLayout->addWidget( label ); @@ -388,21 +388,21 @@ RecipientsPicker::RecipientsPicker( TQWidget *parent ) mRecipientList->addColumn( i18n("->") ); mRecipientList->addColumn( i18n("Name") ); mRecipientList->addColumn( i18n("Email") ); - connect( mRecipientList, TQT_SIGNAL( doubleClicked( TQListViewItem *, - const TQPoint &, int ) ), TQT_SLOT( slotPicked() ) ); - connect( mRecipientList, TQT_SIGNAL( returnPressed( TQListViewItem * ) ), - TQT_SLOT( slotPicked() ) ); + connect( mRecipientList, TQ_SIGNAL( doubleClicked( TQListViewItem *, + const TQPoint &, int ) ), TQ_SLOT( slotPicked() ) ); + connect( mRecipientList, TQ_SIGNAL( returnPressed( TQListViewItem * ) ), + TQ_SLOT( slotPicked() ) ); new RecipientsListToolTip( mRecipientList->viewport(), mRecipientList ); mSearchLine = new SearchLine( this, mRecipientList ); searchLayout->addWidget( mSearchLine ); label->setBuddy( label ); - connect( mSearchLine, TQT_SIGNAL( downPressed() ), TQT_SLOT( setFocusList() ) ); + connect( mSearchLine, TQ_SIGNAL( downPressed() ), TQ_SLOT( setFocusList() ) ); mSearchLDAPButton = new TQPushButton( i18n("Search &Directory Service"), this ); searchLayout->addWidget( mSearchLDAPButton ); - connect( mSearchLDAPButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSearchLDAP() ) ); + connect( mSearchLDAPButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotSearchLDAP() ) ); TQBoxLayout *buttonLayout = new TQHBoxLayout( topLayout ); @@ -410,27 +410,27 @@ RecipientsPicker::RecipientsPicker( TQWidget *parent ) mToButton = new TQPushButton( i18n("Add as To"), this ); buttonLayout->addWidget( mToButton ); - connect( mToButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotToClicked() ) ); + connect( mToButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotToClicked() ) ); mCcButton = new TQPushButton( i18n("Add as CC"), this ); buttonLayout->addWidget( mCcButton ); - connect( mCcButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotCcClicked() ) ); + connect( mCcButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotCcClicked() ) ); mBccButton = new TQPushButton( i18n("Add as BCC"), this ); buttonLayout->addWidget( mBccButton ); - connect( mBccButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotBccClicked() ) ); + connect( mBccButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotBccClicked() ) ); // BCC isn't commonly used, so hide it for now //mBccButton->hide(); TQPushButton *closeButton = new TQPushButton( i18n("&Cancel"), this ); buttonLayout->addWidget( closeButton ); - connect( closeButton, TQT_SIGNAL( clicked() ), TQT_SLOT( close() ) ); + connect( closeButton, TQ_SIGNAL( clicked() ), TQ_SLOT( close() ) ); { using namespace TDEABC; mAddressBook = TDEABC::StdAddressBook::self( true ); - connect( mAddressBook, TQT_SIGNAL( addressBookChanged( AddressBook * ) ), - this, TQT_SLOT( insertAddressBook( AddressBook * ) ) ); + connect( mAddressBook, TQ_SIGNAL( addressBookChanged( AddressBook * ) ), + this, TQ_SLOT( insertAddressBook( AddressBook * ) ) ); } initCollections(); @@ -845,8 +845,8 @@ void RecipientsPicker::slotSearchLDAP() { if ( !mLdapSearchDialog ) { mLdapSearchDialog = new KPIM::LDAPSearchDialog( this ); - connect( mLdapSearchDialog, TQT_SIGNAL( addresseesAdded() ), - TQT_SLOT(ldapSearchResult() ) ); + connect( mLdapSearchDialog, TQ_SIGNAL( addresseesAdded() ), + TQ_SLOT(ldapSearchResult() ) ); } mLdapSearchDialog->setSearchText( mSearchLine->text() ); mLdapSearchDialog->show(); diff --git a/kmail/redirectdialog.cpp b/kmail/redirectdialog.cpp index 0426bf15..371f8b76 100644 --- a/kmail/redirectdialog.cpp +++ b/kmail/redirectdialog.cpp @@ -74,9 +74,9 @@ RedirectDialog::RedirectDialog( TQWidget *parent, const char *name, "where you can select recipients out " "of all available addresses." ) ); - connect( mBtnTo, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddrBook()) ); + connect( mBtnTo, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddrBook()) ); - connect( mEditTo, TQT_SIGNAL( textChanged ( const TQString & ) ), TQT_SLOT( slotEmailChanged( const TQString & ) ) ); + connect( mEditTo, TQ_SIGNAL( textChanged ( const TQString & ) ), TQ_SLOT( slotEmailChanged( const TQString & ) ) ); mLabelTo->setBuddy( mBtnTo ); mEditTo->setFocus(); diff --git a/kmail/regexplineedit.cpp b/kmail/regexplineedit.cpp index 0b297451..e99528a9 100644 --- a/kmail/regexplineedit.cpp +++ b/kmail/regexplineedit.cpp @@ -76,8 +76,8 @@ namespace KMail { setFocusProxy( mLineEdit ); hlay->addWidget( mLineEdit ); - connect( mLineEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( textChanged( const TQString & ) ) ); + connect( mLineEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( textChanged( const TQString & ) ) ); if( !TDETrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty() ) { mRegExpEditButton = new TQPushButton( i18n("Edit..."), this, @@ -86,8 +86,8 @@ namespace KMail { TQSizePolicy::Fixed ); hlay->addWidget( mRegExpEditButton ); - connect( mRegExpEditButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotEditRegExp() ) ); + connect( mRegExpEditButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotEditRegExp() ) ); } } diff --git a/kmail/renamejob.cpp b/kmail/renamejob.cpp index 15c2778f..1c3cbef0 100644 --- a/kmail/renamejob.cpp +++ b/kmail/renamejob.cpp @@ -110,7 +110,7 @@ void RenameJob::execute() } // copy to the new folder mCopyFolderJob = new CopyFolderJob( mStorage, mNewParent ); - connect( mCopyFolderJob, TQT_SIGNAL(folderCopyComplete(bool)), TQT_SLOT(folderCopyComplete(bool)) ); + connect( mCopyFolderJob, TQ_SIGNAL(folderCopyComplete(bool)), TQ_SLOT(folderCopyComplete(bool)) ); mCopyFolderJob->execute(); } else @@ -149,8 +149,8 @@ void RenameJob::execute() ImapAccountBase::jobData jd( src.url() ); account->insertJob( job, jd ); TDEIO::Scheduler::assignJobToSlave( account->slave(), job ); - connect( job, TQT_SIGNAL(result(TDEIO::Job*)), - TQT_SLOT(slotRenameResult(TDEIO::Job*)) ); + connect( job, TQ_SIGNAL(result(TDEIO::Job*)), + TQ_SLOT(slotRenameResult(TDEIO::Job*)) ); } } diff --git a/kmail/rulewidgethandlermanager.cpp b/kmail/rulewidgethandlermanager.cpp index 05844963..27aa68bc 100644 --- a/kmail/rulewidgethandlermanager.cpp +++ b/kmail/rulewidgethandlermanager.cpp @@ -431,8 +431,8 @@ namespace { funcCombo->insertItem( i18n( TextFunctions[i].displayName ) ); } funcCombo->adjustSize(); - TQObject::connect( funcCombo, TQT_SIGNAL( activated( int ) ), - receiver, TQT_SLOT( slotFunctionChanged() ) ); + TQObject::connect( funcCombo, TQ_SIGNAL( activated( int ) ), + receiver, TQ_SLOT( slotFunctionChanged() ) ); return funcCombo; } @@ -445,8 +445,8 @@ namespace { if ( number == 0 ) { RegExpLineEdit *lineEdit = new RegExpLineEdit( valueStack, "regExpLineEdit" ); - TQObject::connect( lineEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - receiver, TQT_SLOT( slotValueChanged() ) ); + TQObject::connect( lineEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + receiver, TQ_SLOT( slotValueChanged() ) ); return lineEdit; } @@ -459,8 +459,8 @@ namespace { TQComboBox *combo = new TQComboBox( valueStack, "categoryCombo" ); TQStringList categories = KabcBridge::categories(); combo->insertStringList( categories ); - TQObject::connect( combo, TQT_SIGNAL( activated( int ) ), - receiver, TQT_SLOT( slotValueChanged() ) ); + TQObject::connect( combo, TQ_SIGNAL( activated( int ) ), + receiver, TQ_SLOT( slotValueChanged() ) ); return combo; } @@ -762,8 +762,8 @@ namespace { funcCombo->insertItem( i18n( MessageFunctions[i].displayName ) ); } funcCombo->adjustSize(); - TQObject::connect( funcCombo, TQT_SIGNAL( activated( int ) ), - receiver, TQT_SLOT( slotFunctionChanged() ) ); + TQObject::connect( funcCombo, TQ_SIGNAL( activated( int ) ), + receiver, TQ_SLOT( slotFunctionChanged() ) ); return funcCombo; } @@ -776,8 +776,8 @@ namespace { if ( number == 0 ) { RegExpLineEdit *lineEdit = new RegExpLineEdit( valueStack, "regExpLineEdit" ); - TQObject::connect( lineEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - receiver, TQT_SLOT( slotValueChanged() ) ); + TQObject::connect( lineEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + receiver, TQ_SLOT( slotValueChanged() ) ); return lineEdit; } @@ -1038,8 +1038,8 @@ namespace { funcCombo->insertItem( i18n( StatusFunctions[i].displayName ) ); } funcCombo->adjustSize(); - TQObject::connect( funcCombo, TQT_SIGNAL( activated( int ) ), - receiver, TQT_SLOT( slotFunctionChanged() ) ); + TQObject::connect( funcCombo, TQ_SIGNAL( activated( int ) ), + receiver, TQ_SLOT( slotFunctionChanged() ) ); return funcCombo; } @@ -1058,8 +1058,8 @@ namespace { statusCombo->insertItem( UserIcon( KMail::StatusValues[ i ].icon ), i18n( KMail::StatusValues[ i ].text ) ); } statusCombo->adjustSize(); - TQObject::connect( statusCombo, TQT_SIGNAL( activated( int ) ), - receiver, TQT_SLOT( slotValueChanged() ) ); + TQObject::connect( statusCombo, TQ_SIGNAL( activated( int ) ), + receiver, TQ_SLOT( slotValueChanged() ) ); return statusCombo; } @@ -1298,8 +1298,8 @@ namespace { funcCombo->insertItem( i18n( NumericFunctions[i].displayName ) ); } funcCombo->adjustSize(); - TQObject::connect( funcCombo, TQT_SIGNAL( activated( int ) ), - receiver, TQT_SLOT( slotFunctionChanged() ) ); + TQObject::connect( funcCombo, TQ_SIGNAL( activated( int ) ), + receiver, TQ_SLOT( slotFunctionChanged() ) ); return funcCombo; } @@ -1313,8 +1313,8 @@ namespace { return 0; KIntNumInput *numInput = new KIntNumInput( valueStack, "KIntNumInput" ); - TQObject::connect( numInput, TQT_SIGNAL( valueChanged( int ) ), - receiver, TQT_SLOT( slotValueChanged() ) ); + TQObject::connect( numInput, TQ_SIGNAL( valueChanged( int ) ), + receiver, TQ_SLOT( slotValueChanged() ) ); return numInput; } diff --git a/kmail/searchjob.cpp b/kmail/searchjob.cpp index b0b1d9de..7b0b5558 100644 --- a/kmail/searchjob.cpp +++ b/kmail/searchjob.cpp @@ -92,10 +92,10 @@ void SearchJob::searchCompleteFolder() if ( mFolder->imapPath() != TQString( "/" ) ) { TDEIO::Scheduler::assignJobToSlave( mAccount->slave(), job ); - connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), - TQT_SLOT( slotSearchData( TDEIO::Job*, const TQString& ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotSearchResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), + TQ_SLOT( slotSearchData( TDEIO::Job*, const TQString& ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotSearchResult( TDEIO::Job * ) ) ); } else { // for the "/ folder" of an imap account, searching blocks the tdeioslave @@ -199,8 +199,8 @@ void SearchJob::slotSearchData( TDEIO::Job* job, const TQString& data ) } else { // get the folder to make sure we have all messages - connect ( mFolder, TQT_SIGNAL( folderComplete( KMFolderImap*, bool ) ), - this, TQT_SLOT( slotSearchFolder()) ); + connect ( mFolder, TQ_SIGNAL( folderComplete( KMFolderImap*, bool ) ), + this, TQ_SLOT( slotSearchFolder()) ); mFolder->getFolder(); } } @@ -221,8 +221,8 @@ bool SearchJob::canMapAllUIDs() //----------------------------------------------------------------------------- void SearchJob::slotSearchFolder() { - disconnect ( mFolder, TQT_SIGNAL( folderComplete( KMFolderImap*, bool ) ), - this, TQT_SLOT( slotSearchFolder()) ); + disconnect ( mFolder, TQ_SIGNAL( folderComplete( KMFolderImap*, bool ) ), + this, TQ_SLOT( slotSearchFolder()) ); if ( mLocalSearchPattern->isEmpty() ) { // pure imap search - now get the serial number for the UIDs @@ -271,8 +271,8 @@ void SearchJob::slotSearchFolder() true, mAccount->useSSL() || mAccount->useTLS() ); mProgress->setTotalItems( numMsgs ); - connect ( mProgress, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem*)), - this, TQT_SLOT( slotAbortSearch( KPIM::ProgressItem* ) ) ); + connect ( mProgress, TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem*)), + this, TQ_SLOT( slotAbortSearch( KPIM::ProgressItem* ) ) ); for ( unsigned int i = 0; i < numMsgs ; ++i ) { KMMessage * msg = mFolder->getMsg( i ); @@ -280,8 +280,8 @@ void SearchJob::slotSearchFolder() ImapJob *job = new ImapJob( msg ); job->setParentFolder( mFolder ); job->setParentProgressItem( mProgress ); - connect( job, TQT_SIGNAL(messageRetrieved(KMMessage*)), - this, TQT_SLOT(slotSearchMessageArrived(KMMessage*)) ); + connect( job, TQ_SIGNAL(messageRetrieved(KMMessage*)), + this, TQ_SLOT(slotSearchMessageArrived(KMMessage*)) ); job->start(); } else { slotSearchMessageArrived( msg ); @@ -387,10 +387,10 @@ void SearchJob::searchSingleMessage() stream << (int) 'E' << url; TDEIO::SimpleJob *job = TDEIO::special( url, packedArgs, false ); TDEIO::Scheduler::assignJobToSlave(mAccount->slave(), job); - connect( job, TQT_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)), - TQT_SLOT(slotSearchDataSingleMessage(TDEIO::Job*,const TQString&)) ); - connect( job, TQT_SIGNAL(result(TDEIO::Job *)), - TQT_SLOT(slotSearchResult(TDEIO::Job *)) ); + connect( job, TQ_SIGNAL(infoMessage(TDEIO::Job*,const TQString&)), + TQ_SLOT(slotSearchDataSingleMessage(TDEIO::Job*,const TQString&)) ); + connect( job, TQ_SIGNAL(result(TDEIO::Job *)), + TQ_SLOT(slotSearchResult(TDEIO::Job *)) ); } } @@ -420,8 +420,8 @@ void SearchJob::slotSearchDataSingleMessage( TDEIO::Job* job, const TQString& da if ( needsDownload() ) { ImapJob *job = new ImapJob( msg ); job->setParentFolder( mFolder ); - connect( job, TQT_SIGNAL(messageRetrieved(KMMessage*)), - this, TQT_SLOT(slotSearchMessageArrived(KMMessage*)) ); + connect( job, TQ_SIGNAL(messageRetrieved(KMMessage*)), + this, TQ_SLOT(slotSearchMessageArrived(KMMessage*)) ); job->start(); } else { slotSearchMessageArrived( msg ); diff --git a/kmail/searchwindow.cpp b/kmail/searchwindow.cpp index 55f991c2..97f1e4b6 100644 --- a/kmail/searchwindow.cpp +++ b/kmail/searchwindow.cpp @@ -194,12 +194,12 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name, vbl->addWidget( mPatternEdit ); // enable/disable widgets depending on radio buttons: - connect( mChkbxSpecificFolders, TQT_SIGNAL(toggled(bool)), - mCbxFolders, TQT_SLOT(setEnabled(bool)) ); - connect( mChkbxSpecificFolders, TQT_SIGNAL(toggled(bool)), - mChkSubFolders, TQT_SLOT(setEnabled(bool)) ); - connect( mChkbxAllFolders, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(setEnabledSearchButton(bool)) ); + connect( mChkbxSpecificFolders, TQ_SIGNAL(toggled(bool)), + mCbxFolders, TQ_SLOT(setEnabled(bool)) ); + connect( mChkbxSpecificFolders, TQ_SIGNAL(toggled(bool)), + mChkSubFolders, TQ_SLOT(setEnabled(bool)) ); + connect( mChkbxAllFolders, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(setEnabledSearchButton(bool)) ); mLbxMatches = new MatchListView(searchWidget, this, "Find Messages"); @@ -236,14 +236,14 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name, mLbxMatches->setDragEnabled( true ); - connect( mLbxMatches, TQT_SIGNAL(clicked(TQListViewItem *)), - this, TQT_SLOT(slotShowMsg(TQListViewItem *)) ); - connect( mLbxMatches, TQT_SIGNAL(doubleClicked(TQListViewItem *)), - this, TQT_SLOT(slotViewMsg(TQListViewItem *)) ); - connect( mLbxMatches, TQT_SIGNAL(currentChanged(TQListViewItem *)), - this, TQT_SLOT(slotCurrentChanged(TQListViewItem *)) ); - connect( mLbxMatches, TQT_SIGNAL(contextMenuRequested(TQListViewItem *,const TQPoint &,int)), - this, TQT_SLOT(slotContextMenuRequested(TQListViewItem *,const TQPoint &,int)) ); + connect( mLbxMatches, TQ_SIGNAL(clicked(TQListViewItem *)), + this, TQ_SLOT(slotShowMsg(TQListViewItem *)) ); + connect( mLbxMatches, TQ_SIGNAL(doubleClicked(TQListViewItem *)), + this, TQ_SLOT(slotViewMsg(TQListViewItem *)) ); + connect( mLbxMatches, TQ_SIGNAL(currentChanged(TQListViewItem *)), + this, TQ_SLOT(slotCurrentChanged(TQListViewItem *)) ); + connect( mLbxMatches, TQ_SIGNAL(contextMenuRequested(TQListViewItem *,const TQPoint &,int)), + this, TQ_SLOT(slotContextMenuRequested(TQListViewItem *,const TQPoint &,int)) ); vbl->addWidget( mLbxMatches ); TQHBoxLayout *hbl2 = new TQHBoxLayout( vbl, spacingHint(), "kmfs_hbl2" ); @@ -260,17 +260,17 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name, mSearchFolderOpenBtn = new TQPushButton(i18n("Op&en Search Folder"), searchWidget); mSearchFolderOpenBtn->setEnabled(false); hbl2->addWidget(mSearchFolderOpenBtn); - connect( mSearchFolderEdt, TQT_SIGNAL( textChanged( const TQString &)), - this, TQT_SLOT( scheduleRename( const TQString & ))); - connect( &mRenameTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( renameSearchFolder() )); - connect( mSearchFolderOpenBtn, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( openSearchFolder() )); + connect( mSearchFolderEdt, TQ_SIGNAL( textChanged( const TQString &)), + this, TQ_SLOT( scheduleRename( const TQString & ))); + connect( &mRenameTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( renameSearchFolder() )); + connect( mSearchFolderOpenBtn, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( openSearchFolder() )); mSearchResultOpenBtn = new TQPushButton(i18n("Open &Message"), searchWidget); mSearchResultOpenBtn->setEnabled(false); hbl2->addWidget(mSearchResultOpenBtn); - connect( mSearchResultOpenBtn, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotViewSelectedMsg() )); + connect( mSearchResultOpenBtn, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotViewSelectedMsg() )); mStatusBar = new KStatusBar(searchWidget); mStatusBar->insertFixedItem(i18n("AMiddleLengthText..."), 0, true); mStatusBar->changeItem(i18n("Ready."), 0); @@ -292,9 +292,9 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name, mBtnStop = actionButton(KDialogBase::User2); mBtnStop->setEnabled(false); - connect(this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(slotSearch())); - connect(this, TQT_SIGNAL(user2Clicked()), TQT_SLOT(slotStop())); - connect(this, TQT_SIGNAL(finished()), this, TQT_SLOT(deleteLater())); + connect(this, TQ_SIGNAL(user1Clicked()), TQ_SLOT(slotSearch())); + connect(this, TQ_SIGNAL(user2Clicked()), TQ_SLOT(slotStop())); + connect(this, TQ_SIGNAL(finished()), this, TQ_SLOT(deleteLater())); // give focus to the value field of the first search rule object = mPatternEdit->child( "regExpLineEdit" ); @@ -310,26 +310,26 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name, TDEActionCollection *ac = actionCollection(); ac->setWidget( this ); mReplyAction = new TDEAction( i18n("&Reply..."), "mail-reply-sender", 0, this, - TQT_SLOT(slotReplyToMsg()), ac, "search_reply" ); + TQ_SLOT(slotReplyToMsg()), ac, "search_reply" ); mReplyAllAction = new TDEAction( i18n("Reply to &All..."), "mail-reply-all", - 0, this, TQT_SLOT(slotReplyAllToMsg()), + 0, this, TQ_SLOT(slotReplyAllToMsg()), ac, "search_reply_all" ); mReplyListAction = new TDEAction( i18n("Reply to Mailing-&List..."), "mail_replylist", 0, this, - TQT_SLOT(slotReplyListToMsg()), ac, + TQ_SLOT(slotReplyListToMsg()), ac, "search_reply_list" ); mForwardActionMenu = new TDEActionMenu( i18n("Message->","&Forward"), "mail-forward", ac, "search_message_forward" ); - connect( mForwardActionMenu, TQT_SIGNAL(activated()), this, - TQT_SLOT(slotForwardInlineMsg()) ); + connect( mForwardActionMenu, TQ_SIGNAL(activated()), this, + TQ_SLOT(slotForwardInlineMsg()) ); mForwardAttachedAction = new TDEAction( i18n("Message->Forward->","As &Attachment..."), "mail-forward", 0, this, - TQT_SLOT(slotForwardAttachedMsg()), ac, + TQ_SLOT(slotForwardAttachedMsg()), ac, "search_message_forward_as_attachment" ); mForwardInlineAction = new TDEAction( i18n("&Inline..."), "mail-forward", 0, this, - TQT_SLOT(slotForwardInlineMsg()), ac, + TQ_SLOT(slotForwardInlineMsg()), ac, "search_message_forward_inline" ); if ( GlobalSettings::self()->forwardingInlineByDefault() ) { mForwardActionMenu->insert( mForwardInlineAction ); @@ -341,31 +341,31 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name, mForwardDigestAction = new TDEAction( i18n("Message->Forward->","As Di&gest..."), "mail-forward", 0, this, - TQT_SLOT(slotForwardDigestMsg()), ac, + TQ_SLOT(slotForwardDigestMsg()), ac, "search_message_forward_as_digest" ); mForwardActionMenu->insert( mForwardDigestAction ); mRedirectAction = new TDEAction( i18n("Message->Forward->","&Redirect..."), "mail-forward", 0, this, - TQT_SLOT(slotRedirectMsg()), ac, + TQ_SLOT(slotRedirectMsg()), ac, "search_message_forward_redirect" ); mForwardActionMenu->insert( mRedirectAction ); - mSaveAsAction = KStdAction::saveAs( this, TQT_SLOT(slotSaveMsg()), ac, "search_file_save_as" ); + mSaveAsAction = KStdAction::saveAs( this, TQ_SLOT(slotSaveMsg()), ac, "search_file_save_as" ); mSaveAtchAction = new TDEAction( i18n("Save Attachments..."), "attach", 0, - this, TQT_SLOT(slotSaveAttachments()), ac, "search_save_attachments" ); + this, TQ_SLOT(slotSaveAttachments()), ac, "search_save_attachments" ); - mPrintAction = KStdAction::print( this, TQT_SLOT(slotPrintMsg()), ac, "search_print" ); + mPrintAction = KStdAction::print( this, TQ_SLOT(slotPrintMsg()), ac, "search_print" ); mClearAction = new TDEAction( i18n("Clear Selection"), 0, 0, this, - TQT_SLOT(slotClearSelection()), ac, "search_clear_selection" ); + TQ_SLOT(slotClearSelection()), ac, "search_clear_selection" ); - mCopyAction = KStdAction::copy( this, TQT_SLOT(slotCopyMsgs()), ac, "search_copy_messages" ); - mCutAction = KStdAction::cut( this, TQT_SLOT(slotCutMsgs()), ac, "search_cut_messages" ); + mCopyAction = KStdAction::copy( this, TQ_SLOT(slotCopyMsgs()), ac, "search_copy_messages" ); + mCutAction = KStdAction::cut( this, TQ_SLOT(slotCutMsgs()), ac, "search_cut_messages" ); - connect(mTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updStatus())); - connect(kmkernel->searchFolderMgr(), TQT_SIGNAL(folderInvalidated(KMFolder*)), - this, TQT_SLOT(folderInvalidated(KMFolder*))); + connect(mTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updStatus())); + connect(kmkernel->searchFolderMgr(), TQ_SIGNAL(folderInvalidated(KMFolder*)), + this, TQ_SLOT(folderInvalidated(KMFolder*))); - connect(mCbxFolders, TQT_SIGNAL(folderChanged(KMFolder*)), - this, TQT_SLOT(slotFolderActivated())); + connect(mCbxFolders, TQ_SIGNAL(folderChanged(KMFolder*)), + this, TQ_SLOT(slotFolderActivated())); } @@ -507,18 +507,18 @@ void SearchWindow::slotSearch() mFolder = dynamic_cast<KMFolderSearch*>( folder->storage() ); } mFolder->stopSearch(); - disconnect(mFolder, TQT_SIGNAL(msgAdded(int)), - this, TQT_SLOT(slotAddMsg(int))); - disconnect(mFolder, TQT_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)), - this, TQT_SLOT(slotRemoveMsg(KMFolder*, TQ_UINT32))); - connect(mFolder, TQT_SIGNAL(msgAdded(int)), - this, TQT_SLOT(slotAddMsg(int))); - connect(mFolder, TQT_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)), - this, TQT_SLOT(slotRemoveMsg(KMFolder*, TQ_UINT32))); + disconnect(mFolder, TQ_SIGNAL(msgAdded(int)), + this, TQ_SLOT(slotAddMsg(int))); + disconnect(mFolder, TQ_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)), + this, TQ_SLOT(slotRemoveMsg(KMFolder*, TQ_UINT32))); + connect(mFolder, TQ_SIGNAL(msgAdded(int)), + this, TQ_SLOT(slotAddMsg(int))); + connect(mFolder, TQ_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)), + this, TQ_SLOT(slotRemoveMsg(KMFolder*, TQ_UINT32))); mSearchFolderEdt->setEnabled(false); KMSearch *search = new KMSearch(); - connect(search, TQT_SIGNAL(finished(bool)), - this, TQT_SLOT(searchDone())); + connect(search, TQ_SIGNAL(finished(bool)), + this, TQ_SLOT(searchDone())); if (mChkbxAllFolders->isChecked()) { search->setRecursive(true); } else { @@ -543,7 +543,7 @@ void SearchWindow::searchDone() mTimer->stop(); updStatus(); - TQTimer::singleShot(0, this, TQT_SLOT(enableGUI())); + TQTimer::singleShot(0, this, TQ_SLOT(enableGUI())); if(mLastFocus) mLastFocus->setFocus(); if (mCloseRequested) @@ -623,7 +623,7 @@ void SearchWindow::closeEvent(TQCloseEvent *e) //Cancel search in progress by setting the search folder search to //the null search mFolder->setSearch(new KMSearch()); - TQTimer::singleShot(0, this, TQT_SLOT(slotClose())); + TQTimer::singleShot(0, this, TQ_SLOT(slotClose())); } else { KDialogBase::closeEvent(e); } @@ -676,8 +676,8 @@ void SearchWindow::folderInvalidated(KMFolder *folder) if (folder->storage() == mFolder) { mLbxMatches->clear(); if (mFolder->search()) - connect(mFolder->search(), TQT_SIGNAL(finished(bool)), - this, TQT_SLOT(searchDone())); + connect(mFolder->search(), TQ_SIGNAL(finished(bool)), + this, TQ_SLOT(searchDone())); mTimer->start(200); enableGUI(); } diff --git a/kmail/sieveconfig.cpp b/kmail/sieveconfig.cpp index a787e06a..9bd137bb 100644 --- a/kmail/sieveconfig.cpp +++ b/kmail/sieveconfig.cpp @@ -70,7 +70,7 @@ namespace KMail { mManagesieveCheck = new TQCheckBox( i18n("&Server supports Sieve"), this ); glay->addMultiCellWidget( mManagesieveCheck, row, row, 0, 1 ); - connect( mManagesieveCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEnableWidgets()) ); + connect( mManagesieveCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEnableWidgets()) ); // "reuse host and login config" checkbox: ++row; @@ -79,7 +79,7 @@ namespace KMail { mSameConfigCheck->setEnabled( false ); glay->addMultiCellWidget( mSameConfigCheck, row, row, 0, 1 ); - connect( mSameConfigCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEnableWidgets()) ); + connect( mSameConfigCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEnableWidgets()) ); // "Managesieve port" spinbox and label: ++row; diff --git a/kmail/sievedebugdialog.cpp b/kmail/sievedebugdialog.cpp index cd3ebdfc..09d7d3fa 100644 --- a/kmail/sievedebugdialog.cpp +++ b/kmail/sievedebugdialog.cpp @@ -206,7 +206,7 @@ SieveDebugDialog::SieveDebugDialog( TQWidget *parent, const char *name ) setInitialSize( TQSize( 640, 480 ) ); if ( !mAccountList.isEmpty() ) - TQTimer::singleShot( 0, this, TQT_SLOT( slotDiagNextAccount() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotDiagNextAccount() ) ); } SieveDebugDialog::~SieveDebugDialog() @@ -268,8 +268,8 @@ void SieveDebugDialog::slotDiagNextAccount() mSieveJob = SieveJob::list( mUrl ); - connect( mSieveJob, TQT_SIGNAL( gotList( KMail::SieveJob *, bool, const TQStringList &, const TQString & ) ), - TQT_SLOT( slotGetScriptList( KMail::SieveJob *, bool, const TQStringList &, const TQString & ) ) ); + connect( mSieveJob, TQ_SIGNAL( gotList( KMail::SieveJob *, bool, const TQStringList &, const TQString & ) ), + TQ_SLOT( slotGetScriptList( KMail::SieveJob *, bool, const TQStringList &, const TQString & ) ) ); // Bypass the singleShot timer -- it's fired when we get our data return; @@ -279,7 +279,7 @@ void SieveDebugDialog::slotDiagNextAccount() } // Handle next account async - TQTimer::singleShot( 0, this, TQT_SLOT( slotDiagNextAccount() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotDiagNextAccount() ) ); } void SieveDebugDialog::slotDiagNextScript() @@ -288,7 +288,7 @@ void SieveDebugDialog::slotDiagNextScript() { // Continue handling accounts instead mScriptList.clear(); - TQTimer::singleShot( 0, this, TQT_SLOT( slotDiagNextAccount() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotDiagNextAccount() ) ); return; } @@ -302,8 +302,8 @@ void SieveDebugDialog::slotDiagNextScript() mSieveJob = SieveJob::get( mUrl ); - connect( mSieveJob, TQT_SIGNAL( gotScript( KMail::SieveJob *, bool, const TQString &, bool ) ), - TQT_SLOT( slotGetScript( KMail::SieveJob *, bool, const TQString &, bool ) ) ); + connect( mSieveJob, TQ_SIGNAL( gotScript( KMail::SieveJob *, bool, const TQString &, bool ) ), + TQ_SLOT( slotGetScript( KMail::SieveJob *, bool, const TQString &, bool ) ) ); } void SieveDebugDialog::slotGetScript( SieveJob * /* job */, bool success, @@ -328,7 +328,7 @@ void SieveDebugDialog::slotGetScript( SieveJob * /* job */, bool success, } // Fetch next script - TQTimer::singleShot( 0, this, TQT_SLOT( slotDiagNextScript() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotDiagNextScript() ) ); } void SieveDebugDialog::slotGetScriptList( SieveJob *job, bool success, @@ -367,7 +367,7 @@ void SieveDebugDialog::slotGetScriptList( SieveJob *job, bool success, } // Handle next job: dump scripts for this server - TQTimer::singleShot( 0, this, TQT_SLOT( slotDiagNextScript() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotDiagNextScript() ) ); } void SieveDebugDialog::slotDialogOk() diff --git a/kmail/sievejob.cpp b/kmail/sievejob.cpp index 290e2d71..fc7b92cf 100644 --- a/kmail/sievejob.cpp +++ b/kmail/sievejob.cpp @@ -72,14 +72,14 @@ namespace KMail { case Get: kdDebug(5006) << "SieveJob::schedule: get( " << mUrl.prettyURL() << " )" << endl; mJob = TDEIO::get( mUrl, false /*reload*/, showProgressInfo ); - connect( mJob, TQT_SIGNAL(data(TDEIO::Job*,const TQByteArray&)), - TQT_SLOT(slotData(TDEIO::Job*,const TQByteArray&)) ); + connect( mJob, TQ_SIGNAL(data(TDEIO::Job*,const TQByteArray&)), + TQ_SLOT(slotData(TDEIO::Job*,const TQByteArray&)) ); break; case Put: kdDebug(5006) << "SieveJob::schedule: put( " << mUrl.prettyURL() << " )" << endl; mJob = TDEIO::put( mUrl, 0600, true /*overwrite*/, false /*resume*/, showProgressInfo ); - connect( mJob, TQT_SIGNAL(dataReq(TDEIO::Job*,TQByteArray&)), - TQT_SLOT(slotDataReq(TDEIO::Job*,TQByteArray&)) ); + connect( mJob, TQ_SIGNAL(dataReq(TDEIO::Job*,TQByteArray&)), + TQ_SLOT(slotDataReq(TDEIO::Job*,TQByteArray&)) ); break; case Activate: kdDebug(5006) << "SieveJob::schedule: chmod( " << mUrl.prettyURL() << ", 0700 )" @@ -102,16 +102,16 @@ namespace KMail { kdDebug(5006) << "SieveJob::schedule: listDir's real URL: " << url.prettyURL() << endl; mJob = TDEIO::listDir( url, showProgressInfo ); - connect( mJob, TQT_SIGNAL(entries(TDEIO::Job*,const TDEIO::UDSEntryList&)), - TQT_SLOT(slotEntries(TDEIO::Job*,const TDEIO::UDSEntryList&)) ); + connect( mJob, TQ_SIGNAL(entries(TDEIO::Job*,const TDEIO::UDSEntryList&)), + TQ_SLOT(slotEntries(TDEIO::Job*,const TDEIO::UDSEntryList&)) ); break; } case List: kdDebug(5006) << "SieveJob::schedule: listDir( " << mUrl.prettyURL() << " )" << endl; { mJob = TDEIO::listDir( mUrl, showProgressInfo ); - connect( mJob, TQT_SIGNAL( entries(TDEIO::Job *, const TDEIO::UDSEntryList & ) ), - TQT_SLOT( slotEntries( TDEIO::Job *, const TDEIO::UDSEntryList & ) ) ); + connect( mJob, TQ_SIGNAL( entries(TDEIO::Job *, const TDEIO::UDSEntryList & ) ), + TQ_SLOT( slotEntries( TDEIO::Job *, const TDEIO::UDSEntryList & ) ) ); break; } case Delete: @@ -123,7 +123,7 @@ namespace KMail { } mJob->setInteractive(showProgressInfo); // common to all jobs: - connect( mJob, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotResult(TDEIO::Job*)) ); + connect( mJob, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotResult(TDEIO::Job*)) ); } void SieveJob::slotData( Job *, const TQByteArray & data ) { diff --git a/kmail/signatureconfigurator.cpp b/kmail/signatureconfigurator.cpp index 209e18c1..4b7faca3 100644 --- a/kmail/signatureconfigurator.cpp +++ b/kmail/signatureconfigurator.cpp @@ -85,19 +85,19 @@ namespace KMail { TQWidgetStack * widgetStack = new TQWidgetStack( this ); widgetStack->setEnabled( false ); // since !mEnableCheck->isChecked() vlay->addWidget( widgetStack, 1 ); - connect( mSourceCombo, TQT_SIGNAL(highlighted(int)), - widgetStack, TQT_SLOT(raiseWidget(int)) ); + connect( mSourceCombo, TQ_SIGNAL(highlighted(int)), + widgetStack, TQ_SLOT(raiseWidget(int)) ); // connects for the enabling of the widgets depending on // signatureEnabled: - connect( mEnableCheck, TQT_SIGNAL(toggled(bool)), - mSourceCombo, TQT_SLOT(setEnabled(bool)) ); - connect( mEnableCheck, TQT_SIGNAL(toggled(bool)), - widgetStack, TQT_SLOT(setEnabled(bool)) ); - connect( mEnableCheck, TQT_SIGNAL(toggled(bool)), - label, TQT_SLOT(setEnabled(bool)) ); + connect( mEnableCheck, TQ_SIGNAL(toggled(bool)), + mSourceCombo, TQ_SLOT(setEnabled(bool)) ); + connect( mEnableCheck, TQ_SIGNAL(toggled(bool)), + widgetStack, TQ_SLOT(setEnabled(bool)) ); + connect( mEnableCheck, TQ_SIGNAL(toggled(bool)), + label, TQ_SLOT(setEnabled(bool)) ); // The focus might be still in the widget that is disabled - connect( mEnableCheck, TQT_SIGNAL(clicked()), - mEnableCheck, TQT_SLOT(setFocus()) ); + connect( mEnableCheck, TQ_SIGNAL(clicked()), + mEnableCheck, TQ_SLOT(setFocus()) ); int pageno = 0; // page 0: input field for direct entering: @@ -126,11 +126,11 @@ namespace KMail { i18n("S&pecify file:"), page ) ); hlay->addWidget( mFileRequester, 1 ); mFileRequester->button()->setAutoDefault( false ); - connect( mFileRequester, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(slotEnableEditButton(const TQString &)) ); + connect( mFileRequester, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(slotEnableEditButton(const TQString &)) ); mEditButton = new TQPushButton( i18n("Edit &File"), page ); TQWhatsThis::add(mEditButton, i18n("Opens the specified file in a text editor.")); - connect( mEditButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEdit()) ); + connect( mEditButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotEdit()) ); mEditButton->setAutoDefault( false ); mEditButton->setEnabled( false ); // initially nothing to edit hlay->addWidget( mEditButton ); diff --git a/kmail/simplestringlisteditor.cpp b/kmail/simplestringlisteditor.cpp index c37ea13f..c62b73ae 100644 --- a/kmail/simplestringlisteditor.cpp +++ b/kmail/simplestringlisteditor.cpp @@ -87,8 +87,8 @@ SimpleStringListEditor::SimpleStringListEditor( TQWidget * parent, mAddButton = new TQPushButton( addLabel, this ); mAddButton->setAutoDefault( false ); vlay->addWidget( mAddButton ); - connect( mAddButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotAdd()) ); + connect( mAddButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotAdd()) ); } if ( buttons & Remove ) { @@ -99,8 +99,8 @@ SimpleStringListEditor::SimpleStringListEditor( TQWidget * parent, mRemoveButton->setAutoDefault( false ); mRemoveButton->setEnabled( false ); // no selection yet vlay->addWidget( mRemoveButton ); - connect( mRemoveButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRemove()) ); + connect( mRemoveButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRemove()) ); } if ( buttons & Modify ) { @@ -111,10 +111,10 @@ SimpleStringListEditor::SimpleStringListEditor( TQWidget * parent, mModifyButton->setAutoDefault( false ); mModifyButton->setEnabled( false ); // no selection yet vlay->addWidget( mModifyButton ); - connect( mModifyButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotModify()) ); - connect( mListBox, TQT_SIGNAL( doubleClicked( TQListBoxItem* ) ), - this, TQT_SLOT( slotModify() ) ); + connect( mModifyButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotModify()) ); + connect( mListBox, TQ_SIGNAL( doubleClicked( TQListBoxItem* ) ), + this, TQ_SLOT( slotModify() ) ); } if ( buttons & Up ) { @@ -126,8 +126,8 @@ SimpleStringListEditor::SimpleStringListEditor( TQWidget * parent, mUpButton->setAutoDefault( false ); mUpButton->setEnabled( false ); // no selection yet vlay->addWidget( mUpButton ); - connect( mUpButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotUp()) ); + connect( mUpButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotUp()) ); } if ( buttons & Down ) { @@ -139,14 +139,14 @@ SimpleStringListEditor::SimpleStringListEditor( TQWidget * parent, mDownButton->setAutoDefault( false ); mDownButton->setEnabled( false ); // no selection yet vlay->addWidget( mDownButton ); - connect( mDownButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotDown()) ); + connect( mDownButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotDown()) ); } vlay->addStretch( 1 ); // spacer - connect( mListBox, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotSelectionChanged()) ); + connect( mListBox, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotSelectionChanged()) ); } void SimpleStringListEditor::setStringList( const TQStringList & strings ) { diff --git a/kmail/snippetdlg.cpp b/kmail/snippetdlg.cpp index 60bf689e..088b39c8 100644 --- a/kmail/snippetdlg.cpp +++ b/kmail/snippetdlg.cpp @@ -40,14 +40,14 @@ SnippetDlg::SnippetDlg( TDEActionCollection* ac, TQWidget* parent, const char* n textLabel3 = new TQLabel( this, "textLabel3" ); keyButton = new KKeyButton( this ); - connect( keyButton, TQT_SIGNAL( capturedShortcut( const TDEShortcut& ) ), - this, TQT_SLOT( slotCapturedShortcut( const TDEShortcut& ) ) ); + connect( keyButton, TQ_SIGNAL( capturedShortcut( const TDEShortcut& ) ), + this, TQ_SLOT( slotCapturedShortcut( const TDEShortcut& ) ) ); btnAdd->setEnabled( false ); - connect( snippetName, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(slotTextChanged(const TQString &)) ); - connect( snippetName, TQT_SIGNAL(returnPressed()), - this, TQT_SLOT(slotReturnPressed()) ); + connect( snippetName, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(slotTextChanged(const TQString &)) ); + connect( snippetName, TQ_SIGNAL(returnPressed()), + this, TQ_SLOT(slotReturnPressed()) ); layout3->addWidget( textLabel3, 7, 0 ); layout3->addWidget( keyButton, 7, 1 ); diff --git a/kmail/snippetwidget.cpp b/kmail/snippetwidget.cpp index e16b4884..c0851121 100644 --- a/kmail/snippetwidget.cpp +++ b/kmail/snippetwidget.cpp @@ -62,22 +62,22 @@ SnippetWidget::SnippetWidget(KMEdit* editor, TDEActionCollection* actionCollecti setRootIsDecorated(true); //connect the signals - connect( this, TQT_SIGNAL( contextMenuRequested ( TQListViewItem *, const TQPoint & , int ) ), - this, TQT_SLOT( showPopupMenu(TQListViewItem *, const TQPoint & , int ) ) ); + connect( this, TQ_SIGNAL( contextMenuRequested ( TQListViewItem *, const TQPoint & , int ) ), + this, TQ_SLOT( showPopupMenu(TQListViewItem *, const TQPoint & , int ) ) ); - connect( this, TQT_SIGNAL( doubleClicked (TQListViewItem *) ), - this, TQT_SLOT( slotEdit( TQListViewItem *) ) ); - connect( this, TQT_SIGNAL( returnPressed (TQListViewItem *) ), - this, TQT_SLOT( slotExecuted( TQListViewItem *) ) ); + connect( this, TQ_SIGNAL( doubleClicked (TQListViewItem *) ), + this, TQ_SLOT( slotEdit( TQListViewItem *) ) ); + connect( this, TQ_SIGNAL( returnPressed (TQListViewItem *) ), + this, TQ_SLOT( slotExecuted( TQListViewItem *) ) ); - connect( this, TQT_SIGNAL( dropped(TQDropEvent *, TQListViewItem *) ), - this, TQT_SLOT( slotDropped(TQDropEvent *, TQListViewItem *) ) ); + connect( this, TQ_SIGNAL( dropped(TQDropEvent *, TQListViewItem *) ), + this, TQ_SLOT( slotDropped(TQDropEvent *, TQListViewItem *) ) ); - connect( editor, TQT_SIGNAL( insertSnippet() ), this, TQT_SLOT( slotExecute() )); + connect( editor, TQ_SIGNAL( insertSnippet() ), this, TQ_SLOT( slotExecute() )); _cfg = 0; - TQTimer::singleShot(0, this, TQT_SLOT(initConfig())); + TQTimer::singleShot(0, this, TQ_SLOT(initConfig())); } SnippetWidget::~SnippetWidget() @@ -149,11 +149,11 @@ SnippetItem* SnippetWidget::makeItem( SnippetItem* parent, const TQString& name, const TQString normalizedName = TQString(actionName).replace(" ", "_"); if ( !mActionCollection->action(normalizedName.utf8().data() ) ) { TDEAction * action = new TDEAction( actionName, shortcut, item, - TQT_SLOT( slotExecute() ), mActionCollection, + TQ_SLOT( slotExecute() ), mActionCollection, normalizedName.utf8() ); item->setAction(action); - connect( item, TQT_SIGNAL( execute( TQListViewItem* ) ), - this, TQT_SLOT( slotExecuted( TQListViewItem* ) ) ); + connect( item, TQ_SIGNAL( execute( TQListViewItem* ) ), + this, TQ_SLOT( slotExecuted( TQListViewItem* ) ) ); } return item; } @@ -542,18 +542,18 @@ void SnippetWidget::showPopupMenu( TQListViewItem * item, const TQPoint & p, int if ( item ) { popup.insertTitle( selectedItem->getName() ); if (dynamic_cast<SnippetGroup*>(item)) { - popup.insertItem( i18n("Edit &group..."), this, TQT_SLOT( slotEditGroup() ) ); + popup.insertItem( i18n("Edit &group..."), this, TQ_SLOT( slotEditGroup() ) ); } else { - popup.insertItem( SmallIconSet("edit-paste"), i18n("&Paste"), this, TQT_SLOT( slotExecuted() ) ); - popup.insertItem( SmallIconSet("edit"), i18n("&Edit..."), this, TQT_SLOT( slotEdit() ) ); + popup.insertItem( SmallIconSet("edit-paste"), i18n("&Paste"), this, TQ_SLOT( slotExecuted() ) ); + popup.insertItem( SmallIconSet("edit"), i18n("&Edit..."), this, TQ_SLOT( slotEdit() ) ); } - popup.insertItem( SmallIconSet("edit-delete"), i18n("&Remove"), this, TQT_SLOT( slotRemove() ) ); + popup.insertItem( SmallIconSet("edit-delete"), i18n("&Remove"), this, TQ_SLOT( slotRemove() ) ); popup.insertSeparator(); } else { popup.insertTitle(i18n("Text Snippets")); } - popup.insertItem( i18n("&Add Snippet..."), this, TQT_SLOT( slotAdd() ) ); - popup.insertItem( i18n("Add G&roup..."), this, TQT_SLOT( slotAddGroup() ) ); + popup.insertItem( i18n("&Add Snippet..."), this, TQ_SLOT( slotAdd() ) ); + popup.insertItem( i18n("Add G&roup..."), this, TQ_SLOT( slotAddGroup() ) ); popup.exec(p); } @@ -722,8 +722,8 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ // --END-- building a dynamic dialog //connect the buttons to the TQDialog default slots - connect(btn1, TQT_SIGNAL(clicked()), &dlg, TQT_SLOT(reject()) ); - connect(btn2, TQT_SIGNAL(clicked()), &dlg, TQT_SLOT(accept()) ); + connect(btn1, TQ_SIGNAL(clicked()), &dlg, TQ_SLOT(reject()) ); + connect(btn2, TQ_SIGNAL(clicked()), &dlg, TQ_SLOT(accept()) ); //prepare to execute the dialog bool bReturn = false; @@ -834,8 +834,8 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri // --END-- building a dynamic dialog //connect the buttons to the TQDialog default slots - connect(btn1, TQT_SIGNAL(clicked()), &dlg, TQT_SLOT(reject()) ); - connect(btn2, TQT_SIGNAL(clicked()), &dlg, TQT_SLOT(accept()) ); + connect(btn1, TQ_SIGNAL(clicked()), &dlg, TQ_SLOT(reject()) ); + connect(btn2, TQ_SIGNAL(clicked()), &dlg, TQ_SLOT(accept()) ); //execute the dialog TQString strReturn = ""; diff --git a/kmail/subscriptiondialog.cpp b/kmail/subscriptiondialog.cpp index 93f92a79..8687096c 100644 --- a/kmail/subscriptiondialog.cpp +++ b/kmail/subscriptiondialog.cpp @@ -55,14 +55,14 @@ SubscriptionDialogBase::SubscriptionDialogBase( TQWidget *parent, const TQString hideNewOnlyCheckbox(); // ok-button - connect(this, TQT_SIGNAL(okClicked()), TQT_SLOT(slotSave())); + connect(this, TQ_SIGNAL(okClicked()), TQ_SLOT(slotSave())); // reload-list button - connect(this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(slotLoadFolders())); + connect(this, TQ_SIGNAL(user1Clicked()), TQ_SLOT(slotLoadFolders())); // get the folders, delayed execution style, otherwise there's bother // with virtuals from ctors and whatnot - TQTimer::singleShot(0, this, TQT_SLOT(slotLoadFolders())); + TQTimer::singleShot(0, this, TQ_SLOT(slotLoadFolders())); } //------------------------------------------------------------------------------ @@ -234,8 +234,8 @@ void SubscriptionDialogBase::slotLoadFolders() { // We'll wait for the connectionResult signal from the account. kdDebug(5006) << "SubscriptionDialog - waiting for connection" << endl; - connect( ai, TQT_SIGNAL( connectionResult(int, const TQString&) ), - this, TQT_SLOT( slotConnectionResult(int, const TQString&) ) ); + connect( ai, TQ_SIGNAL( connectionResult(int, const TQString&) ), + this, TQ_SLOT( slotConnectionResult(int, const TQString&) ) ); return; } // clear the views @@ -286,9 +286,9 @@ void SubscriptionDialogBase::processNext() // kdDebug(5006) << "process " << mCurrentNamespace << ",subscribed=" << mSubscribed << endl; ListJob* job = new ListJob( ai, type, 0, ai->addPathToNamespace( mCurrentNamespace ), completeListing ); - connect( job, TQT_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&, + connect( job, TQ_SIGNAL(receivedFolders(const TQStringList&, const TQStringList&, const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&)), - this, TQT_SLOT(slotListDirectory(const TQStringList&, const TQStringList&, + this, TQ_SLOT(slotListDirectory(const TQStringList&, const TQStringList&, const TQStringList&, const TQStringList&, const ImapAccountBase::jobData&))); job->start(); } @@ -418,7 +418,7 @@ void SubscriptionDialog::processItems() if (done == 1000) { emit listChanged(); - TQTimer::singleShot(0, this, TQT_SLOT(processItems())); + TQTimer::singleShot(0, this, TQ_SLOT(processItems())); return; } ++mCount; diff --git a/kmail/tdehtmlparthtmlwriter.cpp b/kmail/tdehtmlparthtmlwriter.cpp index 2fcf29ba..f75e17bf 100644 --- a/kmail/tdehtmlparthtmlwriter.cpp +++ b/kmail/tdehtmlparthtmlwriter.cpp @@ -52,7 +52,7 @@ namespace KMail { mHtmlPart( part ), mHtmlTimer( 0, "mHtmlTimer" ), mState( Ended ) { assert( part ); - connect( &mHtmlTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotWriteNextHtmlChunk()) ); + connect( &mHtmlTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotWriteNextHtmlChunk()) ); } KHtmlPartHtmlWriter::~KHtmlPartHtmlWriter() { diff --git a/kmail/tdelistboxdialog.cpp b/kmail/tdelistboxdialog.cpp index 89fd0093..d6aabce7 100644 --- a/kmail/tdelistboxdialog.cpp +++ b/kmail/tdelistboxdialog.cpp @@ -39,10 +39,10 @@ TDEListBoxDialog::TDEListBoxDialog( TQString& _selectedString, commentBelowLA->hide(); // signals and slots connections - connect( entriesLB, TQT_SIGNAL( highlighted( const TQString& ) ), - this, TQT_SLOT( highlighted( const TQString& ) ) ); - connect( entriesLB, TQT_SIGNAL( selected(int) ), - TQT_SLOT( slotOk() ) ); + connect( entriesLB, TQ_SIGNAL( highlighted( const TQString& ) ), + this, TQ_SLOT( highlighted( const TQString& ) ) ); + connect( entriesLB, TQ_SIGNAL( selected(int) ), + TQ_SLOT( slotOk() ) ); // buddies labelAboveLA->setBuddy( entriesLB ); } diff --git a/kmail/templateparser.cpp b/kmail/templateparser.cpp index d2dbd318..9c615791 100644 --- a/kmail/templateparser.cpp +++ b/kmail/templateparser.cpp @@ -1125,12 +1125,12 @@ TQString TemplateParser::pipe( const TQString &cmd, const TQString &buf ) proc << KShell::splitArgs( cmd, KShell::TildeExpand ); proc.setUseShell( true ); - connect( &proc, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), - this, TQT_SLOT( onReceivedStdout( TDEProcess *, char *, int ) ) ); - connect( &proc, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), - this, TQT_SLOT( onReceivedStderr( TDEProcess *, char *, int ) ) ); - connect( &proc, TQT_SIGNAL( wroteStdin( TDEProcess * ) ), - this, TQT_SLOT( onWroteStdin( TDEProcess * ) ) ); + connect( &proc, TQ_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), + this, TQ_SLOT( onReceivedStdout( TDEProcess *, char *, int ) ) ); + connect( &proc, TQ_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), + this, TQ_SLOT( onReceivedStderr( TDEProcess *, char *, int ) ) ); + connect( &proc, TQ_SIGNAL( wroteStdin( TDEProcess * ) ), + this, TQ_SLOT( onWroteStdin( TDEProcess * ) ) ); if ( proc.start( TDEProcess::NotifyOnExit, TDEProcess::All ) ) { diff --git a/kmail/templatesconfiguration.cpp b/kmail/templatesconfiguration.cpp index 1b79c521..3dc2d189 100644 --- a/kmail/templatesconfiguration.cpp +++ b/kmail/templatesconfiguration.cpp @@ -50,19 +50,19 @@ TemplatesConfiguration::TemplatesConfiguration( TQWidget *parent, const char *na setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); sizeHint(); - connect( textEdit_new, TQT_SIGNAL( textChanged() ), - this, TQT_SLOT( slotTextChanged( void ) ) ); - connect( textEdit_reply, TQT_SIGNAL( textChanged() ), - this, TQT_SLOT( slotTextChanged( void ) ) ); - connect( textEdit_reply_all, TQT_SIGNAL( textChanged() ), - this, TQT_SLOT( slotTextChanged( void ) ) ); - connect( textEdit_forward, TQT_SIGNAL( textChanged() ), - this, TQT_SLOT( slotTextChanged( void ) ) ); - connect( lineEdit_quote, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( slotTextChanged( void ) ) ); - - connect( mInsertCommand, TQT_SIGNAL( insertCommand(TQString, int) ), - this, TQT_SLOT( slotInsertCommand(TQString, int) ) ); + connect( textEdit_new, TQ_SIGNAL( textChanged() ), + this, TQ_SLOT( slotTextChanged( void ) ) ); + connect( textEdit_reply, TQ_SIGNAL( textChanged() ), + this, TQ_SLOT( slotTextChanged( void ) ) ); + connect( textEdit_reply_all, TQ_SIGNAL( textChanged() ), + this, TQ_SLOT( slotTextChanged( void ) ) ); + connect( textEdit_forward, TQ_SIGNAL( textChanged() ), + this, TQ_SLOT( slotTextChanged( void ) ) ); + connect( lineEdit_quote, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( slotTextChanged( void ) ) ); + + connect( mInsertCommand, TQ_SIGNAL( insertCommand(TQString, int) ), + this, TQ_SLOT( slotInsertCommand(TQString, int) ) ); TQString help; if ( TQString( name ) == "folder-templates" ) { diff --git a/kmail/templatesinsertcommand.cpp b/kmail/templatesinsertcommand.cpp index d629bc8e..8817711c 100644 --- a/kmail/templatesinsertcommand.cpp +++ b/kmail/templatesinsertcommand.cpp @@ -35,15 +35,15 @@ TemplatesInsertCommand::TemplatesInsertCommand( TQWidget *parent, : TQPushButton( parent, name ) { setText( i18n( "&Insert Command..." ) ); - connect( this, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotClicked() ) ); + connect( this, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotClicked() ) ); TDEAction *action; TDEActionMenu *menu; TQSignalMapper *mapper = new TQSignalMapper( this ); - connect( mapper, TQT_SIGNAL( mapped(int) ), - this, TQT_SLOT( slotMapped(int) ) ); + connect( mapper, TQ_SIGNAL( mapped(int) ), + this, TQ_SLOT( slotMapped(int) ) ); mMenu = new TDEActionMenu( i18n( "Insert Command..." ), this ); @@ -52,110 +52,110 @@ TemplatesInsertCommand::TemplatesInsertCommand( TQWidget *parent, mMenu->insert( menu ); action = new TDEAction( i18n("Quoted Message"), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CQuote ); menu->insert( action ); action = new TDEAction( i18n("Message Text as Is"), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CText ); menu->insert( action ); action = new TDEAction( i18n("Message Id"), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COMsgId ); menu->insert( action ); action = new TDEAction( i18n("Date"), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CODate ); menu->insert( action ); action = new TDEAction( i18n("Date in Short Format"), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CODateShort ); menu->insert( action ); action = new TDEAction( i18n("Date in C Locale"), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CODateEn ); menu->insert( action ); action = new TDEAction( i18n("Day of Week"), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CODow ); menu->insert( action ); action = new TDEAction( i18n("Time"), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COTime ); menu->insert( action ); action = new TDEAction( i18n("Time in Long Format"), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COTimeLong ); menu->insert( action ); action = new TDEAction( i18n("Time in C Locale"), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COTimeLongEn ); menu->insert( action ); action = new TDEAction( i18n("To Field Address"), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COToAddr ); menu->insert( action ); action = new TDEAction( i18n("To Field Name"), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COToName ); menu->insert( action ); action = new TDEAction( i18n("To Field First Name"), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COToFName ); menu->insert( action ); action = new TDEAction( i18n("To Field Last Name"), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COToLName ); menu->insert( action ); action = new TDEAction( i18n( "CC Field Address" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COCCAddr ); menu->insert( action ); action = new TDEAction( i18n( "CC Field Name" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COCCName ); menu->insert( action ); action = new TDEAction( i18n( "CC Field First Name" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COCCFName ); menu->insert( action ); action = new TDEAction( i18n( "CC Field Last Name" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COCCLName ); menu->insert( action ); action = new TDEAction( i18n( "From Field Address" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COFromAddr ); menu->insert( action ); action = new TDEAction( i18n( "From Field Name" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COFromName ); menu->insert( action ); action = new TDEAction( i18n( "From Field First Name" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COFromFName ); menu->insert( action ); action = new TDEAction( i18n( "From Field Last Name" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COFromLName ); menu->insert( action ); action = new TDEAction( i18n( "Addresses of all original recipients" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COAddresseesAddr ); action = new TDEAction( i18n( "Subject" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COFullSubject ); menu->insert( action ); action = new TDEAction( i18n( "Quoted Headers" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CTQHeaders ); menu->insert( action ); action = new TDEAction( i18n( "Headers as Is" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CHeaders ); menu->insert( action ); action = new TDEAction( i18n( "Header Content" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, COHeader ); menu->insert( action ); @@ -164,91 +164,91 @@ TemplatesInsertCommand::TemplatesInsertCommand( TQWidget *parent, mMenu->insert( menu ); action = new TDEAction( i18n( "Message Id" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CMsgId ); menu->insert( action ); action = new TDEAction( i18n( "Date" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CDate ); menu->insert( action ); action = new TDEAction( i18n( "Date in Short Format" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CDateShort ); menu->insert( action ); action = new TDEAction( i18n( "Date in C Locale" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CDateEn ); menu->insert( action ); action = new TDEAction( i18n( "Day of Week" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CDow ); menu->insert( action ); action = new TDEAction( i18n( "Time" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CTime ); menu->insert( action ); action = new TDEAction( i18n( "Time in Long Format" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CTimeLong ); menu->insert( action ); action = new TDEAction( i18n( "Time in C Locale" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CTimeLongEn ); menu->insert( action ); action = new TDEAction( i18n( "To Field Address" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CToAddr ); menu->insert( action ); action = new TDEAction( i18n( "To Field Name" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CToName ); menu->insert( action ); action = new TDEAction( i18n( "To Field First Name" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CToFName ); menu->insert( action ); action = new TDEAction( i18n( "To Field Last Name" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CToLName ); menu->insert( action ); action = new TDEAction( i18n( "CC Field Address" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CCCAddr ); menu->insert( action ); action = new TDEAction( i18n( "CC Field Name" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CCCName ); menu->insert( action ); action = new TDEAction( i18n( "CC Field First Name" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CCCFName ); menu->insert( action ); action = new TDEAction( i18n( "CC Field Last Name" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CCCLName ); menu->insert( action ); action = new TDEAction( i18n( "From Field Address" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CFromAddr ); menu->insert( action ); action = new TDEAction( i18n( "From Field Name" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CFromName ); menu->insert( action ); action = new TDEAction( i18n( "From Field First Name" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CFromFName ); menu->insert( action ); action = new TDEAction( i18n( "From Field Last Name" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CFromLName ); menu->insert( action ); action = new TDEAction( i18n( "Subject" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CFullSubject ); menu->insert( action ); action = new TDEAction( i18n( "Header Content" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CHeader ); menu->insert( action ); @@ -257,27 +257,27 @@ TemplatesInsertCommand::TemplatesInsertCommand( TQWidget *parent, mMenu->insert( menu ); action = new TDEAction( i18n( "Insert Result of Command" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CSystem ); menu->insert( action ); action = new TDEAction( i18n( "Pipe Original Message Body and Insert Result as Quoted Text" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CQuotePipe ); menu->insert( action ); action = new TDEAction( i18n( "Pipe Original Message Body and Insert Result as Is" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CTextPipe ); menu->insert( action ); action = new TDEAction( i18n( "Pipe Original Message with Headers and Insert Result as Is" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CMsgPipe ); menu->insert( action ); action = new TDEAction( i18n( "Pipe Current Message Body and Insert Result as Is" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CBodyPipe ); menu->insert( action ); action = new TDEAction( i18n( "Pipe Current Message Body and Replace with Result" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CClearPipe ); menu->insert( action ); @@ -286,35 +286,35 @@ TemplatesInsertCommand::TemplatesInsertCommand( TQWidget *parent, mMenu->insert( menu ); action = new TDEAction( i18n( "Set Cursor Position" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CCursor ); menu->insert( action ); action = new TDEAction( i18n( "Insert File Content" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CInsert ); menu->insert( action ); action = new TDEAction( i18n( "DNL" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CDnl ); menu->insert( action ); action = new TDEAction( i18n( "Template Comment" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CRem ); menu->insert( action ); action = new TDEAction( i18n( "No Operation" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CNop ); menu->insert( action ); action = new TDEAction( i18n( "Clear Generated Message" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CClear ); menu->insert( action ); action = new TDEAction( i18n( "Turn Debug On" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CDebug ); menu->insert( action ); action = new TDEAction( i18n( "Turn Debug Off" ), - 0, mapper, TQT_SLOT( map() ), menu ); + 0, mapper, TQ_SLOT( map() ), menu ); mapper->setMapping( action, CDebugOff ); menu->insert( action ); } diff --git a/kmail/treebase.cpp b/kmail/treebase.cpp index 1e23a007..97d43b5d 100644 --- a/kmail/treebase.cpp +++ b/kmail/treebase.cpp @@ -35,10 +35,10 @@ TreeBase::TreeBase( TQWidget *parent, KMFolderTree *folderTree, Q_UNUSED( mustBeReadWrite ); kdDebug(5006) << k_funcinfo << endl; - connect(this, TQT_SIGNAL(collapsed(TQListViewItem*)), TQT_SLOT(recolorRows())); - connect(this, TQT_SIGNAL(expanded(TQListViewItem*)), TQT_SLOT(recolorRows())); - connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint &, int ) ), - this, TQT_SLOT( slotContextMenuRequested( TQListViewItem*, const TQPoint & ) ) ); + connect(this, TQ_SIGNAL(collapsed(TQListViewItem*)), TQ_SLOT(recolorRows())); + connect(this, TQ_SIGNAL(expanded(TQListViewItem*)), TQ_SLOT(recolorRows())); + connect( this, TQ_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint &, int ) ), + this, TQ_SLOT( slotContextMenuRequested( TQListViewItem*, const TQPoint & ) ) ); } @@ -97,7 +97,7 @@ void TreeBase::slotContextMenuRequested( TQListViewItem *lvi, const TQPoint &p folderMenu->insertSeparator(); folderMenu->insertItem(SmallIconSet("folder-new"), i18n("&New Subfolder..."), this, - TQT_SLOT(addChildFolder())); + TQ_SLOT(addChildFolder())); kmkernel->setContextMenuShown( true ); folderMenu->exec (p, 0); kmkernel->setContextMenuShown( false ); diff --git a/kmail/vacation.cpp b/kmail/vacation.cpp index 383daa94..7ad0728c 100644 --- a/kmail/vacation.cpp +++ b/kmail/vacation.cpp @@ -436,8 +436,8 @@ namespace KMail { if ( mUrl.isEmpty() ) // nothing to do... return; mSieveJob = SieveJob::get( mUrl, !checkOnly ); - connect( mSieveJob, TQT_SIGNAL(gotScript(KMail::SieveJob*,bool,const TQString&,bool)), - TQT_SLOT(slotGetResult(KMail::SieveJob*,bool,const TQString&,bool)) ); + connect( mSieveJob, TQ_SIGNAL(gotScript(KMail::SieveJob*,bool,const TQString&,bool)), + TQ_SLOT(slotGetResult(KMail::SieveJob*,bool,const TQString&,bool)) ); } Vacation::~Vacation() { @@ -645,9 +645,9 @@ namespace KMail { mDialog->setDomainName( domainName ); mDialog->enableDomainAndSendForSpam( !GlobalSettings::allowOutOfOfficeUploadButNoSettings() ); - connect( mDialog, TQT_SIGNAL(okClicked()), TQT_SLOT(slotDialogOk()) ); - connect( mDialog, TQT_SIGNAL(cancelClicked()), TQT_SLOT(slotDialogCancel()) ); - connect( mDialog, TQT_SIGNAL(defaultClicked()), TQT_SLOT(slotDialogDefaults()) ); + connect( mDialog, TQ_SIGNAL(okClicked()), TQ_SLOT(slotDialogOk()) ); + connect( mDialog, TQ_SIGNAL(cancelClicked()), TQ_SLOT(slotDialogCancel()) ); + connect( mDialog, TQ_SIGNAL(defaultClicked()), TQ_SLOT(slotDialogDefaults()) ); mDialog->show(); } @@ -690,10 +690,10 @@ namespace KMail { // and commit the dialog's settings to the server: mSieveJob = SieveJob::put( mUrl, script, active, mWasActive ); - connect( mSieveJob, TQT_SIGNAL(gotScript(KMail::SieveJob*,bool,const TQString&,bool)), + connect( mSieveJob, TQ_SIGNAL(gotScript(KMail::SieveJob*,bool,const TQString&,bool)), active - ? TQT_SLOT(slotPutActiveResult(KMail::SieveJob*,bool)) - : TQT_SLOT(slotPutInactiveResult(KMail::SieveJob*,bool)) ); + ? TQ_SLOT(slotPutActiveResult(KMail::SieveJob*,bool)) + : TQ_SLOT(slotPutInactiveResult(KMail::SieveJob*,bool)) ); // destroy the dialog: mDialog->delayedDestruct(); diff --git a/kmail/vacationdialog.cpp b/kmail/vacationdialog.cpp index df7f8bb7..f02d4236 100644 --- a/kmail/vacationdialog.cpp +++ b/kmail/vacationdialog.cpp @@ -74,7 +74,7 @@ namespace KMail { int defDayInterval = 7; //default day interval mIntervalSpin = new KIntSpinBox( 1, 356, 1, defDayInterval, 10, plainPage(), "mIntervalSpin" ); mIntervalSpin->setSuffix( i18n(" day", " days", defDayInterval) ); - connect(mIntervalSpin, TQT_SIGNAL( valueChanged( int )), TQT_SLOT( slotIntervalSpinChanged( int ) ) ); + connect(mIntervalSpin, TQ_SIGNAL( valueChanged( int )), TQ_SLOT( slotIntervalSpinChanged( int ) ) ); glay->addWidget( new TQLabel( mIntervalSpin, i18n("&Resend notification only after:"), plainPage() ), row, 0 ); glay->addWidget( mIntervalSpin, row, 1 ); @@ -99,8 +99,8 @@ namespace KMail { mDomainEdit->setValidator( new TQRegExpValidator( TQRegExp( "[a-zA-Z0-9+-]+(?:\\.[a-zA-Z0-9+-]+)*" ), mDomainEdit ) ); glay->addWidget( mDomainCheck, row, 0 ); glay->addWidget( mDomainEdit, row, 1 ); - connect( mDomainCheck, TQT_SIGNAL(toggled(bool)), - mDomainEdit, TQT_SLOT(setEnabled(bool)) ); + connect( mDomainCheck, TQ_SIGNAL(toggled(bool)), + mDomainEdit, TQ_SLOT(setEnabled(bool)) ); Q_ASSERT( row == rows - 1 ); } diff --git a/kmail/xfaceconfigurator.cpp b/kmail/xfaceconfigurator.cpp index 593e86ed..bc77041a 100644 --- a/kmail/xfaceconfigurator.cpp +++ b/kmail/xfaceconfigurator.cpp @@ -126,17 +126,17 @@ namespace KMail { TQWidgetStack * widgetStack = new TQWidgetStack( this ); widgetStack->setEnabled( false ); // since !mEnableCheck->isChecked() vlay->addWidget( widgetStack, 1 ); - connect( mSourceCombo, TQT_SIGNAL(highlighted(int)), - widgetStack, TQT_SLOT(raiseWidget(int)) ); - connect( mEnableCheck, TQT_SIGNAL(toggled(bool)), - mSourceCombo, TQT_SLOT(setEnabled(bool)) ); - connect( mEnableCheck, TQT_SIGNAL(toggled(bool)), - widgetStack, TQT_SLOT(setEnabled(bool)) ); - connect( mEnableCheck, TQT_SIGNAL(toggled(bool)), - label, TQT_SLOT(setEnabled(bool)) ); + connect( mSourceCombo, TQ_SIGNAL(highlighted(int)), + widgetStack, TQ_SLOT(raiseWidget(int)) ); + connect( mEnableCheck, TQ_SIGNAL(toggled(bool)), + mSourceCombo, TQ_SLOT(setEnabled(bool)) ); + connect( mEnableCheck, TQ_SIGNAL(toggled(bool)), + widgetStack, TQ_SLOT(setEnabled(bool)) ); + connect( mEnableCheck, TQ_SIGNAL(toggled(bool)), + label, TQ_SLOT(setEnabled(bool)) ); // The focus might be still in the widget that is disabled - connect( mEnableCheck, TQT_SIGNAL(clicked()), - mEnableCheck, TQT_SLOT(setFocus()) ); + connect( mEnableCheck, TQ_SIGNAL(clicked()), + mEnableCheck, TQ_SLOT(setFocus()) ); int pageno = 0; // page 0: create X-Face from image file or address book entry @@ -151,16 +151,16 @@ namespace KMail { "A light background helps improve the result." ) ); mFromFileBtn->setAutoDefault( false ); page_vlay->addWidget( mFromFileBtn, 1 ); - connect( mFromFileBtn, TQT_SIGNAL(released()), - this, TQT_SLOT(slotSelectFile()) ); + connect( mFromFileBtn, TQ_SIGNAL(released()), + this, TQ_SLOT(slotSelectFile()) ); mFromAddrbkBtn = new TQPushButton( i18n("Set From Address Book"), page ); TQWhatsThis::add( mFromAddrbkBtn, i18n( "You can use a scaled-down version of the picture " "you have set in your address book entry." ) ); mFromAddrbkBtn->setAutoDefault( false ); page_vlay->addWidget( mFromAddrbkBtn, 1 ); - connect( mFromAddrbkBtn, TQT_SIGNAL(released()), - this, TQT_SLOT(slotSelectFromAddressbook()) ); + connect( mFromAddrbkBtn, TQ_SIGNAL(released()), + this, TQ_SLOT(slotSelectFromAddressbook()) ); label1 = new TQLabel( i18n("<qt>KMail can send a small (48x48 pixels), low-quality, " "monochrome picture with every message. " "For example, this could be a picture of you or a glyph. " @@ -185,7 +185,7 @@ namespace KMail { page_vlay->addWidget( label2 ); - connect(mTextEdit, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotUpdateXFace())); + connect(mTextEdit, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotUpdateXFace())); } XFaceConfigurator::~XFaceConfigurator() { diff --git a/kmailcvt/kselfilterpage.cpp b/kmailcvt/kselfilterpage.cpp index 118124f7..ef3d9577 100644 --- a/kmailcvt/kselfilterpage.cpp +++ b/kmailcvt/kselfilterpage.cpp @@ -43,7 +43,7 @@ KSelFilterPage::KSelFilterPage(TQWidget *parent, const char *name ) : KSelFilter mIntroSidebar->setPixmap(locate("data", "kmailcvt/pics/step1.png")); mFilterList.setAutoDelete( TRUE ); - connect(mFilterCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(filterSelected(int))); + connect(mFilterCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(filterSelected(int))); // Add new filters below. If this annoys you, please rewrite the stuff to use a factory. // The former approach was overengineered and only worked around problems in the design diff --git a/kmobile/devices/gnokii/gnokiiconfig.cpp b/kmobile/devices/gnokii/gnokiiconfig.cpp index 07bc46f4..4be8fb36 100644 --- a/kmobile/devices/gnokii/gnokiiconfig.cpp +++ b/kmobile/devices/gnokii/gnokiiconfig.cpp @@ -72,7 +72,7 @@ void GnokiiConfig::setValues(const TQString &model, const TQString &connection, slotCheckValues(); - connect( cb_Connection, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotCheckValues(const TQString &)) ); + connect( cb_Connection, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotCheckValues(const TQString &)) ); } void GnokiiConfig::getValues(TQString &model, TQString &connection, TQString &port, TQString &baud) const diff --git a/kmobile/kmobile.cpp b/kmobile/kmobile.cpp index e954594d..6febb6aa 100644 --- a/kmobile/kmobile.cpp +++ b/kmobile/kmobile.cpp @@ -74,8 +74,8 @@ KMobile::KMobile() setAutoSaveSettings(); // allow the view to change the statusbar and caption - connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)), - this, TQT_SLOT(changeStatusbar(const TQString&))); + connect(m_view, TQ_SIGNAL(signalChangeStatusbar(const TQString&)), + this, TQ_SLOT(changeStatusbar(const TQString&))); // restore all configured devices restoreAll(); @@ -83,7 +83,7 @@ KMobile::KMobile() // setup the system tray m_systemTray = new SystemTray(this, "systemTray"); m_systemTray->show(); - connect(m_systemTray, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(slotQuit())); + connect(m_systemTray, TQ_SIGNAL(quitSelected()), this, TQ_SLOT(slotQuit())); } KMobile::~KMobile() @@ -93,29 +93,29 @@ KMobile::~KMobile() void KMobile::setupActions() { - KStdAction::close(this, TQT_SLOT(dockApplication()), actionCollection()); - KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); + KStdAction::close(this, TQ_SLOT(dockApplication()), actionCollection()); + KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection()); - m_toolbarAction = KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection()); + m_toolbarAction = KStdAction::showToolbar(this, TQ_SLOT(optionsShowToolbar()), actionCollection()); optionsShowToolbar(); - m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection()); + m_statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(optionsShowStatusbar()), actionCollection()); - KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection()); - KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection()); new TDEAction(i18n("&Add Device..."), "folder-new", 0, - this, TQT_SLOT(addDevice()), actionCollection(), "device_add"); + this, TQ_SLOT(addDevice()), actionCollection(), "device_add"); new TDEAction( KGuiItem( i18n("&Remove Device"), "edittrash", i18n("Remove this device") ), - "Delete", this, TQT_SLOT(removeDevice()), actionCollection(), "device_remove"); + "Delete", this, TQ_SLOT(removeDevice()), actionCollection(), "device_remove"); new TDEAction(i18n("Re&name Device..."), 0, Key_F2, - this, TQT_SLOT(renameDevice()), actionCollection(), "device_rename"); + this, TQ_SLOT(renameDevice()), actionCollection(), "device_rename"); new TDEAction(i18n("&Configure Device..."), "configure", 0, - this, TQT_SLOT(configDevice()), actionCollection(), "device_configure"); + this, TQ_SLOT(configDevice()), actionCollection(), "device_configure"); createGUI(); - connect( kapp, TQT_SIGNAL(aboutToQuit()), this, TQT_SLOT(saveAll()) ); + connect( kapp, TQ_SIGNAL(aboutToQuit()), this, TQ_SLOT(saveAll()) ); } @@ -261,11 +261,11 @@ void KMobile::addDevice() dialog->helpText->setText( i18n("Please select the category to which your new device belongs:") ); dialog->addButton->setText( i18n("&Scan for New Devices...") ); dialog->addButton->setDisabled(true); - dialog->iconView->connect( dialog->iconView, TQT_SIGNAL(doubleClicked(TQIconViewItem*)), - dialog, TQT_SLOT(accept()) ); + dialog->iconView->connect( dialog->iconView, TQ_SIGNAL(doubleClicked(TQIconViewItem*)), + dialog, TQ_SLOT(accept()) ); dialog->selectButton->setText( i18n("&Add") ); - dialog->selectButton->connect( dialog->selectButton, TQT_SIGNAL(clicked()), dialog, TQT_SLOT(accept()) ); - dialog->cancelButton->connect( dialog->cancelButton, TQT_SIGNAL(clicked()), dialog, TQT_SLOT(reject()) ); + dialog->selectButton->connect( dialog->selectButton, TQ_SIGNAL(clicked()), dialog, TQ_SLOT(accept()) ); + dialog->cancelButton->connect( dialog->cancelButton, TQ_SIGNAL(clicked()), dialog, TQ_SLOT(reject()) ); TDETrader::OfferList list = KMobileItem::getMobileDevicesList(); TDETrader::OfferListIterator it; @@ -344,11 +344,11 @@ KMobileDevice * KMobileFactory::chooseDeviceDialog( TQWidget *parent, if (!dialog) return 0L; - dialog->addButton->connect( dialog->addButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddDevice()) ); - dialog->iconView->connect( dialog->iconView, TQT_SIGNAL(doubleClicked(TQIconViewItem*)), - dialog, TQT_SLOT(accept()) ); - dialog->selectButton->connect( dialog->selectButton, TQT_SIGNAL(clicked()), dialog, TQT_SLOT(accept()) ); - dialog->cancelButton->connect( dialog->cancelButton, TQT_SIGNAL(clicked()), dialog, TQT_SLOT(reject()) ); + dialog->addButton->connect( dialog->addButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddDevice()) ); + dialog->iconView->connect( dialog->iconView, TQ_SIGNAL(doubleClicked(TQIconViewItem*)), + dialog, TQ_SLOT(accept()) ); + dialog->selectButton->connect( dialog->selectButton, TQ_SIGNAL(clicked()), dialog, TQ_SLOT(accept()) ); + dialog->cancelButton->connect( dialog->cancelButton, TQ_SIGNAL(clicked()), dialog, TQ_SLOT(reject()) ); for (int i=0; i<countDevices(); i++) { KService::Ptr ptr; diff --git a/kmobile/kmobileview.cpp b/kmobile/kmobileview.cpp index 87f691d9..49d69105 100644 --- a/kmobile/kmobileview.cpp +++ b/kmobile/kmobileview.cpp @@ -39,8 +39,8 @@ KMobileView::KMobileView(TQWidget *parent, TDEConfig *_config) setSelectionMode(TQIconView::Single); setResizeMode(TQIconView::Adjust); setAutoArrange(true); - connect(this, TQT_SIGNAL(doubleClicked(TQIconViewItem *)), - TQT_SLOT(slotDoubleClicked(TQIconViewItem *))); + connect(this, TQ_SIGNAL(doubleClicked(TQIconViewItem *)), + TQ_SLOT(slotDoubleClicked(TQIconViewItem *))); } KMobileView::~KMobileView() diff --git a/kmobile/systemtray.cpp b/kmobile/systemtray.cpp index 3854f0a2..020aec1c 100644 --- a/kmobile/systemtray.cpp +++ b/kmobile/systemtray.cpp @@ -74,9 +74,9 @@ void SystemTray::contextMenuAboutToShow(TDEPopupMenu *menu) TQString iconName = main->mainView()->iconFileName(devName); TQPixmap pm = TDEGlobal::instance()->iconLoader()->loadIcon(iconName, TDEIcon::Small); menu->insertItem(pm, devName, SYSTEMTRAY_STARTID+no, 3+no); - menu->connectItem(SYSTEMTRAY_STARTID+no, this, TQT_SLOT(menuItemSelected())); + menu->connectItem(SYSTEMTRAY_STARTID+no, this, TQ_SLOT(menuItemSelected())); } - connect(menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(menuItemActivated(int))); + connect(menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(menuItemActivated(int))); } void SystemTray::menuItemSelected() diff --git a/knode/articlewidget.cpp b/knode/articlewidget.cpp index bd148cdd..faf4b4e8 100644 --- a/knode/articlewidget.cpp +++ b/knode/articlewidget.cpp @@ -105,13 +105,13 @@ ArticleWidget::ArticleWidget( TQWidget *parent, mViewer->setMetaRefreshEnabled( false ); mViewer->setOnlyLocalReferences( true ); mViewer->view()->setFocusPolicy( TQWidget::WheelFocus ); - connect( mViewer->browserExtension(), TQT_SIGNAL(openURLRequestDelayed(const KURL&, const KParts::URLArgs&)), - TQT_SLOT(slotURLClicked(const KURL&)) ); - connect( mViewer, TQT_SIGNAL(popupMenu(const TQString&, const TQPoint&)), - TQT_SLOT(slotURLPopup(const TQString&, const TQPoint&)) ); + connect( mViewer->browserExtension(), TQ_SIGNAL(openURLRequestDelayed(const KURL&, const KParts::URLArgs&)), + TQ_SLOT(slotURLClicked(const KURL&)) ); + connect( mViewer, TQ_SIGNAL(popupMenu(const TQString&, const TQPoint&)), + TQ_SLOT(slotURLPopup(const TQString&, const TQPoint&)) ); mTimer = new TQTimer( this ); - connect( mTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()) ); + connect( mTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()) ); initActions(); readConfig(); @@ -134,58 +134,58 @@ ArticleWidget::~ArticleWidget() void ArticleWidget::initActions() { - mSaveAction = KStdAction::save( this, TQT_SLOT(slotSave()), mActionCollection ); + mSaveAction = KStdAction::save( this, TQ_SLOT(slotSave()), mActionCollection ); mSaveAction->setText( KStdGuiItem::saveAs().text() ); - mPrintAction = KStdAction::print( this, TQT_SLOT(slotPrint()), mActionCollection ); - mCopySelectionAction = KStdAction::copy( this, TQT_SLOT(slotCopySelection()), mActionCollection ); - mSelectAllAction = KStdAction::selectAll( this, TQT_SLOT(slotSelectAll()), mActionCollection ); - mFindAction = KStdAction::find( this, TQT_SLOT(slotFind()), mActionCollection, "find_in_article" ); + mPrintAction = KStdAction::print( this, TQ_SLOT(slotPrint()), mActionCollection ); + mCopySelectionAction = KStdAction::copy( this, TQ_SLOT(slotCopySelection()), mActionCollection ); + mSelectAllAction = KStdAction::selectAll( this, TQ_SLOT(slotSelectAll()), mActionCollection ); + mFindAction = KStdAction::find( this, TQ_SLOT(slotFind()), mActionCollection, "find_in_article" ); mFindAction->setText( i18n("F&ind in Article...") ); mViewSourceAction = new TDEAction( i18n("&View Source"), Key_V , this, - TQT_SLOT(slotViewSource()), mActionCollection, "article_viewSource" ); + TQ_SLOT(slotViewSource()), mActionCollection, "article_viewSource" ); mReplyAction = new TDEAction( i18n("&Followup to Newsgroup..."), "message_reply", - Key_R, this, TQT_SLOT(slotReply()), mActionCollection, "article_postReply" ); + Key_R, this, TQ_SLOT(slotReply()), mActionCollection, "article_postReply" ); mRemailAction = new TDEAction( i18n("Reply by E&mail..."), "mail-reply-sender", - Key_A, this, TQT_SLOT(slotRemail()), mActionCollection, "article_mailReply" ); + Key_A, this, TQ_SLOT(slotRemail()), mActionCollection, "article_mailReply" ); mForwardAction = new TDEAction( i18n("Forw&ard by Email..."), "mail-forward", - Key_F, this, TQT_SLOT(slotForward()), mActionCollection, "article_forward" ); + Key_F, this, TQ_SLOT(slotForward()), mActionCollection, "article_forward" ); mCancelAction = new TDEAction( i18n("article","&Cancel Article"), - 0, this, TQT_SLOT(slotCancel()), mActionCollection, "article_cancel" ); + 0, this, TQ_SLOT(slotCancel()), mActionCollection, "article_cancel" ); mSupersedeAction = new TDEAction(i18n("S&upersede Article"), - 0, this, TQT_SLOT(slotSupersede()), mActionCollection, "article_supersede" ); + 0, this, TQ_SLOT(slotSupersede()), mActionCollection, "article_supersede" ); mFixedFontToggle = new TDEToggleAction( i18n("U&se Fixed Font"), - Key_X ,this, TQT_SLOT(slotToggleFixedFont()), mActionCollection, "view_useFixedFont" ); + Key_X ,this, TQ_SLOT(slotToggleFixedFont()), mActionCollection, "view_useFixedFont" ); mFancyToggle = new TDEToggleAction( i18n("Fancy Formating"), - Key_Y, this, TQT_SLOT(slotToggleFancyFormating()), mActionCollection, "view_fancyFormating" ); + Key_Y, this, TQ_SLOT(slotToggleFancyFormating()), mActionCollection, "view_fancyFormating" ); mRot13Toggle = new TDEToggleAction( i18n("&Unscramble (Rot 13)"), "decrypted", 0 , this, - TQT_SLOT(slotToggleRot13()), mActionCollection, "view_rot13" ); + TQ_SLOT(slotToggleRot13()), mActionCollection, "view_rot13" ); mRot13Toggle->setChecked( false ); TDERadioAction *ra; mHeaderStyleMenu = new TDEActionMenu( i18n("&Headers"), mActionCollection, "view_headers" ); - ra = new TDERadioAction( i18n("&Fancy Headers"), 0, this, TQT_SLOT(slotFancyHeaders()), + ra = new TDERadioAction( i18n("&Fancy Headers"), 0, this, TQ_SLOT(slotFancyHeaders()), mActionCollection, "view_headers_fancy" ); ra->setExclusiveGroup( "view_headers" ); mHeaderStyleMenu->insert( ra ); - ra = new TDERadioAction( i18n("&Standard Headers"), 0, this, TQT_SLOT(slotStandardHeaders()), + ra = new TDERadioAction( i18n("&Standard Headers"), 0, this, TQ_SLOT(slotStandardHeaders()), mActionCollection, "view_headers_standard" ); ra->setExclusiveGroup( "view_headers" ); mHeaderStyleMenu->insert( ra ); - ra = new TDERadioAction( i18n("&All Headers"), 0, this, TQT_SLOT(slotAllHeaders()), + ra = new TDERadioAction( i18n("&All Headers"), 0, this, TQ_SLOT(slotAllHeaders()), mActionCollection, "view_headers_all" ); ra->setExclusiveGroup( "view_headers" ); mHeaderStyleMenu->insert( ra ); mAttachmentStyleMenu = new TDEActionMenu( i18n("&Attachments"), mActionCollection, "view_attachments" ); - ra = new TDERadioAction( i18n("&As Icon"), 0, this, TQT_SLOT(slotIconAttachments()), + ra = new TDERadioAction( i18n("&As Icon"), 0, this, TQ_SLOT(slotIconAttachments()), mActionCollection, "view_attachments_icon" ); ra->setExclusiveGroup( "view_attachments" ); mAttachmentStyleMenu->insert( ra ); - ra = new TDERadioAction( i18n("&Inline"), 0, this, TQT_SLOT(slotInlineAttachments()), + ra = new TDERadioAction( i18n("&Inline"), 0, this, TQ_SLOT(slotInlineAttachments()), mActionCollection, "view_attachments_inline" ); ra->setExclusiveGroup( "view_attachments" ); mAttachmentStyleMenu->insert( ra ); - ra = new TDERadioAction( i18n("&Hide"), 0, this, TQT_SLOT(slotHideAttachments()), + ra = new TDERadioAction( i18n("&Hide"), 0, this, TQ_SLOT(slotHideAttachments()), mActionCollection, "view_attachments_hide" ); ra->setExclusiveGroup( "view_attachments" ); mAttachmentStyleMenu->insert( ra ); @@ -196,23 +196,23 @@ void ArticleWidget::initActions() cs.prepend( i18n("Automatic") ); mCharsetSelect->setItems( cs ); mCharsetSelect->setCurrentItem( 0 ); - connect( mCharsetSelect, TQT_SIGNAL(activated(const TQString&)),TQT_SLOT(slotSetCharset(const TQString&)) ); + connect( mCharsetSelect, TQ_SIGNAL(activated(const TQString&)),TQ_SLOT(slotSetCharset(const TQString&)) ); mCharsetSelectKeyb = new TDEAction( i18n("Charset"), Key_C, this, - TQT_SLOT(slotSetCharsetKeyboard()), mActionCollection, "set_charset_keyboard" ); + TQ_SLOT(slotSetCharsetKeyboard()), mActionCollection, "set_charset_keyboard" ); - new TDEAction( i18n("&Open URL"), "document-open", 0, this, TQT_SLOT(slotOpenURL()), + new TDEAction( i18n("&Open URL"), "document-open", 0, this, TQ_SLOT(slotOpenURL()), mActionCollection, "open_url" ); - new TDEAction( i18n("&Copy Link Address"), "edit-copy", 0, this, TQT_SLOT( slotCopyURL()), + new TDEAction( i18n("&Copy Link Address"), "edit-copy", 0, this, TQ_SLOT( slotCopyURL()), mActionCollection, "copy_url" ); - new TDEAction( i18n("&Bookmark This Link"), "bookmark_add", 0, this, TQT_SLOT(slotAddBookmark()), + new TDEAction( i18n("&Bookmark This Link"), "bookmark_add", 0, this, TQ_SLOT(slotAddBookmark()), mActionCollection, "add_bookmark" ); - new TDEAction( i18n("&Add to Address Book"), 0, this, TQT_SLOT(slotAddToAddressBook()), + new TDEAction( i18n("&Add to Address Book"), 0, this, TQ_SLOT(slotAddToAddressBook()), mActionCollection, "add_addr_book" ); - new TDEAction( i18n("&Open in Address Book"), 0, this, TQT_SLOT(slotOpenInAddressBook()), + new TDEAction( i18n("&Open in Address Book"), 0, this, TQ_SLOT(slotOpenInAddressBook()), mActionCollection, "openin_addr_book" ); - new TDEAction( i18n("&Open Attachment"), "document-open", 0, this, TQT_SLOT(slotOpenAttachment()), + new TDEAction( i18n("&Open Attachment"), "document-open", 0, this, TQ_SLOT(slotOpenAttachment()), mActionCollection, "open_attachment" ); - new TDEAction( i18n("&Save Attachment As..."), "document-save-as", 0, this, TQT_SLOT(slotSaveAttachment()), + new TDEAction( i18n("&Save Attachment As..."), "document-save-as", 0, this, TQ_SLOT(slotSaveAttachment()), mActionCollection, "save_attachment" ); } diff --git a/knode/headerview.cpp b/knode/headerview.cpp index d30cc5a3..cae8da28 100644 --- a/knode/headerview.cpp +++ b/knode/headerview.cpp @@ -65,9 +65,9 @@ KNHeaderView::KNHeaderView(TQWidget *parent, const char *name) : setColumnAlignment( mPaintInfo.scoreCol, TQt::AlignRight ); // due to our own column text squeezing we need to repaint on column resizing - disconnect( header(), TQT_SIGNAL(sizeChange(int, int, int)) ); - connect( header(), TQT_SIGNAL(sizeChange(int, int, int)), - TQT_SLOT(slotSizeChanged(int, int, int)) ); + disconnect( header(), TQ_SIGNAL(sizeChange(int, int, int)) ); + connect( header(), TQ_SIGNAL(sizeChange(int, int, int)), + TQ_SLOT(slotSizeChanged(int, int, int)) ); // column selection RMB menu mPopup = new TDEPopupMenu( this ); @@ -76,11 +76,11 @@ KNHeaderView::KNHeaderView(TQWidget *parent, const char *name) : mPopup->insertItem( i18n("Line Count"), KPaintInfo::COL_SIZE ); mPopup->insertItem( i18n("Score"), KPaintInfo::COL_SCORE ); - connect( mPopup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(toggleColumn(int)) ); + connect( mPopup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(toggleColumn(int)) ); // connect to the article manager - connect( knGlobals.articleManager(), TQT_SIGNAL(aboutToShowGroup()), TQT_SLOT(prepareForGroup()) ); - connect( knGlobals.articleManager(), TQT_SIGNAL(aboutToShowFolder()), TQT_SLOT(prepareForFolder()) ); + connect( knGlobals.articleManager(), TQ_SIGNAL(aboutToShowGroup()), TQ_SLOT(prepareForGroup()) ); + connect( knGlobals.articleManager(), TQ_SIGNAL(aboutToShowFolder()), TQ_SLOT(prepareForFolder()) ); new KNHeaderViewToolTip( this ); @@ -188,7 +188,7 @@ void KNHeaderView::ensureItemVisibleWithMargin( const TQListViewItem *i ) { ensureVisible( contentsX(), y + h/2, 0, h/2 ); mDelayedCenter = y + h/2; - TQTimer::singleShot( 300, this, TQT_SLOT(slotCenterDelayed()) ); + TQTimer::singleShot( 300, this, TQ_SLOT(slotCenterDelayed()) ); } else { ensureVisible( contentsX(), y + h/2, 0, h/2 ); } @@ -576,7 +576,7 @@ void KNHeaderView::focusOutEvent(TQFocusEvent *e) void KNHeaderView::resetCurrentTime() { mDateFormatter.reset(); - TQTimer::singleShot( 1000, this, TQT_SLOT(resetCurrentTime()) ); + TQTimer::singleShot( 1000, this, TQ_SLOT(resetCurrentTime()) ); } diff --git a/knode/knaccountmanager.cpp b/knode/knaccountmanager.cpp index 77b97288..45c21936 100644 --- a/knode/knaccountmanager.cpp +++ b/knode/knaccountmanager.cpp @@ -228,7 +228,7 @@ void KNAccountManager::loadPasswordsAsync() else mWallet = Wallet::openWallet( Wallet::NetworkWallet(), 0, Wallet::Asynchronous ); if ( mWallet ) { - connect( mWallet, TQT_SIGNAL(walletOpened(bool)), TQT_SLOT(slotWalletOpened(bool)) ); + connect( mWallet, TQ_SIGNAL(walletOpened(bool)), TQ_SLOT(slotWalletOpened(bool)) ); mAsyncOpening = true; } else { diff --git a/knode/knarticlefactory.cpp b/knode/knarticlefactory.cpp index 78d39149..c01e58f8 100644 --- a/knode/knarticlefactory.cpp +++ b/knode/knarticlefactory.cpp @@ -65,7 +65,7 @@ void KNArticleFactory::createPosting(KNNntpAccount *a) KNComposer *c = new KNComposer( art, TQString(), sig, TQString(), true ); mCompList.append( c ); - connect(c, TQT_SIGNAL(composerDone(KNComposer*)), this, TQT_SLOT(slotComposerDone(KNComposer*))); + connect(c, TQ_SIGNAL(composerDone(KNComposer*)), this, TQ_SLOT(slotComposerDone(KNComposer*))); c->show(); } @@ -94,7 +94,7 @@ void KNArticleFactory::createPosting(KNGroup *g) KNComposer *c=new KNComposer(art, TQString(), sig, TQString(), true); mCompList.append( c ); - connect(c, TQT_SIGNAL(composerDone(KNComposer*)), this, TQT_SLOT(slotComposerDone(KNComposer*))); + connect(c, TQ_SIGNAL(composerDone(KNComposer*)), this, TQ_SLOT(slotComposerDone(KNComposer*))); c->show(); } @@ -264,7 +264,7 @@ void KNArticleFactory::createReply(KNRemoteArticle *a, TQString selectedText, bo //open composer KNComposer *c=new KNComposer(art, quoted, sig, notRewraped, true, authorDislikesMailCopies, authorWantsMailCopies); mCompList.append( c ); - connect(c, TQT_SIGNAL(composerDone(KNComposer*)), this, TQT_SLOT(slotComposerDone(KNComposer*))); + connect(c, TQ_SIGNAL(composerDone(KNComposer*)), this, TQ_SLOT(slotComposerDone(KNComposer*))); c->show(); } @@ -349,7 +349,7 @@ void KNArticleFactory::createForward(KNArticle *a) //open composer KNComposer *c=new KNComposer(art, fwd, sig, TQString(), true); mCompList.append( c ); - connect(c, TQT_SIGNAL(composerDone(KNComposer*)), this, TQT_SLOT(slotComposerDone(KNComposer*))); + connect(c, TQ_SIGNAL(composerDone(KNComposer*)), this, TQ_SLOT(slotComposerDone(KNComposer*))); c->show(); } @@ -500,7 +500,7 @@ void KNArticleFactory::createSupersede(KNArticle *a) //open composer KNComposer *c=new KNComposer(art, text, sig); mCompList.append( c ); - connect(c, TQT_SIGNAL(composerDone(KNComposer*)), this, TQT_SLOT(slotComposerDone(KNComposer*))); + connect(c, TQ_SIGNAL(composerDone(KNComposer*)), this, TQ_SLOT(slotComposerDone(KNComposer*))); c->show(); } @@ -525,7 +525,7 @@ void KNArticleFactory::createMail(KMime::Headers::AddressField *address) //open composer KNComposer *c=new KNComposer(art, TQString(), sig, TQString(), true); mCompList.append( c ); - connect(c, TQT_SIGNAL(composerDone(KNComposer*)), this, TQT_SLOT(slotComposerDone(KNComposer*))); + connect(c, TQ_SIGNAL(composerDone(KNComposer*)), this, TQ_SLOT(slotComposerDone(KNComposer*))); c->show(); } @@ -604,7 +604,7 @@ void KNArticleFactory::edit(KNLocalArticle *a) .arg(id->getSigGeneratorStdErr())); mCompList.append( com ); - connect(com, TQT_SIGNAL(composerDone(KNComposer*)), this, TQT_SLOT(slotComposerDone(KNComposer*))); + connect(com, TQ_SIGNAL(composerDone(KNComposer*)), this, TQ_SLOT(slotComposerDone(KNComposer*))); com->show(); } @@ -990,7 +990,7 @@ void KNArticleFactory::showSendErrorDialog() { if(!s_endErrDlg) { s_endErrDlg=new KNSendErrorDialog(); - connect(s_endErrDlg, TQT_SIGNAL(closeClicked()), this, TQT_SLOT(slotSendErrorDialogDone())); + connect(s_endErrDlg, TQ_SIGNAL(closeClicked()), this, TQ_SLOT(slotSendErrorDialogDone())); } s_endErrDlg->show(); } @@ -1075,7 +1075,7 @@ KNSendErrorDialog::KNSendErrorDialog() j_obs=new KNDialogListBox(true, page); e_rror=new TQLabel(TQString(), page); - connect(j_obs, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHighlighted(int))); + connect(j_obs, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotHighlighted(int))); KNHelper::restoreWindowSize("sendDlg", this, TQSize(320,250)); } diff --git a/knode/knarticlemanager.cpp b/knode/knarticlemanager.cpp index 86c58cc6..332690c2 100644 --- a/knode/knarticlemanager.cpp +++ b/knode/knarticlemanager.cpp @@ -53,8 +53,8 @@ KNArticleManager::KNArticleManager() : TQObject(0,0) s_earchDlg=0; d_isableExpander=false; - connect(f_ilterMgr, TQT_SIGNAL(filterChanged(KNArticleFilter*)), this, - TQT_SLOT(slotFilterChanged(KNArticleFilter*))); + connect(f_ilterMgr, TQ_SIGNAL(filterChanged(KNArticleFilter*)), this, + TQ_SLOT(slotFilterChanged(KNArticleFilter*))); } @@ -390,10 +390,10 @@ void KNArticleManager::search() KWin::activateWindow(s_earchDlg->winId()); } else { s_earchDlg=new KNSearchDialog(KNSearchDialog::STgroupSearch, 0); - connect(s_earchDlg, TQT_SIGNAL(doSearch(KNArticleFilter*)), this, - TQT_SLOT(slotFilterChanged(KNArticleFilter*))); - connect(s_earchDlg, TQT_SIGNAL(dialogDone()), this, - TQT_SLOT(slotSearchDialogDone())); + connect(s_earchDlg, TQ_SIGNAL(doSearch(KNArticleFilter*)), this, + TQ_SLOT(slotFilterChanged(KNArticleFilter*))); + connect(s_earchDlg, TQ_SIGNAL(dialogDone()), this, + TQ_SLOT(slotSearchDialogDone())); s_earchDlg->show(); } } @@ -1081,8 +1081,8 @@ void KNArticleManager::slotItemExpanded(TQListViewItem *p) void KNArticleManager::setView(KNHeaderView* v) { v_iew = v; if(v) { - connect(v, TQT_SIGNAL(expanded(TQListViewItem*)), this, - TQT_SLOT(slotItemExpanded(TQListViewItem*))); + connect(v, TQ_SIGNAL(expanded(TQListViewItem*)), this, + TQ_SLOT(slotItemExpanded(TQListViewItem*))); } } diff --git a/knode/knarticlewindow.cpp b/knode/knarticlewindow.cpp index 8fb30e5c..4a4235e8 100644 --- a/knode/knarticlewindow.cpp +++ b/knode/knarticlewindow.cpp @@ -100,10 +100,10 @@ KNArticleWindow::KNArticleWindow(KNArticle *art) mInstances.append( this ); // file menu - KStdAction::close( this, TQT_SLOT(close()), actionCollection() ); + KStdAction::close( this, TQ_SLOT(close()), actionCollection() ); // settings menu - KStdAction::preferences(knGlobals.top, TQT_SLOT(slotSettings()), actionCollection()); + KStdAction::preferences(knGlobals.top, TQ_SLOT(slotSettings()), actionCollection()); TDEAccel *accel = new TDEAccel( this ); artW->setCharsetKeyboardAction()->plugAccel( accel ); diff --git a/knode/kncollectionview.cpp b/knode/kncollectionview.cpp index ad952552..e7f9aa87 100644 --- a/knode/kncollectionview.cpp +++ b/knode/kncollectionview.cpp @@ -49,8 +49,8 @@ KNCollectionView::KNCollectionView(TQWidget *parent, const char* name) : mPopup = new TDEPopupMenu( this ); mPopup->insertTitle( i18n("View Columns") ); mPopup->setCheckable( true ); - mUnreadPop = mPopup->insertItem( i18n("Unread Column"), this, TQT_SLOT(toggleUnreadColumn()) ); - mTotalPop = mPopup->insertItem( i18n("Total Column"), this, TQT_SLOT(toggleTotalColumn()) ); + mUnreadPop = mPopup->insertItem( i18n("Unread Column"), this, TQ_SLOT(toggleUnreadColumn()) ); + mTotalPop = mPopup->insertItem( i18n("Total Column"), this, TQ_SLOT(toggleTotalColumn()) ); // add unread and total columns if necessary readConfig(); @@ -61,21 +61,21 @@ KNCollectionView::KNCollectionView(TQWidget *parent, const char* name) : // connect to the account manager KNAccountManager* am = knGlobals.accountManager(); - connect(am, TQT_SIGNAL(accountAdded(KNNntpAccount*)), TQT_SLOT(addAccount(KNNntpAccount*))); - connect(am, TQT_SIGNAL(accountRemoved(KNNntpAccount*)), TQT_SLOT(removeAccount(KNNntpAccount*))); - connect(am, TQT_SIGNAL(accountModified(KNNntpAccount*)), TQT_SLOT(updateAccount(KNNntpAccount*))); + connect(am, TQ_SIGNAL(accountAdded(KNNntpAccount*)), TQ_SLOT(addAccount(KNNntpAccount*))); + connect(am, TQ_SIGNAL(accountRemoved(KNNntpAccount*)), TQ_SLOT(removeAccount(KNNntpAccount*))); + connect(am, TQ_SIGNAL(accountModified(KNNntpAccount*)), TQ_SLOT(updateAccount(KNNntpAccount*))); // connect to the group manager KNGroupManager* gm = knGlobals.groupManager(); - connect(gm, TQT_SIGNAL(groupAdded(KNGroup*)), TQT_SLOT(addGroup(KNGroup*))); - connect(gm, TQT_SIGNAL(groupRemoved(KNGroup*)), TQT_SLOT(removeGroup(KNGroup*))); - connect(gm, TQT_SIGNAL(groupUpdated(KNGroup*)), TQT_SLOT(updateGroup(KNGroup*))); + connect(gm, TQ_SIGNAL(groupAdded(KNGroup*)), TQ_SLOT(addGroup(KNGroup*))); + connect(gm, TQ_SIGNAL(groupRemoved(KNGroup*)), TQ_SLOT(removeGroup(KNGroup*))); + connect(gm, TQ_SIGNAL(groupUpdated(KNGroup*)), TQ_SLOT(updateGroup(KNGroup*))); // connect to the folder manager KNFolderManager* fm = knGlobals.folderManager(); - connect(fm, TQT_SIGNAL(folderAdded(KNFolder*)), TQT_SLOT(addPendingFolders())); - connect(fm, TQT_SIGNAL(folderRemoved(KNFolder*)), TQT_SLOT(removeFolder(KNFolder*))); - connect(fm, TQT_SIGNAL(folderActivated(KNFolder*)), TQT_SLOT(activateFolder(KNFolder*))); + connect(fm, TQ_SIGNAL(folderAdded(KNFolder*)), TQ_SLOT(addPendingFolders())); + connect(fm, TQ_SIGNAL(folderRemoved(KNFolder*)), TQ_SLOT(removeFolder(KNFolder*))); + connect(fm, TQ_SIGNAL(folderActivated(KNFolder*)), TQ_SLOT(activateFolder(KNFolder*))); installEventFilter(this); } diff --git a/knode/kncomposer.cpp b/knode/kncomposer.cpp index 707db3fd..5b4f8603 100644 --- a/knode/kncomposer.cpp +++ b/knode/kncomposer.cpp @@ -78,7 +78,7 @@ TQPopupMenu *KNLineEdit::createPopupMenu() menu->insertSeparator(); menu->insertItem( i18n( "Edit Recent Addresses..." ), - this, TQT_SLOT( editRecentAddresses() ) ); + this, TQ_SLOT( editRecentAddresses() ) ); return menu; } @@ -183,9 +183,9 @@ KNComposer::KNComposer(KNLocalArticle *a, const TQString &text, const TQString & v_iew=new ComposerView(this); setCentralWidget(v_iew); - connect(v_iew->c_ancelEditorBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotCancelEditor())); - connect(v_iew->e_dit, TQT_SIGNAL(sigDragEnterEvent(TQDragEnterEvent *)), TQT_SLOT(slotDragEnterEvent(TQDragEnterEvent *))); - connect(v_iew->e_dit, TQT_SIGNAL(sigDropEvent(TQDropEvent *)), TQT_SLOT(slotDropEvent(TQDropEvent *))); + connect(v_iew->c_ancelEditorBtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotCancelEditor())); + connect(v_iew->e_dit, TQ_SIGNAL(sigDragEnterEvent(TQDragEnterEvent *)), TQ_SLOT(slotDragEnterEvent(TQDragEnterEvent *))); + connect(v_iew->e_dit, TQ_SIGNAL(sigDropEvent(TQDropEvent *)), TQ_SLOT(slotDropEvent(TQDropEvent *))); //statusbar KStatusBar *sb=statusBar(); @@ -199,58 +199,58 @@ KNComposer::KNComposer(KNLocalArticle *a, const TQString &text, const TQString & sb->setItemAlignment (4,AlignCenter | AlignVCenter); sb->insertItem(TQString(), 5,0); // line sb->setItemAlignment (5,AlignCenter | AlignVCenter); - connect(v_iew->e_dit, TQT_SIGNAL(CursorPositionChanged()), TQT_SLOT(slotUpdateCursorPos())); - connect(v_iew->e_dit, TQT_SIGNAL(toggle_overwrite_signal()), TQT_SLOT(slotUpdateStatusBar())); + connect(v_iew->e_dit, TQ_SIGNAL(CursorPositionChanged()), TQ_SLOT(slotUpdateCursorPos())); + connect(v_iew->e_dit, TQ_SIGNAL(toggle_overwrite_signal()), TQ_SLOT(slotUpdateStatusBar())); //------------------------------- <Actions> -------------------------------------- //file menu new TDEAction(i18n("&Send Now"),"mail-send", CTRL + Key_Return , this, - TQT_SLOT(slotSendNow()), actionCollection(), "send_now"); + TQ_SLOT(slotSendNow()), actionCollection(), "send_now"); new TDEAction(i18n("Send &Later"), "queue", 0, this, - TQT_SLOT(slotSendLater()), actionCollection(), "send_later"); + TQ_SLOT(slotSendLater()), actionCollection(), "send_later"); new TDEAction(i18n("Save as &Draft"),"document-save", 0 , this, - TQT_SLOT(slotSaveAsDraft()), actionCollection(), "save_as_draft"); + TQ_SLOT(slotSaveAsDraft()), actionCollection(), "save_as_draft"); new TDEAction(i18n("D&elete"),"edit-delete", 0 , this, - TQT_SLOT(slotArtDelete()), actionCollection(), "art_delete"); + TQ_SLOT(slotArtDelete()), actionCollection(), "art_delete"); - KStdAction::close(this, TQT_SLOT(close()),actionCollection()); + KStdAction::close(this, TQ_SLOT(close()),actionCollection()); //edit menu - KStdAction::undo(this, TQT_SLOT(slotUndo()), actionCollection()); - KStdAction::redo(this, TQT_SLOT(slotRedo()), actionCollection()); + KStdAction::undo(this, TQ_SLOT(slotUndo()), actionCollection()); + KStdAction::redo(this, TQ_SLOT(slotRedo()), actionCollection()); - KStdAction::cut(this, TQT_SLOT(slotCut()), actionCollection()); + KStdAction::cut(this, TQ_SLOT(slotCut()), actionCollection()); - KStdAction::copy(this, TQT_SLOT(slotCopy()), actionCollection()); + KStdAction::copy(this, TQ_SLOT(slotCopy()), actionCollection()); - KStdAction::pasteText(this, TQT_SLOT(slotPaste()), actionCollection()); + KStdAction::pasteText(this, TQ_SLOT(slotPaste()), actionCollection()); new TDEAction(i18n("Paste as &Quotation"), 0, v_iew->e_dit, - TQT_SLOT(slotPasteAsQuotation()), actionCollection(), "paste_quoted"); + TQ_SLOT(slotPasteAsQuotation()), actionCollection(), "paste_quoted"); - KStdAction::selectAll(this, TQT_SLOT(slotSelectAll()), actionCollection()); + KStdAction::selectAll(this, TQ_SLOT(slotSelectAll()), actionCollection()); - KStdAction::find(v_iew->e_dit, TQT_SLOT(slotFind()), actionCollection()); - KStdAction::findNext(v_iew->e_dit, TQT_SLOT(slotSearchAgain()), actionCollection()); + KStdAction::find(v_iew->e_dit, TQ_SLOT(slotFind()), actionCollection()); + KStdAction::findNext(v_iew->e_dit, TQ_SLOT(slotSearchAgain()), actionCollection()); - KStdAction::replace(v_iew->e_dit, TQT_SLOT(slotReplace()), actionCollection()); + KStdAction::replace(v_iew->e_dit, TQ_SLOT(slotReplace()), actionCollection()); //attach menu - new TDEAction(i18n("Append &Signature"), 0 , this, TQT_SLOT(slotAppendSig()), + new TDEAction(i18n("Append &Signature"), 0 , this, TQ_SLOT(slotAppendSig()), actionCollection(), "append_signature"); - new TDEAction(i18n("&Insert File..."), 0, this, TQT_SLOT(slotInsertFile()), + new TDEAction(i18n("&Insert File..."), 0, this, TQ_SLOT(slotInsertFile()), actionCollection(), "insert_file"); - new TDEAction(i18n("Insert File (in a &box)..."), 0, this, TQT_SLOT(slotInsertFileBoxed()), + new TDEAction(i18n("Insert File (in a &box)..."), 0, this, TQ_SLOT(slotInsertFileBoxed()), actionCollection(), "insert_file_boxed"); - new TDEAction(i18n("Attach &File..."), "attach", 0, this, TQT_SLOT(slotAttachFile()), + new TDEAction(i18n("Attach &File..."), "attach", 0, this, TQ_SLOT(slotAttachFile()), actionCollection(), "attach_file"); a_ctPGPsign = new TDEToggleAction(i18n("Sign Article with &PGP"), @@ -258,69 +258,69 @@ KNComposer::KNComposer(KNLocalArticle *a, const TQString &text, const TQString & actionCollection(), "sign_article"); a_ctRemoveAttachment = new TDEAction(i18n("&Remove"), 0, this, - TQT_SLOT(slotRemoveAttachment()), actionCollection(), "remove_attachment"); + TQ_SLOT(slotRemoveAttachment()), actionCollection(), "remove_attachment"); a_ctAttachmentProperties = new TDEAction(i18n("&Properties"), 0, this, - TQT_SLOT(slotAttachmentProperties()), actionCollection(), "attachment_properties"); + TQ_SLOT(slotAttachmentProperties()), actionCollection(), "attachment_properties"); //options menu a_ctDoPost = new TDEToggleAction(i18n("Send &News Article"), "document-new", 0 , this, - TQT_SLOT(slotToggleDoPost()), actionCollection(), "send_news"); + TQ_SLOT(slotToggleDoPost()), actionCollection(), "send_news"); a_ctDoMail = new TDEToggleAction(i18n("Send E&mail"), "mail_generic" , 0 , this, - TQT_SLOT(slotToggleDoMail()), actionCollection(), "send_mail"); + TQ_SLOT(slotToggleDoMail()), actionCollection(), "send_mail"); a_ctSetCharset = new TDESelectAction(i18n("Set &Charset"), 0, actionCollection(), "set_charset"); a_ctSetCharset->setItems(knGlobals.configManager()->postNewsTechnical()->composerCharsets()); a_ctSetCharset->setShortcutConfigurable(false); - connect(a_ctSetCharset, TQT_SIGNAL(activated(const TQString&)), - this, TQT_SLOT(slotSetCharset(const TQString&))); + connect(a_ctSetCharset, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(slotSetCharset(const TQString&))); a_ctSetCharsetKeyb = new TDEAction(i18n("Set Charset"), 0, this, - TQT_SLOT(slotSetCharsetKeyboard()), actionCollection(), "set_charset_keyboard"); + TQ_SLOT(slotSetCharsetKeyboard()), actionCollection(), "set_charset_keyboard"); a_ctWordWrap = new TDEToggleAction(i18n("&Word Wrap"), 0 , this, - TQT_SLOT(slotToggleWordWrap()), actionCollection(), "toggle_wordwrap"); + TQ_SLOT(slotToggleWordWrap()), actionCollection(), "toggle_wordwrap"); //tools menu new TDEAction(i18n("Add &Quote Characters"), 0, v_iew->e_dit, - TQT_SLOT(slotAddQuotes()), actionCollection(), "tools_quote"); + TQ_SLOT(slotAddQuotes()), actionCollection(), "tools_quote"); new TDEAction(i18n("&Remove Quote Characters"), 0, v_iew->e_dit, - TQT_SLOT(slotRemoveQuotes()), actionCollection(), "tools_unquote"); + TQ_SLOT(slotRemoveQuotes()), actionCollection(), "tools_unquote"); new TDEAction(i18n("Add &Box"), 0, v_iew->e_dit, - TQT_SLOT(slotAddBox()), actionCollection(), "tools_box"); + TQ_SLOT(slotAddBox()), actionCollection(), "tools_box"); new TDEAction(i18n("Re&move Box"), 0, v_iew->e_dit, - TQT_SLOT(slotRemoveBox()), actionCollection(), "tools_unbox"); + TQ_SLOT(slotRemoveBox()), actionCollection(), "tools_unbox"); TDEAction *undoRewrap = new TDEAction(i18n("Get &Original Text (not re-wrapped)"), 0, this, - TQT_SLOT(slotUndoRewrap()), actionCollection(), "tools_undoRewrap"); + TQ_SLOT(slotUndoRewrap()), actionCollection(), "tools_undoRewrap"); undoRewrap->setEnabled(!u_nwraped.isNull()); TDEAction *rot13 = new TDEAction(i18n("S&cramble (Rot 13)"), "encrypted", 0, v_iew->e_dit, - TQT_SLOT(slotRot13()), actionCollection(), "tools_rot13"); + TQ_SLOT(slotRot13()), actionCollection(), "tools_rot13"); rot13->setEnabled(false); - connect(v_iew->e_dit, TQT_SIGNAL(copyAvailable(bool)), rot13, TQT_SLOT(setEnabled(bool))); + connect(v_iew->e_dit, TQ_SIGNAL(copyAvailable(bool)), rot13, TQ_SLOT(setEnabled(bool))); a_ctExternalEditor = new TDEAction(i18n("Start &External Editor"), "system-run", 0, this, - TQT_SLOT(slotExternalEditor()), actionCollection(), "external_editor"); + TQ_SLOT(slotExternalEditor()), actionCollection(), "external_editor"); - a_ctSpellCheck = KStdAction::spelling (this, TQT_SLOT(slotSpellcheck()), actionCollection()); + a_ctSpellCheck = KStdAction::spelling (this, TQ_SLOT(slotSpellcheck()), actionCollection()); //settings menu createStandardStatusBarAction(); setStandardToolBarMenuEnabled(true); - KStdAction::keyBindings(this, TQT_SLOT(slotConfKeys()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(slotConfKeys()), actionCollection()); - KStdAction::configureToolbars(this, TQT_SLOT(slotConfToolbar()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(slotConfToolbar()), actionCollection()); - KStdAction::preferences(knGlobals.top, TQT_SLOT(slotSettings()), actionCollection()); + KStdAction::preferences(knGlobals.top, TQ_SLOT(slotSettings()), actionCollection()); a_ccel=new TDEAccel(this); a_ctSetCharsetKeyb->plugAccel(a_ccel); @@ -420,7 +420,7 @@ int KNComposer::listOfResultOfCheckWord( const TQStringList & lst , const TQStri { TDEAction * act = new TDEAction( *it ); - connect( act, TQT_SIGNAL(activated()), v_iew->e_dit, TQT_SLOT(slotCorrectWord()) ); + connect( act, TQ_SIGNAL(activated()), v_iew->e_dit, TQ_SLOT(slotCorrectWord()) ); m_listAction.append( act ); } } @@ -1302,7 +1302,7 @@ void KNComposer::slotExternalEditor() if(!filenameAdded) // no %f in the editor command (*e_xternalEditor) << e_ditorTempfile->name(); - connect(e_xternalEditor, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotEditorFinished(TDEProcess *))); + connect(e_xternalEditor, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotEditorFinished(TDEProcess *))); if(!e_xternalEditor->start()) { KMessageBox::error(this, i18n("Unable to start external editor.\nPlease check your configuration in the settings dialog.")); delete e_xternalEditor; @@ -1327,17 +1327,17 @@ void KNComposer::slotSpellcheck() a_ctExternalEditor->setEnabled(false); a_ctSpellCheck->setEnabled(false); - s_pellChecker = new KSpell(this, i18n("Spellcheck"), this, TQT_SLOT(slotSpellStarted(KSpell *))); + s_pellChecker = new KSpell(this, i18n("Spellcheck"), this, TQ_SLOT(slotSpellStarted(KSpell *))); TQStringList l = KSpellingHighlighter::personalWords(); for ( TQStringList::Iterator it = l.begin(); it != l.end(); ++it ) { s_pellChecker->addPersonal( *it ); } - connect(s_pellChecker, TQT_SIGNAL(death()), this, TQT_SLOT(slotSpellFinished())); - connect(s_pellChecker, TQT_SIGNAL(done(const TQString&)), this, TQT_SLOT(slotSpellDone(const TQString&))); - connect(s_pellChecker, TQT_SIGNAL(misspelling (const TQString &, const TQStringList &, unsigned int)), - this, TQT_SLOT(slotMisspelling (const TQString &, const TQStringList &, unsigned int))); - connect(s_pellChecker, TQT_SIGNAL(corrected (const TQString &, const TQString &, unsigned int)), - this, TQT_SLOT(slotCorrected (const TQString &, const TQString &, unsigned int))); + connect(s_pellChecker, TQ_SIGNAL(death()), this, TQ_SLOT(slotSpellFinished())); + connect(s_pellChecker, TQ_SIGNAL(done(const TQString&)), this, TQ_SLOT(slotSpellDone(const TQString&))); + connect(s_pellChecker, TQ_SIGNAL(misspelling (const TQString &, const TQStringList &, unsigned int)), + this, TQ_SLOT(slotMisspelling (const TQString &, const TQStringList &, unsigned int))); + connect(s_pellChecker, TQ_SIGNAL(corrected (const TQString &, const TQString &, unsigned int)), + this, TQ_SLOT(slotCorrected (const TQString &, const TQString &, unsigned int))); } @@ -1401,7 +1401,7 @@ void KNComposer::slotConfToolbar() conf->setGroup("composerWindow_options"); saveMainWindowSettings(conf); KEditToolbar dlg(guiFactory(),this); - connect(&dlg,TQT_SIGNAL( newToolbarConfig() ), this, TQT_SLOT( slotNewToolbarConfig() )); + connect(&dlg,TQ_SIGNAL( newToolbarConfig() ), this, TQ_SLOT( slotNewToolbarConfig() )); dlg.exec(); } @@ -1508,10 +1508,10 @@ void KNComposer::slotGroupsBtnClicked() KNGroupSelectDialog *dlg=new KNGroupSelectDialog(this, nntp, v_iew->g_roups->text().remove(TQRegExp("\\s"))); - connect(dlg, TQT_SIGNAL(loadList(KNNntpAccount*)), - knGlobals.groupManager(), TQT_SLOT(slotLoadGroupList(KNNntpAccount*))); - connect(knGlobals.groupManager(), TQT_SIGNAL(newListReady(KNGroupListData*)), - dlg, TQT_SLOT(slotReceiveList(KNGroupListData*))); + connect(dlg, TQ_SIGNAL(loadList(KNNntpAccount*)), + knGlobals.groupManager(), TQ_SLOT(slotLoadGroupList(KNNntpAccount*))); + connect(knGlobals.groupManager(), TQ_SIGNAL(newListReady(KNGroupListData*)), + dlg, TQ_SLOT(slotReceiveList(KNGroupListData*))); if(dlg->exec()) v_iew->g_roups->setText(dlg->selectedGroups()); @@ -1744,7 +1744,7 @@ KNComposer::ComposerView::ComposerView(KNComposer *composer, const char *n) hdrL->addWidget(l_to, 0,0); hdrL->addWidget(t_o, 0,1); hdrL->addWidget(t_oBtn, 0,2); - connect(t_oBtn, TQT_SIGNAL(clicked()), parent(), TQT_SLOT(slotToBtnClicked())); + connect(t_oBtn, TQ_SIGNAL(clicked()), parent(), TQ_SLOT(slotToBtnClicked())); //Newsgroups g_roups=new KNLineEdit(this, false, hdrFrame); @@ -1755,9 +1755,9 @@ KNComposer::ComposerView::ComposerView(KNComposer *composer, const char *n) hdrL->addWidget(l_groups, 1,0); hdrL->addWidget(g_roups, 1,1); hdrL->addWidget(g_roupsBtn, 1,2); - connect(g_roups, TQT_SIGNAL(textChanged(const TQString&)), - parent(), TQT_SLOT(slotGroupsChanged(const TQString&))); - connect(g_roupsBtn, TQT_SIGNAL(clicked()), parent(), TQT_SLOT(slotGroupsBtnClicked())); + connect(g_roups, TQ_SIGNAL(textChanged(const TQString&)), + parent(), TQ_SLOT(slotGroupsChanged(const TQString&))); + connect(g_roupsBtn, TQ_SIGNAL(clicked()), parent(), TQ_SLOT(slotGroupsBtnClicked())); //Followup-To f_up2=new KComboBox(true, hdrFrame); @@ -1772,8 +1772,8 @@ KNComposer::ComposerView::ComposerView(KNComposer *composer, const char *n) TQLabel *l=new TQLabel(s_ubject, i18n("S&ubject:"), hdrFrame); hdrL->addWidget(l, 3,0); hdrL->addMultiCellWidget(s_ubject, 3,3, 1,2); - connect(s_ubject, TQT_SIGNAL(textChanged(const TQString&)), - parent(), TQT_SLOT(slotSubjectChanged(const TQString&))); + connect(s_ubject, TQ_SIGNAL(textChanged(const TQString&)), + parent(), TQ_SLOT(slotSubjectChanged(const TQString&))); //Editor e_dit=new Editor(this, composer, main); @@ -1793,8 +1793,8 @@ KNComposer::ComposerView::ComposerView(KNComposer *composer, const char *n) mSpellChecker = new KDictSpellingHighlighter(e_dit, /*active*/ true, /*autoEnabled*/ true, /*spellColor*/ config->readColorEntry("NewMessage", &c), /*colorQuoting*/ true, col1, col2, col3, col4); - connect( mSpellChecker, TQT_SIGNAL(newSuggestions(const TQString&, const TQStringList&, unsigned int)), e_dit, - TQT_SLOT(slotAddSuggestion(const TQString&, const TQStringList&, unsigned int)) ); + connect( mSpellChecker, TQ_SIGNAL(newSuggestions(const TQString&, const TQStringList&, unsigned int)), e_dit, + TQ_SLOT(slotAddSuggestion(const TQString&, const TQStringList&, unsigned int)) ); TQVBoxLayout *notL=new TQVBoxLayout(e_dit); notL->addStretch(1); @@ -1906,33 +1906,33 @@ void KNComposer::ComposerView::showAttachmentView() topL->addMultiCellWidget(a_ttView, 0,2, 0,0); //connections - connect(a_ttView, TQT_SIGNAL(currentChanged(TQListViewItem*)), - parent(), TQT_SLOT(slotAttachmentSelected(TQListViewItem*))); - connect(a_ttView, TQT_SIGNAL(clicked ( TQListViewItem * )), - parent(), TQT_SLOT(slotAttachmentSelected(TQListViewItem*))); - - connect(a_ttView, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - parent(), TQT_SLOT(slotAttachmentPopup(TDEListView*, TQListViewItem*, const TQPoint&))); - connect(a_ttView, TQT_SIGNAL(delPressed(TQListViewItem*)), - parent(), TQT_SLOT(slotAttachmentRemove(TQListViewItem*))); - connect(a_ttView, TQT_SIGNAL(doubleClicked(TQListViewItem*)), - parent(), TQT_SLOT(slotAttachmentEdit(TQListViewItem*))); - connect(a_ttView, TQT_SIGNAL(returnPressed(TQListViewItem*)), - parent(), TQT_SLOT(slotAttachmentEdit(TQListViewItem*))); + connect(a_ttView, TQ_SIGNAL(currentChanged(TQListViewItem*)), + parent(), TQ_SLOT(slotAttachmentSelected(TQListViewItem*))); + connect(a_ttView, TQ_SIGNAL(clicked ( TQListViewItem * )), + parent(), TQ_SLOT(slotAttachmentSelected(TQListViewItem*))); + + connect(a_ttView, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + parent(), TQ_SLOT(slotAttachmentPopup(TDEListView*, TQListViewItem*, const TQPoint&))); + connect(a_ttView, TQ_SIGNAL(delPressed(TQListViewItem*)), + parent(), TQ_SLOT(slotAttachmentRemove(TQListViewItem*))); + connect(a_ttView, TQ_SIGNAL(doubleClicked(TQListViewItem*)), + parent(), TQ_SLOT(slotAttachmentEdit(TQListViewItem*))); + connect(a_ttView, TQ_SIGNAL(returnPressed(TQListViewItem*)), + parent(), TQ_SLOT(slotAttachmentEdit(TQListViewItem*))); //buttons a_ttAddBtn=new TQPushButton(i18n("A&dd..."),a_ttWidget); - connect(a_ttAddBtn, TQT_SIGNAL(clicked()), parent(), TQT_SLOT(slotAttachFile())); + connect(a_ttAddBtn, TQ_SIGNAL(clicked()), parent(), TQ_SLOT(slotAttachFile())); topL->addWidget(a_ttAddBtn, 0,1); a_ttRemoveBtn=new TQPushButton(i18n("&Remove"), a_ttWidget); a_ttRemoveBtn->setEnabled(false); - connect(a_ttRemoveBtn, TQT_SIGNAL(clicked()), parent(), TQT_SLOT(slotRemoveAttachment())); + connect(a_ttRemoveBtn, TQ_SIGNAL(clicked()), parent(), TQ_SLOT(slotRemoveAttachment())); topL->addWidget(a_ttRemoveBtn, 1,1); a_ttEditBtn=new TQPushButton(i18n("&Properties"), a_ttWidget); a_ttEditBtn->setEnabled(false); - connect(a_ttEditBtn, TQT_SIGNAL(clicked()), parent(), TQT_SLOT(slotAttachmentProperties())); + connect(a_ttEditBtn, TQ_SIGNAL(clicked()), parent(), TQ_SLOT(slotAttachmentProperties())); topL->addWidget(a_ttEditBtn, 2,1, TQt::AlignTop); topL->setRowStretch(2,1); @@ -2398,15 +2398,15 @@ void KNComposer::Editor::contentsContextMenuEvent( TQContextMenuEvent */*e*/ ) } else { - spell = new KSpell(this, i18n("Spellcheck"), this, TQT_SLOT(slotSpellStarted(KSpell *))); + spell = new KSpell(this, i18n("Spellcheck"), this, TQ_SLOT(slotSpellStarted(KSpell *))); TQStringList l = KSpellingHighlighter::personalWords(); for ( TQStringList::Iterator it = l.begin(); it != l.end(); ++it ) { spell->addPersonal( *it ); } - connect(spell, TQT_SIGNAL(death()), this, TQT_SLOT(slotSpellFinished())); - connect(spell, TQT_SIGNAL(done(const TQString&)), this, TQT_SLOT(slotSpellDone(const TQString&))); - connect(spell, TQT_SIGNAL(misspelling (const TQString &, const TQStringList &, unsigned int)), - this, TQT_SLOT(slotMisspelling (const TQString &, const TQStringList &, unsigned int))); + connect(spell, TQ_SIGNAL(death()), this, TQ_SLOT(slotSpellFinished())); + connect(spell, TQ_SIGNAL(done(const TQString&)), this, TQ_SLOT(slotSpellDone(const TQString&))); + connect(spell, TQ_SIGNAL(misspelling (const TQString &, const TQStringList &, unsigned int)), + this, TQ_SLOT(slotMisspelling (const TQString &, const TQStringList &, unsigned int))); } } @@ -2600,8 +2600,8 @@ KNComposer::AttachmentPropertiesDlg::AttachmentPropertiesDlg(KNAttachment *a, TQ topL->addWidget(mimeGB); //connections - connect(m_imeType, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotMimeTypeTextChanged(const TQString&))); + connect(m_imeType, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotMimeTypeTextChanged(const TQString&))); //finish GUI setFixedHeight(sizeHint().height()); diff --git a/knode/knconfig.cpp b/knode/knconfig.cpp index 7c0ef435..9be34f00 100644 --- a/knode/knconfig.cpp +++ b/knode/knconfig.cpp @@ -138,8 +138,8 @@ TQString KNConfig::Identity::getSignature() for ( TQStringList::Iterator it = command.begin(); it != command.end(); ++it ) process << (*it); - connect(&process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQT_SLOT(slotReceiveStdout(TDEProcess *, char *, int))); - connect(&process, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), TQT_SLOT(slotReceiveStderr(TDEProcess *, char *, int))); + connect(&process, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQ_SLOT(slotReceiveStdout(TDEProcess *, char *, int))); + connect(&process, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), TQ_SLOT(slotReceiveStderr(TDEProcess *, char *, int))); if (!process.start(TDEProcess::Block,TDEProcess::AllOutput)) KMessageBox::error(knGlobals.topWidget, i18n("Cannot run the signature generator.")); diff --git a/knode/knconfigmanager.cpp b/knode/knconfigmanager.cpp index a07a9c5e..f7d26506 100644 --- a/knode/knconfigmanager.cpp +++ b/knode/knconfigmanager.cpp @@ -67,7 +67,7 @@ void KNConfigManager::configure() { if(!d_ialog) { d_ialog=new KNConfigDialog(knGlobals.topWidget, "Preferences_Dlg"); - connect(d_ialog, TQT_SIGNAL(finished()), this, TQT_SLOT(slotDialogDone())); + connect(d_ialog, TQ_SIGNAL(finished()), this, TQ_SLOT(slotDialogDone())); d_ialog->show(); } else @@ -113,7 +113,7 @@ KNConfigDialog::KNConfigDialog(TQWidget *p, const char *n) setHelp("anc-setting-your-identity"); - connect(this, TQT_SIGNAL(configCommitted()), this, TQT_SLOT(slotConfigCommitted())); + connect(this, TQ_SIGNAL(configCommitted()), this, TQ_SLOT(slotConfigCommitted())); } diff --git a/knode/knconfigpages.cpp b/knode/knconfigpages.cpp index d9f21878..91d7666c 100644 --- a/knode/knconfigpages.cpp +++ b/knode/knconfigpages.cpp @@ -38,7 +38,7 @@ KNConfig::BasePageWithTabs::BasePageWithTabs( TQWidget * parent, const char * na void KNConfig::BasePageWithTabs::addTab( TDECModule* tab, const TQString & title ) { mTabWidget->addTab( tab, title ); - connect( tab, TQT_SIGNAL(changed( bool )), this, TQT_SIGNAL(changed( bool )) ); + connect( tab, TQ_SIGNAL(changed( bool )), this, TQ_SIGNAL(changed( bool )) ); } void KNConfig::BasePageWithTabs::load() { diff --git a/knode/knconfigwidgets.cpp b/knode/knconfigwidgets.cpp index ea2d77a2..27c81824 100644 --- a/knode/knconfigwidgets.cpp +++ b/knode/knconfigwidgets.cpp @@ -66,7 +66,7 @@ KNConfig::IdentityWidget::IdentityWidget( Identity *d, TQWidget *p, const char * "<p>Ex: <b>John Stuart Masterson III</b>.</p></qt>"); TQWhatsThis::add( n_ame, msg ); TQWhatsThis::add( l, msg ); - connect( n_ame, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed()) ); + connect( n_ame, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed()) ); o_rga=new KLineEdit(this); l=new TQLabel(o_rga, i18n("Organi&zation:"), this); @@ -76,7 +76,7 @@ KNConfig::IdentityWidget::IdentityWidget( Identity *d, TQWidget *p, const char * "<p>Ex: <b>KNode, Inc</b>.</p></qt>" ); TQWhatsThis::add( o_rga, msg ); TQWhatsThis::add( l, msg ); - connect( o_rga, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed()) ); + connect( o_rga, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed()) ); e_mail=new KLineEdit(this); l=new TQLabel(e_mail, i18n("Email a&ddress:"), this); @@ -86,7 +86,7 @@ KNConfig::IdentityWidget::IdentityWidget( Identity *d, TQWidget *p, const char * "reading your articles</p><p>Ex: <b>nospam@please.com</b>.</qt>" ); TQWhatsThis::add( l, msg ); TQWhatsThis::add( e_mail, msg ); - connect( e_mail, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed()) ); + connect( e_mail, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed()) ); r_eplyTo=new KLineEdit(this); l=new TQLabel(r_eplyTo, i18n("&Reply-to address:"), this); @@ -97,13 +97,13 @@ KNConfig::IdentityWidget::IdentityWidget( Identity *d, TQWidget *p, const char * "email address.</p><p>Ex: <b>john@example.com</b>.</p></qt>" ); TQWhatsThis::add( l, msg ); TQWhatsThis::add( r_eplyTo, msg ); - connect( r_eplyTo, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed()) ); + connect( r_eplyTo, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed()) ); m_ailCopiesTo=new KLineEdit(this); l=new TQLabel(m_ailCopiesTo, i18n("&Mail-copies-to:"), this); topL->addWidget(l, 4,0); topL->addMultiCellWidget(m_ailCopiesTo, 4,4, 1,2); - connect( m_ailCopiesTo, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed()) ); + connect( m_ailCopiesTo, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed()) ); s_igningKey = new Kpgp::SecretKeyRequester(this); s_igningKey->dialogButton()->setText(i18n("Chan&ge...")); @@ -117,11 +117,11 @@ KNConfig::IdentityWidget::IdentityWidget( Identity *d, TQWidget *p, const char * "used to sign your articles.</p></qt>"); TQWhatsThis::add( l, msg ); TQWhatsThis::add( s_igningKey, msg ); - connect( s_igningKey, TQT_SIGNAL(changed()), TQT_SLOT(changed()) ); + connect( s_igningKey, TQ_SIGNAL(changed()), TQ_SLOT(changed()) ); b_uttonGroup = new TQButtonGroup(this); - connect( b_uttonGroup, TQT_SIGNAL(clicked(int)), - this, TQT_SLOT(slotSignatureType(int)) ); + connect( b_uttonGroup, TQ_SIGNAL(clicked(int)), + this, TQ_SLOT(slotSignatureType(int)) ); b_uttonGroup->setExclusive(true); b_uttonGroup->hide(); @@ -143,12 +143,12 @@ KNConfig::IdentityWidget::IdentityWidget( Identity *d, TQWidget *p, const char * TQWhatsThis::add( s_ig, msg ); c_hooseBtn = new TQPushButton( i18n("Choo&se..."), this); - connect(c_hooseBtn, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSignatureChoose())); + connect(c_hooseBtn, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSignatureChoose())); topL->addWidget(c_hooseBtn, 7, 2 ); e_ditBtn = new TQPushButton( i18n("&Edit File"), this); - connect(e_ditBtn, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSignatureEdit())); + connect(e_ditBtn, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSignatureEdit())); topL->addWidget(e_ditBtn, 8, 2); s_igGenerator = new TQCheckBox(i18n("&The file is a program"), this); @@ -156,7 +156,7 @@ KNConfig::IdentityWidget::IdentityWidget( Identity *d, TQWidget *p, const char * msg = i18n( "<qt><p>Mark this option if the signature will be generated by a program</p>" "<p>Ex: <b>/home/robt/gensig.sh</b>.</p></qt>" ); TQWhatsThis::add( s_igGenerator, msg ); - connect( s_igGenerator, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()) ); + connect( s_igGenerator, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()) ); s_igEdit = new TQRadioButton( i18n("Specify signature &below"), this); b_uttonGroup->insert(s_igEdit, 1); @@ -165,13 +165,13 @@ KNConfig::IdentityWidget::IdentityWidget( Identity *d, TQWidget *p, const char * s_igEditor = new TQTextEdit(this); s_igEditor->setTextFormat(TQt::PlainText); topL->addMultiCellWidget(s_igEditor, 10, 10, 0, 2); - connect( s_igEditor, TQT_SIGNAL(textChanged()), TQT_SLOT(changed()) ); + connect( s_igEditor, TQ_SIGNAL(textChanged()), TQ_SLOT(changed()) ); topL->setColStretch(1,1); topL->setRowStretch(7,1); topL->setResizeMode(TQLayout::Minimum); - connect(s_ig,TQT_SIGNAL(textChanged ( const TQString & )), - this,TQT_SLOT(textFileNameChanged(const TQString &))); + connect(s_ig,TQ_SIGNAL(textChanged ( const TQString & )), + this,TQ_SLOT(textFileNameChanged(const TQString &))); load(); } @@ -289,8 +289,8 @@ KNConfig::NntpAccountListWidget::NntpAccountListWidget(TQWidget *p, const char * // account listbox l_box=new KNDialogListBox(false, this); - connect(l_box, TQT_SIGNAL(selected(int)), this, TQT_SLOT(slotItemSelected(int))); - connect(l_box, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged())); + connect(l_box, TQ_SIGNAL(selected(int)), this, TQ_SLOT(slotItemSelected(int))); + connect(l_box, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged())); topL->addMultiCellWidget(l_box, 0,4, 0,0); // info box @@ -302,19 +302,19 @@ KNConfig::NntpAccountListWidget::NntpAccountListWidget(TQWidget *p, const char * // buttons a_ddBtn=new TQPushButton(i18n("&Add..."), this); - connect(a_ddBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddBtnClicked())); + connect(a_ddBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddBtnClicked())); topL->addWidget(a_ddBtn, 0,1); e_ditBtn=new TQPushButton(i18n("modify something","&Edit..."), this); - connect(e_ditBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditBtnClicked())); + connect(e_ditBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEditBtnClicked())); topL->addWidget(e_ditBtn, 1,1); d_elBtn=new TQPushButton(i18n("&Delete"), this); - connect(d_elBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDelBtnClicked())); + connect(d_elBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDelBtnClicked())); topL->addWidget(d_elBtn, 2,1); s_ubBtn=new TQPushButton(i18n("&Subscribe..."), this); - connect(s_ubBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSubBtnClicked())); + connect(s_ubBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSubBtnClicked())); topL->addWidget(s_ubBtn, 3,1); topL->setRowStretch(4,1); // stretch the server listbox @@ -323,9 +323,9 @@ KNConfig::NntpAccountListWidget::NntpAccountListWidget(TQWidget *p, const char * // the settings dialog is non-modal, so we have to react to changes // made outside of the dialog - connect(a_ccManager, TQT_SIGNAL(accountAdded(KNNntpAccount*)), this, TQT_SLOT(slotAddItem(KNNntpAccount*))); - connect(a_ccManager, TQT_SIGNAL(accountRemoved(KNNntpAccount*)), this, TQT_SLOT(slotRemoveItem(KNNntpAccount*))); - connect(a_ccManager, TQT_SIGNAL(accountModified(KNNntpAccount*)), this, TQT_SLOT(slotUpdateItem(KNNntpAccount*))); + connect(a_ccManager, TQ_SIGNAL(accountAdded(KNNntpAccount*)), this, TQ_SLOT(slotAddItem(KNNntpAccount*))); + connect(a_ccManager, TQ_SIGNAL(accountRemoved(KNNntpAccount*)), this, TQ_SLOT(slotRemoveItem(KNNntpAccount*))); + connect(a_ccManager, TQ_SIGNAL(accountModified(KNNntpAccount*)), this, TQ_SLOT(slotUpdateItem(KNNntpAccount*))); slotSelectionChanged(); // disable Delete & Edit initially } @@ -510,7 +510,7 @@ KNConfig::NntpAccountConfDialog::NntpAccountConfDialog(KNNntpAccount *a, TQWidge topL->addMultiCellWidget(u_seDiskCache, 6,6, 0,3);*/ a_uth=new TQCheckBox(i18n("Server requires &authentication"), page); - connect(a_uth, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotAuthChecked(bool))); + connect(a_uth, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotAuthChecked(bool))); topL->addMultiCellWidget(a_uth, 6,6, 0,3); u_ser=new KLineEdit(page); @@ -531,7 +531,7 @@ KNConfig::NntpAccountConfDialog::NntpAccountConfDialog(KNNntpAccount *a, TQWidge topL->addMultiCellWidget(p_ass, 8,8, 1,2); i_nterval=new TQCheckBox(i18n("Enable &interval news checking"), page); - connect(i_nterval, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotIntervalChecked(bool))); + connect(i_nterval, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotIntervalChecked(bool))); topL->addMultiCellWidget(i_nterval, 9,9, 0,3); c_heckInterval=new KIntSpinBox(1,10000,1,1,10,page); @@ -559,7 +559,7 @@ KNConfig::NntpAccountConfDialog::NntpAccountConfDialog(KNNntpAccount *a, TQWidge cleanupLayout->addWidget( mCleanupWidget ); cleanupLayout->addStretch( 1 ); - connect( knGlobals.accountManager(), TQT_SIGNAL(passwordsChanged()), TQT_SLOT(slotPasswordChanged()) ); + connect( knGlobals.accountManager(), TQ_SIGNAL(passwordsChanged()), TQ_SLOT(slotPasswordChanged()) ); KNHelper::restoreWindowSize("accNewsPropDLG", this, sizeHint()); @@ -633,7 +633,7 @@ KNConfig::SmtpAccountWidget::SmtpAccountWidget( TQWidget *p, const char *n ) : SmtpAccountWidgetBase( p, n ) { mAccount = knGlobals.accountManager()->smtp(); - connect( knGlobals.accountManager(), TQT_SIGNAL(passwordsChanged()), TQT_SLOT(slotPasswordChanged()) ); + connect( knGlobals.accountManager(), TQ_SIGNAL(passwordsChanged()), TQ_SLOT(slotPasswordChanged()) ); load(); } @@ -821,29 +821,29 @@ KNConfig::AppearanceWidget::AppearanceWidget( TQWidget *p, const char *n ) : //color-list c_List = new KNDialogListBox(false, this); topL->addMultiCellWidget(c_List,1,3,0,0); - connect(c_List, TQT_SIGNAL(selected(TQListBoxItem*)),TQT_SLOT(slotColItemSelected(TQListBoxItem*))); - connect(c_List, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotColSelectionChanged())); + connect(c_List, TQ_SIGNAL(selected(TQListBoxItem*)),TQ_SLOT(slotColItemSelected(TQListBoxItem*))); + connect(c_List, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotColSelectionChanged())); c_olorCB = new TQCheckBox(i18n("&Use custom colors"),this); topL->addWidget(c_olorCB,0,0); - connect(c_olorCB, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotColCheckBoxToggled(bool))); + connect(c_olorCB, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotColCheckBoxToggled(bool))); c_olChngBtn=new TQPushButton(i18n("Cha&nge..."), this); - connect(c_olChngBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotColChangeBtnClicked())); + connect(c_olChngBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotColChangeBtnClicked())); topL->addWidget(c_olChngBtn,1,1); //font-list f_List = new KNDialogListBox(false, this); topL->addMultiCellWidget(f_List,5,7,0,0); - connect(f_List, TQT_SIGNAL(selected(TQListBoxItem*)),TQT_SLOT(slotFontItemSelected(TQListBoxItem*))); - connect(f_List, TQT_SIGNAL(selectionChanged()),TQT_SLOT(slotFontSelectionChanged())); + connect(f_List, TQ_SIGNAL(selected(TQListBoxItem*)),TQ_SLOT(slotFontItemSelected(TQListBoxItem*))); + connect(f_List, TQ_SIGNAL(selectionChanged()),TQ_SLOT(slotFontSelectionChanged())); f_ontCB = new TQCheckBox(i18n("Use custom &fonts"),this); topL->addWidget(f_ontCB,4,0); - connect(f_ontCB, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotFontCheckBoxToggled(bool))); + connect(f_ontCB, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotFontCheckBoxToggled(bool))); f_ntChngBtn=new TQPushButton(i18n("Chang&e..."), this); - connect(f_ntChngBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFontChangeBtnClicked())); + connect(f_ntChngBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFontChangeBtnClicked())); topL->addWidget(f_ntChngBtn,5,1); load(); @@ -1005,7 +1005,7 @@ KNConfig::ReadNewsGeneralWidget::ReadNewsGeneralWidget( ReadNewsGeneral *d, TQWi l1=new TQLabel(m_axFetch, i18n("&Maximum number of articles to fetch:"), hgb); m_arkCB=new TQCheckBox(i18n("Mar&k article as read after:"), hgb); m_arkSecs=new KIntSpinBox(0, 9999, 1, 0, 10, hgb); - connect(m_arkCB, TQT_SIGNAL(toggled(bool)), m_arkSecs, TQT_SLOT(setEnabled(bool))); + connect(m_arkCB, TQ_SIGNAL(toggled(bool)), m_arkSecs, TQ_SLOT(setEnabled(bool))); m_arkSecs->setSuffix(i18n(" sec")); m_arkCrossCB=new TQCheckBox(i18n("Mark c&rossposted articles as read"), hgb); @@ -1059,19 +1059,19 @@ KNConfig::ReadNewsGeneralWidget::ReadNewsGeneralWidget( ReadNewsGeneral *d, TQWi topL->setResizeMode(TQLayout::Minimum); - connect(a_utoCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(m_axFetch, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - connect(m_arkCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(m_arkSecs, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - connect(m_arkCrossCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(s_martScrollingCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(e_xpThrCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(d_efaultExpandCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(l_inesCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(s_coreCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(u_nreadCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(c_ollCacheSize, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - connect(a_rtCacheSize, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); + connect(a_utoCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(m_axFetch, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); + connect(m_arkCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(m_arkSecs, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); + connect(m_arkCrossCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(s_martScrollingCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(e_xpThrCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(d_efaultExpandCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(l_inesCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(s_coreCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(u_nreadCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(c_ollCacheSize, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); + connect(a_rtCacheSize, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); load(); } @@ -1138,7 +1138,7 @@ KNConfig::ReadNewsNavigationWidget::ReadNewsNavigationWidget( ReadNewsNavigation m_arkAllReadGoNextCB=new TQCheckBox(i18n("&Switch to the next group"), gb); gbL->addWidget(m_arkAllReadGoNextCB); - connect(m_arkAllReadGoNextCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); + connect(m_arkAllReadGoNextCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); // ==== Mark Thread as Read ================================================= @@ -1152,8 +1152,8 @@ KNConfig::ReadNewsNavigationWidget::ReadNewsNavigationWidget( ReadNewsNavigation m_arkThreadReadGoNextCB=new TQCheckBox(i18n("Go &to the next unread thread"), gb); gbL->addWidget(m_arkThreadReadGoNextCB); - connect(m_arkThreadReadCloseThreadCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(m_arkThreadReadGoNextCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); + connect(m_arkThreadReadCloseThreadCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(m_arkThreadReadGoNextCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); // ==== Ignore Thread ======================================================= @@ -1167,8 +1167,8 @@ KNConfig::ReadNewsNavigationWidget::ReadNewsNavigationWidget( ReadNewsNavigation i_gnoreThreadGoNextCB=new TQCheckBox(i18n("Go to the next &unread thread"), gb); gbL->addWidget(i_gnoreThreadGoNextCB); - connect(i_gnoreThreadCloseThreadCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(i_gnoreThreadGoNextCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); + connect(i_gnoreThreadCloseThreadCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(i_gnoreThreadGoNextCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); topL->addStretch(1); topL->setResizeMode(TQLayout::Minimum); @@ -1253,14 +1253,14 @@ KNConfig::ReadNewsViewerWidget::ReadNewsViewerWidget( ReadNewsViewer *d, TQWidge topL->setResizeMode(TQLayout::Minimum); - connect(r_ewrapCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(r_emoveTrailingCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(s_igCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(q_uoteCharacters, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed())); - connect(o_penAttCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(a_ltAttCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect( mShowRefBar, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()) ); - connect( mAlwaysShowHTML, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()) ); + connect(r_ewrapCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(r_emoveTrailingCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(s_igCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(q_uoteCharacters, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed())); + connect(o_penAttCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(a_ltAttCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect( mShowRefBar, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()) ); + connect( mAlwaysShowHTML, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()) ); load(); } @@ -1311,29 +1311,29 @@ KNConfig::DisplayedHeadersWidget::DisplayedHeadersWidget( DisplayedHeaders *d, T //listbox l_box=new KNDialogListBox(false, this); - connect(l_box, TQT_SIGNAL(selected(int)), this, TQT_SLOT(slotItemSelected(int))); - connect(l_box, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged())); + connect(l_box, TQ_SIGNAL(selected(int)), this, TQ_SLOT(slotItemSelected(int))); + connect(l_box, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged())); topL->addMultiCellWidget(l_box, 0,6, 0,0); // buttons a_ddBtn=new TQPushButton(i18n("&Add..."), this); - connect(a_ddBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddBtnClicked())); + connect(a_ddBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddBtnClicked())); topL->addWidget(a_ddBtn, 0,1); d_elBtn=new TQPushButton(i18n("&Delete"), this); - connect(d_elBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDelBtnClicked())); + connect(d_elBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDelBtnClicked())); topL->addWidget(d_elBtn, 1,1); e_ditBtn=new TQPushButton(i18n("modify something","&Edit..."), this); - connect(e_ditBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditBtnClicked())); + connect(e_ditBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEditBtnClicked())); topL->addWidget(e_ditBtn, 2,1); u_pBtn=new TQPushButton(i18n("&Up"), this); - connect(u_pBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUpBtnClicked())); + connect(u_pBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUpBtnClicked())); topL->addWidget(u_pBtn, 4,1); d_ownBtn=new TQPushButton(i18n("Do&wn"), this); - connect(d_ownBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDownBtnClicked())); + connect(d_ownBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDownBtnClicked())); topL->addWidget(d_ownBtn, 5,1); topL->addRowSpacing(3,20); // separate up/down buttons @@ -1499,7 +1499,7 @@ KNConfig::DisplayedHeaderConfDialog::DisplayedHeaderConfDialog(KNDisplayedHeader h_drC=new KComboBox(true, nameW); h_drC->lineEdit()->setMaxLength(64); - connect(h_drC, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated(int))); + connect(h_drC, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated(int))); nameL->addWidget(new TQLabel(h_drC, i18n("H&eader:"),nameW),0,0); nameL->addWidget(h_drC,0,1); @@ -1551,7 +1551,7 @@ KNConfig::DisplayedHeaderConfDialog::DisplayedHeaderConfDialog(KNDisplayedHeader setFixedHeight(sizeHint().height()); KNHelper::restoreWindowSize("accReadHdrPropDLG", this, sizeHint()); - connect(n_ameE, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotNameChanged(const TQString&))); + connect(n_ameE, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotNameChanged(const TQString&))); setHelp("anc-knode-headers"); slotNameChanged( n_ameE->text() ); @@ -1610,13 +1610,13 @@ KNConfig::ScoringWidget::ScoringWidget( Scoring *d, TQWidget *p, const char *n ) TQLabel *l=new TQLabel(i_gnored, i18n("Default score for &ignored threads:"), this); topL->addWidget(l, 2, 0); topL->addWidget(i_gnored, 2, 1); - connect(i_gnored, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); + connect(i_gnored, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); w_atched=new KIntSpinBox(-100000, 100000, 1, 0, 10, this); l=new TQLabel(w_atched, i18n("Default score for &watched threads:"), this); topL->addWidget(l, 3, 0); topL->addWidget(w_atched, 3, 1); - connect(w_atched, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); + connect(w_atched, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); topL->setColStretch(0, 1); @@ -1658,24 +1658,24 @@ KNConfig::FilterListWidget::FilterListWidget( TQWidget *p, const char *n ) : f_lb=new KNDialogListBox(false, this); topL->addWidget(new TQLabel(f_lb, i18n("&Filters:"),this),0,0); - connect(f_lb, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChangedFilter())); - connect(f_lb, TQT_SIGNAL(selected(int)), TQT_SLOT(slotItemSelectedFilter(int))); + connect(f_lb, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectionChangedFilter())); + connect(f_lb, TQ_SIGNAL(selected(int)), TQ_SLOT(slotItemSelectedFilter(int))); topL->addMultiCellWidget(f_lb,1,5,0,0); a_ddBtn=new TQPushButton(i18n("&Add..."), this); - connect(a_ddBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddBtnClicked())); + connect(a_ddBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddBtnClicked())); topL->addWidget(a_ddBtn,1,1); e_ditBtn=new TQPushButton(i18n("modify something","&Edit..."), this); - connect(e_ditBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditBtnClicked())); + connect(e_ditBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEditBtnClicked())); topL->addWidget(e_ditBtn,2,1); c_opyBtn=new TQPushButton(i18n("Co&py..."), this); - connect(c_opyBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCopyBtnClicked())); + connect(c_opyBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCopyBtnClicked())); topL->addWidget(c_opyBtn,3,1); d_elBtn=new TQPushButton(i18n("&Delete"), this); - connect(d_elBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDelBtnClicked())); + connect(d_elBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDelBtnClicked())); topL->addWidget(d_elBtn,4,1); // == Menu ==================================================== @@ -1683,23 +1683,23 @@ KNConfig::FilterListWidget::FilterListWidget( TQWidget *p, const char *n ) : m_lb=new KNDialogListBox(false, this); topL->addWidget(new TQLabel(m_lb, i18n("&Menu:"),this),6,0); - connect(m_lb, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChangedMenu())); + connect(m_lb, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectionChangedMenu())); topL->addMultiCellWidget(m_lb,7,11,0,0); u_pBtn=new TQPushButton(i18n("&Up"), this); - connect(u_pBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUpBtnClicked())); + connect(u_pBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUpBtnClicked())); topL->addWidget(u_pBtn,7,1); d_ownBtn=new TQPushButton(i18n("Do&wn"), this); - connect(d_ownBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDownBtnClicked())); + connect(d_ownBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDownBtnClicked())); topL->addWidget(d_ownBtn,8,1); s_epAddBtn=new TQPushButton(i18n("Add\n&Separator"), this); - connect(s_epAddBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSepAddBtnClicked())); + connect(s_epAddBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSepAddBtnClicked())); topL->addWidget(s_epAddBtn,9,1); s_epRemBtn=new TQPushButton(i18n("&Remove\nSeparator"), this); - connect(s_epRemBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSepRemBtnClicked())); + connect(s_epRemBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSepRemBtnClicked())); topL->addWidget(s_epRemBtn,10,1); topL->setRowStretch(5,1); @@ -1946,21 +1946,21 @@ KNConfig::PostNewsTechnicalWidget::PostNewsTechnicalWidget( PostNewsTechnical *d c_harset->insertStringList(d->composerCharsets()); ggbL->addWidget(new TQLabel(c_harset, i18n("Cha&rset:"), ggb), 1,0); ggbL->addWidget(c_harset, 1,1); - connect(c_harset, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(c_harset, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); e_ncoding=new TQComboBox(ggb); e_ncoding->insertItem(i18n("Allow 8-bit")); e_ncoding->insertItem(i18n("7-bit (Quoted-Printable)")); ggbL->addWidget(new TQLabel(e_ncoding, i18n("Enco&ding:"), ggb), 2,0); ggbL->addWidget(e_ncoding, 2,1); - connect(e_ncoding, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(e_ncoding, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); u_seOwnCSCB=new TQCheckBox(i18n("Use o&wn default charset when replying"), ggb); ggbL->addMultiCellWidget(u_seOwnCSCB, 3,3, 0,1); - connect(u_seOwnCSCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); + connect(u_seOwnCSCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); g_enMIdCB=new TQCheckBox(i18n("&Generate message-id"), ggb); - connect(g_enMIdCB, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotGenMIdCBToggled(bool))); + connect(g_enMIdCB, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotGenMIdCBToggled(bool))); ggbL->addMultiCellWidget(g_enMIdCB, 4,4, 0,1); h_ost=new KLineEdit(ggb); h_ost->setEnabled(false); @@ -1969,7 +1969,7 @@ KNConfig::PostNewsTechnicalWidget::PostNewsTechnicalWidget( PostNewsTechnical *d ggbL->addWidget(h_ostL, 5,0); ggbL->addWidget(h_ost, 5,1); ggbL->setColStretch(1,1); - connect(h_ost, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed())); + connect(h_ost, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed())); // ==== X-Headers ============================================================= @@ -1980,20 +1980,20 @@ KNConfig::PostNewsTechnicalWidget::PostNewsTechnicalWidget( PostNewsTechnical *d xgbL->addRowSpacing(0, fontMetrics().lineSpacing()-4); l_box=new KNDialogListBox(false, xgb); - connect(l_box, TQT_SIGNAL(selected(int)), TQT_SLOT(slotItemSelected(int))); - connect(l_box, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged())); + connect(l_box, TQ_SIGNAL(selected(int)), TQ_SLOT(slotItemSelected(int))); + connect(l_box, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectionChanged())); xgbL->addMultiCellWidget(l_box, 1,4, 0,0); a_ddBtn=new TQPushButton(i18n("&Add..."), xgb); - connect(a_ddBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddBtnClicked())); + connect(a_ddBtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddBtnClicked())); xgbL->addWidget(a_ddBtn, 1,1); d_elBtn=new TQPushButton(i18n("Dele&te"), xgb); - connect(d_elBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotDelBtnClicked())); + connect(d_elBtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotDelBtnClicked())); xgbL->addWidget(d_elBtn, 2,1); e_ditBtn=new TQPushButton(i18n("modify something","&Edit..."), xgb); - connect(e_ditBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotEditBtnClicked())); + connect(e_ditBtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotEditBtnClicked())); xgbL->addWidget(e_ditBtn, 3,1); TQLabel *placeHolders = new TQLabel(i18n("<qt>Placeholders for replies: <b>%NAME</b>=sender's name, <b>%EMAIL</b>=sender's address</qt>"), xgb); @@ -2001,7 +2001,7 @@ KNConfig::PostNewsTechnicalWidget::PostNewsTechnicalWidget( PostNewsTechnical *d i_ncUaCB=new TQCheckBox(i18n("Do not add the \"&User-Agent\" identification header"), xgb); xgbL->addMultiCellWidget(i_ncUaCB, 6,6, 0,1); - connect(i_ncUaCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); + connect(i_ncUaCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); xgbL->setRowStretch(4,1); xgbL->setColStretch(0,1); @@ -2183,13 +2183,13 @@ KNConfig::PostNewsComposerWidget::PostNewsComposerWidget( PostNewsComposer *d, T generalL->addWidget(w_ordWrapCB,1,0); m_axLen=new KIntSpinBox(20, 200, 1, 20, 10, generalB); generalL->addWidget(m_axLen,1,2); - connect(w_ordWrapCB, TQT_SIGNAL(toggled(bool)), m_axLen, TQT_SLOT(setEnabled(bool))); - connect(w_ordWrapCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(m_axLen, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); + connect(w_ordWrapCB, TQ_SIGNAL(toggled(bool)), m_axLen, TQ_SLOT(setEnabled(bool))); + connect(w_ordWrapCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(m_axLen, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); o_wnSigCB=new TQCheckBox(i18n("Appe&nd signature automatically"), generalB); generalL->addMultiCellWidget(o_wnSigCB,2,2,0,1); - connect(o_wnSigCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); + connect(o_wnSigCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); generalL->setColStretch(1,1); @@ -2205,19 +2205,19 @@ KNConfig::PostNewsComposerWidget::PostNewsComposerWidget( PostNewsComposer *d, T replyL->addMultiCellWidget(new TQLabel(i_ntro,i18n("&Introduction phrase:"), replyB),1,1,0,1); replyL->addMultiCellWidget(i_ntro, 2,2,0,1); replyL->addMultiCellWidget(new TQLabel(i18n("<qt>Placeholders: <b>%NAME</b>=sender's name, <b>%EMAIL</b>=sender's address,<br><b>%DATE</b>=date, <b>%MSID</b>=message-id, <b>%GROUP</b>=group name, <b>%L</b>=line break</qt>"), replyB),3,3,0,1); - connect(i_ntro, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed())); + connect(i_ntro, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed())); r_ewrapCB=new TQCheckBox(i18n("Rewrap quoted te&xt automatically"), replyB); replyL->addMultiCellWidget(r_ewrapCB, 4,4,0,1); - connect(r_ewrapCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); + connect(r_ewrapCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); a_uthSigCB=new TQCheckBox(i18n("Include the a&uthor's signature"), replyB); replyL->addMultiCellWidget(a_uthSigCB, 5,5,0,1); - connect(a_uthSigCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); + connect(a_uthSigCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); c_ursorOnTopCB=new TQCheckBox(i18n("Put the cursor &below the introduction phrase"), replyB); replyL->addMultiCellWidget(c_ursorOnTopCB, 6,6,0,1); - connect(c_ursorOnTopCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); + connect(c_ursorOnTopCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); replyL->setColStretch(1,1); @@ -2233,15 +2233,15 @@ KNConfig::PostNewsComposerWidget::PostNewsComposerWidget( PostNewsComposer *d, T editorL->addWidget(new TQLabel(e_ditor, i18n("Specify edi&tor:"), editorB),1,0); editorL->addWidget(e_ditor,1,1); TQPushButton *btn = new TQPushButton(i18n("Choo&se..."),editorB); - connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotChooseEditor())); - connect(e_ditor, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed())); + connect(btn, TQ_SIGNAL(clicked()), TQ_SLOT(slotChooseEditor())); + connect(e_ditor, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed())); editorL->addWidget(btn,1,2); editorL->addMultiCellWidget(new TQLabel(i18n("%f will be replaced with the filename to edit."), editorB),2,2,0,2); e_xternCB=new TQCheckBox(i18n("Start exte&rnal editor automatically"), editorB); editorL->addMultiCellWidget(e_xternCB, 3,3,0,2); - connect(e_xternCB, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); + connect(e_xternCB, TQ_SIGNAL(clicked()), TQ_SLOT(changed())); editorL->setColStretch(1,1); @@ -2310,7 +2310,7 @@ KNConfig::PostNewsSpellingWidget::PostNewsSpellingWidget( TQWidget *p, const cha c_onf = new KSpellConfig( this, "spell", 0, false ); topL->addWidget(c_onf); - connect(c_onf, TQT_SIGNAL(configChanged()), TQT_SLOT(changed())); + connect(c_onf, TQ_SIGNAL(configChanged()), TQ_SLOT(changed())); topL->addStretch(1); } @@ -2335,7 +2335,7 @@ KNConfig::PrivacyWidget::PrivacyWidget(TQWidget *p, const char *n) : TQBoxLayout *topLayout = new TQVBoxLayout(this, 5); c_onf = new Kpgp::Config(this,"knode pgp config",false); topLayout->addWidget(c_onf); - connect(c_onf, TQT_SIGNAL(changed()), TQT_SLOT(changed())); + connect(c_onf, TQ_SIGNAL(changed()), TQ_SLOT(changed())); topLayout->addStretch(1); @@ -2367,7 +2367,7 @@ KNConfig::GroupCleanupWidget::GroupCleanupWidget( Cleanup *data, TQWidget *paren if (!mData->isGlobal()) { mDefault = new TQCheckBox( i18n("&Use global cleanup configuration"), this ); - connect( mDefault, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotDefaultToggled(bool)) ); + connect( mDefault, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotDefaultToggled(bool)) ); top->addWidget( mDefault ); } @@ -2382,38 +2382,38 @@ KNConfig::GroupCleanupWidget::GroupCleanupWidget( Cleanup *data, TQWidget *paren mExpEnabled = new TQCheckBox( i18n("&Expire old articles automatically"), mExpGroup ); grid->addMultiCellWidget( mExpEnabled, 1, 1, 0, 1 ); - connect( mExpEnabled, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed()) ); + connect( mExpEnabled, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed()) ); mExpDays = new KIntSpinBox( 0, 99999, 1, 0, 10, mExpGroup ); TQLabel *label = new TQLabel( mExpDays, i18n("&Purge groups every:"), mExpGroup ); grid->addWidget( label, 2, 0 ); grid->addWidget( mExpDays, 2, 1, TQt::AlignRight ); - connect( mExpDays, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed()) ); - connect( mExpDays, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(expDaysChanged(int)) ); - connect( mExpEnabled, TQT_SIGNAL(toggled(bool)), label, TQT_SLOT(setEnabled(bool)) ); - connect( mExpEnabled, TQT_SIGNAL(toggled(bool)), mExpDays, TQT_SLOT(setEnabled(bool)) ); + connect( mExpDays, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(changed()) ); + connect( mExpDays, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(expDaysChanged(int)) ); + connect( mExpEnabled, TQ_SIGNAL(toggled(bool)), label, TQ_SLOT(setEnabled(bool)) ); + connect( mExpEnabled, TQ_SIGNAL(toggled(bool)), mExpDays, TQ_SLOT(setEnabled(bool)) ); mExpReadDays = new KIntSpinBox( 0, 99999, 1, 0, 10, mExpGroup ); label = new TQLabel( mExpReadDays, i18n("&Keep read articles:"), mExpGroup ); grid->addWidget( label, 3, 0 ); grid->addWidget( mExpReadDays, 3, 1, TQt::AlignRight ); - connect( mExpReadDays, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed()) ); - connect( mExpReadDays, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(expReadDaysChanged(int)) ); + connect( mExpReadDays, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(changed()) ); + connect( mExpReadDays, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(expReadDaysChanged(int)) ); mExpUnreadDays = new KIntSpinBox( 0, 99999, 1, 0, 10, mExpGroup ); label = new TQLabel( mExpUnreadDays, i18n("Keep u&nread articles:"), mExpGroup ); grid->addWidget( label, 4, 0 ); grid->addWidget( mExpUnreadDays, 4, 1, TQt::AlignRight ); - connect( mExpUnreadDays, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed()) ); - connect( mExpUnreadDays, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(expUnreadDaysChanged(int)) ); + connect( mExpUnreadDays, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(changed()) ); + connect( mExpUnreadDays, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(expUnreadDaysChanged(int)) ); mExpUnavailable = new TQCheckBox( i18n("&Remove articles that are not available on the server"), mExpGroup ); grid->addMultiCellWidget( mExpUnavailable, 5, 5, 0, 1 ); - connect( mExpUnavailable, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed()) ); + connect( mExpUnavailable, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed()) ); mPreserveThreads = new TQCheckBox( i18n("Preser&ve threads"), mExpGroup ); grid->addMultiCellWidget( mPreserveThreads, 6, 6, 0, 1 ); - connect( mPreserveThreads, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed()) ); + connect( mPreserveThreads, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed()) ); grid->setColStretch(1,1); } @@ -2476,7 +2476,7 @@ KNConfig::CleanupWidget::CleanupWidget( TQWidget *p, const char *n ) : mGroupCleanup = new GroupCleanupWidget( d_ata, this ); topL->addWidget( mGroupCleanup ); - connect( mGroupCleanup, TQT_SIGNAL(changed()), TQT_SLOT(changed()) ); + connect( mGroupCleanup, TQ_SIGNAL(changed()), TQ_SLOT(changed()) ); // === folders ========================================================= @@ -2491,15 +2491,15 @@ KNConfig::CleanupWidget::CleanupWidget( TQWidget *p, const char *n ) : foldersL->setRowSpacing( 0, KDialog::spacingHint() ); f_olderCB=new TQCheckBox(i18n("Co&mpact folders automatically"), foldersB); - connect(f_olderCB, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotFolderCBtoggled(bool))); + connect(f_olderCB, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotFolderCBtoggled(bool))); foldersL->addMultiCellWidget(f_olderCB,1,1,0,1); f_olderDays=new KIntSpinBox(0, 99999, 1, 0, 10, foldersB); f_olderDaysL=new TQLabel(f_olderDays,i18n("P&urge folders every:"), foldersB); foldersL->addWidget(f_olderDaysL,2,0); foldersL->addWidget(f_olderDays,2,1,TQt::AlignRight); - connect(f_olderDays, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - connect(f_olderDays, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotFolderDaysChanged(int))); + connect(f_olderDays, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); + connect(f_olderDays, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotFolderDaysChanged(int))); foldersL->setColStretch(1,1); diff --git a/knode/knconvert.cpp b/knode/knconvert.cpp index 20a63ffa..c8325f64 100644 --- a/knode/knconvert.cpp +++ b/knode/knconvert.cpp @@ -61,8 +61,8 @@ KNConvert::KNConvert(const TQString &version) c_ancelBtn=new KPushButton(KStdGuiItem::cancel(), this); btnL->addWidget(c_ancelBtn); - connect(s_tartBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStart())); - connect(c_ancelBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject())); + connect(s_tartBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStart())); + connect(c_ancelBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject())); w_1=new TQWidget(s_tack); s_tack->addWidget(w_1, 1); @@ -78,7 +78,7 @@ will be created before the conversion starts.").arg(KNODE_VERSION), w_1); c_reateBkup=new TQCheckBox(i18n("Create backup of old data"), w_1); w1L->addMultiCellWidget(c_reateBkup, 2,2, 0,2); - connect(c_reateBkup, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotCreateBkupToggled(bool))); + connect(c_reateBkup, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotCreateBkupToggled(bool))); b_ackupPathLabel=new TQLabel(i18n("Save backup in:"), w_1); w1L->addWidget(b_ackupPathLabel, 3,0); @@ -87,7 +87,7 @@ will be created before the conversion starts.").arg(KNODE_VERSION), w_1); w1L->addWidget(b_ackupPath, 3,1); b_rowseBtn= new TQPushButton(i18n("Browse..."), w_1); - connect(b_rowseBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBrowse())); + connect(b_rowseBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotBrowse())); w1L->addWidget(b_rowseBtn, 3,2); w1L->setColStretch(1,1); w1L->addRowSpacing(1,15); @@ -177,7 +177,7 @@ void KNConvert::slotStart() *t_ar << "tar"; *t_ar << "-cz" << dataDir << "-f" << b_ackupPath->text(); - connect(t_ar, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotTarExited(TDEProcess*))); + connect(t_ar, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotTarExited(TDEProcess*))); if(!t_ar->start()) { delete t_ar; t_ar = 0; diff --git a/knode/knfilterdialog.cpp b/knode/knfilterdialog.cpp index 6a0e972a..b8471e6b 100644 --- a/knode/knfilterdialog.cpp +++ b/knode/knfilterdialog.cpp @@ -78,7 +78,7 @@ KNFilterDialog::KNFilterDialog(KNArticleFilter *f, TQWidget *parent, const char KNHelper::restoreWindowSize("filterDLG", this, sizeHint()); setHelp("anc-using-filters"); - connect( fname, TQT_SIGNAL( textChanged ( const TQString & )), this, TQT_SLOT( slotTextChanged( const TQString & ))); + connect( fname, TQ_SIGNAL( textChanged ( const TQString & )), this, TQ_SLOT( slotTextChanged( const TQString & ))); slotTextChanged( fname->text() ); } diff --git a/knode/knfiltermanager.cpp b/knode/knfiltermanager.cpp index eee045c2..a80853ea 100644 --- a/knode/knfiltermanager.cpp +++ b/knode/knfiltermanager.cpp @@ -34,7 +34,7 @@ KNFilterSelectAction::KNFilterSelectAction( const TQString& text, const TQString : TDEActionMenu(text,pix,parent,name), currentItem(-42) { popupMenu()->setCheckable(true); - connect(popupMenu(),TQT_SIGNAL(activated(int)),this,TQT_SLOT(slotMenuActivated(int))); + connect(popupMenu(),TQ_SIGNAL(activated(int)),this,TQ_SLOT(slotMenuActivated(int))); setDelayed(false); } @@ -383,10 +383,10 @@ void KNFilterManager::setMenuAction(KNFilterSelectAction *a, TDEAction *keybA) { if(a) { a_ctFilter = a; - connect(a_ctFilter, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuActivated(int))); + connect(a_ctFilter, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMenuActivated(int))); } if(keybA) - connect(keybA, TQT_SIGNAL(activated()), this, TQT_SLOT(slotShowFilterChooser())); + connect(keybA, TQ_SIGNAL(activated()), this, TQ_SLOT(slotShowFilterChooser())); updateMenu(); } diff --git a/knode/kngroupbrowser.cpp b/knode/kngroupbrowser.cpp index bafa065c..865dbd20 100644 --- a/knode/kngroupbrowser.cpp +++ b/knode/kngroupbrowser.cpp @@ -87,8 +87,8 @@ KNGroupBrowser::KNGroupBrowser(TQWidget *parent, const TQString &caption, KNNntp groupView->addColumn(i18n("Description")); groupView->setTreeStepSize(15); - connect(groupView, TQT_SIGNAL(doubleClicked(TQListViewItem*)), - this, TQT_SLOT(slotItemDoubleClicked(TQListViewItem*))); + connect(groupView, TQ_SIGNAL(doubleClicked(TQListViewItem*)), + this, TQ_SLOT(slotItemDoubleClicked(TQListViewItem*))); //layout TQGridLayout *topL=new TQGridLayout(page,3,1,0,5); @@ -119,22 +119,22 @@ KNGroupBrowser::KNGroupBrowser(TQWidget *parent, const TQString &caption, KNNntp arrL->addWidget(arrowBtn2, AlignCenter); //connect - connect(filterEdit, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(slotFilterTextChanged(const TQString&))); - connect(groupView, TQT_SIGNAL(expanded(TQListViewItem*)), - TQT_SLOT(slotItemExpand(TQListViewItem*))); + connect(filterEdit, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(slotFilterTextChanged(const TQString&))); + connect(groupView, TQ_SIGNAL(expanded(TQListViewItem*)), + TQ_SLOT(slotItemExpand(TQListViewItem*))); - connect(refilterTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotRefilter())); - connect(noTreeCB, TQT_SIGNAL(clicked()), TQT_SLOT(slotTreeCBToggled())); - connect(subCB, TQT_SIGNAL(clicked()), TQT_SLOT(slotSubCBToggled())); - connect(newCB, TQT_SIGNAL(clicked()), TQT_SLOT(slotNewCBToggled())); + connect(refilterTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotRefilter())); + connect(noTreeCB, TQ_SIGNAL(clicked()), TQ_SLOT(slotTreeCBToggled())); + connect(subCB, TQ_SIGNAL(clicked()), TQ_SLOT(slotSubCBToggled())); + connect(newCB, TQ_SIGNAL(clicked()), TQ_SLOT(slotNewCBToggled())); enableButton(User1,false); enableButton(User2,false); filterEdit->setFocus(); - TQTimer::singleShot(2, this, TQT_SLOT(slotLoadList())); + TQTimer::singleShot(2, this, TQ_SLOT(slotLoadList())); } @@ -301,7 +301,7 @@ void KNGroupBrowser::slotItemExpand(TQListViewItem *it) { groupView->ensureVisible(groupView->contentsX(), y+h/2, 0, h/2); delayedCenter = y+h/2; - TQTimer::singleShot(300, this, TQT_SLOT(slotCenterDelayed())); + TQTimer::singleShot(300, this, TQ_SLOT(slotCenterDelayed())); } } diff --git a/knode/kngroupdialog.cpp b/knode/kngroupdialog.cpp index 19bbad34..0fe1e7db 100644 --- a/knode/kngroupdialog.cpp +++ b/knode/kngroupdialog.cpp @@ -51,17 +51,17 @@ KNGroupDialog::KNGroupDialog(TQWidget *parent, KNNntpAccount *a) : dir1=right; dir2=left; - connect(groupView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(slotItemSelected(TQListViewItem*))); - connect(groupView, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotSelectionChanged())); - connect(subView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(slotItemSelected(TQListViewItem*))); - connect(unsubView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(slotItemSelected(TQListViewItem*))); - - connect(arrowBtn1, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotArrowBtn1())); - connect(arrowBtn2, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotArrowBtn2())); + connect(groupView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(slotItemSelected(TQListViewItem*))); + connect(groupView, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotSelectionChanged())); + connect(subView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(slotItemSelected(TQListViewItem*))); + connect(unsubView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(slotItemSelected(TQListViewItem*))); + + connect(arrowBtn1, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotArrowBtn1())); + connect(arrowBtn2, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotArrowBtn2())); KNHelper::restoreWindowSize("groupDlg", this, TQSize(662,393)); // optimized for 800x600 @@ -293,7 +293,7 @@ void KNGroupDialog::slotUser2() TQLabel *l = new TQLabel(TDEGlobal::locale()->formatDate(lastDate, false),btnGrp); topL->addWidget(l, 1, 1, TQt::AlignLeft); - connect(takeLast, TQT_SIGNAL(toggled(bool)), l, TQT_SLOT(setEnabled(bool))); + connect(takeLast, TQ_SIGNAL(toggled(bool)), l, TQ_SLOT(setEnabled(bool))); TQRadioButton *takeCustom = new TQRadioButton( i18n("Created since this date:"), btnGrp ); topL->addMultiCellWidget(takeCustom, 2, 2, 0, 1); @@ -302,7 +302,7 @@ void KNGroupDialog::slotUser2() dateSel->setMinimumSize(dateSel->sizeHint()); topL->addWidget(dateSel, 3, 1, TQt::AlignLeft); - connect(takeCustom, TQT_SIGNAL(toggled(bool)), dateSel, TQT_SLOT(setEnabled(bool))); + connect(takeCustom, TQ_SIGNAL(toggled(bool)), dateSel, TQ_SLOT(setEnabled(bool))); takeLast->setChecked(true); dateSel->setEnabled(false); diff --git a/knode/kngroupmanager.cpp b/knode/kngroupmanager.cpp index d2d21762..e4c7aed6 100644 --- a/knode/kngroupmanager.cpp +++ b/knode/kngroupmanager.cpp @@ -418,10 +418,10 @@ void KNGroupManager::showGroupDialog(KNNntpAccount *a, TQWidget *parent) { KNGroupDialog* gDialog=new KNGroupDialog((parent!=0)? parent:knGlobals.topWidget, a); - connect(gDialog, TQT_SIGNAL(loadList(KNNntpAccount*)), this, TQT_SLOT(slotLoadGroupList(KNNntpAccount*))); - connect(gDialog, TQT_SIGNAL(fetchList(KNNntpAccount*)), this, TQT_SLOT(slotFetchGroupList(KNNntpAccount*))); - connect(gDialog, TQT_SIGNAL(checkNew(KNNntpAccount*,TQDate)), this, TQT_SLOT(slotCheckForNewGroups(KNNntpAccount*,TQDate))); - connect(this, TQT_SIGNAL(newListReady(KNGroupListData*)), gDialog, TQT_SLOT(slotReceiveList(KNGroupListData*))); + connect(gDialog, TQ_SIGNAL(loadList(KNNntpAccount*)), this, TQ_SLOT(slotLoadGroupList(KNNntpAccount*))); + connect(gDialog, TQ_SIGNAL(fetchList(KNNntpAccount*)), this, TQ_SLOT(slotFetchGroupList(KNNntpAccount*))); + connect(gDialog, TQ_SIGNAL(checkNew(KNNntpAccount*,TQDate)), this, TQ_SLOT(slotCheckForNewGroups(KNNntpAccount*,TQDate))); + connect(this, TQ_SIGNAL(newListReady(KNGroupListData*)), gDialog, TQ_SLOT(slotReceiveList(KNGroupListData*))); if(gDialog->exec()) { KNGroup *g=0; diff --git a/knode/kngrouppropdlg.cpp b/knode/kngrouppropdlg.cpp index a6a90578..5a7f5200 100644 --- a/knode/kngrouppropdlg.cpp +++ b/knode/kngrouppropdlg.cpp @@ -62,7 +62,7 @@ KNGroupPropDlg::KNGroupPropDlg(KNGroup *group, TQWidget *parent, const char *nam c_harset->insertStringList(knGlobals.configManager()->postNewsTechnical()->composerCharsets()); c_harset->setCurrentItem(knGlobals.configManager()->postNewsTechnical()->indexForCharset(g_rp->defaultCharset())); c_harset->setEnabled(g_rp->useCharset()); - connect(u_seCharset, TQT_SIGNAL(toggled(bool)), c_harset, TQT_SLOT(setEnabled(bool))); + connect(u_seCharset, TQ_SIGNAL(toggled(bool)), c_harset, TQ_SLOT(setEnabled(bool))); grpL->addWidget(c_harset, 2,2); grpL->setColStretch(1,1); diff --git a/knode/kngroupselectdialog.cpp b/knode/kngroupselectdialog.cpp index 07f118c8..10374d6d 100644 --- a/knode/kngroupselectdialog.cpp +++ b/knode/kngroupselectdialog.cpp @@ -44,14 +44,14 @@ KNGroupSelectDialog::KNGroupSelectDialog(TQWidget *parent, KNNntpAccount *a, con new GroupItem(selView, info); } - connect(selView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(slotItemSelected(TQListViewItem*))); - connect(groupView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(slotItemSelected(TQListViewItem*))); - connect(groupView, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotSelectionChanged())); - connect(arrowBtn1, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotArrowBtn1())); - connect(arrowBtn2, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotArrowBtn2())); + connect(selView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(slotItemSelected(TQListViewItem*))); + connect(groupView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(slotItemSelected(TQListViewItem*))); + connect(groupView, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotSelectionChanged())); + connect(arrowBtn1, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotArrowBtn1())); + connect(arrowBtn2, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotArrowBtn2())); KNHelper::restoreWindowSize("groupSelDlg", this, TQSize(659,364)); // optimized for 800x600 } diff --git a/knode/knjobdata.cpp b/knode/knjobdata.cpp index 7d4ac912..74d98a85 100644 --- a/knode/knjobdata.cpp +++ b/knode/knjobdata.cpp @@ -105,10 +105,10 @@ void KNJobData::setJob( TDEIO::Job *job ) { mJob = job; if ( job ) { - connect( job, TQT_SIGNAL( percent(TDEIO::Job*, unsigned long) ), - TQT_SLOT( slotJobPercent(TDEIO::Job*, unsigned long) ) ); - connect( job, TQT_SIGNAL( infoMessage(TDEIO::Job*, const TQString&) ), - TQT_SLOT( slotJobInfoMessage(TDEIO::Job*, const TQString&) ) ); + connect( job, TQ_SIGNAL( percent(TDEIO::Job*, unsigned long) ), + TQ_SLOT( slotJobPercent(TDEIO::Job*, unsigned long) ) ); + connect( job, TQ_SIGNAL( infoMessage(TDEIO::Job*, const TQString&) ), + TQ_SLOT( slotJobInfoMessage(TDEIO::Job*, const TQString&) ) ); } } diff --git a/knode/knmainwidget.cpp b/knode/knmainwidget.cpp index 19baa926..35f976c4 100644 --- a/knode/knmainwidget.cpp +++ b/knode/knmainwidget.cpp @@ -106,9 +106,9 @@ KNMainWidget::KNMainWidget( KXMLGUIClient* client, bool detachable, TQWidget* pa //setView(a_rtDock); setMainDockWidget(a_rtDock); - connect(a_rtDock, TQT_SIGNAL(iMBeingClosed()), TQT_SLOT(slotArticleDockHidden())); - connect(a_rtDock, TQT_SIGNAL(hasUndocked()), TQT_SLOT(slotArticleDockHidden())); - connect( mArticleViewer, TQT_SIGNAL(focusChangeRequest(TQWidget*)), TQT_SLOT(slotDockWidgetFocusChangeRequest(TQWidget*)) ); + connect(a_rtDock, TQ_SIGNAL(iMBeingClosed()), TQ_SLOT(slotArticleDockHidden())); + connect(a_rtDock, TQ_SIGNAL(hasUndocked()), TQ_SLOT(slotArticleDockHidden())); + connect( mArticleViewer, TQ_SIGNAL(focusChangeRequest(TQWidget*)), TQ_SLOT(slotDockWidgetFocusChangeRequest(TQWidget*)) ); //collection view c_olDock = createDockWidget("group_view", UserIcon("group"), 0, @@ -123,22 +123,22 @@ KNMainWidget::KNMainWidget( KXMLGUIClient* client, bool detachable, TQWidget* pa c_olDock->setWidget(c_olView); c_olDock->manualDock(a_rtDock, KDockWidget::DockLeft, 3000); - connect(c_olDock, TQT_SIGNAL(iMBeingClosed()), TQT_SLOT(slotGroupDockHidden())); - connect(c_olDock, TQT_SIGNAL(hasUndocked()), TQT_SLOT(slotGroupDockHidden())); - connect(c_olView, TQT_SIGNAL(focusChangeRequest(TQWidget *)), TQT_SLOT(slotDockWidgetFocusChangeRequest(TQWidget *))); - connect(c_olView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - TQT_SLOT(slotCollectionSelected(TQListViewItem*))); - connect(c_olView, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - TQT_SLOT(slotCollectionRMB(TDEListView*, TQListViewItem*, const TQPoint&))); - connect(c_olView, TQT_SIGNAL(folderDrop(TQDropEvent*, KNCollectionViewItem*)), - TQT_SLOT(slotCollectionViewDrop(TQDropEvent*, KNCollectionViewItem*))); - connect(c_olView, TQT_SIGNAL(itemRenamed(TQListViewItem*)), - TQT_SLOT(slotCollectionRenamed(TQListViewItem*))); - - accel->connectItem( accel->insertItem(Key_Up), mArticleViewer, TQT_SLOT(scrollUp()) ); - accel->connectItem( accel->insertItem(Key_Down), mArticleViewer, TQT_SLOT(scrollDown()) ); - accel->connectItem( accel->insertItem(Key_Prior), mArticleViewer, TQT_SLOT(scrollPrior()) ); - accel->connectItem( accel->insertItem(Key_Next), mArticleViewer, TQT_SLOT(scrollNext()) ); + connect(c_olDock, TQ_SIGNAL(iMBeingClosed()), TQ_SLOT(slotGroupDockHidden())); + connect(c_olDock, TQ_SIGNAL(hasUndocked()), TQ_SLOT(slotGroupDockHidden())); + connect(c_olView, TQ_SIGNAL(focusChangeRequest(TQWidget *)), TQ_SLOT(slotDockWidgetFocusChangeRequest(TQWidget *))); + connect(c_olView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + TQ_SLOT(slotCollectionSelected(TQListViewItem*))); + connect(c_olView, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + TQ_SLOT(slotCollectionRMB(TDEListView*, TQListViewItem*, const TQPoint&))); + connect(c_olView, TQ_SIGNAL(folderDrop(TQDropEvent*, KNCollectionViewItem*)), + TQ_SLOT(slotCollectionViewDrop(TQDropEvent*, KNCollectionViewItem*))); + connect(c_olView, TQ_SIGNAL(itemRenamed(TQListViewItem*)), + TQ_SLOT(slotCollectionRenamed(TQListViewItem*))); + + accel->connectItem( accel->insertItem(Key_Up), mArticleViewer, TQ_SLOT(scrollUp()) ); + accel->connectItem( accel->insertItem(Key_Down), mArticleViewer, TQ_SLOT(scrollDown()) ); + accel->connectItem( accel->insertItem(Key_Prior), mArticleViewer, TQ_SLOT(scrollPrior()) ); + accel->connectItem( accel->insertItem(Key_Next), mArticleViewer, TQ_SLOT(scrollNext()) ); //header view h_drDock = createDockWidget("header_view", SmallIcon("text_block"), 0, @@ -171,25 +171,25 @@ KNMainWidget::KNMainWidget( KXMLGUIClient* client, bool detachable, TQWidget* pa s_earchLineEdit = new TDEListViewSearchLine(q_uicksearch, h_drView, "TDEListViewSearchLine"); q_uicksearch->setStretchableWidget(s_earchLineEdit); lbl->setBuddy(s_earchLineEdit); - connect( resetQuickSearch, TQT_SIGNAL( activated() ), s_earchLineEdit, TQT_SLOT( clear() )); + connect( resetQuickSearch, TQ_SIGNAL( activated() ), s_earchLineEdit, TQ_SLOT( clear() )); vlay->addWidget(q_uicksearch); vlay->addWidget(h_drView); - connect(h_drDock, TQT_SIGNAL(iMBeingClosed()), TQT_SLOT(slotHeaderDockHidden())); - connect(h_drDock, TQT_SIGNAL(hasUndocked()), TQT_SLOT(slotHeaderDockHidden())); - connect(h_drView, TQT_SIGNAL(focusChangeRequest(TQWidget *)), - TQT_SLOT(slotDockWidgetFocusChangeRequest(TQWidget *))); - connect(h_drView, TQT_SIGNAL(itemSelected(TQListViewItem*)), - TQT_SLOT(slotArticleSelected(TQListViewItem*))); - connect(h_drView, TQT_SIGNAL(selectionChanged()), - TQT_SLOT(slotArticleSelectionChanged())); - connect(h_drView, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - TQT_SLOT(slotArticleRMB(TDEListView*, TQListViewItem*, const TQPoint&))); - connect(h_drView, TQT_SIGNAL(doubleClick(TQListViewItem *)), - TQT_SLOT(slotOpenArticle(TQListViewItem *))); - connect(h_drView, TQT_SIGNAL(sortingChanged(int)), - TQT_SLOT(slotHdrViewSortingChanged(int))); + connect(h_drDock, TQ_SIGNAL(iMBeingClosed()), TQ_SLOT(slotHeaderDockHidden())); + connect(h_drDock, TQ_SIGNAL(hasUndocked()), TQ_SLOT(slotHeaderDockHidden())); + connect(h_drView, TQ_SIGNAL(focusChangeRequest(TQWidget *)), + TQ_SLOT(slotDockWidgetFocusChangeRequest(TQWidget *))); + connect(h_drView, TQ_SIGNAL(itemSelected(TQListViewItem*)), + TQ_SLOT(slotArticleSelected(TQListViewItem*))); + connect(h_drView, TQ_SIGNAL(selectionChanged()), + TQ_SLOT(slotArticleSelectionChanged())); + connect(h_drView, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + TQ_SLOT(slotArticleRMB(TDEListView*, TQListViewItem*, const TQPoint&))); + connect(h_drView, TQ_SIGNAL(doubleClick(TQListViewItem *)), + TQ_SLOT(slotOpenArticle(TQListViewItem *))); + connect(h_drView, TQ_SIGNAL(sortingChanged(int)), + TQ_SLOT(slotHdrViewSortingChanged(int))); //actions initActions(); @@ -200,7 +200,7 @@ KNMainWidget::KNMainWidget( KXMLGUIClient* client, bool detachable, TQWidget* pa //Network n_etAccess = knGlobals.netAccess(); - connect(n_etAccess, TQT_SIGNAL(netActive(bool)), this, TQT_SLOT(slotNetworkActive(bool))); + connect(n_etAccess, TQ_SIGNAL(netActive(bool)), this, TQ_SLOT(slotNetworkActive(bool))); //Filter Manager f_ilManager = knGlobals.filterManager(); @@ -225,8 +225,8 @@ KNMainWidget::KNMainWidget( KXMLGUIClient* client, bool detachable, TQWidget* pa // Score Manager s_coreManager = knGlobals.scoringManager(); - //connect(s_coreManager, TQT_SIGNAL(changedRules()), TQT_SLOT(slotReScore())); - connect(s_coreManager, TQT_SIGNAL(finishedEditing()), TQT_SLOT(slotReScore())); + //connect(s_coreManager, TQ_SIGNAL(changedRules()), TQ_SLOT(slotReScore())); + connect(s_coreManager, TQ_SIGNAL(finishedEditing()), TQ_SLOT(slotReScore())); // Memory Manager m_emManager = knGlobals.memoryManager(); @@ -551,113 +551,113 @@ void KNMainWidget::initActions() //navigation a_ctNavNextArt = new TDEAction( KGuiItem(i18n("&Next Article"), "go-next", i18n("Go to next article")), "N;Right", h_drView, - TQT_SLOT(nextArticle()), actionCollection(), "go_nextArticle" ); + TQ_SLOT(nextArticle()), actionCollection(), "go_nextArticle" ); a_ctNavPrevArt = new TDEAction( KGuiItem(i18n("&Previous Article"), "go-previous", i18n("Go to previous article")), "P;Left" , h_drView, - TQT_SLOT(prevArticle()), actionCollection(), "go_prevArticle" ); + TQ_SLOT(prevArticle()), actionCollection(), "go_prevArticle" ); a_ctNavNextUnreadArt = new TDEAction(i18n("Next Unread &Article"), "1rightarrow", ALT+SHIFT+Key_Space , this, - TQT_SLOT(slotNavNextUnreadArt()), actionCollection(), "go_nextUnreadArticle"); + TQ_SLOT(slotNavNextUnreadArt()), actionCollection(), "go_nextUnreadArticle"); a_ctNavNextUnreadThread = new TDEAction(i18n("Next Unread &Thread"),"2rightarrow", SHIFT+Key_Space , this, - TQT_SLOT(slotNavNextUnreadThread()), actionCollection(), "go_nextUnreadThread"); + TQ_SLOT(slotNavNextUnreadThread()), actionCollection(), "go_nextUnreadThread"); a_ctNavNextGroup = new TDEAction(i18n("Ne&xt Group"), "go-down", Key_Plus , c_olView, - TQT_SLOT(nextGroup()), actionCollection(), "go_nextGroup"); + TQ_SLOT(nextGroup()), actionCollection(), "go_nextGroup"); a_ctNavPrevGroup = new TDEAction(i18n("Pre&vious Group"), "go-up", Key_Minus , c_olView, - TQT_SLOT(prevGroup()), actionCollection(), "go_prevGroup"); + TQ_SLOT(prevGroup()), actionCollection(), "go_prevGroup"); a_ctNavReadThrough = new TDEAction(i18n("Read &Through Articles"), Key_Space , this, - TQT_SLOT(slotNavReadThrough()), actionCollection(), "go_readThrough"); + TQ_SLOT(slotNavReadThrough()), actionCollection(), "go_readThrough"); a_ctNavReadThrough->plugAccel(a_ccel); TQAccel *accel = new TQAccel( this ); new TDEAction( i18n("Focus on Next Folder"), CTRL+Key_Right, c_olView, - TQT_SLOT(incCurrentFolder()), actionCollection(), "inc_current_folder" ); + TQ_SLOT(incCurrentFolder()), actionCollection(), "inc_current_folder" ); accel->connectItem(accel->insertItem(CTRL+Key_Right), - c_olView, TQT_SLOT(incCurrentFolder())); + c_olView, TQ_SLOT(incCurrentFolder())); new TDEAction( i18n("Focus on Previous Folder"), CTRL+Key_Left, c_olView, - TQT_SLOT(decCurrentFolder()), actionCollection(), "dec_current_folder" ); + TQ_SLOT(decCurrentFolder()), actionCollection(), "dec_current_folder" ); accel->connectItem(accel->insertItem(CTRL+Key_Left), - c_olView, TQT_SLOT(decCurrentFolder())); + c_olView, TQ_SLOT(decCurrentFolder())); new TDEAction( i18n("Select Folder with Focus"), CTRL+Key_Space, c_olView, - TQT_SLOT(selectCurrentFolder()), actionCollection(), "select_current_folder" ); + TQ_SLOT(selectCurrentFolder()), actionCollection(), "select_current_folder" ); accel->connectItem(accel->insertItem(CTRL+Key_Space), - c_olView, TQT_SLOT(selectCurrentFolder())); + c_olView, TQ_SLOT(selectCurrentFolder())); new TDEAction( i18n("Focus on Next Article"), ALT+Key_Right, h_drView, - TQT_SLOT(incCurrentArticle()), actionCollection(), "inc_current_article" ); + TQ_SLOT(incCurrentArticle()), actionCollection(), "inc_current_article" ); accel->connectItem( accel->insertItem(ALT+Key_Right), - h_drView, TQT_SLOT(incCurrentArticle()) ); + h_drView, TQ_SLOT(incCurrentArticle()) ); new TDEAction( i18n("Focus on Previous Article"), ALT+Key_Left, h_drView, - TQT_SLOT(decCurrentArticle()), actionCollection(), "dec_current_article" ); + TQ_SLOT(decCurrentArticle()), actionCollection(), "dec_current_article" ); accel->connectItem( accel->insertItem(ALT+Key_Left), - h_drView, TQT_SLOT(decCurrentArticle()) ); + h_drView, TQ_SLOT(decCurrentArticle()) ); new TDEAction( i18n("Select Article with Focus"), ALT+Key_Space, h_drView, - TQT_SLOT(selectCurrentArticle()), actionCollection(), "select_current_article" ); + TQ_SLOT(selectCurrentArticle()), actionCollection(), "select_current_article" ); accel->connectItem( accel->insertItem(ALT+Key_Space), - h_drView, TQT_SLOT(selectCurrentArticle()) ); + h_drView, TQ_SLOT(selectCurrentArticle()) ); //collection-view - accounts a_ctAccProperties = new TDEAction(i18n("Account &Properties"), "configure", 0, this, - TQT_SLOT(slotAccProperties()), actionCollection(), "account_properties"); + TQ_SLOT(slotAccProperties()), actionCollection(), "account_properties"); a_ctAccRename = new TDEAction(i18n("&Rename Account"), "text", 0, this, - TQT_SLOT(slotAccRename()), actionCollection(), "account_rename"); + TQ_SLOT(slotAccRename()), actionCollection(), "account_rename"); a_ctAccSubscribe = new TDEAction(i18n("&Subscribe to Newsgroups..."), "news_subscribe", 0, this, - TQT_SLOT(slotAccSubscribe()), actionCollection(), "account_subscribe"); + TQ_SLOT(slotAccSubscribe()), actionCollection(), "account_subscribe"); a_ctAccExpireAll = new TDEAction(i18n("&Expire All Groups"), 0, this, - TQT_SLOT(slotAccExpireAll()), actionCollection(), "account_expire_all"); + TQ_SLOT(slotAccExpireAll()), actionCollection(), "account_expire_all"); a_ctAccGetNewHdrs = new TDEAction(i18n("&Get New Articles in All Groups"), "mail_get", 0, this, - TQT_SLOT(slotAccGetNewHdrs()), actionCollection(), "account_dnlHeaders"); + TQ_SLOT(slotAccGetNewHdrs()), actionCollection(), "account_dnlHeaders"); a_ctAccGetNewHdrsAll = new TDEAction(i18n("&Get New Articles in All Accounts"), "mail_get_all", 0, this, - TQT_SLOT(slotAccGetNewHdrsAll()), actionCollection(), "account_dnlAllHeaders"); + TQ_SLOT(slotAccGetNewHdrsAll()), actionCollection(), "account_dnlAllHeaders"); a_ctAccDelete = new TDEAction(i18n("&Delete Account"), "edit-delete", 0, this, - TQT_SLOT(slotAccDelete()), actionCollection(), "account_delete"); + TQ_SLOT(slotAccDelete()), actionCollection(), "account_delete"); a_ctAccPostNewArticle = new TDEAction(i18n("&Post to Newsgroup..."), "mail-message-new", CTRL+Key_N, this, - TQT_SLOT(slotAccPostNewArticle()), actionCollection(), "article_postNew"); + TQ_SLOT(slotAccPostNewArticle()), actionCollection(), "article_postNew"); //collection-view - groups a_ctGrpProperties = new TDEAction(i18n("Group &Properties"), "configure", 0, this, - TQT_SLOT(slotGrpProperties()), actionCollection(), "group_properties"); + TQ_SLOT(slotGrpProperties()), actionCollection(), "group_properties"); a_ctGrpRename = new TDEAction(i18n("Rename &Group"), "text", 0, this, - TQT_SLOT(slotGrpRename()), actionCollection(), "group_rename"); + TQ_SLOT(slotGrpRename()), actionCollection(), "group_rename"); a_ctGrpGetNewHdrs = new TDEAction(i18n("&Get New Articles"), "mail_get" , 0, this, - TQT_SLOT(slotGrpGetNewHdrs()), actionCollection(), "group_dnlHeaders"); + TQ_SLOT(slotGrpGetNewHdrs()), actionCollection(), "group_dnlHeaders"); a_ctGrpExpire = new TDEAction(i18n("E&xpire Group"), "wizard", 0, this, - TQT_SLOT(slotGrpExpire()), actionCollection(), "group_expire"); + TQ_SLOT(slotGrpExpire()), actionCollection(), "group_expire"); a_ctGrpReorganize = new TDEAction(i18n("Re&organize Group"), 0, this, - TQT_SLOT(slotGrpReorganize()), actionCollection(), "group_reorg"); + TQ_SLOT(slotGrpReorganize()), actionCollection(), "group_reorg"); a_ctGrpUnsubscribe = new TDEAction(i18n("&Unsubscribe From Group"), "news_unsubscribe", 0, this, - TQT_SLOT(slotGrpUnsubscribe()), actionCollection(), "group_unsubscribe"); + TQ_SLOT(slotGrpUnsubscribe()), actionCollection(), "group_unsubscribe"); a_ctGrpSetAllRead = new TDEAction(i18n("Mark All as &Read"), "goto", 0, this, - TQT_SLOT(slotGrpSetAllRead()), actionCollection(), "group_allRead"); + TQ_SLOT(slotGrpSetAllRead()), actionCollection(), "group_allRead"); a_ctGrpSetAllUnread = new TDEAction(i18n("Mark All as U&nread"), 0, this, - TQT_SLOT(slotGrpSetAllUnread()), actionCollection(), "group_allUnread"); + TQ_SLOT(slotGrpSetAllUnread()), actionCollection(), "group_allUnread"); a_ctGrpSetUnread = new TDEAction(i18n("Mark Last as Unr&ead..."), 0, this, - TQT_SLOT(slotGrpSetUnread()), actionCollection(), "group_unread"); + TQ_SLOT(slotGrpSetUnread()), actionCollection(), "group_unread"); (void) new TDEAction( i18n("&Configure KNode..."), "configure", 0, this, - TQT_SLOT(slotSettings()), actionCollection(), + TQ_SLOT(slotSettings()), actionCollection(), "knode_configure_knode" ); //collection-view - folder a_ctFolNew = new TDEAction(i18n("&New Folder"), "folder-new", 0, this, - TQT_SLOT(slotFolNew()), actionCollection(), "folder-new"); + TQ_SLOT(slotFolNew()), actionCollection(), "folder-new"); a_ctFolNewChild = new TDEAction(i18n("New &Subfolder"), "folder-new", 0, this, - TQT_SLOT(slotFolNewChild()), actionCollection(), "folder_newChild"); + TQ_SLOT(slotFolNewChild()), actionCollection(), "folder_newChild"); a_ctFolDelete = new TDEAction(i18n("&Delete Folder"), "edit-delete", 0, this, - TQT_SLOT(slotFolDelete()), actionCollection(), "folder_delete"); + TQ_SLOT(slotFolDelete()), actionCollection(), "folder_delete"); a_ctFolRename = new TDEAction(i18n("&Rename Folder"), "text", 0, this, - TQT_SLOT(slotFolRename()), actionCollection(), "folder_rename"); + TQ_SLOT(slotFolRename()), actionCollection(), "folder_rename"); a_ctFolCompact = new TDEAction(i18n("C&ompact Folder"), "wizard", 0, this, - TQT_SLOT(slotFolCompact()), actionCollection(), "folder_compact"); + TQ_SLOT(slotFolCompact()), actionCollection(), "folder_compact"); a_ctFolCompactAll = new TDEAction(i18n("Co&mpact All Folders"), 0, this, - TQT_SLOT(slotFolCompactAll()), actionCollection(), "folder_compact_all"); + TQ_SLOT(slotFolCompactAll()), actionCollection(), "folder_compact_all"); a_ctFolEmpty = new TDEAction(i18n("&Empty Folder"), 0, this, - TQT_SLOT(slotFolEmpty()), actionCollection(), "folder_empty"); + TQ_SLOT(slotFolEmpty()), actionCollection(), "folder_empty"); a_ctFolMboxImport = new TDEAction(i18n("&Import MBox Folder..."), 0, this, - TQT_SLOT(slotFolMBoxImport()), actionCollection(), "folder_MboxImport"); + TQ_SLOT(slotFolMBoxImport()), actionCollection(), "folder_MboxImport"); a_ctFolMboxExport = new TDEAction(i18n("E&xport as MBox Folder..."), 0, this, - TQT_SLOT(slotFolMBoxExport()), actionCollection(), "folder_MboxExport"); + TQ_SLOT(slotFolMBoxExport()), actionCollection(), "folder_MboxExport"); //header-view - list-handling a_ctArtSortHeaders = new TDESelectAction(i18n("S&ort"), 0, actionCollection(), "view_Sort"); @@ -669,9 +669,9 @@ void KNMainWidget::initActions() items += i18n("By &Date"); a_ctArtSortHeaders->setItems(items); a_ctArtSortHeaders->setShortcutConfigurable(false); - connect(a_ctArtSortHeaders, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotArtSortHeaders(int))); + connect(a_ctArtSortHeaders, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotArtSortHeaders(int))); a_ctArtSortHeadersKeyb = new TDEAction(i18n("Sort"), TQString(), Key_F7 , this, - TQT_SLOT(slotArtSortHeadersKeyb()), actionCollection(), "view_Sort_Keyb"); + TQ_SLOT(slotArtSortHeadersKeyb()), actionCollection(), "view_Sort_Keyb"); a_ctArtSortHeadersKeyb->plugAccel(a_ccel); a_ctArtFilter = new KNFilterSelectAction(i18n("&Filter"), "filter", actionCollection(), "view_Filter"); @@ -679,86 +679,86 @@ void KNMainWidget::initActions() a_ctArtFilterKeyb = new TDEAction(i18n("Filter"), Key_F6, actionCollection(), "view_Filter_Keyb"); a_ctArtFilterKeyb->plugAccel(a_ccel); a_ctArtSearch = new TDEAction(i18n("&Search Articles..."),"mail_find" , Key_F4 , this, - TQT_SLOT(slotArtSearch()), actionCollection(), "article_search"); + TQ_SLOT(slotArtSearch()), actionCollection(), "article_search"); a_ctArtRefreshList = new TDEAction(i18n("&Refresh List"),"reload", TDEStdAccel::shortcut(TDEStdAccel::Reload), this, - TQT_SLOT(slotArtRefreshList()), actionCollection(), "view_Refresh"); + TQ_SLOT(slotArtRefreshList()), actionCollection(), "view_Refresh"); a_ctArtCollapseAll = new TDEAction(i18n("&Collapse All Threads"), 0 , this, - TQT_SLOT(slotArtCollapseAll()), actionCollection(), "view_CollapseAll"); + TQ_SLOT(slotArtCollapseAll()), actionCollection(), "view_CollapseAll"); a_ctArtExpandAll = new TDEAction(i18n("E&xpand All Threads"), 0 , this, - TQT_SLOT(slotArtExpandAll()), actionCollection(), "view_ExpandAll"); + TQ_SLOT(slotArtExpandAll()), actionCollection(), "view_ExpandAll"); a_ctArtToggleThread = new TDEAction(i18n("&Toggle Subthread"), Key_T, this, - TQT_SLOT(slotArtToggleThread()), actionCollection(), "thread_toggle"); + TQ_SLOT(slotArtToggleThread()), actionCollection(), "thread_toggle"); a_ctArtToggleShowThreads = new TDEToggleAction(i18n("Show T&hreads"), 0 , this, - TQT_SLOT(slotArtToggleShowThreads()), actionCollection(), "view_showThreads"); + TQ_SLOT(slotArtToggleShowThreads()), actionCollection(), "view_showThreads"); a_ctArtToggleShowThreads->setCheckedState(i18n("Hide T&hreads")); a_ctArtToggleShowThreads->setChecked(c_fgManager->readNewsGeneral()->showThreads()); //header-view - remote articles a_ctArtSetArtRead = new TDEAction(i18n("Mark as &Read"), Key_D , this, - TQT_SLOT(slotArtSetArtRead()), actionCollection(), "article_read"); + TQ_SLOT(slotArtSetArtRead()), actionCollection(), "article_read"); a_ctArtSetArtUnread = new TDEAction(i18n("Mar&k as Unread"), Key_U , this, - TQT_SLOT(slotArtSetArtUnread()), actionCollection(), "article_unread"); + TQ_SLOT(slotArtSetArtUnread()), actionCollection(), "article_unread"); a_ctArtSetThreadRead = new TDEAction(i18n("Mark &Thread as Read"), CTRL+Key_D , this, - TQT_SLOT(slotArtSetThreadRead()), actionCollection(), "thread_read"); + TQ_SLOT(slotArtSetThreadRead()), actionCollection(), "thread_read"); a_ctArtSetThreadUnread = new TDEAction(i18n("Mark T&hread as Unread"), CTRL+Key_U , this, - TQT_SLOT(slotArtSetThreadUnread()), actionCollection(), "thread_unread"); + TQ_SLOT(slotArtSetThreadUnread()), actionCollection(), "thread_unread"); a_ctArtOpenNewWindow = new TDEAction(i18n("Open in Own &Window"), "window-new", Key_O , this, - TQT_SLOT(slotArtOpenNewWindow()), actionCollection(), "article_ownWindow"); + TQ_SLOT(slotArtOpenNewWindow()), actionCollection(), "article_ownWindow"); // scoring a_ctScoresEdit = new TDEAction(i18n("&Edit Scoring Rules..."), "edit", CTRL+Key_E, this, - TQT_SLOT(slotScoreEdit()), actionCollection(), "scoreedit"); + TQ_SLOT(slotScoreEdit()), actionCollection(), "scoreedit"); a_ctReScore = new TDEAction(i18n("Recalculate &Scores"), 0, this, - TQT_SLOT(slotReScore()),actionCollection(),"rescore"); + TQ_SLOT(slotReScore()),actionCollection(),"rescore"); a_ctScoreLower = new TDEAction(i18n("&Lower Score for Author..."), CTRL+Key_L, this, - TQT_SLOT(slotScoreLower()), actionCollection(), "scorelower"); + TQ_SLOT(slotScoreLower()), actionCollection(), "scorelower"); a_ctScoreRaise = new TDEAction(i18n("&Raise Score for Author..."), CTRL+Key_I, this, - TQT_SLOT(slotScoreRaise()),actionCollection(),"scoreraise"); + TQ_SLOT(slotScoreRaise()),actionCollection(),"scoreraise"); a_ctArtToggleIgnored = new TDEAction(i18n("&Ignore Thread"), "go-bottom", Key_I , this, - TQT_SLOT(slotArtToggleIgnored()), actionCollection(), "thread_ignore"); + TQ_SLOT(slotArtToggleIgnored()), actionCollection(), "thread_ignore"); a_ctArtToggleWatched = new TDEAction(i18n("&Watch Thread"), "go-top", Key_W , this, - TQT_SLOT(slotArtToggleWatched()), actionCollection(), "thread_watch"); + TQ_SLOT(slotArtToggleWatched()), actionCollection(), "thread_watch"); //header-view local articles a_ctArtSendOutbox = new TDEAction(i18n("Sen&d Pending Messages"), "mail-send", 0, this, - TQT_SLOT(slotArtSendOutbox()), actionCollection(), "net_sendPending"); + TQ_SLOT(slotArtSendOutbox()), actionCollection(), "net_sendPending"); a_ctArtDelete = new TDEAction(i18n("&Delete Article"), "edit-delete", Key_Delete, this, - TQT_SLOT(slotArtDelete()), actionCollection(), "article_delete"); + TQ_SLOT(slotArtDelete()), actionCollection(), "article_delete"); a_ctArtSendNow = new TDEAction(i18n("Send &Now"),"mail-send", 0 , this, - TQT_SLOT(slotArtSendNow()), actionCollection(), "article_sendNow"); + TQ_SLOT(slotArtSendNow()), actionCollection(), "article_sendNow"); a_ctArtEdit = new TDEAction(i18n("edit article","&Edit Article..."), "edit", Key_E , this, - TQT_SLOT(slotArtEdit()), actionCollection(), "article_edit"); + TQ_SLOT(slotArtEdit()), actionCollection(), "article_edit"); //network a_ctNetCancel = new TDEAction(i18n("Stop &Network"),"process-stop",0, this, - TQT_SLOT(slotNetCancel()), actionCollection(), "net_stop"); + TQ_SLOT(slotNetCancel()), actionCollection(), "net_stop"); a_ctNetCancel->setEnabled(false); a_ctFetchArticleWithID = new TDEAction(i18n("&Fetch Article with ID..."), 0, this, - TQT_SLOT(slotFetchArticleWithID()), actionCollection(), "fetch_article_with_id"); + TQ_SLOT(slotFetchArticleWithID()), actionCollection(), "fetch_article_with_id"); a_ctFetchArticleWithID->setEnabled(false); a_ctToggleGroupView = new TDEToggleAction(i18n("Show &Group View"), CTRL+Key_G, this, - TQT_SLOT(slotToggleGroupView()), actionCollection(), "settings_show_groupView"); + TQ_SLOT(slotToggleGroupView()), actionCollection(), "settings_show_groupView"); a_ctToggleGroupView->setCheckedState(i18n("Hide &Group View")); a_ctToggleHeaderView = new TDEToggleAction(i18n("Show &Header View"), CTRL+Key_H, this, - TQT_SLOT(slotToggleHeaderView()), actionCollection(), "settings_show_headerView"); + TQ_SLOT(slotToggleHeaderView()), actionCollection(), "settings_show_headerView"); a_ctToggleHeaderView->setCheckedState(i18n("Hide &Header View")); a_ctToggleArticleViewer = new TDEToggleAction(i18n("Show &Article Viewer"), CTRL+Key_J, this, - TQT_SLOT(slotToggleArticleViewer()), actionCollection(), "settings_show_articleViewer"); + TQ_SLOT(slotToggleArticleViewer()), actionCollection(), "settings_show_articleViewer"); a_ctToggleArticleViewer->setCheckedState(i18n("Hide &Article Viewer")); a_ctToggleQuickSearch = new TDEToggleAction(i18n("Show Quick Search"), TQString(), this, - TQT_SLOT(slotToggleQuickSearch()), actionCollection(), "settings_show_quickSearch"); + TQ_SLOT(slotToggleQuickSearch()), actionCollection(), "settings_show_quickSearch"); a_ctToggleQuickSearch->setCheckedState(i18n("Hide Quick Search")); a_ctSwitchToGroupView = new TDEAction(i18n("Switch to Group View"), Key_G , this, - TQT_SLOT(slotSwitchToGroupView()), actionCollection(), "switch_to_group_view"); + TQ_SLOT(slotSwitchToGroupView()), actionCollection(), "switch_to_group_view"); a_ctSwitchToGroupView->plugAccel(a_ccel); a_ctSwitchToHeaderView = new TDEAction(i18n("Switch to Header View"), Key_H , this, - TQT_SLOT(slotSwitchToHeaderView()), actionCollection(), "switch_to_header_view"); + TQ_SLOT(slotSwitchToHeaderView()), actionCollection(), "switch_to_header_view"); a_ctSwitchToHeaderView->plugAccel(a_ccel); a_ctSwitchToArticleViewer = new TDEAction(i18n("Switch to Article Viewer"), Key_J , this, - TQT_SLOT(slotSwitchToArticleViewer()), actionCollection(), "switch_to_article_viewer"); + TQ_SLOT(slotSwitchToArticleViewer()), actionCollection(), "switch_to_article_viewer"); a_ctSwitchToArticleViewer->plugAccel(a_ccel); } @@ -2054,7 +2054,7 @@ FetchArticleIdDlg::FetchArticleIdDlg(TQWidget *parent, const char */*name*/ ) edit->setFocus(); enableButtonOK( false ); setButtonOK( i18n("&Fetch") ); - connect( edit, TQT_SIGNAL(textChanged( const TQString & )), this, TQT_SLOT(slotTextChanged(const TQString & ))); + connect( edit, TQ_SIGNAL(textChanged( const TQString & )), this, TQ_SLOT(slotTextChanged(const TQString & ))); KNHelper::restoreWindowSize("fetchArticleWithID", this, TQSize(325,66)); } diff --git a/knode/knnetaccess.cpp b/knode/knnetaccess.cpp index 57488f71..b63ba859 100644 --- a/knode/knnetaccess.cpp +++ b/knode/knnetaccess.cpp @@ -51,7 +51,7 @@ KNNetAccess::KNNetAccess(TQObject *parent, const char *name ) } nntpNotifier=new TQSocketNotifier(nntpInPipe[0], TQSocketNotifier::Read); - connect(nntpNotifier, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotThreadSignal(int))); + connect(nntpNotifier, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotThreadSignal(int))); // initialize the KSocks stuff in the main thread, otherwise we get // strange effects on FreeBSD @@ -60,14 +60,14 @@ KNNetAccess::KNNetAccess(TQObject *parent, const char *name ) nntpClient=new KNNntpClient(nntpOutPipe[0],nntpInPipe[1],nntp_Mutex); nntpClient->start(); - connect( knGlobals.accountManager(), TQT_SIGNAL(passwordsChanged()), TQT_SLOT(slotPasswordsChanged()) ); + connect( knGlobals.accountManager(), TQ_SIGNAL(passwordsChanged()), TQ_SLOT(slotPasswordsChanged()) ); } KNNetAccess::~KNNetAccess() { - disconnect(nntpNotifier, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotThreadSignal(int))); + disconnect(nntpNotifier, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotThreadSignal(int))); nntpClient->terminateClient(); triggerAsyncThread(nntpOutPipe[1]); @@ -95,7 +95,7 @@ void KNNetAccess::addJob(KNJobData *job) } job->createProgressItem(); - connect( job->progressItem(), TQT_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), TQT_SLOT(slotCancelJob(KPIM::ProgressItem*)) ); + connect( job->progressItem(), TQ_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), TQ_SLOT(slotCancelJob(KPIM::ProgressItem*)) ); emit netActive( true ); // put jobs which are waiting for the wallet into an extra queue @@ -275,8 +275,8 @@ void KNNetAccess::startJobSmtp() destination.setPass( account->pass() ); } TDEIO::Job* job = TDEIO::storedPut( art->encodedContent(true), destination, -1, false, false, false ); - connect( job, TQT_SIGNAL( result(TDEIO::Job*) ), - TQT_SLOT( slotJobResult(TDEIO::Job*) ) ); + connect( job, TQ_SIGNAL( result(TDEIO::Job*) ), + TQ_SLOT( slotJobResult(TDEIO::Job*) ) ); if ( account->encryption() == KNServerInfo::TLS ) job->addMetaData( "tls", "on" ); else diff --git a/knode/knnntpaccount.cpp b/knode/knnntpaccount.cpp index ba1657c0..c5536c96 100644 --- a/knode/knnntpaccount.cpp +++ b/knode/knnntpaccount.cpp @@ -46,7 +46,7 @@ void KNNntpAccountIntervalChecking::installTimer() if(!t_imer) { t_imer = new TQTimer(); - connect(t_imer,TQT_SIGNAL(timeout()),this,TQT_SLOT(slotCheckNews())); + connect(t_imer,TQ_SIGNAL(timeout()),this,TQ_SLOT(slotCheckNews())); } else { diff --git a/knode/knode.cpp b/knode/knode.cpp index 549ac354..51f4f127 100644 --- a/knode/knode.cpp +++ b/knode/knode.cpp @@ -46,17 +46,17 @@ KNMainWindow::KNMainWindow( TQWidget* pWidget ) setStandardToolBarMenuEnabled(true); //config stuff - KStdAction::quit(kapp, TQT_SLOT(closeAllWindows()), actionCollection()); - KStdAction::configureToolbars(this, TQT_SLOT(slotConfToolbar()), actionCollection()); - KStdAction::keyBindings(this, TQT_SLOT(slotConfKeys()), actionCollection()); + KStdAction::quit(kapp, TQ_SLOT(closeAllWindows()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(slotConfToolbar()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(slotConfKeys()), actionCollection()); m_mainWidget = new KNMainWidget( this, true, this, 0 ); - connect( m_mainWidget, TQT_SIGNAL(signalCaptionChangeRequest(const TQString&)), - TQT_SLOT( setCaption(const TQString&)) ); + connect( m_mainWidget, TQ_SIGNAL(signalCaptionChangeRequest(const TQString&)), + TQ_SLOT( setCaption(const TQString&)) ); setCentralWidget( m_mainWidget ); setupStatusBar(); - connect( KPIM::BroadcastStatus::instance(), TQT_SIGNAL(statusMsg(const TQString&)), - this, TQT_SLOT(slotShowStatusMsg(const TQString& )) ); + connect( KPIM::BroadcastStatus::instance(), TQ_SIGNAL(statusMsg(const TQString&)), + this, TQ_SLOT(slotShowStatusMsg(const TQString& )) ); createGUI( "knodeui.rc" ); knGlobals.instance = 0; @@ -77,7 +77,7 @@ void KNMainWindow::slotConfToolbar() { saveMainWindowSettings(knGlobals.config(),"mainWindow_options"); KEditToolbar dlg(actionCollection(), "knodeui.rc"); - connect(&dlg,TQT_SIGNAL( newToolbarConfig() ), this, TQT_SLOT( slotNewToolbarConfig() )); + connect(&dlg,TQ_SIGNAL( newToolbarConfig() ), this, TQ_SLOT( slotNewToolbarConfig() )); dlg.exec(); } diff --git a/knode/knrangefilter.cpp b/knode/knrangefilter.cpp index f5aa5593..a74a48df 100644 --- a/knode/knrangefilter.cpp +++ b/knode/knrangefilter.cpp @@ -134,9 +134,9 @@ KNRangeFilterWidget::KNRangeFilterWidget(const TQString& value, int min, int max topL->setColStretch(1,1); topL->setColStretch(5,1); - connect(op1, TQT_SIGNAL(activated(int)), TQT_SLOT(slotOp1Changed(int))); - connect(op2, TQT_SIGNAL(activated(int)), TQT_SLOT(slotOp2Changed(int))); - connect(enabled, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEnabled(bool))); + connect(op1, TQ_SIGNAL(activated(int)), TQ_SLOT(slotOp1Changed(int))); + connect(op2, TQ_SIGNAL(activated(int)), TQ_SLOT(slotOp2Changed(int))); + connect(enabled, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEnabled(bool))); slotEnabled(false); } diff --git a/knode/knsearchdialog.cpp b/knode/knsearchdialog.cpp index b38e0650..646969ee 100644 --- a/knode/knsearchdialog.cpp +++ b/knode/knsearchdialog.cpp @@ -60,9 +60,9 @@ KNSearchDialog::KNSearchDialog(searchType /*t*/, TQWidget *parent) topL->addLayout(filterL, 1); topL->addWidget(bg); - connect(startBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStartClicked())); - connect(newBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewClicked())); - connect(closeBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCloseClicked())); + connect(startBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStartClicked())); + connect(newBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNewClicked())); + connect(closeBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCloseClicked())); f_ilter=new KNArticleFilter(); f_ilter->setLoaded(true); diff --git a/knode/knsourceviewwindow.cpp b/knode/knsourceviewwindow.cpp index 71af3c18..651bc1e8 100644 --- a/knode/knsourceviewwindow.cpp +++ b/knode/knsourceviewwindow.cpp @@ -27,7 +27,7 @@ KNSourceViewWindow::KNSourceViewWindow( const TQString &text ) { setWFlags(WType_TopLevel | WDestructiveClose); TQAccel *accel = new TQAccel( this, "browser close-accel" ); - accel->connectItem( accel->insertItem( TQt::Key_Escape ), this , TQT_SLOT( close() )); + accel->connectItem( accel->insertItem( TQt::Key_Escape ), this , TQ_SLOT( close() )); KNConfig::Appearance *app=knGlobals.configManager()->appearance(); setTextFormat( PlainText ); diff --git a/knode/knstatusfilter.cpp b/knode/knstatusfilter.cpp index ec098d9c..d770ae22 100644 --- a/knode/knstatusfilter.cpp +++ b/knode/knstatusfilter.cpp @@ -116,7 +116,7 @@ KNStatusFilterWidget::KNStatusFilterWidget(TQWidget *parent) : topL->setColStretch(2,1); topL->setRowStretch(4,1); - connect(this, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotEnabled(int))); + connect(this, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotEnabled(int))); } diff --git a/knode/knwidgets.cpp b/knode/knwidgets.cpp index b4c9a160..3e1d8dec 100644 --- a/knode/knwidgets.cpp +++ b/knode/knwidgets.cpp @@ -110,7 +110,7 @@ void KNDialogListBox::keyPressEvent(TQKeyEvent *e) KNDockWidgetHeaderDrag::KNDockWidgetHeaderDrag(TQWidget *focusWidget, KDockWidgetAbstractHeader* parent, KDockWidget* dock, const char* name ) : KDockWidgetHeaderDrag(parent, dock, name), f_ocus(false) { - connect(focusWidget, TQT_SIGNAL(focusChanged(TQFocusEvent*)), TQT_SLOT(slotFocusChanged(TQFocusEvent*))); + connect(focusWidget, TQ_SIGNAL(focusChanged(TQFocusEvent*)), TQ_SLOT(slotFocusChanged(TQFocusEvent*))); } diff --git a/knotes/knote.cpp b/knotes/knote.cpp index c498dc76..69fb1d43 100644 --- a/knotes/knote.cpp +++ b/knotes/knote.cpp @@ -105,47 +105,47 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char * // create the menu items for the note - not the editor... // rename, mail, print, save as, insert date, alarm, close, delete, new note new TDEAction( i18n("New"), "document-new", 0, - this,TQT_SLOT(slotRequestNewNote()) , actionCollection(), "new_note" ); + this,TQ_SLOT(slotRequestNewNote()) , actionCollection(), "new_note" ); new TDEAction( i18n("Rename..."), "text", 0, - this, TQT_SLOT(slotRename()), actionCollection(), "rename_note" ); + this, TQ_SLOT(slotRename()), actionCollection(), "rename_note" ); m_readOnly = new TDEToggleAction( i18n("Lock"), "system-lock-screen" , 0, - this, TQT_SLOT(slotUpdateReadOnly()), actionCollection(), "lock_note" ); + this, TQ_SLOT(slotUpdateReadOnly()), actionCollection(), "lock_note" ); m_readOnly->setCheckedState( KGuiItem( i18n("Unlock"), "unlock" ) ); new TDEAction( i18n("Hide"), "window-close" , Key_Escape, - this, TQT_SLOT(slotClose()), actionCollection(), "hide_note" ); + this, TQ_SLOT(slotClose()), actionCollection(), "hide_note" ); new TDEAction( i18n("Delete"), "knotes_delete", 0, - this, TQT_SLOT(slotKill()), actionCollection(), "delete_note" ); + this, TQ_SLOT(slotKill()), actionCollection(), "delete_note" ); new TDEAction( i18n("Insert Date"), "knotes_date", 0 , - this, TQT_SLOT(slotInsDate()), actionCollection(), "insert_date" ); + this, TQ_SLOT(slotInsDate()), actionCollection(), "insert_date" ); new TDEAction( i18n("Set Alarm..."), "knotes_alarm", 0 , - this, TQT_SLOT(slotSetAlarm()), actionCollection(), "set_alarm" ); + this, TQ_SLOT(slotSetAlarm()), actionCollection(), "set_alarm" ); new TDEAction( i18n("Send..."), "network", 0, - this, TQT_SLOT(slotSend()), actionCollection(), "send_note" ); + this, TQ_SLOT(slotSend()), actionCollection(), "send_note" ); new TDEAction( i18n("Mail..."), "mail-send", 0, - this, TQT_SLOT(slotMail()), actionCollection(), "mail_note" ); + this, TQ_SLOT(slotMail()), actionCollection(), "mail_note" ); new TDEAction( i18n("Save As..."), "document-save-as", 0, - this, TQT_SLOT(slotSaveAs()), actionCollection(), "save_note" ); - KStdAction::print( this, TQT_SLOT(slotPrint()), actionCollection(), "print_note" ); + this, TQ_SLOT(slotSaveAs()), actionCollection(), "save_note" ); + KStdAction::print( this, TQ_SLOT(slotPrint()), actionCollection(), "print_note" ); new TDEAction( i18n("Preferences..."), "configure", 0, - this, TQT_SLOT(slotPreferences()), actionCollection(), "configure_note" ); + this, TQ_SLOT(slotPreferences()), actionCollection(), "configure_note" ); m_keepAbove = new TDEToggleAction( i18n("Keep Above Others"), "go-up", 0, - this, TQT_SLOT(slotUpdateKeepAboveBelow()), actionCollection(), "keep_above" ); + this, TQ_SLOT(slotUpdateKeepAboveBelow()), actionCollection(), "keep_above" ); m_keepAbove->setExclusiveGroup( "keepAB" ); m_keepBelow = new TDEToggleAction( i18n("Keep Below Others"), "go-down", 0, - this, TQT_SLOT(slotUpdateKeepAboveBelow()), actionCollection(), "keep_below" ); + this, TQ_SLOT(slotUpdateKeepAboveBelow()), actionCollection(), "keep_below" ); m_keepBelow->setExclusiveGroup( "keepAB" ); m_toDesktop = new TDEListAction( i18n("To Desktop"), 0, - this, TQT_SLOT(slotPopupActionToDesktop(int)), actionCollection(), "to_desktop" ); - connect( m_toDesktop->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotUpdateDesktopActions()) ); + this, TQ_SLOT(slotPopupActionToDesktop(int)), actionCollection(), "to_desktop" ); + connect( m_toDesktop->popupMenu(), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotUpdateDesktopActions()) ); // invisible action to walk through the notes to make this configurable new TDEAction( i18n("Walk Through Notes"), 0, SHIFT+Key_BackTab, - this, TQT_SIGNAL(sigShowNextNote()), actionCollection(), "walk_notes" ); + this, TQ_SIGNAL(sigShowNextNote()), actionCollection(), "walk_notes" ); // create the note header, button and label... m_label = new TQLabel( this ); @@ -155,14 +155,14 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char * setName( m_journal->summary() ); // don't worry, no signals are connected at this stage yet m_button = new KNoteButton( "knotes_close", this ); - connect( m_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClose()) ); + connect( m_button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClose()) ); // create the note editor m_editor = new KNoteEdit( actionCollection(), this ); m_editor->setNote( this ); m_editor->installEventFilter( this ); // receive events (for modified) m_editor->viewport()->installEventFilter( this ); - connect( m_editor, TQT_SIGNAL(contentsMoving( int, int )), this, TQT_SLOT(slotUpdateViewport( int, int ))); + connect( m_editor, TQ_SIGNAL(contentsMoving( int, int )), this, TQ_SLOT(slotUpdateViewport( int, int ))); KXMLGUIBuilder builder( this ); KXMLGUIFactory factory( &builder, this ); @@ -600,9 +600,9 @@ void KNote::find( const TQString& pattern, long options ) delete m_find; m_find = new KFind( pattern, options, this ); - connect( m_find, TQT_SIGNAL(highlight( const TQString &, int, int )), - this, TQT_SLOT(slotHighlight( const TQString &, int, int )) ); - connect( m_find, TQT_SIGNAL(findNext()), this, TQT_SLOT(slotFindNext()) ); + connect( m_find, TQ_SIGNAL(highlight( const TQString &, int, int )), + this, TQ_SLOT(slotHighlight( const TQString &, int, int )) ); + connect( m_find, TQ_SIGNAL(findNext()), this, TQ_SLOT(slotFindNext()) ); m_find->setData( plainText() ); slotFindNext(); @@ -816,8 +816,8 @@ void KNote::slotPreferences() // create a new preferences dialog... KNoteConfigDlg *dialog = new KNoteConfigDlg( m_config, name(), this, noteId().utf8() ); - connect( dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(slotApplyConfig()) ); - connect( this, TQT_SIGNAL(sigNameChanged()), dialog, TQT_SLOT(slotUpdateCaption()) ); + connect( dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(slotApplyConfig()) ); + connect( this, TQ_SIGNAL(sigNameChanged()), dialog, TQ_SLOT(slotUpdateCaption()) ); dialog->show(); } diff --git a/knotes/knotealarmdlg.cpp b/knotes/knotealarmdlg.cpp index 0a3236a2..5e43a86a 100644 --- a/knotes/knotealarmdlg.cpp +++ b/knotes/knotealarmdlg.cpp @@ -72,7 +72,7 @@ KNoteAlarmDlg::KNoteAlarmDlg( const TQString& caption, TQWidget *parent, const c label_in->setEnabled( false ); // TODO in->hide(); //show it and enable it when feature will implement - connect( m_buttons, TQT_SIGNAL(clicked( int )), TQT_SLOT(slotButtonChanged( int )) ); + connect( m_buttons, TQ_SIGNAL(clicked( int )), TQ_SLOT(slotButtonChanged( int )) ); } diff --git a/knotes/knoteedit.cpp b/knotes/knoteedit.cpp index f03150ba..4ef1274d 100644 --- a/knotes/knoteedit.cpp +++ b/knotes/knoteedit.cpp @@ -45,27 +45,27 @@ KNoteEdit::KNoteEdit( TDEActionCollection *actions, TQWidget *parent, const char setLinkUnderline( true ); setCheckSpellingEnabled(false); // create the actions for the RMB menu - undo = KStdAction::undo( this, TQT_SLOT(undo()), actions ); - redo = KStdAction::redo( this, TQT_SLOT(redo()), actions ); + undo = KStdAction::undo( this, TQ_SLOT(undo()), actions ); + redo = KStdAction::redo( this, TQ_SLOT(redo()), actions ); undo->setEnabled( isUndoAvailable() ); redo->setEnabled( isRedoAvailable() ); - m_cut = KStdAction::cut( this, TQT_SLOT(cut()), actions ); - m_copy = KStdAction::copy( this, TQT_SLOT(copy()), actions ); - m_paste = KStdAction::paste( this, TQT_SLOT(paste()), actions ); + m_cut = KStdAction::cut( this, TQ_SLOT(cut()), actions ); + m_copy = KStdAction::copy( this, TQ_SLOT(copy()), actions ); + m_paste = KStdAction::paste( this, TQ_SLOT(paste()), actions ); m_cut->setEnabled( false ); m_copy->setEnabled( false ); m_paste->setEnabled( true ); - connect( this, TQT_SIGNAL(undoAvailable(bool)), this, TQT_SLOT(setEnabledUndo(bool)) ); - connect( this, TQT_SIGNAL(redoAvailable(bool)), this, TQT_SLOT(setEnabledRedo(bool)) ); + connect( this, TQ_SIGNAL(undoAvailable(bool)), this, TQ_SLOT(setEnabledUndo(bool)) ); + connect( this, TQ_SIGNAL(redoAvailable(bool)), this, TQ_SLOT(setEnabledRedo(bool)) ); - connect( this, TQT_SIGNAL(copyAvailable(bool)), this, TQT_SLOT( slotCutEnabled( bool ) ) ); - connect( this, TQT_SIGNAL(copyAvailable(bool)), m_copy, TQT_SLOT(setEnabled(bool)) ); + connect( this, TQ_SIGNAL(copyAvailable(bool)), this, TQ_SLOT( slotCutEnabled( bool ) ) ); + connect( this, TQ_SIGNAL(copyAvailable(bool)), m_copy, TQ_SLOT(setEnabled(bool)) ); - new TDEAction( KStdGuiItem::clear(), 0, this, TQT_SLOT(clear()), actions, "edit_clear" ); - KStdAction::selectAll( this, TQT_SLOT(selectAll()), actions ); + new TDEAction( KStdGuiItem::clear(), 0, this, TQ_SLOT(clear()), actions, "edit_clear" ); + KStdAction::selectAll( this, TQ_SLOT(selectAll()), actions ); // create the actions modifying the text format m_textBold = new TDEToggleAction( i18n("Bold"), "format-text-bold", CTRL + Key_B, 0, 0, @@ -77,23 +77,23 @@ KNoteEdit::KNoteEdit( TDEActionCollection *actions, TQWidget *parent, const char m_textStrikeOut = new TDEToggleAction( i18n("Strike Out"), "format-text-strikethrough", CTRL + Key_S, 0, 0, actions, "format_strikeout" ); - connect( m_textBold, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setBold(bool)) ); - connect( m_textItalic, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setItalic(bool)) ); - connect( m_textUnderline, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setUnderline(bool)) ); - connect( m_textStrikeOut, TQT_SIGNAL(toggled(bool)), TQT_SLOT(textStrikeOut(bool)) ); + connect( m_textBold, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setBold(bool)) ); + connect( m_textItalic, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setItalic(bool)) ); + connect( m_textUnderline, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setUnderline(bool)) ); + connect( m_textStrikeOut, TQ_SIGNAL(toggled(bool)), TQ_SLOT(textStrikeOut(bool)) ); m_textAlignLeft = new TDEToggleAction( i18n("Align Left"), "format-text-direction-ltr", ALT + Key_L, - this, TQT_SLOT(textAlignLeft()), + this, TQ_SLOT(textAlignLeft()), actions, "format_alignleft" ); m_textAlignLeft->setChecked( true ); // just a dummy, will be updated later m_textAlignCenter = new TDEToggleAction( i18n("Align Center"), "text_center", ALT + Key_C, - this, TQT_SLOT(textAlignCenter()), + this, TQ_SLOT(textAlignCenter()), actions, "format_aligncenter" ); m_textAlignRight = new TDEToggleAction( i18n("Align Right"), "format-text-direction-rtl", ALT + Key_R, - this, TQT_SLOT(textAlignRight()), + this, TQ_SLOT(textAlignRight()), actions, "format_alignright" ); m_textAlignBlock = new TDEToggleAction( i18n("Align Block"), "text_block", ALT + Key_B, - this, TQT_SLOT(textAlignBlock()), + this, TQ_SLOT(textAlignBlock()), actions, "format_alignblock" ); m_textAlignLeft->setExclusiveGroup( "align" ); @@ -102,16 +102,16 @@ KNoteEdit::KNoteEdit( TDEActionCollection *actions, TQWidget *parent, const char m_textAlignBlock->setExclusiveGroup( "align" ); m_textList = new TDEToggleAction( i18n("List"), "enum_list", 0, - this, TQT_SLOT(textList()), + this, TQ_SLOT(textList()), actions, "format_list" ); m_textList->setExclusiveGroup( "style" ); m_textSuper = new TDEToggleAction( i18n("Superscript"), "text_super", 0, - this, TQT_SLOT(textSuperScript()), + this, TQ_SLOT(textSuperScript()), actions, "format_super" ); m_textSub = new TDEToggleAction( i18n("Subscript"), "text_sub", 0, - this, TQT_SLOT(textSubScript()), + this, TQ_SLOT(textSubScript()), actions, "format_sub" ); m_textSuper->setExclusiveGroup( "valign" ); @@ -120,38 +120,38 @@ KNoteEdit::KNoteEdit( TDEActionCollection *actions, TQWidget *parent, const char // There is no easy possibility to implement text indenting with TQTextEdit // // m_textIncreaseIndent = new TDEAction( i18n("Increase Indent"), "format_increaseindent", 0, -// this, TQT_SLOT(textIncreaseIndent()), +// this, TQ_SLOT(textIncreaseIndent()), // actions, "format_increaseindent" ); // // m_textDecreaseIndent = new TDEAction( i18n("Decrease Indent"), "format_decreaseindent", 0, -// this, TQT_SLOT(textDecreaseIndent()), +// this, TQ_SLOT(textDecreaseIndent()), // actions, "format_decreaseindent" ); TQPixmap pix( ICON_SIZE, ICON_SIZE ); pix.fill( black ); // just a dummy, gets updated before widget is shown m_textColor = new TDEAction( i18n("Text Color..."), pix, 0, this, - TQT_SLOT(textColor()), actions, "format_color" ); + TQ_SLOT(textColor()), actions, "format_color" ); m_textFont = new TDEFontAction( i18n("Text Font"), "text", KKey(), actions, "format_font" ); - connect( m_textFont, TQT_SIGNAL(activated( const TQString & )), - this, TQT_SLOT(setFamily( const TQString & )) ); + connect( m_textFont, TQ_SIGNAL(activated( const TQString & )), + this, TQ_SLOT(setFamily( const TQString & )) ); m_textSize = new TDEFontSizeAction( i18n("Text Size"), KKey(), actions, "format_size" ); - connect( m_textSize, TQT_SIGNAL(fontSizeChanged( int )), - this, TQT_SLOT(setPointSize( int )) ); + connect( m_textSize, TQ_SIGNAL(fontSizeChanged( int )), + this, TQ_SLOT(setPointSize( int )) ); // TQTextEdit connections - connect( this, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) ); - connect( this, TQT_SIGNAL(currentFontChanged( const TQFont & )), - this, TQT_SLOT(fontChanged( const TQFont & )) ); - connect( this, TQT_SIGNAL(currentColorChanged( const TQColor & )), - this, TQT_SLOT(colorChanged( const TQColor & )) ); - connect( this, TQT_SIGNAL(currentAlignmentChanged( int )), - this, TQT_SLOT(alignmentChanged( int )) ); - connect( this, TQT_SIGNAL(currentVerticalAlignmentChanged( VerticalAlignment )), - this, TQT_SLOT(verticalAlignmentChanged( VerticalAlignment )) ); + connect( this, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()) ); + connect( this, TQ_SIGNAL(currentFontChanged( const TQFont & )), + this, TQ_SLOT(fontChanged( const TQFont & )) ); + connect( this, TQ_SIGNAL(currentColorChanged( const TQColor & )), + this, TQ_SLOT(colorChanged( const TQColor & )) ); + connect( this, TQ_SIGNAL(currentAlignmentChanged( int )), + this, TQ_SLOT(alignmentChanged( int )) ); + connect( this, TQ_SIGNAL(currentVerticalAlignmentChanged( VerticalAlignment )), + this, TQ_SLOT(verticalAlignmentChanged( VerticalAlignment )) ); } KNoteEdit::~KNoteEdit() @@ -541,13 +541,13 @@ TQPopupMenu *KNoteEdit::createPopupMenu( const TQPoint &pos ) menu->insertSeparator(); id = menu->insertItem( SmallIconSet( "tools-check-spelling" ), i18n( "Check Spelling..." ), - this, TQT_SLOT( checkSpelling() ) ); + this, TQ_SLOT( checkSpelling() ) ); if( text().isEmpty() ) menu->setItemEnabled( id, false ); menu->insertSeparator(); - id=menu->insertItem(i18n("Allow Tabulations"),this,TQT_SLOT(slotAllowTab())); + id=menu->insertItem(i18n("Allow Tabulations"),this,TQ_SLOT(slotAllowTab())); menu->setItemChecked(id, !tabChangesFocus()); } diff --git a/knotes/knotehostdlg.cpp b/knotes/knotehostdlg.cpp index 9d8fff97..15a32c66 100644 --- a/knotes/knotehostdlg.cpp +++ b/knotes/knotehostdlg.cpp @@ -60,8 +60,8 @@ KNoteHostDlg::KNoteHostDlg( const TQString &caption, TQWidget *parent, const cha m_hostCombo->setHistoryItems( KNotesGlobalConfig::knownHosts(), true ); m_hostCombo->setFocus(); //m_hostCombo->completionObject()->setItems( KNotesGlobalConfig::hostCompletions() ); - connect( m_hostCombo->lineEdit(), TQT_SIGNAL( textChanged ( const TQString & ) ), - this, TQT_SLOT( slotTextChanged( const TQString & ) ) ); + connect( m_hostCombo->lineEdit(), TQ_SIGNAL( textChanged ( const TQString & ) ), + this, TQ_SLOT( slotTextChanged( const TQString & ) ) ); slotTextChanged( m_hostCombo->lineEdit()->text() ); } diff --git a/knotes/knotesalarm.cpp b/knotes/knotesalarm.cpp index c2d1bd1c..99f05cd9 100644 --- a/knotes/knotesalarm.cpp +++ b/knotes/knotesalarm.cpp @@ -49,7 +49,7 @@ KNotesAlarm::KNotesAlarm( KNotesResourceManager *manager, TQObject *parent, cons { // TODO: fix timezone stuff? - connect( &m_checkTimer, TQT_SIGNAL(timeout()), TQT_SLOT(checkAlarms()) ); + connect( &m_checkTimer, TQ_SIGNAL(timeout()), TQ_SLOT(checkAlarms()) ); m_checkTimer.start( 1000 * KNotesGlobalConfig::self()->checkInterval() ); // interval in seconds } diff --git a/knotes/knotesapp.cpp b/knotes/knotesapp.cpp index e6802749..1f7e9b99 100644 --- a/knotes/knotesapp.cpp +++ b/knotes/knotesapp.cpp @@ -65,7 +65,7 @@ public: { m_keyChooser = new KKeyChooser( globals, this ); setMainWidget( m_keyChooser ); - connect( this, TQT_SIGNAL(defaultClicked()), m_keyChooser, TQT_SLOT(allDefault()) ); + connect( this, TQ_SIGNAL(defaultClicked()), m_keyChooser, TQ_SLOT(allDefault()) ); } void insert( TDEActionCollection *actions ) @@ -96,7 +96,7 @@ KNotesApp::KNotesApp() : DCOPObject("KNotesIface"), TQLabel( 0, 0, WType_TopLevel ), m_alarm( 0 ), m_listener( 0 ), m_find( 0 ), m_findPos( 0 ) { - connect( kapp, TQT_SIGNAL(lastWindowClosed()), kapp, TQT_SLOT(quit()) ); + connect( kapp, TQ_SIGNAL(lastWindowClosed()), kapp, TQ_SLOT(quit()) ); m_noteList.setAutoDelete( true ); m_noteActions.setAutoDelete( true ); @@ -112,20 +112,20 @@ KNotesApp::KNotesApp() // create the GUI... new TDEAction( i18n("New Note"), "document-new", 0, - this, TQT_SLOT(newNote()), actionCollection(), "new_note" ); + this, TQ_SLOT(newNote()), actionCollection(), "new_note" ); new TDEAction( i18n("New Note From Clipboard"), "edit-paste", 0, - this, TQT_SLOT(newNoteFromClipboard()), actionCollection(), "new_note_clipboard" ); + this, TQ_SLOT(newNoteFromClipboard()), actionCollection(), "new_note_clipboard" ); new TDEAction( i18n("Show All Notes"), "knotes", 0, - this, TQT_SLOT(showAllNotes()), actionCollection(), "show_all_notes" ); + this, TQ_SLOT(showAllNotes()), actionCollection(), "show_all_notes" ); new TDEAction( i18n("Hide All Notes"), "window-close", 0, - this, TQT_SLOT(hideAllNotes()), actionCollection(), "hide_all_notes" ); + this, TQ_SLOT(hideAllNotes()), actionCollection(), "hide_all_notes" ); new KHelpMenu( this, kapp->aboutData(), false, actionCollection() ); - m_findAction = KStdAction::find( this, TQT_SLOT(slotOpenFindDialog()), actionCollection() ); - KStdAction::preferences( this, TQT_SLOT(slotPreferences()), actionCollection() ); - KStdAction::keyBindings( this, TQT_SLOT(slotConfigureAccels()), actionCollection() ); + m_findAction = KStdAction::find( this, TQ_SLOT(slotOpenFindDialog()), actionCollection() ); + KStdAction::preferences( this, TQ_SLOT(slotPreferences()), actionCollection() ); + KStdAction::keyBindings( this, TQ_SLOT(slotConfigureAccels()), actionCollection() ); //FIXME: no shortcut removing!? - KStdAction::quit( this, TQT_SLOT(slotQuit()), actionCollection() )->setShortcut( 0 ); + KStdAction::quit( this, TQ_SLOT(slotQuit()), actionCollection() )->setShortcut( 0 ); setXMLFile( instance()->instanceName() + "appui.rc" ); @@ -150,16 +150,16 @@ KNotesApp::KNotesApp() m_globalAccel = new TDEGlobalAccel( this, "global accel" ); m_globalAccel->insert( "global_new_note", i18n("New Note"), "", TDEShortcut(), TDEShortcut(), - this, TQT_SLOT(newNote()), true, true ); + this, TQ_SLOT(newNote()), true, true ); m_globalAccel->insert( "global_new_note_clipboard", i18n("New Note From Clipboard"), "", TDEShortcut(), TDEShortcut(), - this, TQT_SLOT(newNoteFromClipboard()), true, true ); + this, TQ_SLOT(newNoteFromClipboard()), true, true ); m_globalAccel->insert( "global_hide_all_notes", i18n("Hide All Notes"), "", TDEShortcut(), TDEShortcut(), - this, TQT_SLOT(hideAllNotes()), true, true ); + this, TQ_SLOT(hideAllNotes()), true, true ); m_globalAccel->insert( "global_show_all_notes", i18n("Show All Notes"), "", TDEShortcut(), TDEShortcut(), - this, TQT_SLOT(showAllNotes()), true, true ); + this, TQ_SLOT(showAllNotes()), true, true ); m_globalAccel->readSettings(); @@ -174,10 +174,10 @@ KNotesApp::KNotesApp() // create the resource manager m_manager = new KNotesResourceManager(); - connect( m_manager, TQT_SIGNAL(sigRegisteredNote( KCal::Journal * )), - this, TQT_SLOT(createNote( KCal::Journal * )) ); - connect( m_manager, TQT_SIGNAL(sigDeregisteredNote( KCal::Journal * )), - this, TQT_SLOT(killNote( KCal::Journal * )) ); + connect( m_manager, TQ_SIGNAL(sigRegisteredNote( KCal::Journal * )), + this, TQ_SLOT(createNote( KCal::Journal * )) ); + connect( m_manager, TQ_SIGNAL(sigDeregisteredNote( KCal::Journal * )), + this, TQ_SLOT(killNote( KCal::Journal * )) ); // read the notes m_manager->load(); @@ -201,7 +201,7 @@ KNotesApp::KNotesApp() // create the socket and possibly start listening for connections m_listener = new TDEServerSocket(); m_listener->setResolutionEnabled( true ); - connect( m_listener, TQT_SIGNAL(readyAccept()), TQT_SLOT(acceptConnection()) ); + connect( m_listener, TQ_SIGNAL(readyAccept()), TQ_SLOT(acceptConnection()) ); updateNetworkListener(); if ( m_noteList.count() == 0 && !kapp->isRestored() ) @@ -575,8 +575,8 @@ void KNotesApp::slotPreferences() // create a new preferences dialog... KNoteConfigDlg *dialog = new KNoteConfigDlg( 0, i18n("Settings"), this, "KNotes Settings" ); - connect( dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(updateNetworkListener()) ); - connect( dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(updateStyle()) ); + connect( dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(updateNetworkListener()) ); + connect( dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(updateStyle()) ); dialog->show(); } @@ -657,14 +657,14 @@ void KNotesApp::createNote( KCal::Journal *journal ) KNote *newNote = new KNote( m_noteGUI, journal, 0, journal->uid().utf8() ); m_noteList.insert( newNote->noteId(), newNote ); - connect( newNote, TQT_SIGNAL(sigRequestNewNote()), TQT_SLOT(newNote()) ); - connect( newNote, TQT_SIGNAL(sigShowNextNote()), TQT_SLOT(slotWalkThroughNotes()) ); - connect( newNote, TQT_SIGNAL(sigKillNote( KCal::Journal* )), - TQT_SLOT(slotNoteKilled( KCal::Journal* )) ); - connect( newNote, TQT_SIGNAL(sigNameChanged()), TQT_SLOT(updateNoteActions()) ); - connect( newNote, TQT_SIGNAL(sigDataChanged(const TQString &)), TQT_SLOT(saveNotes(const TQString &)) ); - connect( newNote, TQT_SIGNAL(sigColorChanged()), TQT_SLOT(updateNoteActions()) ); - connect( newNote, TQT_SIGNAL(sigFindFinished()), TQT_SLOT(slotFindNext()) ); + connect( newNote, TQ_SIGNAL(sigRequestNewNote()), TQ_SLOT(newNote()) ); + connect( newNote, TQ_SIGNAL(sigShowNextNote()), TQ_SLOT(slotWalkThroughNotes()) ); + connect( newNote, TQ_SIGNAL(sigKillNote( KCal::Journal* )), + TQ_SLOT(slotNoteKilled( KCal::Journal* )) ); + connect( newNote, TQ_SIGNAL(sigNameChanged()), TQ_SLOT(updateNoteActions()) ); + connect( newNote, TQ_SIGNAL(sigDataChanged(const TQString &)), TQ_SLOT(saveNotes(const TQString &)) ); + connect( newNote, TQ_SIGNAL(sigColorChanged()), TQ_SLOT(updateNoteActions()) ); + connect( newNote, TQ_SIGNAL(sigFindFinished()), TQ_SLOT(slotFindNext()) ); // don't call this during startup for each and every loaded note if ( m_alarm ) @@ -693,8 +693,8 @@ void KNotesApp::acceptConnection() if ( s ) { KNotesNetworkReceiver *recv = new KNotesNetworkReceiver( s ); - connect( recv, TQT_SIGNAL(sigNoteReceived( const TQString &, const TQString & )), - this, TQT_SLOT(newNote( const TQString &, const TQString & )) ); + connect( recv, TQ_SIGNAL(sigNoteReceived( const TQString &, const TQString & )), + this, TQ_SLOT(newNote( const TQString &, const TQString & )) ); } } @@ -725,7 +725,7 @@ void KNotesApp::updateNoteActions() for ( TQDictIterator<KNote> it( m_noteList ); it.current(); ++it ) { TDEAction *action = new TDEAction( it.current()->name().replace("&", "&&"), - TDEShortcut(), this, TQT_SLOT(slotShowNote()), + TDEShortcut(), this, TQ_SLOT(slotShowNote()), (TQObject *)0, it.current()->noteId().utf8() ); TDEIconEffect effect; diff --git a/knotes/knotesnetrecv.cpp b/knotes/knotesnetrecv.cpp index 48bb791f..d1ae1237 100644 --- a/knotes/knotesnetrecv.cpp +++ b/knotes/knotesnetrecv.cpp @@ -70,15 +70,15 @@ KNotesNetworkReceiver::KNotesNetworkReceiver( TDEBufferedSocket *s ) .arg( date ); // Setup the communications - connect( m_sock, TQT_SIGNAL(readyRead()), TQT_SLOT(slotDataAvailable()) ); - connect( m_sock, TQT_SIGNAL(closed()), TQT_SLOT(slotConnectionClosed()) ); - connect( m_sock, TQT_SIGNAL(gotError( int )), TQT_SLOT(slotError( int )) ); + connect( m_sock, TQ_SIGNAL(readyRead()), TQ_SLOT(slotDataAvailable()) ); + connect( m_sock, TQ_SIGNAL(closed()), TQ_SLOT(slotConnectionClosed()) ); + connect( m_sock, TQ_SIGNAL(gotError( int )), TQ_SLOT(slotError( int )) ); m_sock->enableRead( true ); // Setup the timer m_timer = new TQTimer( this, "m_timer" ); - connect( m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotReceptionTimeout()) ); + connect( m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotReceptionTimeout()) ); m_timer->start( MAXTIME, true ); } diff --git a/knotes/knotesnetsend.cpp b/knotes/knotesnetsend.cpp index d1e9f1d8..55dc75c3 100644 --- a/knotes/knotesnetsend.cpp +++ b/knotes/knotesnetsend.cpp @@ -48,11 +48,11 @@ KNotesNetworkSender::KNotesNetworkSender( const TQString& hostname, int port ) // TQObject:: prefix needed, otherwise the KStreamSocket::connect() // mehtod is called!!! - TQObject::connect( this, TQT_SIGNAL(connected( const KResolverEntry& )), - TQT_SLOT(slotConnected( const KResolverEntry& )) ); - TQObject::connect( this, TQT_SIGNAL(gotError( int )), TQT_SLOT(slotError( int )) ); - TQObject::connect( this, TQT_SIGNAL(closed()), TQT_SLOT(slotClosed()) ); - TQObject::connect( this, TQT_SIGNAL(readyWrite()), TQT_SLOT(slotReadyWrite()) ); + TQObject::connect( this, TQ_SIGNAL(connected( const KResolverEntry& )), + TQ_SLOT(slotConnected( const KResolverEntry& )) ); + TQObject::connect( this, TQ_SIGNAL(gotError( int )), TQ_SLOT(slotError( int )) ); + TQObject::connect( this, TQ_SIGNAL(closed()), TQ_SLOT(slotClosed()) ); + TQObject::connect( this, TQ_SIGNAL(readyWrite()), TQ_SLOT(slotReadyWrite()) ); } void KNotesNetworkSender::setSenderId( const TQString& sender ) diff --git a/knotes/main.cpp b/knotes/main.cpp index e809a8f7..8b85abe3 100644 --- a/knotes/main.cpp +++ b/knotes/main.cpp @@ -122,7 +122,7 @@ int main( int argc, char* argv[] ) KUniqueApplication::addCmdLineOptions(); Application app; - app.connect( &app, TQT_SIGNAL( lastWindowClosed() ), &app, TQT_SLOT( quit() ) ); + app.connect( &app, TQ_SIGNAL( lastWindowClosed() ), &app, TQ_SLOT( quit() ) ); remove_sm_from_client_leader(); diff --git a/kode/kwsdl/converter.cpp b/kode/kwsdl/converter.cpp index 8ec676fb..41e7e0a9 100644 --- a/kode/kwsdl/converter.cpp +++ b/kode/kwsdl/converter.cpp @@ -689,9 +689,9 @@ void Converter::convertService( const Service &service ) KODE::MemberVariable transport( inputMessage.name() + "Transport", "Transport" ); ctorCode += transport.name() + " = new Transport( \"" + (*it).mLocation + "\" );"; - ctorCode += "connect( " + transport.name() + ", TQT_SIGNAL( result( const TQString& ) ),"; + ctorCode += "connect( " + transport.name() + ", TQ_SIGNAL( result( const TQString& ) ),"; ctorCode.indent(); - ctorCode += "this, TQT_SLOT( " + outputMessage.name() + "Slot( const TQString& ) ) );"; + ctorCode += "this, TQ_SLOT( " + outputMessage.name() + "Slot( const TQString& ) ) );"; ctorCode.unindent(); dtorCode += "delete " + transport.name() + ";"; @@ -946,8 +946,8 @@ void Converter::createTransportClass() queryCode += "job->addMetaData( \"UserAgent\", \"KWSDL\" );"; queryCode += "job->addMetaData( \"content-type\", \"Content-Type: text/xml; charset=utf-8\" );"; queryCode.newLine(); - queryCode += "connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );"; - queryCode += "connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotResult( TDEIO::Job* ) ) );"; + queryCode += "connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );"; + queryCode += "connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotResult( TDEIO::Job* ) ) );"; query.setBody( queryCode ); diff --git a/kode/kwsdl/kung/binaryinputfield.cpp b/kode/kwsdl/kung/binaryinputfield.cpp index b0fb78b0..9a31b31a 100644 --- a/kode/kwsdl/kung/binaryinputfield.cpp +++ b/kode/kwsdl/kung/binaryinputfield.cpp @@ -107,8 +107,8 @@ BinaryWidget::BinaryWidget( TQWidget *parent ) mLayout->addWidget( mLoadButton, 0, 1 ); mLayout->addWidget( mSaveButton, 1, 1 ); - connect( mLoadButton, TQT_SIGNAL( clicked() ), TQT_SLOT( load() ) ); - connect( mSaveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( save() ) ); + connect( mLoadButton, TQ_SIGNAL( clicked() ), TQ_SLOT( load() ) ); + connect( mSaveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( save() ) ); } void BinaryWidget::setData( const TQByteArray &data ) diff --git a/kode/kwsdl/kung/boolinputfield.cpp b/kode/kwsdl/kung/boolinputfield.cpp index 88311266..12def657 100644 --- a/kode/kwsdl/kung/boolinputfield.cpp +++ b/kode/kwsdl/kung/boolinputfield.cpp @@ -65,8 +65,8 @@ TQWidget *BoolInputField::createWidget( TQWidget *parent ) mInputWidget->setChecked( mValue ); - connect( mInputWidget, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( inputChanged( bool ) ) ); + connect( mInputWidget, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( inputChanged( bool ) ) ); return mInputWidget; } diff --git a/kode/kwsdl/kung/dateinputfield.cpp b/kode/kwsdl/kung/dateinputfield.cpp index cb24670f..b7d6f8f0 100644 --- a/kode/kwsdl/kung/dateinputfield.cpp +++ b/kode/kwsdl/kung/dateinputfield.cpp @@ -65,8 +65,8 @@ TQWidget *DateInputField::createWidget( TQWidget *parent ) mInputWidget->setDate( mValue ); - connect( mInputWidget, TQT_SIGNAL( dateChanged( TQDate ) ), - this, TQT_SLOT( inputChanged( TQDate ) ) ); + connect( mInputWidget, TQ_SIGNAL( dateChanged( TQDate ) ), + this, TQ_SLOT( inputChanged( TQDate ) ) ); return mInputWidget; } diff --git a/kode/kwsdl/kung/dispatcher.cpp b/kode/kwsdl/kung/dispatcher.cpp index 5c65d0c4..7b2ad477 100644 --- a/kode/kwsdl/kung/dispatcher.cpp +++ b/kode/kwsdl/kung/dispatcher.cpp @@ -57,10 +57,10 @@ void Dispatcher::setWSDL( const KWSDL::WSDL &wsdl ) mConversationManager = new GeneralConversationManager( mWSDL ); mTransport = new Transport( mWSDL.service().ports().first().mLocation ); - connect( mTransport, TQT_SIGNAL( result( const TQString& ) ), - this, TQT_SLOT( result( const TQString& ) ) ); - connect( mTransport, TQT_SIGNAL( error( const TQString& ) ), - this, TQT_SLOT( error( const TQString& ) ) ); + connect( mTransport, TQ_SIGNAL( result( const TQString& ) ), + this, TQ_SLOT( result( const TQString& ) ) ); + connect( mTransport, TQ_SIGNAL( error( const TQString& ) ), + this, TQ_SLOT( error( const TQString& ) ) ); } void Dispatcher::run() @@ -140,14 +140,14 @@ void Dispatcher::result( const TQString &xml ) mLastMessage = mCurrentMessage; - TQTimer::singleShot( 0, this, TQT_SLOT( nextMessage() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( nextMessage() ) ); } void Dispatcher::error( const TQString &errorMsg ) { KMessageBox::error( 0, errorMsg ); - TQTimer::singleShot( 0, this, TQT_SLOT( nextMessage() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( nextMessage() ) ); } #include "dispatcher.moc" diff --git a/kode/kwsdl/kung/doubleinputfield.cpp b/kode/kwsdl/kung/doubleinputfield.cpp index 39f22774..1df00f03 100644 --- a/kode/kwsdl/kung/doubleinputfield.cpp +++ b/kode/kwsdl/kung/doubleinputfield.cpp @@ -78,8 +78,8 @@ TQWidget *DoubleInputField::createWidget( TQWidget *parent ) mInputWidget->setValue( mValue ); - connect( mInputWidget, TQT_SIGNAL( valueChanged( double ) ), - this, TQT_SLOT( inputChanged( double ) ) ); + connect( mInputWidget, TQ_SIGNAL( valueChanged( double ) ), + this, TQ_SLOT( inputChanged( double ) ) ); return mInputWidget; } diff --git a/kode/kwsdl/kung/enuminputfield.cpp b/kode/kwsdl/kung/enuminputfield.cpp index 30c11670..f49ab4be 100644 --- a/kode/kwsdl/kung/enuminputfield.cpp +++ b/kode/kwsdl/kung/enuminputfield.cpp @@ -70,8 +70,8 @@ TQWidget *EnumInputField::createWidget( TQWidget *parent ) mInputWidget->insertStringList( mEnums ); mInputWidget->setCurrentItem( mEnums.findIndex( mValue ) ); - connect( mInputWidget, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( inputChanged( int ) ) ); + connect( mInputWidget, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( inputChanged( int ) ) ); return mInputWidget; } diff --git a/kode/kwsdl/kung/integerinputfield.cpp b/kode/kwsdl/kung/integerinputfield.cpp index 76d48cd5..38c08222 100644 --- a/kode/kwsdl/kung/integerinputfield.cpp +++ b/kode/kwsdl/kung/integerinputfield.cpp @@ -116,8 +116,8 @@ TQWidget *IntegerInputField::createWidget( TQWidget *parent ) mInputWidget->setValue( mValue ); - connect( mInputWidget, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( inputChanged( int ) ) ); + connect( mInputWidget, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( inputChanged( int ) ) ); return mInputWidget; } diff --git a/kode/kwsdl/kung/listinputfield.cpp b/kode/kwsdl/kung/listinputfield.cpp index 539e3de2..147c83fd 100644 --- a/kode/kwsdl/kung/listinputfield.cpp +++ b/kode/kwsdl/kung/listinputfield.cpp @@ -105,9 +105,9 @@ ListWidget::ListWidget( InputField *parentField, const TQString &name, const TQS mRemoveButton = new TQPushButton( i18n( "Remove" ), this ); layout->addWidget( mRemoveButton, 2, 1 ); - connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( add() ) ); - connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( edit() ) ); - connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( remove() ) ); + connect( mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( add() ) ); + connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( edit() ) ); + connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( remove() ) ); update(); } diff --git a/kode/kwsdl/kung/main.cpp b/kode/kwsdl/kung/main.cpp index 2dadbe9d..3036eeae 100644 --- a/kode/kwsdl/kung/main.cpp +++ b/kode/kwsdl/kung/main.cpp @@ -58,7 +58,7 @@ int main( int argc, char **argv ) Loader loader; loader.setWSDLUrl( args->url( 0 ).path() ); - TQTimer::singleShot( 0, &loader, TQT_SLOT( run() ) ); + TQTimer::singleShot( 0, &loader, TQ_SLOT( run() ) ); return app.exec(); } diff --git a/kode/kwsdl/kung/stringinputfield.cpp b/kode/kwsdl/kung/stringinputfield.cpp index 9ea45029..ee90eeec 100644 --- a/kode/kwsdl/kung/stringinputfield.cpp +++ b/kode/kwsdl/kung/stringinputfield.cpp @@ -84,8 +84,8 @@ TQWidget *StringInputField::createWidget( TQWidget *parent ) mInputWidget->setText( mValue ); - connect( mInputWidget, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( inputChanged( const TQString& ) ) ); + connect( mInputWidget, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( inputChanged( const TQString& ) ) ); return mInputWidget; } diff --git a/kode/kwsdl/kung/timeinputfield.cpp b/kode/kwsdl/kung/timeinputfield.cpp index 38e1a264..024e2671 100644 --- a/kode/kwsdl/kung/timeinputfield.cpp +++ b/kode/kwsdl/kung/timeinputfield.cpp @@ -65,8 +65,8 @@ TQWidget *TimeInputField::createWidget( TQWidget *parent ) mInputWidget->setTime( mValue ); - connect( mInputWidget, TQT_SIGNAL( valueChanged( const TQTime& ) ), - this, TQT_SLOT( inputChanged( const TQTime& ) ) ); + connect( mInputWidget, TQ_SIGNAL( valueChanged( const TQTime& ) ), + this, TQ_SLOT( inputChanged( const TQTime& ) ) ); return mInputWidget; } diff --git a/kode/kwsdl/kung/transport.cpp b/kode/kwsdl/kung/transport.cpp index e9dabf3c..4961ad2f 100644 --- a/kode/kwsdl/kung/transport.cpp +++ b/kode/kwsdl/kung/transport.cpp @@ -45,8 +45,8 @@ void Transport::query( const TQString &xml ) job->addMetaData( "UserAgent", "KDE Kung" ); job->addMetaData( "content-type", "Content-Type: text/xml; charset=utf-8" ); - connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotResult( TDEIO::Job* ) ) ); } void Transport::slotData( TDEIO::Job*, const TQByteArray &data ) diff --git a/kode/kwsdl/main.cpp b/kode/kwsdl/main.cpp index 5ba4f533..900f6ee4 100644 --- a/kode/kwsdl/main.cpp +++ b/kode/kwsdl/main.cpp @@ -71,7 +71,7 @@ int main( int argc, char **argv ) if ( args->isSet( "namespace" ) ) compiler.setNameSpace( args->getOption( "namespace" ) ); - TQTimer::singleShot( 0, &compiler, TQT_SLOT( run() ) ); + TQTimer::singleShot( 0, &compiler, TQ_SLOT( run() ) ); return app.exec(); } diff --git a/kode/kwsdl/schema/fileprovider.cpp b/kode/kwsdl/schema/fileprovider.cpp index ed5606fd..8d435274 100644 --- a/kode/kwsdl/schema/fileprovider.cpp +++ b/kode/kwsdl/schema/fileprovider.cpp @@ -53,10 +53,10 @@ bool FileProvider::get( const TQString &url, TQString &target ) tqDebug( "Downloading external schema '%s'", url.latin1() ); TDEIO::TransferJob* job = TDEIO::get( KURL( url ), false, false ); - connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), - this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( slotResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + this, TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( slotResult( TDEIO::Job* ) ) ); mBlocked = true; while ( mBlocked ) { diff --git a/kode/kwsdl/tests/google/googlesearch.cpp b/kode/kwsdl/tests/google/googlesearch.cpp index fcea9d75..aa282a06 100644 --- a/kode/kwsdl/tests/google/googlesearch.cpp +++ b/kode/kwsdl/tests/google/googlesearch.cpp @@ -29,12 +29,12 @@ GoogleSearch::GoogleSearch() : TQObject( 0, "" ) { - connect( &mService, TQT_SIGNAL( doGetCachedPageResponse( TQByteArray* ) ), - this, TQT_SLOT( cachedPageResult( TQByteArray* ) ) ); - connect( &mService, TQT_SIGNAL( doSpellingSuggestionResponse( TQString* ) ), - this, TQT_SLOT( spellingSuggestionResult( TQString* ) ) ); - connect( &mService, TQT_SIGNAL( doGoogleSearchResponse( GoogleSearchResult* ) ), - this, TQT_SLOT( googleSearchResult( GoogleSearchResult* ) ) ); + connect( &mService, TQ_SIGNAL( doGetCachedPageResponse( TQByteArray* ) ), + this, TQ_SLOT( cachedPageResult( TQByteArray* ) ) ); + connect( &mService, TQ_SIGNAL( doSpellingSuggestionResponse( TQString* ) ), + this, TQ_SLOT( spellingSuggestionResult( TQString* ) ) ); + connect( &mService, TQ_SIGNAL( doGoogleSearchResponse( GoogleSearchResult* ) ), + this, TQ_SLOT( googleSearchResult( GoogleSearchResult* ) ) ); mKey = ""; } diff --git a/kode/kwsdl/tests/google/googlesearchservice.cpp b/kode/kwsdl/tests/google/googlesearchservice.cpp index d2e7c97e..095fe115 100644 --- a/kode/kwsdl/tests/google/googlesearchservice.cpp +++ b/kode/kwsdl/tests/google/googlesearchservice.cpp @@ -183,14 +183,14 @@ void GoogleSearchService::doGoogleSearchResponseSlot( const TQString &xml ) GoogleSearchService::GoogleSearchService() { mDoGetCachedPageTransport = new Transport( "http://api.google.com/search/beta2" ); - connect( mDoGetCachedPageTransport, TQT_SIGNAL( result( const TQString& ) ), - this, TQT_SLOT( doGetCachedPageResponseSlot( const TQString& ) ) ); + connect( mDoGetCachedPageTransport, TQ_SIGNAL( result( const TQString& ) ), + this, TQ_SLOT( doGetCachedPageResponseSlot( const TQString& ) ) ); mDoSpellingSuggestionTransport = new Transport( "http://api.google.com/search/beta2" ); - connect( mDoSpellingSuggestionTransport, TQT_SIGNAL( result( const TQString& ) ), - this, TQT_SLOT( doSpellingSuggestionResponseSlot( const TQString& ) ) ); + connect( mDoSpellingSuggestionTransport, TQ_SIGNAL( result( const TQString& ) ), + this, TQ_SLOT( doSpellingSuggestionResponseSlot( const TQString& ) ) ); mDoGoogleSearchTransport = new Transport( "http://api.google.com/search/beta2" ); - connect( mDoGoogleSearchTransport, TQT_SIGNAL( result( const TQString& ) ), - this, TQT_SLOT( doGoogleSearchResponseSlot( const TQString& ) ) ); + connect( mDoGoogleSearchTransport, TQ_SIGNAL( result( const TQString& ) ), + this, TQ_SLOT( doGoogleSearchResponseSlot( const TQString& ) ) ); } GoogleSearchService::~GoogleSearchService() diff --git a/kode/kwsdl/tests/google/transport.cpp b/kode/kwsdl/tests/google/transport.cpp index 30b9645e..c7a390e8 100644 --- a/kode/kwsdl/tests/google/transport.cpp +++ b/kode/kwsdl/tests/google/transport.cpp @@ -48,8 +48,8 @@ void Transport::query( const TQString &xml ) job->addMetaData( "UserAgent", "KWSDL" ); job->addMetaData( "content-type", "Content-Type: text/xml; charset=utf-8" ); - connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotResult( TDEIO::Job* ) ) ); } void Transport::slotData( TDEIO::Job*, const TQByteArray &data ) diff --git a/kontact/DESIGN.dcopinteraction b/kontact/DESIGN.dcopinteraction index d51fd886..612ed845 100644 --- a/kontact/DESIGN.dcopinteraction +++ b/kontact/DESIGN.dcopinteraction @@ -21,8 +21,8 @@ Here are some code snippets that must go into the part (A) that wants to use "Fo * Constructor: m_foo_stub = 0L; kapp->dcopClient()->setNotifications( true ); - connect( kapp->dcopClient(), SIGNAL( applicationRemoved( const QCString&)), - this, SLOT( unregisteredFromDCOP( const QCString& )) ); + connect( kapp->dcopClient(), TQ_SIGNAL( applicationRemoved( const QCString&)), + this, TQ_SLOT( unregisteredFromDCOP( const QCString& )) ); * Destructor: kapp->dcopClient()->setNotifications( false ); diff --git a/kontact/interfaces/core.cpp b/kontact/interfaces/core.cpp index 0328938f..859e76fa 100644 --- a/kontact/interfaces/core.cpp +++ b/kontact/interfaces/core.cpp @@ -43,7 +43,7 @@ Core::Core( TQWidget *parent, const char *name ) d = new Private; TQTimer* timer = new TQTimer( this ); mLastDate = TQDate::currentDate(); - connect(timer, TQT_SIGNAL( timeout() ), TQT_SLOT( checkNewDay() ) ); + connect(timer, TQ_SIGNAL( timeout() ), TQ_SLOT( checkNewDay() ) ); timer->start( 1000*60 ); } @@ -71,8 +71,8 @@ KParts::ReadOnlyPart *Core::createPart( const char *libname ) KParts::ReadOnlyPart *pimPart = dynamic_cast<KParts::ReadOnlyPart*>( part ); if ( pimPart ) { mParts.insert( libname, pimPart ); - TQObject::connect( pimPart, TQT_SIGNAL( destroyed( TQObject * ) ), - TQT_SLOT( slotPartDestroyed( TQObject * ) ) ); + TQObject::connect( pimPart, TQ_SIGNAL( destroyed( TQObject * ) ), + TQ_SLOT( slotPartDestroyed( TQObject * ) ) ); } else { // TODO move to KParts::ComponentFactory switch( error ) { diff --git a/kontact/interfaces/plugin.cpp b/kontact/interfaces/plugin.cpp index 3b63466c..71364b6a 100644 --- a/kontact/interfaces/plugin.cpp +++ b/kontact/interfaces/plugin.cpp @@ -147,7 +147,7 @@ KParts::ReadOnlyPart *Plugin::part() if ( !d->part ) { d->part = createPart(); if ( d->part ) { - connect( d->part, TQT_SIGNAL( destroyed() ), TQT_SLOT( partDestroyed() ) ); + connect( d->part, TQ_SIGNAL( destroyed() ), TQ_SLOT( partDestroyed() ) ); core()->partLoaded( this, d->part ); } } diff --git a/kontact/interfaces/uniqueapphandler.cpp b/kontact/interfaces/uniqueapphandler.cpp index 98a5d45b..2ad0f638 100644 --- a/kontact/interfaces/uniqueapphandler.cpp +++ b/kontact/interfaces/uniqueapphandler.cpp @@ -156,8 +156,8 @@ UniqueAppWatcher::UniqueAppWatcher( UniqueAppHandlerFactoryBase* factory, Plugin if ( mRunningStandalone ) { kapp->dcopClient()->setNotifications( true ); - connect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString& ) ), - this, TQT_SLOT( unregisteredFromDCOP( const TQCString& ) ) ); + connect( kapp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& ) ), + this, TQ_SLOT( unregisteredFromDCOP( const TQCString& ) ) ); } else { mFactory->createHandler( mPlugin ); } @@ -174,8 +174,8 @@ UniqueAppWatcher::~UniqueAppWatcher() void UniqueAppWatcher::unregisteredFromDCOP( const TQCString& appId ) { if ( appId == mPlugin->name() && mRunningStandalone ) { - disconnect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString& ) ), - this, TQT_SLOT( unregisteredFromDCOP( const TQCString& ) ) ); + disconnect( kapp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& ) ), + this, TQ_SLOT( unregisteredFromDCOP( const TQCString& ) ) ); kdDebug(5601) << k_funcinfo << appId << endl; mFactory->createHandler( mPlugin ); kapp->dcopClient()->setNotifications( false ); diff --git a/kontact/plugins/akregator/akregator_plugin.cpp b/kontact/plugins/akregator/akregator_plugin.cpp index 36d716fa..17cd5862 100644 --- a/kontact/plugins/akregator/akregator_plugin.cpp +++ b/kontact/plugins/akregator/akregator_plugin.cpp @@ -53,7 +53,7 @@ AkregatorPlugin::AkregatorPlugin( Kontact::Core *core, const char *, const TQStr { setInstance( PluginFactory::instance() ); - insertNewAction( new TDEAction( i18n( "New Feed..." ), "bookmark_add", CTRL+SHIFT+Key_F, this, TQT_SLOT( addFeed() ), actionCollection(), "feed_new" ) ); + insertNewAction( new TDEAction( i18n( "New Feed..." ), "bookmark_add", CTRL+SHIFT+Key_F, this, TQ_SLOT( addFeed() ), actionCollection(), "feed_new" ) ); m_uniqueAppWatcher = new Kontact::UniqueAppWatcher( new Kontact::UniqueAppHandlerFactory<Akregator::UniqueAppHandler>(), this ); @@ -89,7 +89,7 @@ MyBasePart* AkregatorPlugin::createPart() { MyBasePart* p = loadPart(); - connect(p, TQT_SIGNAL(showPart()), this, TQT_SLOT(showPart())); + connect(p, TQ_SIGNAL(showPart()), this, TQ_SLOT(showPart())); m_stub = new Akregator::AkregatorPartIface_stub( dcopClient(), "akregator", "AkregatorIface" ); m_stub->openStandardFeedList(); diff --git a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp index bc9393e5..8cdef758 100644 --- a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp +++ b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp @@ -58,14 +58,14 @@ KAddressbookPlugin::KAddressbookPlugin( Kontact::Core *core, const char *, const setInstance( KAddressbookPluginFactory::instance() ); insertNewAction( new TDEAction( i18n( "New Contact..." ), "identity", - CTRL+SHIFT+Key_C, this, TQT_SLOT( slotNewContact() ), actionCollection(), + CTRL+SHIFT+Key_C, this, TQ_SLOT( slotNewContact() ), actionCollection(), "new_contact" ) ); insertNewAction( new TDEAction( i18n( "&New Distribution List..." ), "kontact_contacts", 0, this, - TQT_SLOT( slotNewDistributionList() ), actionCollection(), "new_distributionlist" ) ); + TQ_SLOT( slotNewDistributionList() ), actionCollection(), "new_distributionlist" ) ); insertSyncAction( new TDEAction( i18n( "Synchronize Contacts" ), "reload", - 0, this, TQT_SLOT( slotSyncContacts() ), actionCollection(), + 0, this, TQ_SLOT( slotSyncContacts() ), actionCollection(), "kaddressbook_sync" ) ); mUniqueAppWatcher = new Kontact::UniqueAppWatcher( new Kontact::UniqueAppHandlerFactory<KABUniqueAppHandler>(), this ); diff --git a/kontact/plugins/karm/karm_plugin.cpp b/kontact/plugins/karm/karm_plugin.cpp index f927e826..a84dd63b 100644 --- a/kontact/plugins/karm/karm_plugin.cpp +++ b/kontact/plugins/karm/karm_plugin.cpp @@ -42,7 +42,7 @@ KarmPlugin::KarmPlugin( Kontact::Core *core, const char *, const TQStringList& ) setInstance( KarmPluginFactory::instance() ); (void)dcopClient(); insertNewAction( new TDEAction( i18n( "New Task" ), "karm", - CTRL+SHIFT+Key_W, this, TQT_SLOT( newTask() ), actionCollection(), + CTRL+SHIFT+Key_W, this, TQ_SLOT( newTask() ), actionCollection(), "new_task" ) ); } diff --git a/kontact/plugins/kmail/kcmkmailsummary.cpp b/kontact/plugins/kmail/kcmkmailsummary.cpp index e2f9126f..690cbc50 100644 --- a/kontact/plugins/kmail/kcmkmailsummary.cpp +++ b/kontact/plugins/kmail/kcmkmailsummary.cpp @@ -52,8 +52,8 @@ KCMKMailSummary::KCMKMailSummary( TQWidget *parent, const char *name ) { initGUI(); - connect( mFolderView, TQT_SIGNAL( clicked( TQListViewItem* ) ), TQT_SLOT( modified() ) ); - connect( mFullPath, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) ); + connect( mFolderView, TQ_SIGNAL( clicked( TQListViewItem* ) ), TQ_SLOT( modified() ) ); + connect( mFullPath, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( modified() ) ); TDEAcceleratorManager::manage( this ); diff --git a/kontact/plugins/kmail/kmail_plugin.cpp b/kontact/plugins/kmail/kmail_plugin.cpp index 3f4249dc..1a818694 100644 --- a/kontact/plugins/kmail/kmail_plugin.cpp +++ b/kontact/plugins/kmail/kmail_plugin.cpp @@ -62,11 +62,11 @@ KMailPlugin::KMailPlugin(Kontact::Core *core, const char *, const TQStringList& setInstance( KMailPluginFactory::instance() ); insertNewAction( new TDEAction( i18n( "New Message..." ), "mail-message-new", - CTRL+SHIFT+Key_M, this, TQT_SLOT( slotNewMail() ), actionCollection(), + CTRL+SHIFT+Key_M, this, TQ_SLOT( slotNewMail() ), actionCollection(), "new_mail" ) ); insertSyncAction( new TDEAction( i18n( "Synchronize Mail" ), "reload", - 0, this, TQT_SLOT( slotSyncFolders() ), actionCollection(), + 0, this, TQ_SLOT( slotSyncFolders() ), actionCollection(), "sync_mail" ) ); mUniqueAppWatcher = new Kontact::UniqueAppWatcher( diff --git a/kontact/plugins/kmail/summarywidget.cpp b/kontact/plugins/kmail/summarywidget.cpp index 8b9f4e53..31e22992 100644 --- a/kontact/plugins/kmail/summarywidget.cpp +++ b/kontact/plugins/kmail/summarywidget.cpp @@ -133,8 +133,8 @@ void SummaryWidget::updateFolderList( const TQStringList& folders ) urlLabel->installEventFilter( this ); urlLabel->setAlignment( AlignLeft ); urlLabel->show(); - connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ), - TQT_SLOT( selectFolder( const TQString& ) ) ); + connect( urlLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ), + TQ_SLOT( selectFolder( const TQString& ) ) ); mLayout->addWidget( urlLabel, counter, 0 ); mLabels.append( urlLabel ); diff --git a/kontact/plugins/knode/knode_plugin.cpp b/kontact/plugins/knode/knode_plugin.cpp index a25a0258..8a6fb54f 100644 --- a/kontact/plugins/knode/knode_plugin.cpp +++ b/kontact/plugins/knode/knode_plugin.cpp @@ -50,7 +50,7 @@ KNodePlugin::KNodePlugin( Kontact::Core *core, const char *, const TQStringList& setInstance( KNodePluginFactory::instance() ); insertNewAction( new TDEAction( i18n( "New Article..." ), "mail-message-new", CTRL+SHIFT+Key_A, - this, TQT_SLOT( slotPostArticle() ), actionCollection(), "post_article" ) ); + this, TQ_SLOT( slotPostArticle() ), actionCollection(), "post_article" ) ); mUniqueAppWatcher = new Kontact::UniqueAppWatcher( new Kontact::UniqueAppHandlerFactory<KNodeUniqueAppHandler>(), this ); diff --git a/kontact/plugins/knotes/knotes_part.cpp b/kontact/plugins/knotes/knotes_part.cpp index 20e8d6c9..7ec3df6c 100644 --- a/kontact/plugins/knotes/knotes_part.cpp +++ b/kontact/plugins/knotes/knotes_part.cpp @@ -50,13 +50,13 @@ KNotesPart::KNotesPart( TQObject *parent, const char *name ) setInstance( new TDEInstance( "knotes" ) ); // create the actions - new TDEAction( i18n( "&New" ), "knotes", CTRL+Key_N, this, TQT_SLOT( newNote() ), + new TDEAction( i18n( "&New" ), "knotes", CTRL+Key_N, this, TQ_SLOT( newNote() ), actionCollection(), "file_new" ); - new TDEAction( i18n( "Rename..." ), "text", this, TQT_SLOT( renameNote() ), + new TDEAction( i18n( "Rename..." ), "text", this, TQ_SLOT( renameNote() ), actionCollection(), "edit_rename" ); - new TDEAction( i18n( "Delete" ), "edit-delete", Key_Delete, this, TQT_SLOT( killSelectedNotes() ), + new TDEAction( i18n( "Delete" ), "edit-delete", Key_Delete, this, TQ_SLOT( killSelectedNotes() ), actionCollection(), "edit_delete" ); - new TDEAction( i18n( "Print Selected Notes..." ), "print", CTRL+Key_P, this, TQT_SLOT( printSelectedNotes() ), + new TDEAction( i18n( "Print Selected Notes..." ), "print", CTRL+Key_P, this, TQ_SLOT( printSelectedNotes() ), actionCollection(), "print_note" ); // TODO icons: s/editdelete/knotes_delete/ or the other way round in knotes @@ -68,20 +68,20 @@ KNotesPart::KNotesPart( TQObject *parent, const char *name ) mNotesView->setAutoArrange( true ); mNotesView->setSorting( true ); - connect( mNotesView, TQT_SIGNAL( executed( TQIconViewItem* ) ), - this, TQT_SLOT( editNote( TQIconViewItem* ) ) ); - connect( mNotesView, TQT_SIGNAL( returnPressed( TQIconViewItem* ) ), - this, TQT_SLOT( editNote( TQIconViewItem* ) ) ); - connect( mNotesView, TQT_SIGNAL( itemRenamed( TQIconViewItem* ) ), - this, TQT_SLOT( renamedNote( TQIconViewItem* ) ) ); - connect( mNotesView, TQT_SIGNAL( contextMenuRequested( TQIconViewItem*, const TQPoint& ) ), - this, TQT_SLOT( popupRMB( TQIconViewItem*, const TQPoint& ) ) ); - connect( mNotesView, TQT_SIGNAL( onItem( TQIconViewItem* ) ), - this, TQT_SLOT( slotOnItem( TQIconViewItem* ) ) ); - connect( mNotesView, TQT_SIGNAL( onViewport() ), - this, TQT_SLOT( slotOnViewport() ) ); - connect( mNotesView, TQT_SIGNAL( currentChanged( TQIconViewItem* ) ), - this, TQT_SLOT( slotOnCurrentChanged( TQIconViewItem* ) ) ); + connect( mNotesView, TQ_SIGNAL( executed( TQIconViewItem* ) ), + this, TQ_SLOT( editNote( TQIconViewItem* ) ) ); + connect( mNotesView, TQ_SIGNAL( returnPressed( TQIconViewItem* ) ), + this, TQ_SLOT( editNote( TQIconViewItem* ) ) ); + connect( mNotesView, TQ_SIGNAL( itemRenamed( TQIconViewItem* ) ), + this, TQ_SLOT( renamedNote( TQIconViewItem* ) ) ); + connect( mNotesView, TQ_SIGNAL( contextMenuRequested( TQIconViewItem*, const TQPoint& ) ), + this, TQ_SLOT( popupRMB( TQIconViewItem*, const TQPoint& ) ) ); + connect( mNotesView, TQ_SIGNAL( onItem( TQIconViewItem* ) ), + this, TQ_SLOT( slotOnItem( TQIconViewItem* ) ) ); + connect( mNotesView, TQ_SIGNAL( onViewport() ), + this, TQ_SLOT( slotOnViewport() ) ); + connect( mNotesView, TQ_SIGNAL( currentChanged( TQIconViewItem* ) ), + this, TQ_SLOT( slotOnCurrentChanged( TQIconViewItem* ) ) ); slotOnCurrentChanged( 0 ); @@ -91,10 +91,10 @@ KNotesPart::KNotesPart( TQObject *parent, const char *name ) setXMLFile( "knotes_part.rc" ); // connect the resource manager - connect( mManager, TQT_SIGNAL( sigRegisteredNote( KCal::Journal* ) ), - this, TQT_SLOT( createNote( KCal::Journal* ) ) ); - connect( mManager, TQT_SIGNAL( sigDeregisteredNote( KCal::Journal* ) ), - this, TQT_SLOT( killNote( KCal::Journal* ) ) ); + connect( mManager, TQ_SIGNAL( sigRegisteredNote( KCal::Journal* ) ), + this, TQ_SLOT( createNote( KCal::Journal* ) ) ); + connect( mManager, TQ_SIGNAL( sigDeregisteredNote( KCal::Journal* ) ), + this, TQ_SLOT( killNote( KCal::Journal* ) ) ); // read the notes mManager->load(); diff --git a/kontact/plugins/knotes/knotes_plugin.cpp b/kontact/plugins/knotes/knotes_plugin.cpp index 7c3a2bd4..1b66eea1 100644 --- a/kontact/plugins/knotes/knotes_plugin.cpp +++ b/kontact/plugins/knotes/knotes_plugin.cpp @@ -45,9 +45,9 @@ KNotesPlugin::KNotesPlugin( Kontact::Core *core, const char *, const TQStringLis setInstance( KNotesPluginFactory::instance() ); insertNewAction( new TDEAction( i18n( "New Note..." ), "knotes", CTRL+SHIFT+Key_N, - this, TQT_SLOT( slotNewNote() ), actionCollection(), "new_note" ) ); + this, TQ_SLOT( slotNewNote() ), actionCollection(), "new_note" ) ); insertSyncAction( new TDEAction( i18n( "Synchronize Notes" ), "reload", 0, - this, TQT_SLOT( slotSyncNotes() ), actionCollection(), "knotes_sync" ) ); + this, TQ_SLOT( slotSyncNotes() ), actionCollection(), "knotes_sync" ) ); } KNotesPlugin::~KNotesPlugin() diff --git a/kontact/plugins/knotes/summarywidget.cpp b/kontact/plugins/knotes/summarywidget.cpp index b8568bf4..89ae1ec1 100644 --- a/kontact/plugins/knotes/summarywidget.cpp +++ b/kontact/plugins/knotes/summarywidget.cpp @@ -61,10 +61,10 @@ KNotesSummaryWidget::KNotesSummaryWidget( Kontact::Plugin *plugin, mCalendar = new KCal::CalendarLocal( TQString::fromLatin1("UTC") ); KNotesResourceManager *manager = new KNotesResourceManager(); - TQObject::connect( manager, TQT_SIGNAL( sigRegisteredNote( KCal::Journal* ) ), - this, TQT_SLOT( addNote( KCal::Journal* ) ) ); - TQObject::connect( manager, TQT_SIGNAL( sigDeregisteredNote( KCal::Journal* ) ), - this, TQT_SLOT( removeNote( KCal::Journal* ) ) ); + TQObject::connect( manager, TQ_SIGNAL( sigRegisteredNote( KCal::Journal* ) ), + this, TQ_SLOT( addNote( KCal::Journal* ) ) ); + TQObject::connect( manager, TQ_SIGNAL( sigDeregisteredNote( KCal::Journal* ) ), + this, TQ_SLOT( removeNote( KCal::Journal* ) ) ); manager->load(); @@ -111,8 +111,8 @@ void KNotesSummaryWidget::updateView() TQToolTip::add( urlLabel, (*it)->description().left( 80 ) ); } - connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ), - this, TQT_SLOT( urlClicked( const TQString& ) ) ); + connect( urlLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ), + this, TQ_SLOT( urlClicked( const TQString& ) ) ); counter++; } diff --git a/kontact/plugins/korganizer/journalplugin.cpp b/kontact/plugins/korganizer/journalplugin.cpp index ab5306ac..a028d937 100644 --- a/kontact/plugins/korganizer/journalplugin.cpp +++ b/kontact/plugins/korganizer/journalplugin.cpp @@ -50,10 +50,10 @@ JournalPlugin::JournalPlugin( Kontact::Core *core, const char *, const TQStringL instance()->iconLoader()->addAppDir("tdepim"); insertNewAction( new TDEAction( i18n( "New Journal..." ), "newjournal", - CTRL+SHIFT+Key_J, this, TQT_SLOT( slotNewJournal() ), actionCollection(), + CTRL+SHIFT+Key_J, this, TQ_SLOT( slotNewJournal() ), actionCollection(), "new_journal" ) ); insertSyncAction( new TDEAction( i18n( "Synchronize Journal" ), "reload", - 0, this, TQT_SLOT( slotSyncJournal() ), actionCollection(), + 0, this, TQ_SLOT( slotSyncJournal() ), actionCollection(), "journal_sync" ) ); diff --git a/kontact/plugins/korganizer/kcmkorgsummary.cpp b/kontact/plugins/korganizer/kcmkorgsummary.cpp index eda11019..4c0945e7 100644 --- a/kontact/plugins/korganizer/kcmkorgsummary.cpp +++ b/kontact/plugins/korganizer/kcmkorgsummary.cpp @@ -54,11 +54,11 @@ KCMKOrgSummary::KCMKOrgSummary( TQWidget *parent, const char *name ) customDaysChanged( 1 ); - connect( mCalendarGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( modified() ) ); - connect( mCalendarGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( buttonClicked( int ) ) ); - connect( mTodoGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( modified() ) ); - connect( mCustomDays, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( modified() ) ); - connect( mCustomDays, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( customDaysChanged( int ) ) ); + connect( mCalendarGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( modified() ) ); + connect( mCalendarGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( buttonClicked( int ) ) ); + connect( mTodoGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( modified() ) ); + connect( mCustomDays, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( modified() ) ); + connect( mCustomDays, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( customDaysChanged( int ) ) ); TDEAcceleratorManager::manage( this ); diff --git a/kontact/plugins/korganizer/korganizerplugin.cpp b/kontact/plugins/korganizer/korganizerplugin.cpp index 0479c53c..475c64a9 100644 --- a/kontact/plugins/korganizer/korganizerplugin.cpp +++ b/kontact/plugins/korganizer/korganizerplugin.cpp @@ -65,11 +65,11 @@ KOrganizerPlugin::KOrganizerPlugin( Kontact::Core *core, const char *, const TQS instance()->iconLoader()->addAppDir("tdepim"); insertNewAction( new TDEAction( i18n( "New Event..." ), "newappointment", - CTRL+SHIFT+Key_E, this, TQT_SLOT( slotNewEvent() ), actionCollection(), + CTRL+SHIFT+Key_E, this, TQ_SLOT( slotNewEvent() ), actionCollection(), "new_event" ) ); insertSyncAction( new TDEAction( i18n( "Synchronize Calendar" ), "reload", - 0, this, TQT_SLOT( slotSyncEvents() ), actionCollection(), + 0, this, TQ_SLOT( slotSyncEvents() ), actionCollection(), "korganizer_sync" ) ); mUniqueAppWatcher = new Kontact::UniqueAppWatcher( diff --git a/kontact/plugins/korganizer/summarywidget.cpp b/kontact/plugins/korganizer/summarywidget.cpp index de567b8b..6a3c0432 100644 --- a/kontact/plugins/korganizer/summarywidget.cpp +++ b/kontact/plugins/korganizer/summarywidget.cpp @@ -66,9 +66,9 @@ SummaryWidget::SummaryWidget( KOrganizerPlugin *plugin, TQWidget *parent, mCalendar = KOrg::StdCalendar::self(); - connect( mCalendar, TQT_SIGNAL( calendarChanged() ), TQT_SLOT( updateView() ) ); - connect( mPlugin->core(), TQT_SIGNAL( dayChanged( const TQDate& ) ), - TQT_SLOT( updateView() ) ); + connect( mCalendar, TQ_SIGNAL( calendarChanged() ), TQ_SLOT( updateView() ) ); + connect( mPlugin->core(), TQ_SIGNAL( dayChanged( const TQDate& ) ), + TQ_SLOT( updateView() ) ); updateView(); } @@ -202,10 +202,10 @@ void SummaryWidget::updateView() mLayout->addWidget( urlLabel, counter, 2 ); mLabels.append( urlLabel ); - connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ), - this, TQT_SLOT( viewEvent( const TQString& ) ) ); - connect( urlLabel, TQT_SIGNAL( rightClickedURL( const TQString& ) ), - this, TQT_SLOT( popupMenu( const TQString& ) ) ); + connect( urlLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ), + this, TQ_SLOT( viewEvent( const TQString& ) ) ); + connect( urlLabel, TQ_SIGNAL( rightClickedURL( const TQString& ) ), + this, TQ_SLOT( popupMenu( const TQString& ) ) ); TQString tipText( KCal::IncidenceFormatter::toolTipStr( mCalendar, ev, dt, true ) ); if ( !tipText.isEmpty() ) { diff --git a/kontact/plugins/korganizer/todoplugin.cpp b/kontact/plugins/korganizer/todoplugin.cpp index 0b9e426e..bcb2c566 100644 --- a/kontact/plugins/korganizer/todoplugin.cpp +++ b/kontact/plugins/korganizer/todoplugin.cpp @@ -62,11 +62,11 @@ TodoPlugin::TodoPlugin( Kontact::Core *core, const char *, const TQStringList& ) instance()->iconLoader()->addAppDir("tdepim"); insertNewAction( new TDEAction( i18n( "New To-do..." ), "newtodo", - CTRL+SHIFT+Key_T, this, TQT_SLOT( slotNewTodo() ), actionCollection(), + CTRL+SHIFT+Key_T, this, TQ_SLOT( slotNewTodo() ), actionCollection(), "new_todo" ) ); insertSyncAction( new TDEAction( i18n( "Synchronize To-do List" ), "reload", - 0, this, TQT_SLOT( slotSyncTodos() ), actionCollection(), + 0, this, TQ_SLOT( slotSyncTodos() ), actionCollection(), "todo_sync" ) ); mUniqueAppWatcher = new Kontact::UniqueAppWatcher( diff --git a/kontact/plugins/korganizer/todosummarywidget.cpp b/kontact/plugins/korganizer/todosummarywidget.cpp index adce6c33..bdab72a9 100644 --- a/kontact/plugins/korganizer/todosummarywidget.cpp +++ b/kontact/plugins/korganizer/todosummarywidget.cpp @@ -68,9 +68,9 @@ TodoSummaryWidget::TodoSummaryWidget( TodoPlugin *plugin, mCalendar = KOrg::StdCalendar::self(); - connect( mCalendar, TQT_SIGNAL( calendarChanged() ), TQT_SLOT( updateView() ) ); - connect( mPlugin->core(), TQT_SIGNAL( dayChanged( const TQDate& ) ), - TQT_SLOT( updateView() ) ); + connect( mCalendar, TQ_SIGNAL( calendarChanged() ), TQ_SLOT( updateView() ) ); + connect( mPlugin->core(), TQ_SIGNAL( dayChanged( const TQDate& ) ), + TQ_SLOT( updateView() ) ); updateView(); } @@ -163,10 +163,10 @@ void TodoSummaryWidget::updateView() mLayout->addWidget( urlLabel, counter, 2 ); mLabels.append( urlLabel ); - connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ), - this, TQT_SLOT( viewTodo( const TQString& ) ) ); - connect( urlLabel, TQT_SIGNAL( rightClickedURL( const TQString& ) ), - this, TQT_SLOT( popupMenu( const TQString& ) ) ); + connect( urlLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ), + this, TQ_SLOT( viewTodo( const TQString& ) ) ); + connect( urlLabel, TQ_SIGNAL( rightClickedURL( const TQString& ) ), + this, TQ_SLOT( popupMenu( const TQString& ) ) ); TQString tipText( KCal::IncidenceFormatter::toolTipStr( mCalendar, todo, currentDate, true ) ); if ( !tipText.isEmpty() ) { diff --git a/kontact/plugins/kpilot/summarywidget.cpp b/kontact/plugins/kpilot/summarywidget.cpp index 9ab256d2..cc91632f 100644 --- a/kontact/plugins/kpilot/summarywidget.cpp +++ b/kontact/plugins/kpilot/summarywidget.cpp @@ -71,8 +71,8 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name ) mLayout->addWidget( mSyncTimeLabel, row, 1 ); mShowSyncLogLabel = new KURLLabel( "", i18n( "[View Sync Log]" ), this ); mLayout->addWidget( mShowSyncLogLabel, row, 3 ); - connect( mShowSyncLogLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ), - this, TQT_SLOT( showSyncLog( const TQString& ) ) ); + connect( mShowSyncLogLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ), + this, TQ_SLOT( showSyncLog( const TQString& ) ) ); // User row++; @@ -110,8 +110,8 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name ) mLayout->addMultiCellWidget( mNoConnectionLabel, row, row, 1, 2 ); mNoConnectionStartLabel = new KURLLabel( "", i18n( "[Start KPilot]" ), this ); mLayout->addWidget( mNoConnectionStartLabel, row, 3 ); - connect( mNoConnectionStartLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ), - this, TQT_SLOT( startKPilot() ) ); + connect( mNoConnectionStartLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ), + this, TQ_SLOT( startKPilot() ) ); if ( !kapp->dcopClient()->isApplicationRegistered( "kpilotDaemon" ) ) { startKPilot(); @@ -119,7 +119,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name ) connectDCOPSignal( 0, 0, "kpilotDaemonStatusDetails(TQDateTime,TQString,TQStringList,TQString,TQString,TQString,bool)", "receiveDaemonStatusDetails(TQDateTime,TQString,TQStringList,TQString,TQString,TQString,bool)", false ); - connect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString & ) ), TQT_SLOT( slotAppRemoved( const TQCString& ) ) ); + connect( kapp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString & ) ), TQ_SLOT( slotAppRemoved( const TQCString& ) ) ); } SummaryWidget::~SummaryWidget() diff --git a/kontact/plugins/newsticker/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp index 2eee85ea..4a698ff8 100644 --- a/kontact/plugins/newsticker/kcmkontactknt.cpp +++ b/kontact/plugins/newsticker/kcmkontactknt.cpp @@ -80,10 +80,10 @@ NewsEditDialog::NewsEditDialog( const TQString& title, const TQString& url, TQWi mTitle->setText( title ); mURL->setText( url ); mTitle->setFocus(); - connect( mTitle, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( modified() ) ); - connect( mURL, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( modified() ) ); + connect( mTitle, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( modified() ) ); + connect( mURL, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( modified() ) ); modified(); } @@ -133,18 +133,18 @@ KCMKontactKNT::KCMKontactKNT( TQWidget *parent, const char *name ) { initGUI(); - connect( mAllNews, TQT_SIGNAL( currentChanged( TQListViewItem* ) ), - this, TQT_SLOT( allCurrentChanged( TQListViewItem* ) ) ); - connect( mSelectedNews, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), - this, TQT_SLOT( selectedChanged( TQListViewItem* ) ) ); + connect( mAllNews, TQ_SIGNAL( currentChanged( TQListViewItem* ) ), + this, TQ_SLOT( allCurrentChanged( TQListViewItem* ) ) ); + connect( mSelectedNews, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ), + this, TQ_SLOT( selectedChanged( TQListViewItem* ) ) ); - connect( mUpdateInterval, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( modified() ) ); - connect( mArticleCount, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( modified() ) ); + connect( mUpdateInterval, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( modified() ) ); + connect( mArticleCount, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( modified() ) ); - connect( mAddButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( addNews() ) ); - connect( mRemoveButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( removeNews() ) ); - connect( mNewButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( newFeed() ) ); - connect( mDeleteButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( deleteFeed() ) ); + connect( mAddButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( addNews() ) ); + connect( mRemoveButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( removeNews() ) ); + connect( mNewButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( newFeed() ) ); + connect( mDeleteButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( deleteFeed() ) ); TDEAcceleratorManager::manage( this ); diff --git a/kontact/plugins/newsticker/summarywidget.cpp b/kontact/plugins/newsticker/summarywidget.cpp index 72c65baa..b7b3f866 100644 --- a/kontact/plugins/newsticker/summarywidget.cpp +++ b/kontact/plugins/newsticker/summarywidget.cpp @@ -68,7 +68,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name ) mBaseWidget = new TQWidget( this, "baseWidget" ); vlay->addWidget( mBaseWidget ); - connect( &mTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( updateDocuments() ) ); + connect( &mTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( updateDocuments() ) ); readConfig(); @@ -223,10 +223,10 @@ void SummaryWidget::updateView() urlLabel->setMaximumSize( urlLabel->minimumSizeHint() ); mLabels.append( urlLabel ); - connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ), - kapp, TQT_SLOT( invokeBrowser( const TQString& ) ) ); - connect( urlLabel, TQT_SIGNAL( rightClickedURL( const TQString& ) ), - this, TQT_SLOT( rmbMenu( const TQString& ) ) ); + connect( urlLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ), + kapp, TQ_SLOT( invokeBrowser( const TQString& ) ) ); + connect( urlLabel, TQ_SIGNAL( rightClickedURL( const TQString& ) ), + this, TQ_SLOT( rmbMenu( const TQString& ) ) ); // header TQLabel *label = new TQLabel( hbox ); @@ -252,10 +252,10 @@ void SummaryWidget::updateView() mLabels.append( urlLabel ); mLayout->addWidget( urlLabel ); - connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ), - kapp, TQT_SLOT( invokeBrowser( const TQString& ) ) ); - connect( urlLabel, TQT_SIGNAL( rightClickedURL( const TQString& ) ), - this, TQT_SLOT( rmbMenu( const TQString& ) ) ); + connect( urlLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ), + kapp, TQ_SLOT( invokeBrowser( const TQString& ) ) ); + connect( urlLabel, TQ_SIGNAL( rightClickedURL( const TQString& ) ), + this, TQ_SLOT( rmbMenu( const TQString& ) ) ); numArticles++; diff --git a/kontact/plugins/specialdates/kcmsdsummary.cpp b/kontact/plugins/specialdates/kcmsdsummary.cpp index c0512fae..f35cc2b4 100644 --- a/kontact/plugins/specialdates/kcmsdsummary.cpp +++ b/kontact/plugins/specialdates/kcmsdsummary.cpp @@ -56,12 +56,12 @@ KCMSDSummary::KCMSDSummary( TQWidget *parent, const char *name ) customDaysChanged( 1 ); - connect( mDaysGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( modified() ) ); - connect( mDaysGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( buttonClicked( int ) ) ); - connect( mCalendarGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( modified() ) ); - connect( mContactGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( modified() ) ); - connect( mCustomDays, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( modified() ) ); - connect( mCustomDays, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( customDaysChanged( int ) ) ); + connect( mDaysGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( modified() ) ); + connect( mDaysGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( buttonClicked( int ) ) ); + connect( mCalendarGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( modified() ) ); + connect( mContactGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( modified() ) ); + connect( mCustomDays, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( modified() ) ); + connect( mCustomDays, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( customDaysChanged( int ) ) ); TDEAcceleratorManager::manage( this ); diff --git a/kontact/plugins/specialdates/sdsummarywidget.cpp b/kontact/plugins/specialdates/sdsummarywidget.cpp index c8c9b716..fb9167c6 100644 --- a/kontact/plugins/specialdates/sdsummarywidget.cpp +++ b/kontact/plugins/specialdates/sdsummarywidget.cpp @@ -95,10 +95,10 @@ SDSummaryWidget::SDSummaryWidget( Kontact::Plugin *plugin, TQWidget *parent, // Setup the Addressbook TDEABC::StdAddressBook *ab = TDEABC::StdAddressBook::self( true ); - connect( ab, TQT_SIGNAL( addressBookChanged( AddressBook* ) ), - this, TQT_SLOT( updateView() ) ); - connect( mPlugin->core(), TQT_SIGNAL( dayChanged( const TQDate& ) ), - this, TQT_SLOT( updateView() ) ); + connect( ab, TQ_SIGNAL( addressBookChanged( AddressBook* ) ), + this, TQ_SLOT( updateView() ) ); + connect( mPlugin->core(), TQ_SIGNAL( dayChanged( const TQDate& ) ), + this, TQ_SLOT( updateView() ) ); // Setup the Calendar mCalendar = new KCal::CalendarResources( KPimPrefs::timezone() ); @@ -128,10 +128,10 @@ SDSummaryWidget::SDSummaryWidget( Kontact::Plugin *plugin, TQWidget *parent, } mCalendar = KOrg::StdCalendar::self(); - connect( mCalendar, TQT_SIGNAL( calendarChanged() ), - this, TQT_SLOT( updateView() ) ); - connect( mPlugin->core(), TQT_SIGNAL( dayChanged( const TQDate& ) ), - this, TQT_SLOT( updateView() ) ); + connect( mCalendar, TQ_SIGNAL( calendarChanged() ), + this, TQ_SLOT( updateView() ) ); + connect( mPlugin->core(), TQ_SIGNAL( dayChanged( const TQDate& ) ), + this, TQ_SLOT( updateView() ) ); // Update Configuration configUpdated(); @@ -506,10 +506,10 @@ void SDSummaryWidget::updateView() mLayout->addWidget( urlLabel, counter, 4 ); mLabels.append( urlLabel ); - connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ), - this, TQT_SLOT( mailContact( const TQString& ) ) ); - connect( urlLabel, TQT_SIGNAL( rightClickedURL( const TQString& ) ), - this, TQT_SLOT( popupMenu( const TQString& ) ) ); + connect( urlLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ), + this, TQ_SLOT( mailContact( const TQString& ) ) ); + connect( urlLabel, TQ_SIGNAL( rightClickedURL( const TQString& ) ), + this, TQ_SLOT( popupMenu( const TQString& ) ) ); } else { label = new TQLabel( this ); label->setText( (*addrIt).summary ); diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp index 65bd13e5..591cb033 100644 --- a/kontact/plugins/summary/kcmkontactsummary.cpp +++ b/kontact/plugins/summary/kcmkontactsummary.cpp @@ -103,8 +103,8 @@ KCMKontactSummary::KCMKontactSummary( TQWidget *parent, const char *name ) layout->setStretchFactor( mPluginView, 1 ); - connect( mPluginView, TQT_SIGNAL( clicked( TQListViewItem* ) ), - this, TQT_SLOT( itemClicked( TQListViewItem* ) ) ); + connect( mPluginView, TQ_SIGNAL( clicked( TQListViewItem* ) ), + this, TQ_SLOT( itemClicked( TQListViewItem* ) ) ); load(); TDEAboutData *about = new TDEAboutData( I18N_NOOP( "kontactsummary" ), diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp index ddb43d71..5c64d934 100644 --- a/kontact/plugins/summary/summaryview_part.cpp +++ b/kontact/plugins/summary/summaryview_part.cpp @@ -77,25 +77,25 @@ SummaryViewPart::SummaryViewPart( Kontact::Core *core, const char*, initGUI( core ); - connect( kapp, TQT_SIGNAL( tdedisplayPaletteChanged() ), TQT_SLOT( slotAdjustPalette() ) ); + connect( kapp, TQ_SIGNAL( tdedisplayPaletteChanged() ), TQ_SLOT( slotAdjustPalette() ) ); slotAdjustPalette(); setDate( TQDate::currentDate() ); - connect( mCore, TQT_SIGNAL( dayChanged( const TQDate& ) ), - TQT_SLOT( setDate( const TQDate& ) ) ); + connect( mCore, TQ_SIGNAL( dayChanged( const TQDate& ) ), + TQ_SLOT( setDate( const TQDate& ) ) ); KParts::InfoExtension *info = new KParts::InfoExtension( this, "Summary" ); - connect( this, TQT_SIGNAL( textChanged( const TQString& ) ), - info, TQT_SIGNAL( textChanged( const TQString& ) ) ); + connect( this, TQ_SIGNAL( textChanged( const TQString& ) ), + info, TQ_SIGNAL( textChanged( const TQString& ) ) ); mConfigAction = new TDEAction( i18n( "&Configure Summary View..." ), "configure", 0, this, - TQT_SLOT( slotConfigure() ), actionCollection(), + TQ_SLOT( slotConfigure() ), actionCollection(), "summaryview_configure" ); setXMLFile( "kontactsummary_part.rc" ); - TQTimer::singleShot( 0, this, TQT_SLOT( slotTextChanged() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotTextChanged() ) ); } SummaryViewPart::~SummaryViewPart() @@ -142,8 +142,8 @@ void SummaryViewPart::updateWidgets() mSummaries.clear(); mFrame = new DropWidget( mMainWidget ); - connect( mFrame, TQT_SIGNAL( summaryWidgetDropped( TQWidget*, TQWidget*, int ) ), - this, TQT_SLOT( summaryWidgetMoved( TQWidget*, TQWidget*, int ) ) ); + connect( mFrame, TQ_SIGNAL( summaryWidgetDropped( TQWidget*, TQWidget*, int ) ), + this, TQ_SLOT( summaryWidgetMoved( TQWidget*, TQWidget*, int ) ) ); mMainLayout->insertWidget( 2, mFrame ); @@ -176,10 +176,10 @@ void SummaryViewPart::updateWidgets() if ( summary->summaryHeight() > 0 ) { mSummaries.insert( plugin->identifier(), summary ); - connect( summary, TQT_SIGNAL( message( const TQString& ) ), - BroadcastStatus::instance(), TQT_SLOT( setStatusMsg( const TQString& ) ) ); - connect( summary, TQT_SIGNAL( summaryWidgetDropped( TQWidget*, TQWidget*, int ) ), - this, TQT_SLOT( summaryWidgetMoved( TQWidget*, TQWidget*, int ) ) ); + connect( summary, TQ_SIGNAL( message( const TQString& ) ), + BroadcastStatus::instance(), TQ_SLOT( setStatusMsg( const TQString& ) ) ); + connect( summary, TQ_SIGNAL( summaryWidgetDropped( TQWidget*, TQWidget*, int ) ), + this, TQ_SLOT( summaryWidgetMoved( TQWidget*, TQWidget*, int ) ) ); if ( !mLeftColumnSummaries.contains( plugin->identifier() ) && !mRightColumnSummaries.contains( plugin->identifier() ) ) { @@ -327,8 +327,8 @@ void SummaryViewPart::slotConfigure() TQStringList modules = configModules(); modules.prepend( "kcmkontactsummary.desktop" ); - connect( &dlg, TQT_SIGNAL( configCommitted() ), - this, TQT_SLOT( updateWidgets() ) ); + connect( &dlg, TQ_SIGNAL( configCommitted() ), + this, TQ_SLOT( updateWidgets() ) ); TQStringList::ConstIterator strIt; for ( strIt = modules.begin(); strIt != modules.end(); ++strIt ) @@ -384,8 +384,8 @@ void SummaryViewPart::initGUI( Kontact::Core *core ) mFrame = new DropWidget( mMainWidget ); mMainLayout->insertWidget( 2, mFrame ); - connect( mFrame, TQT_SIGNAL( summaryWidgetDropped( TQWidget*, TQWidget*, int ) ), - this, TQT_SLOT( summaryWidgetMoved( TQWidget*, TQWidget*, int ) ) ); + connect( mFrame, TQ_SIGNAL( summaryWidgetDropped( TQWidget*, TQWidget*, int ) ), + this, TQ_SLOT( summaryWidgetMoved( TQWidget*, TQWidget*, int ) ) ); updateWidgets(); } diff --git a/kontact/plugins/summary/summaryview_plugin.cpp b/kontact/plugins/summary/summaryview_plugin.cpp index 0523e2ac..711c2b39 100644 --- a/kontact/plugins/summary/summaryview_plugin.cpp +++ b/kontact/plugins/summary/summaryview_plugin.cpp @@ -42,8 +42,8 @@ SummaryView::SummaryView( Kontact::Core *core, const char *name, const TQStringL mSyncAction = new TDESelectAction( i18n( "Synchronize All" ), "reload", 0, 0, 0, actionCollection(), "kontact_summary_sync" ); - connect( mSyncAction, TQT_SIGNAL( activated( const TQString& ) ), this, TQT_SLOT( syncAccount( const TQString& ) ) ); - connect( mSyncAction->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( fillSyncActionSubEntries() ) ); + connect( mSyncAction, TQ_SIGNAL( activated( const TQString& ) ), this, TQ_SLOT( syncAccount( const TQString& ) ) ); + connect( mSyncAction->popupMenu(), TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( fillSyncActionSubEntries() ) ); insertSyncAction( mSyncAction ); fillSyncActionSubEntries(); diff --git a/kontact/plugins/test/test_part.cpp b/kontact/plugins/test/test_part.cpp index 2e712ae8..12a7b483 100644 --- a/kontact/plugins/test/test_part.cpp +++ b/kontact/plugins/test/test_part.cpp @@ -48,14 +48,14 @@ TestPart::TestPart(TQObject *parent, const char *name) // ## parentWidget m_edit = new TQTextEdit; setWidget(m_edit); setXMLFile("testpartui.rc"); - new TDEAction( "new contact (test)", 0, this, TQT_SLOT( newContact() ), actionCollection(), "test_deleteevent" ); + new TDEAction( "new contact (test)", 0, this, TQ_SLOT( newContact() ), actionCollection(), "test_deleteevent" ); m_kab_stub = 0L; new KParts::SideBarExtension(new TQComboBox(this), this, "sbe"); kapp->dcopClient()->setNotifications( true ); - connect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString&)), - this, TQT_SLOT( unregisteredFromDCOP( const TQCString& )) ); + connect( kapp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString&)), + this, TQ_SLOT( unregisteredFromDCOP( const TQCString& )) ); } TestPart::~TestPart() diff --git a/kontact/plugins/test/test_plugin.cpp b/kontact/plugins/test/test_plugin.cpp index 03d76ad6..e98cd4f2 100644 --- a/kontact/plugins/test/test_plugin.cpp +++ b/kontact/plugins/test/test_plugin.cpp @@ -39,7 +39,7 @@ TestPlugin::TestPlugin(Kontact::Core *_core, const char *name, const TQStringLis { setInstance(TestPluginFactory::instance()); - insertNewAction(new TDEAction("Test", 0, this, TQT_SLOT(slotTestMenu()), actionCollection(), "edit_test")); + insertNewAction(new TDEAction("Test", 0, this, TQ_SLOT(slotTestMenu()), actionCollection(), "edit_test")); setXMLFile("kptestplugin.rc"); } diff --git a/kontact/plugins/weather/summarywidget.cpp b/kontact/plugins/weather/summarywidget.cpp index 37fbe74d..323ad8de 100644 --- a/kontact/plugins/weather/summarywidget.cpp +++ b/kontact/plugins/weather/summarywidget.cpp @@ -69,7 +69,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name ) if ( reply.isValid() ) { mStations = reply; - connect( &mTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( timeout() ) ); + connect( &mTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( timeout() ) ); mTimer.start( 0 ); } else { kdDebug(5602) << "ERROR: dcop reply not valid..." << endl; @@ -117,8 +117,8 @@ void SummaryWidget::updateView() urlLabel->setAlignment( AlignTop ); layout->addMultiCellWidget( urlLabel, 0, 1, 0, 0 ); mLabels.append( urlLabel ); - connect ( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ), - this, TQT_SLOT( showReport( const TQString& ) ) ); + connect ( urlLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ), + this, TQ_SLOT( showReport( const TQString& ) ) ); TQLabel* label = new TQLabel( this ); label->setText( TQString( "%1 (%2)" ).arg( (*it).name() ).arg( (*it).temperature() ) ); @@ -210,8 +210,8 @@ void SummaryWidget::updateSummary( bool ) void SummaryWidget::showReport( const TQString &stationID ) { mProc = new TDEProcess; - TQApplication::connect( mProc, TQT_SIGNAL( processExited( TDEProcess* ) ), - this, TQT_SLOT( reportFinished( TDEProcess* ) ) ); + TQApplication::connect( mProc, TQ_SIGNAL( processExited( TDEProcess* ) ), + this, TQ_SLOT( reportFinished( TDEProcess* ) ) ); *mProc << "kweatherreport"; *mProc << stationID; diff --git a/kontact/src/iconsidepane.cpp b/kontact/src/iconsidepane.cpp index 811d42f7..f9a261a9 100644 --- a/kontact/src/iconsidepane.cpp +++ b/kontact/src/iconsidepane.cpp @@ -267,16 +267,16 @@ Navigator::Navigator( IconSidePane *parent, const char *name ) setFocusPolicy( TQWidget::NoFocus ); - connect( this, TQT_SIGNAL( selectionChanged( TQListBoxItem* ) ), - TQT_SLOT( slotExecuted( TQListBoxItem* ) ) ); - connect( this, TQT_SIGNAL( rightButtonPressed( TQListBoxItem*, const TQPoint& ) ), - TQT_SLOT( slotShowRMBMenu( TQListBoxItem*, const TQPoint& ) ) ); - connect( this, TQT_SIGNAL( onItem( TQListBoxItem * ) ), - TQT_SLOT( slotMouseOn( TQListBoxItem * ) ) ); - connect( this, TQT_SIGNAL( onViewport() ), TQT_SLOT( slotMouseOff() ) ); + connect( this, TQ_SIGNAL( selectionChanged( TQListBoxItem* ) ), + TQ_SLOT( slotExecuted( TQListBoxItem* ) ) ); + connect( this, TQ_SIGNAL( rightButtonPressed( TQListBoxItem*, const TQPoint& ) ), + TQ_SLOT( slotShowRMBMenu( TQListBoxItem*, const TQPoint& ) ) ); + connect( this, TQ_SIGNAL( onItem( TQListBoxItem * ) ), + TQ_SLOT( slotMouseOn( TQListBoxItem * ) ) ); + connect( this, TQ_SIGNAL( onViewport() ), TQ_SLOT( slotMouseOff() ) ); mMapper = new TQSignalMapper( this ); - connect( mMapper, TQT_SIGNAL( mapped( int ) ), TQT_SLOT( shortCutSelected( int ) ) ); + connect( mMapper, TQ_SIGNAL( mapped( int ) ), TQ_SLOT( shortCutSelected( int ) ) ); TQToolTip::remove( this ); if ( !mShowText ) @@ -295,7 +295,7 @@ void Navigator::highlightItem( EntryItem * item ) setPaintActiveItem( mHighlightItem, true ); - TQTimer::singleShot( 2000, this, TQT_SLOT( slotStopHighlight() ) ); + TQTimer::singleShot( 2000, this, TQ_SLOT( slotStopHighlight() ) ); } void Navigator::slotStopHighlight() @@ -539,8 +539,8 @@ IconSidePane::IconSidePane( Core *core, TQWidget *parent, const char *name ) : SidePaneBase( core, parent, name ) { mNavigator = new Navigator( this ); - connect( mNavigator, TQT_SIGNAL( pluginActivated( Kontact::Plugin* ) ), - TQT_SIGNAL( pluginSelected( Kontact::Plugin* ) ) ); + connect( mNavigator, TQ_SIGNAL( pluginActivated( Kontact::Plugin* ) ), + TQ_SIGNAL( pluginSelected( Kontact::Plugin* ) ) ); setAcceptDrops( true ); } diff --git a/kontact/src/kcmkontact.cpp b/kontact/src/kcmkontact.cpp index 4e6e4407..b1d0b039 100644 --- a/kontact/src/kcmkontact.cpp +++ b/kontact/src/kcmkontact.cpp @@ -81,8 +81,8 @@ KcmKontact::KcmKontact( TQWidget *parent, const char *name ) pluginStartupLayout->addWidget( selection->comboBox() ); selection->comboBox()->setEnabled( false ); - connect( forceStartupPlugin->checkBox(), TQT_SIGNAL( toggled( bool ) ), - selection->comboBox(), TQT_SLOT( setEnabled( bool ) ) ); + connect( forceStartupPlugin->checkBox(), TQ_SIGNAL( toggled( bool ) ), + selection->comboBox(), TQ_SLOT( setEnabled( bool ) ) ); load(); } @@ -104,7 +104,7 @@ PluginSelection::PluginSelection( TDEConfigSkeleton::ItemString *item, TQWidget { mItem = item; mPluginCombo = new TQComboBox( parent ); - connect( mPluginCombo, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( changed() ) ); + connect( mPluginCombo, TQ_SIGNAL( activated( int ) ), TQ_SIGNAL( changed() ) ); } PluginSelection::~PluginSelection() diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp index 9e79545c..a354fa41 100644 --- a/kontact/src/mainwindow.cpp +++ b/kontact/src/mainwindow.cpp @@ -120,8 +120,8 @@ void MainWindow::initGUI() setupActions(); setHelpMenuEnabled( false ); KHelpMenu *helpMenu = new KHelpMenu( this, 0, true, actionCollection() ); - connect( helpMenu, TQT_SIGNAL( showAboutApplication() ), - TQT_SLOT( showAboutDialog() ) ); + connect( helpMenu, TQ_SIGNAL( showAboutApplication() ), + TQ_SLOT( showAboutDialog() ) ); TDETrader::OfferList offers = TDETrader::self()->query( TQString::fromLatin1( "Kontact/Plugin" ), @@ -133,7 +133,7 @@ void MainWindow::initGUI() (*it)->load(); TDEAction *action = new TDEAction( (*it)->name(), (*it)->icon(), TDEShortcut(), - this, TQT_SLOT(slotActionTriggered()), + this, TQ_SLOT(slotActionTriggered()), actionCollection(), (*it)->pluginName().latin1() ); action->setName( (*it)->pluginName().latin1() ); action->setWhatsThis( i18n( "Switch to plugin %1" ).arg( (*it)->name() ) ); @@ -144,8 +144,8 @@ void MainWindow::initGUI() } } - KStdAction::keyBindings( this, TQT_SLOT( configureShortcuts() ), actionCollection() ); - KStdAction::configureToolbars( this, TQT_SLOT( configureToolbars() ), actionCollection() ); + KStdAction::keyBindings( this, TQ_SLOT( configureShortcuts() ), actionCollection() ); + KStdAction::configureToolbars( this, TQ_SLOT( configureToolbars() ), actionCollection() ); setXMLFile( "kontactui.rc" ); setStandardToolBarMenuEnabled( true ); @@ -157,10 +157,10 @@ void MainWindow::initGUI() resize( 700, 520 ); // initial size to prevent a scrollbar in sidepane setAutoSaveSettings(); - connect( Kontact::ProfileManager::self(), TQT_SIGNAL( profileLoaded( const TQString& ) ), - this, TQT_SLOT( slotLoadProfile( const TQString& ) ) ); - connect( Kontact::ProfileManager::self(), TQT_SIGNAL( saveToProfileRequested( const TQString& ) ), - this, TQT_SLOT( slotSaveToProfile( const TQString& ) ) ); + connect( Kontact::ProfileManager::self(), TQ_SIGNAL( profileLoaded( const TQString& ) ), + this, TQ_SLOT( slotLoadProfile( const TQString& ) ) ); + connect( Kontact::ProfileManager::self(), TQ_SIGNAL( saveToProfileRequested( const TQString& ) ), + this, TQ_SLOT( slotSaveToProfile( const TQString& ) ) ); } @@ -168,15 +168,15 @@ void MainWindow::initObject() { // prepare the part manager mPartManager = new KParts::PartManager( this ); - connect( mPartManager, TQT_SIGNAL( activePartChanged( KParts::Part* ) ), - this, TQT_SLOT( slotActivePartChanged( KParts::Part* ) ) ); + connect( mPartManager, TQ_SIGNAL( activePartChanged( KParts::Part* ) ), + this, TQ_SLOT( slotActivePartChanged( KParts::Part* ) ) ); if ( mSidePane ) { mSidePane->updatePlugins(); } KSettings::Dispatcher::self()->registerInstance( instance(), this, - TQT_SLOT( updateConfig() ) ); + TQ_SLOT( updateConfig() ) ); loadSettings(); @@ -187,8 +187,8 @@ void MainWindow::initObject() // done initializing slotShowStatusMsg( TQString() ); - connect( KPIM::BroadcastStatus::instance(), TQT_SIGNAL( statusMsg( const TQString& ) ), - this, TQT_SLOT( slotShowStatusMsg( const TQString& ) ) ); + connect( KPIM::BroadcastStatus::instance(), TQ_SIGNAL( statusMsg( const TQString& ) ), + this, TQ_SLOT( slotShowStatusMsg( const TQString& ) ) ); // launch commandline specified module if any activatePluginModule(); @@ -251,8 +251,8 @@ void MainWindow::initWidgets() sizes << 0; mSplitter->setSizes(sizes); - connect( mSidePane, TQT_SIGNAL( pluginSelected( Kontact::Plugin * ) ), - TQT_SLOT( selectPlugin( Kontact::Plugin * ) ) ); + connect( mSidePane, TQ_SIGNAL( pluginSelected( Kontact::Plugin * ) ), + TQ_SLOT( selectPlugin( Kontact::Plugin * ) ) ); TQVBox *vBox; if ( mSplitter ) { @@ -323,19 +323,19 @@ void MainWindow::initAboutScreen() mIntroPart->view()->setLineWidth( 0 ); connect( mIntroPart->browserExtension(), - TQT_SIGNAL( openURLRequest( const KURL&, const KParts::URLArgs& ) ), - TQT_SLOT( slotOpenUrl( const KURL& ) ) ); + TQ_SIGNAL( openURLRequest( const KURL&, const KParts::URLArgs& ) ), + TQ_SLOT( slotOpenUrl( const KURL& ) ) ); connect( mIntroPart->browserExtension(), - TQT_SIGNAL( createNewWindow( const KURL&, const KParts::URLArgs& ) ), - TQT_SLOT( slotOpenUrl( const KURL& ) ) ); + TQ_SIGNAL( createNewWindow( const KURL&, const KParts::URLArgs& ) ), + TQ_SLOT( slotOpenUrl( const KURL& ) ) ); } void MainWindow::setupActions() { - KStdAction::quit( this, TQT_SLOT( slotQuit() ), actionCollection() ); + KStdAction::quit( this, TQ_SLOT( slotQuit() ), actionCollection() ); mNewActions = new TDEToolBarPopupAction( KGuiItem( i18n( "New" ), "" ), - TDEStdAccel::shortcut(TDEStdAccel::New), this, TQT_SLOT( slotNewClicked() ), + TDEStdAccel::shortcut(TDEStdAccel::New), this, TQ_SLOT( slotNewClicked() ), actionCollection(), "action_new" ); TDEConfig* const cfg = Prefs::self()->config(); @@ -344,18 +344,18 @@ void MainWindow::setupActions() if ( mSyncActionsEnabled ) { mSyncActions = new TDEToolBarPopupAction( KGuiItem( i18n( "Synchronize" ) ), - TDEStdAccel::shortcut(TDEStdAccel::Reload), this, TQT_SLOT( slotSyncClicked() ), + TDEStdAccel::shortcut(TDEStdAccel::Reload), this, TQ_SLOT( slotSyncClicked() ), actionCollection(), "action_sync" ); } - new TDEAction( i18n( "Configure Kontact..." ), "configure", 0, this, TQT_SLOT( slotPreferences() ), + new TDEAction( i18n( "Configure Kontact..." ), "configure", 0, this, TQ_SLOT( slotPreferences() ), actionCollection(), "settings_configure_kontact" ); - new TDEAction( i18n( "Configure &Profiles..." ), 0, this, TQT_SLOT( slotConfigureProfiles() ), + new TDEAction( i18n( "Configure &Profiles..." ), 0, this, TQ_SLOT( slotConfigureProfiles() ), actionCollection(), "settings_configure_kontact_profiles" ); - new TDEAction( i18n( "&Kontact Introduction" ), 0, this, TQT_SLOT( slotShowIntroduction() ), + new TDEAction( i18n( "&Kontact Introduction" ), 0, this, TQ_SLOT( slotShowIntroduction() ), actionCollection(), "help_introduction" ); - new TDEAction( i18n( "&Tip of the Day" ), 0, this, TQT_SLOT( slotShowTip() ), + new TDEAction( i18n( "&Tip of the Day" ), 0, this, TQ_SLOT( slotShowTip() ), actionCollection(), "help_tipofday" ); KWidgetAction* spacerAction = new KWidgetAction( new TQWidget( this ), "SpacerAction", "", 0, 0, actionCollection(), "navigator_spacer_item" ); @@ -977,8 +977,8 @@ void MainWindow::slotPreferences() } dlg = new SettingsDialogWrapper( KSettings::Dialog::Configurable, this ); dlg->addPluginInfos( filteredPlugins ); - connect( dlg, TQT_SIGNAL( pluginSelectionChanged() ), - TQT_SLOT( pluginsChanged() ) ); + connect( dlg, TQ_SIGNAL( pluginSelectionChanged() ), + TQ_SLOT( pluginsChanged() ) ); } dlg->show(); @@ -1053,8 +1053,8 @@ void MainWindow::configureToolbars() saveMainWindowSettings( TDEGlobal::config(), "MainWindow" ); KEditToolbar edit( factory() ); - connect( &edit, TQT_SIGNAL( newToolbarConfig() ), - this, TQT_SLOT( slotNewToolbarConfig() ) ); + connect( &edit, TQ_SIGNAL( newToolbarConfig() ), + this, TQ_SLOT( slotNewToolbarConfig() ) ); edit.exec(); } diff --git a/kontact/src/profiledialog.cpp b/kontact/src/profiledialog.cpp index e85d90c5..0c9c2a49 100644 --- a/kontact/src/profiledialog.cpp +++ b/kontact/src/profiledialog.cpp @@ -53,10 +53,10 @@ Kontact::ProfileDialog::ProfileDialog( TQWidget* parent, WFlags flags ) : KDialo m_list->setRenameable( NameColumn, true ); m_list->setRenameable( DescriptionColumn, true ); - connect( m_list, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( listSelectionChanged() ) ); - connect( m_list, TQT_SIGNAL( itemRenamed( TQListViewItem*, const TQString&, int ) ), - this, TQT_SLOT( listItemRenamed( TQListViewItem*, const TQString&, int ) ) ); + connect( m_list, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( listSelectionChanged() ) ); + connect( m_list, TQ_SIGNAL( itemRenamed( TQListViewItem*, const TQString&, int ) ), + this, TQ_SLOT( listItemRenamed( TQListViewItem*, const TQString&, int ) ) ); horizontalLayout->addWidget( m_list ); TQVBoxLayout* buttonLayout = new TQVBoxLayout( horizontalLayout ); @@ -64,49 +64,49 @@ Kontact::ProfileDialog::ProfileDialog( TQWidget* parent, WFlags flags ) : KDialo m_newProfileButton = new TQPushButton( mainWidget ); m_newProfileButton->setText( i18n("New Profile") ); - connect( m_newProfileButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( addNewProfile() ) ); + connect( m_newProfileButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( addNewProfile() ) ); buttonLayout->addWidget( m_newProfileButton ); m_deleteProfileButton = new TQPushButton( mainWidget ); m_deleteProfileButton->setText( i18n("Delete Profile") ); m_deleteProfileButton->setEnabled( false ); - connect( m_deleteProfileButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( deleteSelectedProfile() ) ); + connect( m_deleteProfileButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( deleteSelectedProfile() ) ); buttonLayout->addWidget( m_deleteProfileButton ); m_saveProfileButton = new TQPushButton( mainWidget ); m_saveProfileButton->setText( i18n("Save Profile") ); m_saveProfileButton->setEnabled( false ); - connect( m_saveProfileButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( saveToSelectedProfile() ) ); + connect( m_saveProfileButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( saveToSelectedProfile() ) ); buttonLayout->addWidget( m_saveProfileButton ); buttonLayout->addStretch(); m_importProfileButton = new TQPushButton( mainWidget ); m_importProfileButton->setText( i18n("Import Profile") ); - connect( m_importProfileButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( importProfile() ) ); + connect( m_importProfileButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( importProfile() ) ); buttonLayout->addWidget( m_importProfileButton ); m_exportProfileButton = new TQPushButton( mainWidget ); m_exportProfileButton->setText( i18n("Export Profile") ); m_exportProfileButton->setEnabled( false ); - connect( m_exportProfileButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( exportSelectedProfile() ) ); + connect( m_exportProfileButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( exportSelectedProfile() ) ); buttonLayout->addWidget( m_exportProfileButton ); setMainWidget( mainWidget ); - connect( Kontact::ProfileManager::self(), TQT_SIGNAL( profileAdded( const TQString& ) ), - this, TQT_SLOT( profileAdded( const TQString& ) ) ); - connect( Kontact::ProfileManager::self(), TQT_SIGNAL( profileRemoved( const TQString& ) ), - this, TQT_SLOT( profileRemoved( const TQString& ) ) ); - connect( Kontact::ProfileManager::self(), TQT_SIGNAL( profileLoaded( const TQString& ) ), - this, TQT_SLOT( profileLoaded( const TQString& ) ) ); - connect( Kontact::ProfileManager::self(), TQT_SIGNAL( profileUpdated( const TQString& ) ), - this, TQT_SLOT( profileUpdated( const TQString& ) ) ); + connect( Kontact::ProfileManager::self(), TQ_SIGNAL( profileAdded( const TQString& ) ), + this, TQ_SLOT( profileAdded( const TQString& ) ) ); + connect( Kontact::ProfileManager::self(), TQ_SIGNAL( profileRemoved( const TQString& ) ), + this, TQ_SLOT( profileRemoved( const TQString& ) ) ); + connect( Kontact::ProfileManager::self(), TQ_SIGNAL( profileLoaded( const TQString& ) ), + this, TQ_SLOT( profileLoaded( const TQString& ) ) ); + connect( Kontact::ProfileManager::self(), TQ_SIGNAL( profileUpdated( const TQString& ) ), + this, TQ_SLOT( profileUpdated( const TQString& ) ) ); const TQValueList<Kontact::Profile> profiles = Kontact::ProfileManager::self()->profiles(); for ( TQValueList<Kontact::Profile>::ConstIterator it = profiles.begin(), end = profiles.end(); it != end; ++it ) diff --git a/korganizer/actionmanager.cpp b/korganizer/actionmanager.cpp index a47c25ef..abde9092 100644 --- a/korganizer/actionmanager.cpp +++ b/korganizer/actionmanager.cpp @@ -127,7 +127,7 @@ void ActionManager::init() mWindowList = new KOWindowList; // Show tip of the day, when the first calendar is shown. if ( !mIsPart ) - TQTimer::singleShot( 0, this, TQT_SLOT( showTipOnStart() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( showTipOnStart() ) ); } // Note: We need this ActionManager to be fully constructed, and // parent() to have a valid reference to it before the following @@ -138,27 +138,27 @@ void ActionManager::init() // set up autoSaving stuff mAutoSaveTimer = new TQTimer( this ); - connect( mAutoSaveTimer,TQT_SIGNAL( timeout() ), TQT_SLOT( checkAutoSave() ) ); + connect( mAutoSaveTimer,TQ_SIGNAL( timeout() ), TQ_SLOT( checkAutoSave() ) ); if ( KOPrefs::instance()->mAutoSave && KOPrefs::instance()->mAutoSaveInterval > 0 ) { mAutoSaveTimer->start( 1000 * 60 * KOPrefs::instance()->mAutoSaveInterval ); } mAutoArchiveTimer = new TQTimer( this ); - connect( mAutoArchiveTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotAutoArchive() ) ); + connect( mAutoArchiveTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotAutoArchive() ) ); // First auto-archive should be in 5 minutes (like in kmail). if ( KOPrefs::instance()->mAutoArchive ) mAutoArchiveTimer->start( 5 * 60 * 1000, true ); // singleshot setTitle(); - connect( mCalendarView, TQT_SIGNAL( modifiedChanged( bool ) ), TQT_SLOT( setTitle() ) ); - connect( mCalendarView, TQT_SIGNAL( configChanged() ), TQT_SLOT( updateConfig() ) ); + connect( mCalendarView, TQ_SIGNAL( modifiedChanged( bool ) ), TQ_SLOT( setTitle() ) ); + connect( mCalendarView, TQ_SIGNAL( configChanged() ), TQ_SLOT( updateConfig() ) ); - connect( mCalendarView, TQT_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ), - this, TQT_SLOT( processIncidenceSelection( Incidence *,const TQDate & ) ) ); - connect( mCalendarView, TQT_SIGNAL( exportHTML( HTMLExportSettings * ) ), - this, TQT_SLOT( exportHTML( HTMLExportSettings * ) ) ); + connect( mCalendarView, TQ_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ), + this, TQ_SLOT( processIncidenceSelection( Incidence *,const TQDate & ) ) ); + connect( mCalendarView, TQ_SIGNAL( exportHTML( HTMLExportSettings * ) ), + this, TQ_SLOT( exportHTML( HTMLExportSettings * ) ) ); processIncidenceSelection( 0, TQDate() ); @@ -198,13 +198,13 @@ void ActionManager::createCalendarResources() mCalendarView->addExtension( &factory ); mResourceView = factory.resourceView(); - connect( mCalendarResources, TQT_SIGNAL( calendarChanged() ), - mCalendarView, TQT_SLOT( resourcesChanged() ) ); - connect( mCalendarResources, TQT_SIGNAL( signalErrorMessage( const TQString & ) ), - mCalendarView, TQT_SLOT( showErrorMessage( const TQString & ) ) ); + connect( mCalendarResources, TQ_SIGNAL( calendarChanged() ), + mCalendarView, TQ_SLOT( resourcesChanged() ) ); + connect( mCalendarResources, TQ_SIGNAL( signalErrorMessage( const TQString & ) ), + mCalendarView, TQ_SLOT( showErrorMessage( const TQString & ) ) ); - connect( mCalendarView, TQT_SIGNAL( configChanged() ), - TQT_SLOT( updateConfig() ) ); + connect( mCalendarView, TQ_SIGNAL( configChanged() ), + TQ_SLOT( updateConfig() ) ); initCalendar( mCalendarResources ); } @@ -227,58 +227,58 @@ void ActionManager::initActions() //~~~~~~~~~~~~~~~~~~~~~~~ LOADING / SAVING ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ if ( mIsPart ) { if ( mMainWindow->hasDocument() ) { - KStdAction::openNew( this, TQT_SLOT(file_new()), mACollection, "korganizer_openNew" ); - KStdAction::open( this, TQT_SLOT( file_open() ), mACollection, "korganizer_open" ); - mRecent = KStdAction::openRecent( this, TQT_SLOT( file_open( const KURL& ) ), + KStdAction::openNew( this, TQ_SLOT(file_new()), mACollection, "korganizer_openNew" ); + KStdAction::open( this, TQ_SLOT( file_open() ), mACollection, "korganizer_open" ); + mRecent = KStdAction::openRecent( this, TQ_SLOT( file_open( const KURL& ) ), mACollection, "korganizer_openRecent" ); - KStdAction::revert( this,TQT_SLOT( file_revert() ), mACollection, "korganizer_revert" ); - KStdAction::saveAs( this, TQT_SLOT( file_saveas() ), mACollection, + KStdAction::revert( this,TQ_SLOT( file_revert() ), mACollection, "korganizer_revert" ); + KStdAction::saveAs( this, TQ_SLOT( file_saveas() ), mACollection, "korganizer_saveAs" ); - KStdAction::save( this, TQT_SLOT( file_save() ), mACollection, "korganizer_save" ); + KStdAction::save( this, TQ_SLOT( file_save() ), mACollection, "korganizer_save" ); } - KStdAction::print( mCalendarView, TQT_SLOT( print() ), mACollection, "korganizer_print" ); + KStdAction::print( mCalendarView, TQ_SLOT( print() ), mACollection, "korganizer_print" ); } else { - KStdAction::openNew( this, TQT_SLOT( file_new() ), mACollection ); - KStdAction::open( this, TQT_SLOT( file_open() ), mACollection ); - mRecent = KStdAction::openRecent( this, TQT_SLOT( file_open( const KURL& ) ), + KStdAction::openNew( this, TQ_SLOT( file_new() ), mACollection ); + KStdAction::open( this, TQ_SLOT( file_open() ), mACollection ); + mRecent = KStdAction::openRecent( this, TQ_SLOT( file_open( const KURL& ) ), mACollection ); if ( mMainWindow->hasDocument() ) { - KStdAction::revert( this,TQT_SLOT( file_revert() ), mACollection ); - KStdAction::save( this, TQT_SLOT( file_save() ), mACollection ); - KStdAction::saveAs( this, TQT_SLOT( file_saveas() ), mACollection ); + KStdAction::revert( this,TQ_SLOT( file_revert() ), mACollection ); + KStdAction::save( this, TQ_SLOT( file_save() ), mACollection ); + KStdAction::saveAs( this, TQ_SLOT( file_saveas() ), mACollection ); } - KStdAction::print( mCalendarView, TQT_SLOT( print() ), mACollection ); + KStdAction::print( mCalendarView, TQ_SLOT( print() ), mACollection ); } //~~~~~~~~~~~~~~~~~~~~~~~~ IMPORT / EXPORT ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - new TDEAction( i18n("Import &Event/Calendar (ICS-/VCS-File)..."), 0, this, TQT_SLOT( file_merge() ), + new TDEAction( i18n("Import &Event/Calendar (ICS-/VCS-File)..."), 0, this, TQ_SLOT( file_merge() ), mACollection, "import_icalendar" ); - new TDEAction( i18n("&Import From UNIX Ical tool (.calendar-File)"), 0, this, TQT_SLOT( file_icalimport() ), + new TDEAction( i18n("&Import From UNIX Ical tool (.calendar-File)"), 0, this, TQ_SLOT( file_icalimport() ), mACollection, "import_ical" ); new TDEAction( i18n("Get &Hot New Stuff..."), 0, this, - TQT_SLOT( downloadNewStuff() ), mACollection, + TQ_SLOT( downloadNewStuff() ), mACollection, "downloadnewstuff" ); new TDEAction( i18n("Export &Web Page..."), "webexport", 0, - mCalendarView, TQT_SLOT( exportWeb() ), + mCalendarView, TQ_SLOT( exportWeb() ), mACollection, "export_web" ); new TDEAction( i18n("&iCalendar..."), 0, - mCalendarView, TQT_SLOT( exportICalendar() ), + mCalendarView, TQ_SLOT( exportICalendar() ), mACollection, "export_icalendar" ); new TDEAction( i18n("&vCalendar..."), 0, - mCalendarView, TQT_SLOT( exportVCalendar() ), + mCalendarView, TQ_SLOT( exportVCalendar() ), mACollection, "export_vcalendar" ); new TDEAction( i18n("Upload &Hot New Stuff..."), 0, this, - TQT_SLOT( uploadNewStuff() ), mACollection, + TQ_SLOT( uploadNewStuff() ), mACollection, "uploadnewstuff" ); - new TDEAction( i18n("Archive O&ld Entries..."), 0, this, TQT_SLOT( file_archive() ), + new TDEAction( i18n("Archive O&ld Entries..."), 0, this, TQ_SLOT( file_archive() ), mACollection, "file_archive" ); new TDEAction( i18n("delete completed to-dos", "Pur&ge Completed To-dos"), 0, - mCalendarView, TQT_SLOT( purgeCompleted() ), mACollection, + mCalendarView, TQ_SLOT( purgeCompleted() ), mACollection, "purge_completed" ); @@ -289,45 +289,45 @@ void ActionManager::initActions() KOrg::History *h = mCalendarView->history(); if ( mIsPart ) { // edit menu - mCutAction = KStdAction::cut( mCalendarView, TQT_SLOT( edit_cut() ), + mCutAction = KStdAction::cut( mCalendarView, TQ_SLOT( edit_cut() ), mACollection, "korganizer_cut" ); - mCopyAction = KStdAction::copy( mCalendarView, TQT_SLOT( edit_copy() ), + mCopyAction = KStdAction::copy( mCalendarView, TQ_SLOT( edit_copy() ), mACollection, "korganizer_copy" ); - pasteAction = KStdAction::paste( mCalendarView, TQT_SLOT( edit_paste() ), + pasteAction = KStdAction::paste( mCalendarView, TQ_SLOT( edit_paste() ), mACollection, "korganizer_paste" ); - mUndoAction = KStdAction::undo( h, TQT_SLOT( undo() ), + mUndoAction = KStdAction::undo( h, TQ_SLOT( undo() ), mACollection, "korganizer_undo" ); - mRedoAction = KStdAction::redo( h, TQT_SLOT( redo() ), + mRedoAction = KStdAction::redo( h, TQ_SLOT( redo() ), mACollection, "korganizer_redo" ); } else { - mCutAction = KStdAction::cut( mCalendarView,TQT_SLOT( edit_cut() ), + mCutAction = KStdAction::cut( mCalendarView,TQ_SLOT( edit_cut() ), mACollection ); - mCopyAction = KStdAction::copy( mCalendarView,TQT_SLOT( edit_copy() ), + mCopyAction = KStdAction::copy( mCalendarView,TQ_SLOT( edit_copy() ), mACollection ); - pasteAction = KStdAction::paste( mCalendarView,TQT_SLOT( edit_paste() ), + pasteAction = KStdAction::paste( mCalendarView,TQ_SLOT( edit_paste() ), mACollection ); - mUndoAction = KStdAction::undo( h, TQT_SLOT( undo() ), mACollection ); - mRedoAction = KStdAction::redo( h, TQT_SLOT( redo() ), mACollection ); + mUndoAction = KStdAction::undo( h, TQ_SLOT( undo() ), mACollection ); + mRedoAction = KStdAction::redo( h, TQ_SLOT( redo() ), mACollection ); } mDeleteAction = new TDEAction( i18n("&Delete"), "edit-delete", 0, - mCalendarView, TQT_SLOT( appointment_delete() ), + mCalendarView, TQ_SLOT( appointment_delete() ), mACollection, "edit_delete" ); if ( mIsPart ) { - KStdAction::find( mCalendarView->dialogManager(), TQT_SLOT( showSearchDialog() ), + KStdAction::find( mCalendarView->dialogManager(), TQ_SLOT( showSearchDialog() ), mACollection, "korganizer_find" ); } else { - KStdAction::find( mCalendarView->dialogManager(), TQT_SLOT( showSearchDialog() ), + KStdAction::find( mCalendarView->dialogManager(), TQ_SLOT( showSearchDialog() ), mACollection ); } pasteAction->setEnabled( false ); mUndoAction->setEnabled( false ); mRedoAction->setEnabled( false ); - connect( mCalendarView, TQT_SIGNAL( pasteEnabled( bool ) ), - pasteAction, TQT_SLOT( setEnabled( bool ) ) ); - connect( h, TQT_SIGNAL( undoAvailable( const TQString & ) ), - TQT_SLOT( updateUndoAction( const TQString & ) ) ); - connect( h, TQT_SIGNAL( redoAvailable( const TQString & ) ), - TQT_SLOT( updateRedoAction( const TQString & ) ) ); + connect( mCalendarView, TQ_SIGNAL( pasteEnabled( bool ) ), + pasteAction, TQ_SLOT( setEnabled( bool ) ) ); + connect( h, TQ_SIGNAL( undoAvailable( const TQString & ) ), + TQ_SLOT( updateUndoAction( const TQString & ) ) ); + connect( h, TQ_SIGNAL( redoAvailable( const TQString & ) ), + TQ_SLOT( updateRedoAction( const TQString & ) ) ); @@ -337,83 +337,83 @@ void ActionManager::initActions() //~~~~~~~~~~~~~~~~~~~~~~~~~~~~ VIEWS ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ new TDEAction( i18n("What's &Next"), KOGlobals::self()->smallIcon( "whatsnext" ), 0, - mCalendarView->viewManager(), TQT_SLOT( showWhatsNextView() ), + mCalendarView->viewManager(), TQ_SLOT( showWhatsNextView() ), mACollection, "view_whatsnext" ); new TDEAction( i18n("&Day"), KOGlobals::self()->smallIcon( "1day" ), 0, - mCalendarView->viewManager(), TQT_SLOT( showDayView() ), + mCalendarView->viewManager(), TQ_SLOT( showDayView() ), mACollection, "view_day" ); mNextXDays = new TDEAction( "", KOGlobals::self()->smallIcon( "xdays" ), 0, mCalendarView->viewManager(), - TQT_SLOT( showNextXView() ), + TQ_SLOT( showNextXView() ), mACollection, "view_nextx" ); mNextXDays->setText( i18n( "&Next Day", "Ne&xt %n Days", KOPrefs::instance()->mNextXDays ) ); new TDEAction( i18n("W&ork Week"), KOGlobals::self()->smallIcon( "5days" ), 0, - mCalendarView->viewManager(), TQT_SLOT( showWorkWeekView() ), + mCalendarView->viewManager(), TQ_SLOT( showWorkWeekView() ), mACollection, "view_workweek" ); new TDEAction( i18n("&Week"), KOGlobals::self()->smallIcon( "7days" ), 0, - mCalendarView->viewManager(), TQT_SLOT( showWeekView() ), + mCalendarView->viewManager(), TQ_SLOT( showWeekView() ), mACollection, "view_week" ); new TDEAction( i18n("&Month"), KOGlobals::self()->smallIcon( "month" ), 0, - mCalendarView->viewManager(), TQT_SLOT( showMonthView() ), + mCalendarView->viewManager(), TQ_SLOT( showMonthView() ), mACollection, "view_month" ); new TDEAction( i18n("&List"), KOGlobals::self()->smallIcon( "list" ), 0, - mCalendarView->viewManager(), TQT_SLOT( showListView() ), + mCalendarView->viewManager(), TQ_SLOT( showListView() ), mACollection, "view_list" ); new TDEAction( i18n("&To-do List"), KOGlobals::self()->smallIcon( "todo" ), 0, - mCalendarView->viewManager(), TQT_SLOT( showTodoView() ), + mCalendarView->viewManager(), TQ_SLOT( showTodoView() ), mACollection, "view_todo" ); new TDEAction( i18n("&Journal"), KOGlobals::self()->smallIcon( "journal" ), 0, - mCalendarView->viewManager(), TQT_SLOT( showJournalView() ), + mCalendarView->viewManager(), TQ_SLOT( showJournalView() ), mACollection, "view_journal" ); new TDEAction( i18n("&Timeline View"), KOGlobals::self()->smallIcon( "timeline" ), 0, - mCalendarView->viewManager(), TQT_SLOT( showTimelineView() ), + mCalendarView->viewManager(), TQ_SLOT( showTimelineView() ), mACollection, "view_timeline" ); //~~~~~~~~~~~~~~~~~~~~~~~~~~~ FILTERS ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ new TDEAction( i18n("&Refresh"), 0, - mCalendarView, TQT_SLOT( updateView() ), + mCalendarView, TQ_SLOT( updateView() ), mACollection, "update" ); // TODO: // new TDEAction( i18n("Hide &Completed To-dos"), 0, -// mCalendarView, TQT_SLOT( toggleHideCompleted() ), +// mCalendarView, TQ_SLOT( toggleHideCompleted() ), // mACollection, "hide_completed_todos" ); mFilterAction = new TDESelectAction( i18n("F&ilter"), 0, mACollection, "filter_select" ); mFilterAction->setEditable( false ); - connect( mFilterAction, TQT_SIGNAL( activated(int) ), - mCalendarView, TQT_SLOT( filterActivated( int ) ) ); - connect( mCalendarView, TQT_SIGNAL( newFilterListSignal( const TQStringList & ) ), - mFilterAction, TQT_SLOT( setItems( const TQStringList & ) ) ); - connect( mCalendarView, TQT_SIGNAL( selectFilterSignal( int ) ), - mFilterAction, TQT_SLOT( setCurrentItem( int ) ) ); - connect( mCalendarView, TQT_SIGNAL( filterChanged() ), - this, TQT_SLOT( setTitle() ) ); + connect( mFilterAction, TQ_SIGNAL( activated(int) ), + mCalendarView, TQ_SLOT( filterActivated( int ) ) ); + connect( mCalendarView, TQ_SIGNAL( newFilterListSignal( const TQStringList & ) ), + mFilterAction, TQ_SLOT( setItems( const TQStringList & ) ) ); + connect( mCalendarView, TQ_SIGNAL( selectFilterSignal( int ) ), + mFilterAction, TQ_SLOT( setCurrentItem( int ) ) ); + connect( mCalendarView, TQ_SIGNAL( filterChanged() ), + this, TQ_SLOT( setTitle() ) ); //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ZOOM ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // TODO: try to find / create better icons for the following 4 actions new TDEAction( i18n( "Zoom In Horizontally" ), "zoom-in", 0, - mCalendarView->viewManager(), TQT_SLOT( zoomInHorizontally() ), + mCalendarView->viewManager(), TQ_SLOT( zoomInHorizontally() ), mACollection, "zoom_in_horizontally" ); new TDEAction( i18n( "Zoom Out Horizontally" ), "zoom-out", 0, - mCalendarView->viewManager(), TQT_SLOT( zoomOutHorizontally() ), + mCalendarView->viewManager(), TQ_SLOT( zoomOutHorizontally() ), mACollection, "zoom_out_horizontally" ); new TDEAction( i18n( "Zoom In Vertically" ), "zoom-in", 0, - mCalendarView->viewManager(), TQT_SLOT( zoomInVertically() ), + mCalendarView->viewManager(), TQ_SLOT( zoomInVertically() ), mACollection, "zoom_in_vertically" ); new TDEAction( i18n( "Zoom Out Vertically" ), "zoom-out", 0, - mCalendarView->viewManager(), TQT_SLOT( zoomOutVertically() ), + mCalendarView->viewManager(), TQ_SLOT( zoomOutVertically() ), mACollection, "zoom_out_vertically" ); @@ -422,73 +422,73 @@ void ActionManager::initActions() //************************** Actions MENU ********************************* new TDEAction( i18n("Go to &Today"), "today", 0, - mCalendarView,TQT_SLOT( goToday() ), + mCalendarView,TQ_SLOT( goToday() ), mACollection, "go_today" ); bool isRTL = TQApplication::reverseLayout(); action = new TDEAction( i18n("Go &Backward"), isRTL ? "forward" : "back", 0, - mCalendarView,TQT_SLOT( goPrevious() ), + mCalendarView,TQ_SLOT( goPrevious() ), mACollection, "go_previous" ); // Changing the action text by setText makes the toolbar button disappear. // This has to be fixed first, before the connects below can be reenabled. /* - connect( mCalendarView, TQT_SIGNAL( changeNavStringPrev( const TQString & ) ), - action, TQT_SLOT( setText( const TQString & ) ) ); - connect( mCalendarView, TQT_SIGNAL( changeNavStringPrev( const TQString & ) ), - this, TQT_SLOT( dumpText( const TQString & ) ) );*/ + connect( mCalendarView, TQ_SIGNAL( changeNavStringPrev( const TQString & ) ), + action, TQ_SLOT( setText( const TQString & ) ) ); + connect( mCalendarView, TQ_SIGNAL( changeNavStringPrev( const TQString & ) ), + this, TQ_SLOT( dumpText( const TQString & ) ) );*/ action = new TDEAction( i18n("Go &Forward"), isRTL ? "back" : "forward", 0, - mCalendarView,TQT_SLOT( goNext() ), + mCalendarView,TQ_SLOT( goNext() ), mACollection, "go_next" ); /* - connect( mCalendarView,TQT_SIGNAL( changeNavStringNext( const TQString & ) ), - action,TQT_SLOT( setText( const TQString & ) ) ); + connect( mCalendarView,TQ_SIGNAL( changeNavStringNext( const TQString & ) ), + action,TQ_SLOT( setText( const TQString & ) ) ); */ //************************** Actions MENU ********************************* new TDEAction( i18n("New E&vent..."), KOGlobals::self()->smallIcon( "newappointment" ), 0, - mCalendarView, TQT_SLOT(newEvent()), + mCalendarView, TQ_SLOT(newEvent()), mACollection, "new_event" ); new TDEAction( i18n("New &To-do..."), KOGlobals::self()->smallIcon( "newtodo" ), 0, - mCalendarView, TQT_SLOT(newTodo()), + mCalendarView, TQ_SLOT(newTodo()), mACollection, "new_todo" ); action = new TDEAction( i18n("New Su&b-to-do..."), 0, - mCalendarView,TQT_SLOT( newSubTodo() ), + mCalendarView,TQ_SLOT( newSubTodo() ), mACollection, "new_subtodo" ); action->setEnabled( false ); - connect( mCalendarView,TQT_SIGNAL( todoSelected( bool ) ), - action,TQT_SLOT( setEnabled( bool ) ) ); + connect( mCalendarView,TQ_SIGNAL( todoSelected( bool ) ), + action,TQ_SLOT( setEnabled( bool ) ) ); new TDEAction( i18n("New &Journal..."), KOGlobals::self()->smallIcon( "newjournal" ), 0, - mCalendarView, TQT_SLOT(newJournal()), + mCalendarView, TQ_SLOT(newJournal()), mACollection, "new_journal" ); mShowIncidenceAction = new TDEAction( i18n("&Show"), 0, - mCalendarView,TQT_SLOT( showIncidence() ), + mCalendarView,TQ_SLOT( showIncidence() ), mACollection, "show_incidence" ); mEditIncidenceAction = new TDEAction( i18n("&Edit..."), 0, - mCalendarView,TQT_SLOT( editIncidence() ), + mCalendarView,TQ_SLOT( editIncidence() ), mACollection, "edit_incidence" ); mDeleteIncidenceAction = new TDEAction( i18n("&Delete"), Key_Delete, - mCalendarView,TQT_SLOT( deleteIncidence()), + mCalendarView,TQ_SLOT( deleteIncidence()), mACollection, "delete_incidence" ); action = new TDEAction( i18n("&Make Sub-to-do Independent"), 0, - mCalendarView,TQT_SLOT( todo_unsub() ), + mCalendarView,TQ_SLOT( todo_unsub() ), mACollection, "unsub_todo" ); action->setEnabled( false ); - connect( mCalendarView,TQT_SIGNAL( subtodoSelected( bool ) ), - action,TQT_SLOT( setEnabled( bool ) ) ); + connect( mCalendarView,TQ_SIGNAL( subtodoSelected( bool ) ), + action,TQ_SLOT( setEnabled( bool ) ) ); // TODO: Add item to move the incidence to different resource // mAssignResourceAction = new TDEAction( i18n("Assign &Resource..."), 0, -// mCalendarView, TQT_SLOT( assignResource()), +// mCalendarView, TQ_SLOT( assignResource()), // mACollection, "assign_resource" ); // TODO: Add item to quickly toggle the reminder of a given incidence // mToggleAlarmAction = new TDEToggleAction( i18n("&Activate Reminder"), 0, -// mCalendarView, TQT_SLOT( toggleAlarm()), +// mCalendarView, TQ_SLOT( toggleAlarm()), // mACollection, "activate_alarm" ); @@ -496,65 +496,65 @@ void ActionManager::initActions() //************************** SCHEDULE MENU ******************************** mPublishEvent = new TDEAction( i18n("&Publish Item Information..."), "mail-send", 0, - mCalendarView, TQT_SLOT( schedule_publish() ), + mCalendarView, TQ_SLOT( schedule_publish() ), mACollection, "schedule_publish" ); mPublishEvent->setEnabled( false ); mSendInvitation = new TDEAction( i18n( "Send &Invitation to Attendees" ), "mail_generic", 0, - mCalendarView, TQT_SLOT(schedule_request()), + mCalendarView, TQ_SLOT(schedule_request()), mACollection, "schedule_request" ); mSendInvitation->setEnabled( false ); - connect( mCalendarView, TQT_SIGNAL(organizerEventsSelected(bool)), - mSendInvitation, TQT_SLOT(setEnabled(bool)) ); + connect( mCalendarView, TQ_SIGNAL(organizerEventsSelected(bool)), + mSendInvitation, TQ_SLOT(setEnabled(bool)) ); mRequestUpdate = new TDEAction( i18n( "Re&quest Update" ), 0, - mCalendarView, TQT_SLOT(schedule_refresh()), + mCalendarView, TQ_SLOT(schedule_refresh()), mACollection, "schedule_refresh" ); mRequestUpdate->setEnabled( false ); - connect( mCalendarView, TQT_SIGNAL(groupEventsSelected(bool)), - mRequestUpdate, TQT_SLOT(setEnabled(bool)) ); + connect( mCalendarView, TQ_SIGNAL(groupEventsSelected(bool)), + mRequestUpdate, TQ_SLOT(setEnabled(bool)) ); mSendCancel = new TDEAction( i18n( "Send &Cancelation to Attendees" ), 0, - mCalendarView, TQT_SLOT(schedule_cancel()), + mCalendarView, TQ_SLOT(schedule_cancel()), mACollection, "schedule_cancel" ); mSendCancel->setEnabled( false ); - connect( mCalendarView, TQT_SIGNAL(organizerEventsSelected(bool)), - mSendCancel, TQT_SLOT(setEnabled(bool)) ); + connect( mCalendarView, TQ_SIGNAL(organizerEventsSelected(bool)), + mSendCancel, TQ_SLOT(setEnabled(bool)) ); mSendStatusUpdate = new TDEAction( i18n( "Send Status &Update" ), "mail-reply-sender", 0, - mCalendarView,TQT_SLOT(schedule_reply()), + mCalendarView,TQ_SLOT(schedule_reply()), mACollection, "schedule_reply" ); mSendStatusUpdate->setEnabled( false ); - connect( mCalendarView, TQT_SIGNAL(groupEventsSelected(bool)), - mSendStatusUpdate, TQT_SLOT(setEnabled(bool)) ); + connect( mCalendarView, TQ_SIGNAL(groupEventsSelected(bool)), + mSendStatusUpdate, TQ_SLOT(setEnabled(bool)) ); mRequestChange = new TDEAction( i18n( "counter proposal", "Request Chan&ge" ), 0, - mCalendarView, TQT_SLOT(schedule_counter()), + mCalendarView, TQ_SLOT(schedule_counter()), mACollection, "schedule_counter" ); mRequestChange->setEnabled( false ); - connect( mCalendarView, TQT_SIGNAL(groupEventsSelected(bool)), - mRequestChange, TQT_SLOT(setEnabled(bool)) ); + connect( mCalendarView, TQ_SIGNAL(groupEventsSelected(bool)), + mRequestChange, TQ_SLOT(setEnabled(bool)) ); mForwardEvent = new TDEAction( i18n("&Send as iCalendar..."), "mail-forward", 0, - mCalendarView, TQT_SLOT(schedule_forward()), + mCalendarView, TQ_SLOT(schedule_forward()), mACollection, "schedule_forward" ); mForwardEvent->setEnabled( false ); action = new TDEAction( i18n("&Mail Free Busy Information..."), 0, - mCalendarView, TQT_SLOT( mailFreeBusy() ), + mCalendarView, TQ_SLOT( mailFreeBusy() ), mACollection, "mail_freebusy" ); action->setEnabled( true ); action = new TDEAction( i18n("&Upload Free Busy Information"), 0, - mCalendarView, TQT_SLOT( uploadFreeBusy() ), + mCalendarView, TQ_SLOT( uploadFreeBusy() ), mACollection, "upload_freebusy" ); action->setEnabled( true ); if ( !mIsPart ) { action = new TDEAction( i18n("&Addressbook"),"contents",0, - mCalendarView,TQT_SLOT( openAddressbook() ), + mCalendarView,TQ_SLOT( openAddressbook() ), mACollection,"addressbook" ); } @@ -565,13 +565,13 @@ void ActionManager::initActions() //~~~~~~~~~~~~~~~~~~~~~~~~~~~~ SIDEBAR ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ mDateNavigatorShowAction = new TDEToggleAction( i18n("Show Date Navigator"), 0, - this, TQT_SLOT( toggleDateNavigator() ), + this, TQ_SLOT( toggleDateNavigator() ), mACollection, "show_datenavigator" ); mTodoViewShowAction = new TDEToggleAction ( i18n("Show To-do View"), 0, - this, TQT_SLOT( toggleTodoView() ), + this, TQ_SLOT( toggleTodoView() ), mACollection, "show_todoview" ); mEventViewerShowAction = new TDEToggleAction ( i18n("Show Item Viewer"), 0, - this, TQT_SLOT( toggleEventViewer() ), + this, TQ_SLOT( toggleEventViewer() ), mACollection, "show_eventviewer" ); TDEConfig *config = KOGlobals::self()->config(); config->setGroup( "Settings" ); @@ -590,10 +590,10 @@ void ActionManager::initActions() if ( !mMainWindow->hasDocument() ) { mResourceViewShowAction = new TDEToggleAction ( i18n("Show Resource View"), 0, - this, TQT_SLOT( toggleResourceView() ), + this, TQ_SLOT( toggleResourceView() ), mACollection, "show_resourceview" ); mResourceButtonsAction = new TDEToggleAction( i18n("Show &Resource Buttons"), 0, - this, TQT_SLOT( toggleResourceButtons() ), + this, TQ_SLOT( toggleResourceButtons() ), mACollection, "show_resourcebuttons" ); mResourceViewShowAction->setChecked( config->readBoolEntry( "ResourceViewVisible", true ) ); @@ -608,38 +608,38 @@ void ActionManager::initActions() //~~~~~~~~~~~~~~~~~~~~~~~~~~~~ SIDEBAR ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ new TDEAction( i18n("Configure &Date && Time..."), 0, - this, TQT_SLOT( configureDateTime() ), + this, TQ_SLOT( configureDateTime() ), mACollection, "conf_datetime" ); // TODO: Add an item to show the resource management dlg // new TDEAction( i18n("Manage &Resources..."), 0, -// this, TQT_SLOT( manageResources() ), +// this, TQ_SLOT( manageResources() ), // mACollection, "conf_resources" ); new TDEAction( i18n("Manage View &Filters..."), "configure", 0, - mCalendarView, TQT_SLOT( editFilters() ), + mCalendarView, TQ_SLOT( editFilters() ), mACollection, "edit_filters" ); new TDEAction( i18n("Manage C&ategories..."), 0, - mCalendarView->dialogManager(), TQT_SLOT( showCategoryEditDialog() ), + mCalendarView->dialogManager(), TQ_SLOT( showCategoryEditDialog() ), mACollection, "edit_categories" ); if ( mIsPart ) { new TDEAction( i18n("&Configure Calendar..."), "configure", 0, - mCalendarView, TQT_SLOT( edit_options() ), + mCalendarView, TQ_SLOT( edit_options() ), mACollection, "korganizer_configure" ); - KStdAction::keyBindings( this, TQT_SLOT( keyBindings() ), + KStdAction::keyBindings( this, TQ_SLOT( keyBindings() ), mACollection, "korganizer_configure_shortcuts" ); } else { - KStdAction::preferences( mCalendarView, TQT_SLOT( edit_options() ), + KStdAction::preferences( mCalendarView, TQ_SLOT( edit_options() ), mACollection ); - KStdAction::keyBindings( this, TQT_SLOT( keyBindings() ), mACollection ); + KStdAction::keyBindings( this, TQ_SLOT( keyBindings() ), mACollection ); } //**************************** HELP MENU ********************************** - KStdAction::tipOfDay( this, TQT_SLOT( showTip() ), mACollection, + KStdAction::tipOfDay( this, TQ_SLOT( showTip() ), mACollection, "help_tipofday" ); // new TDEAction( i18n("Show Intro Page"), 0, -// mCalendarView,TQT_SLOT( showIntro() ), +// mCalendarView,TQ_SLOT( showIntro() ), // mACollection,"show_intro" ); @@ -1293,8 +1293,8 @@ void ActionManager::configureDateTime() TDEProcess *proc = new TDEProcess; *proc << "tdecmshell" << "language"; - connect( proc,TQT_SIGNAL( processExited( TDEProcess * ) ), - TQT_SLOT( configureDateTimeFinished( TDEProcess * ) ) ); + connect( proc,TQ_SIGNAL( processExited( TDEProcess * ) ), + TQ_SLOT( configureDateTimeFinished( TDEProcess * ) ) ); if ( !proc->start() ) { KMessageBox::sorry( dialogParent(), @@ -1935,8 +1935,8 @@ bool ActionManager::queryClose() // FIXME: Put main window into a state indicating final saving. mIsClosing = true; // FIXME: Close main window when save is finished -// connect( mCalendarResources, TQT_SIGNAL( calendarSaved() ), -// mMainWindow, TQT_SLOT( close() ) ); +// connect( mCalendarResources, TQ_SIGNAL( calendarSaved() ), +// mMainWindow, TQ_SLOT( close() ) ); } if ( mCalendarResources->isSaving() ) { kdDebug(5850) << "ActionManager::queryClose(): isSaving" << endl; @@ -2012,12 +2012,12 @@ void ActionManager::importCalendar( const KURL &url ) PreviewDialog *dialog; dialog = new PreviewDialog( url, mMainWindow->topLevelWidget() ); - connect( dialog, TQT_SIGNAL( dialogFinished( PreviewDialog * ) ), - TQT_SLOT( slotPreviewDialogFinished( PreviewDialog * ) ) ); - connect( dialog, TQT_SIGNAL( openURL( const KURL &, bool ) ), - TQT_SLOT( openURL( const KURL &, bool ) ) ); - connect( dialog, TQT_SIGNAL( addResource( const KURL & ) ), - TQT_SLOT( addResource( const KURL & ) ) ); + connect( dialog, TQ_SIGNAL( dialogFinished( PreviewDialog * ) ), + TQ_SLOT( slotPreviewDialogFinished( PreviewDialog * ) ) ); + connect( dialog, TQ_SIGNAL( openURL( const KURL &, bool ) ), + TQ_SLOT( openURL( const KURL &, bool ) ) ); + connect( dialog, TQ_SIGNAL( addResource( const KURL & ) ), + TQ_SLOT( addResource( const KURL & ) ) ); if ( dialog->loadCalendar() ) { dialog->show(); @@ -2046,7 +2046,7 @@ void ActionManager::slotAutoArchive() return; mAutoArchiveTimer->stop(); EventArchiver archiver; - connect( &archiver, TQT_SIGNAL( eventsDeleted() ), mCalendarView, TQT_SLOT( updateView() ) ); + connect( &archiver, TQ_SIGNAL( eventsDeleted() ), mCalendarView, TQ_SLOT( updateView() ) ); archiver.runAuto( mCalendarView->calendar(), mCalendarView, false /*no gui*/ ); // restart timer with the correct delay ( especially useful for the first time ) slotAutoArchivingSettingsModified(); diff --git a/korganizer/agendaview.cpp b/korganizer/agendaview.cpp index df141789..e0519ba4 100644 --- a/korganizer/agendaview.cpp +++ b/korganizer/agendaview.cpp @@ -27,9 +27,9 @@ AgendaView::AgendaView(Calendar * cal, TQWidget * parent, const char * name) : { KCal::CalendarResources *calres = dynamic_cast<KCal::CalendarResources*>( cal ); if ( calres ) { - connect( calres, TQT_SIGNAL(signalResourceAdded(ResourceCalendar *)), TQT_SLOT(resourcesChanged()) ); - connect( calres, TQT_SIGNAL(signalResourceModified( ResourceCalendar *)), TQT_SLOT(resourcesChanged()) ); - connect( calres, TQT_SIGNAL(signalResourceDeleted(ResourceCalendar *)), TQT_SLOT(resourcesChanged()) ); + connect( calres, TQ_SIGNAL(signalResourceAdded(ResourceCalendar *)), TQ_SLOT(resourcesChanged()) ); + connect( calres, TQ_SIGNAL(signalResourceModified( ResourceCalendar *)), TQ_SLOT(resourcesChanged()) ); + connect( calres, TQ_SIGNAL(signalResourceDeleted(ResourceCalendar *)), TQ_SLOT(resourcesChanged()) ); } } diff --git a/korganizer/archivedialog.cpp b/korganizer/archivedialog.cpp index 989be261..7b8eae46 100644 --- a/korganizer/archivedialog.cpp +++ b/korganizer/archivedialog.cpp @@ -76,7 +76,7 @@ ArchiveDialog::ArchiveDialog(Calendar *cal,TQWidget *parent, const char *name) TQButtonGroup* radioBG = new TQButtonGroup( this ); radioBG->hide(); // just for the exclusive behavior - connect( radioBG, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( slotActionChanged() ) ); + connect( radioBG, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( slotActionChanged() ) ); TQHBoxLayout *dateLayout = new TQHBoxLayout(0); mArchiveOnceRB = new TQRadioButton(i18n("Archive now items older than:"),topFrame); @@ -147,10 +147,10 @@ ArchiveDialog::ArchiveDialog(Calendar *cal,TQWidget *parent, const char *name) i18n("Select this option to delete old events and to-dos without saving them. " "It is not possible to recover the events later.")); topLayout->addWidget(mDeleteCb); - connect(mDeleteCb, TQT_SIGNAL(toggled(bool)), mArchiveFile, TQT_SLOT(setDisabled(bool))); - connect(mDeleteCb, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEnableUser1())); - connect(mArchiveFile->lineEdit(),TQT_SIGNAL(textChanged ( const TQString & )), - this,TQT_SLOT(slotEnableUser1())); + connect(mDeleteCb, TQ_SIGNAL(toggled(bool)), mArchiveFile, TQ_SLOT(setDisabled(bool))); + connect(mDeleteCb, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotEnableUser1())); + connect(mArchiveFile->lineEdit(),TQ_SIGNAL(textChanged ( const TQString & )), + this,TQ_SLOT(slotEnableUser1())); // Load settings from KOPrefs mExpiryTimeNumInput->setValue( KOPrefs::instance()->mExpiryTime ); @@ -194,7 +194,7 @@ void ArchiveDialog::slotActionChanged() void ArchiveDialog::slotUser1() { EventArchiver archiver; - connect( &archiver, TQT_SIGNAL( eventsDeleted() ), this, TQT_SLOT( slotEventsDeleted() ) ); + connect( &archiver, TQ_SIGNAL( eventsDeleted() ), this, TQ_SLOT( slotEventsDeleted() ) ); KOPrefs::instance()->mAutoArchive = mAutoArchiveRB->isChecked(); KOPrefs::instance()->mExpiryTime = mExpiryTimeNumInput->value(); diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index bffd525e..dbee755f 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -200,64 +200,64 @@ CalendarView::CalendarView( TQWidget *parent, const char *name ) #endif // Signals emited by mDateNavigator - connect( mDateNavigator, TQT_SIGNAL( datesSelected( const KCal::DateList &, const TQDate & ) ), - TQT_SLOT( showDates( const KCal::DateList &, const TQDate & ) ) ); + connect( mDateNavigator, TQ_SIGNAL( datesSelected( const KCal::DateList &, const TQDate & ) ), + TQ_SLOT( showDates( const KCal::DateList &, const TQDate & ) ) ); // Signals emited by mNavigatorBar - connect( mNavigatorBar, TQT_SIGNAL( prevYearClicked() ), - mDateNavigator, TQT_SLOT( selectPreviousYear() ) ); - connect( mNavigatorBar, TQT_SIGNAL( nextYearClicked() ), - mDateNavigator, TQT_SLOT( selectNextYear() ) ); - connect( mNavigatorBar, TQT_SIGNAL( prevMonthClicked() ), - mDateNavigator, TQT_SLOT( selectPreviousMonth() ) ); - connect( mNavigatorBar, TQT_SIGNAL( nextMonthClicked() ), - mDateNavigator, TQT_SLOT( selectNextMonth() ) ); - connect( mNavigatorBar, TQT_SIGNAL( monthSelected(int) ), - mDateNavigator, TQT_SLOT( selectMonth(int) ) ); - connect( mNavigatorBar, TQT_SIGNAL( yearSelected(int)), - mDateNavigator, TQT_SLOT(selectYear(int)) ); + connect( mNavigatorBar, TQ_SIGNAL( prevYearClicked() ), + mDateNavigator, TQ_SLOT( selectPreviousYear() ) ); + connect( mNavigatorBar, TQ_SIGNAL( nextYearClicked() ), + mDateNavigator, TQ_SLOT( selectNextYear() ) ); + connect( mNavigatorBar, TQ_SIGNAL( prevMonthClicked() ), + mDateNavigator, TQ_SLOT( selectPreviousMonth() ) ); + connect( mNavigatorBar, TQ_SIGNAL( nextMonthClicked() ), + mDateNavigator, TQ_SLOT( selectNextMonth() ) ); + connect( mNavigatorBar, TQ_SIGNAL( monthSelected(int) ), + mDateNavigator, TQ_SLOT( selectMonth(int) ) ); + connect( mNavigatorBar, TQ_SIGNAL( yearSelected(int)), + mDateNavigator, TQ_SLOT(selectYear(int)) ); // Signals emited by mDateNavigatorContainer - connect( mDateNavigatorContainer, TQT_SIGNAL( weekClicked( const TQDate & ) ), - this, TQT_SLOT( selectWeek( const TQDate & ) ) ); - connect( mDateNavigatorContainer, TQT_SIGNAL( prevMonthClicked(const TQDate &, const TQDate &, const TQDate &) ), - mDateNavigator, TQT_SLOT( selectPreviousMonth(const TQDate &, const TQDate &, const TQDate &) ) ); - connect( mDateNavigatorContainer, TQT_SIGNAL( nextMonthClicked(const TQDate &, const TQDate &, const TQDate &) ), - mDateNavigator, TQT_SLOT( selectNextMonth(const TQDate &, const TQDate &, const TQDate &) ) ); - connect( mDateNavigatorContainer, TQT_SIGNAL( prevYearClicked() ), - mDateNavigator, TQT_SLOT( selectPreviousYear() ) ); - connect( mDateNavigatorContainer, TQT_SIGNAL( nextYearClicked() ), - mDateNavigator, TQT_SLOT( selectNextYear() ) ); - connect( mDateNavigatorContainer, TQT_SIGNAL( monthSelected(int) ), - mDateNavigator, TQT_SLOT( selectMonth(int) ) ); - connect( mDateNavigatorContainer, TQT_SIGNAL(yearSelected(int)), - mDateNavigator, TQT_SLOT(selectYear(int)) ); - connect( mDateNavigatorContainer, TQT_SIGNAL( goPrevious() ), - mDateNavigator, TQT_SLOT( selectPrevious() ) ); - connect( mDateNavigatorContainer, TQT_SIGNAL( goNext() ), - mDateNavigator, TQT_SLOT( selectNext() ) ); - - connect( mDateNavigatorContainer, TQT_SIGNAL( datesSelected( const KCal::DateList & ) ), - mDateNavigator, TQT_SLOT( selectDates( const KCal::DateList & ) ) ); - - connect( mDateNavigatorContainer, TQT_SIGNAL(incidenceDropped(Incidence*, const TQDate&)), - TQT_SLOT( addIncidenceOn( Incidence *, const TQDate & ) ) ); - connect( mDateNavigatorContainer, TQT_SIGNAL(incidenceDroppedMove(Incidence*,const TQDate&)), - TQT_SLOT( moveIncidenceTo( Incidence *, const TQDate & ) ) ); - - connect( mDateChecker, TQT_SIGNAL( dayPassed( const TQDate & ) ), - mTodoList, TQT_SLOT( dayPassed( const TQDate & ) ) ); - connect( mDateChecker, TQT_SIGNAL( dayPassed( const TQDate & ) ), - TQT_SIGNAL( dayPassed( const TQDate & ) ) ); - connect( mDateChecker, TQT_SIGNAL( dayPassed( const TQDate & ) ), - mDateNavigatorContainer, TQT_SLOT( updateToday() ) ); - - connect( this, TQT_SIGNAL( configChanged() ), - mDateNavigatorContainer, TQT_SLOT( updateConfig() ) ); - - connect( this, TQT_SIGNAL( incidenceSelected(Incidence *, const TQDate &) ), - mEventViewer, TQT_SLOT ( setIncidence (Incidence *, const TQDate &) ) ); + connect( mDateNavigatorContainer, TQ_SIGNAL( weekClicked( const TQDate & ) ), + this, TQ_SLOT( selectWeek( const TQDate & ) ) ); + connect( mDateNavigatorContainer, TQ_SIGNAL( prevMonthClicked(const TQDate &, const TQDate &, const TQDate &) ), + mDateNavigator, TQ_SLOT( selectPreviousMonth(const TQDate &, const TQDate &, const TQDate &) ) ); + connect( mDateNavigatorContainer, TQ_SIGNAL( nextMonthClicked(const TQDate &, const TQDate &, const TQDate &) ), + mDateNavigator, TQ_SLOT( selectNextMonth(const TQDate &, const TQDate &, const TQDate &) ) ); + connect( mDateNavigatorContainer, TQ_SIGNAL( prevYearClicked() ), + mDateNavigator, TQ_SLOT( selectPreviousYear() ) ); + connect( mDateNavigatorContainer, TQ_SIGNAL( nextYearClicked() ), + mDateNavigator, TQ_SLOT( selectNextYear() ) ); + connect( mDateNavigatorContainer, TQ_SIGNAL( monthSelected(int) ), + mDateNavigator, TQ_SLOT( selectMonth(int) ) ); + connect( mDateNavigatorContainer, TQ_SIGNAL(yearSelected(int)), + mDateNavigator, TQ_SLOT(selectYear(int)) ); + connect( mDateNavigatorContainer, TQ_SIGNAL( goPrevious() ), + mDateNavigator, TQ_SLOT( selectPrevious() ) ); + connect( mDateNavigatorContainer, TQ_SIGNAL( goNext() ), + mDateNavigator, TQ_SLOT( selectNext() ) ); + + connect( mDateNavigatorContainer, TQ_SIGNAL( datesSelected( const KCal::DateList & ) ), + mDateNavigator, TQ_SLOT( selectDates( const KCal::DateList & ) ) ); + + connect( mDateNavigatorContainer, TQ_SIGNAL(incidenceDropped(Incidence*, const TQDate&)), + TQ_SLOT( addIncidenceOn( Incidence *, const TQDate & ) ) ); + connect( mDateNavigatorContainer, TQ_SIGNAL(incidenceDroppedMove(Incidence*,const TQDate&)), + TQ_SLOT( moveIncidenceTo( Incidence *, const TQDate & ) ) ); + + connect( mDateChecker, TQ_SIGNAL( dayPassed( const TQDate & ) ), + mTodoList, TQ_SLOT( dayPassed( const TQDate & ) ) ); + connect( mDateChecker, TQ_SIGNAL( dayPassed( const TQDate & ) ), + TQ_SIGNAL( dayPassed( const TQDate & ) ) ); + connect( mDateChecker, TQ_SIGNAL( dayPassed( const TQDate & ) ), + mDateNavigatorContainer, TQ_SLOT( updateToday() ) ); + + connect( this, TQ_SIGNAL( configChanged() ), + mDateNavigatorContainer, TQ_SLOT( updateConfig() ) ); + + connect( this, TQ_SIGNAL( incidenceSelected(Incidence *, const TQDate &) ), + mEventViewer, TQ_SLOT ( setIncidence (Incidence *, const TQDate &) ) ); //TODO: do a pretty Summary, TQString s; @@ -277,13 +277,13 @@ CalendarView::CalendarView( TQWidget *parent, const char *name ) KOGlobals::self()-> setHolidays( new KHolidays( KOPrefs::instance()->mHolidays ) ); - connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ), - TQT_SLOT( checkClipboard() ) ); + connect( TQApplication::clipboard(), TQ_SIGNAL( dataChanged() ), + TQ_SLOT( checkClipboard() ) ); - connect( mTodoList, TQT_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ), - TQT_SLOT( processTodoListSelection( Incidence *,const TQDate & ) ) ); - disconnect( mTodoList, TQT_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ), - this, TQT_SLOT( processMainViewSelection( Incidence *,const TQDate & ) ) ); + connect( mTodoList, TQ_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ), + TQ_SLOT( processTodoListSelection( Incidence *,const TQDate & ) ) ); + disconnect( mTodoList, TQ_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ), + this, TQ_SLOT( processMainViewSelection( Incidence *,const TQDate & ) ) ); kdDebug(5850) << "CalendarView::CalendarView() done" << endl; } @@ -307,8 +307,8 @@ void CalendarView::setCalendar( Calendar *cal ) delete mHistory; mHistory = new History( mCalendar ); - connect( mHistory, TQT_SIGNAL( undone() ), TQT_SLOT( updateView() ) ); - connect( mHistory, TQT_SIGNAL( redone() ), TQT_SLOT( updateView() ) ); + connect( mHistory, TQ_SIGNAL( undone() ), TQ_SLOT( updateView() ) ); + connect( mHistory, TQ_SIGNAL( redone() ), TQ_SLOT( updateView() ) ); if ( mChanger ) delete mChanger; setIncidenceChanger( new IncidenceChanger( mCalendar, this ) ); @@ -326,21 +326,21 @@ void CalendarView::setIncidenceChanger( IncidenceChangerBase *changer ) { mChanger = changer; emit newIncidenceChanger( mChanger ); - connect( mChanger, TQT_SIGNAL( incidenceAdded( Incidence* ) ), - this, TQT_SLOT( incidenceAdded( Incidence* ) ) ); - connect( mChanger, TQT_SIGNAL( incidenceChanged( Incidence*, Incidence*, KOGlobals::WhatChanged ) ), - this, TQT_SLOT( incidenceChanged( Incidence*, Incidence*, KOGlobals::WhatChanged ) ) ); - connect( mChanger, TQT_SIGNAL( incidenceToBeDeleted( Incidence * ) ), - this, TQT_SLOT( incidenceToBeDeleted( Incidence * ) ) ); - connect( mChanger, TQT_SIGNAL( incidenceDeleted( Incidence * ) ), - this, TQT_SLOT( incidenceDeleted( Incidence * ) ) ); + connect( mChanger, TQ_SIGNAL( incidenceAdded( Incidence* ) ), + this, TQ_SLOT( incidenceAdded( Incidence* ) ) ); + connect( mChanger, TQ_SIGNAL( incidenceChanged( Incidence*, Incidence*, KOGlobals::WhatChanged ) ), + this, TQ_SLOT( incidenceChanged( Incidence*, Incidence*, KOGlobals::WhatChanged ) ) ); + connect( mChanger, TQ_SIGNAL( incidenceToBeDeleted( Incidence * ) ), + this, TQ_SLOT( incidenceToBeDeleted( Incidence * ) ) ); + connect( mChanger, TQ_SIGNAL( incidenceDeleted( Incidence * ) ), + this, TQ_SLOT( incidenceDeleted( Incidence * ) ) ); - connect( mChanger, TQT_SIGNAL( schedule( Scheduler::Method, Incidence*) ), - this, TQT_SLOT( schedule( Scheduler::Method, Incidence*) ) ); + connect( mChanger, TQ_SIGNAL( schedule( Scheduler::Method, Incidence*) ), + this, TQ_SLOT( schedule( Scheduler::Method, Incidence*) ) ); - connect( this, TQT_SIGNAL( cancelAttendees( Incidence * ) ), - mChanger, TQT_SLOT( cancelAttendees( Incidence * ) ) ); + connect( this, TQ_SIGNAL( cancelAttendees( Incidence * ) ), + mChanger, TQ_SLOT( cancelAttendees( Incidence * ) ) ); } Calendar *CalendarView::calendar() @@ -1776,7 +1776,7 @@ void CalendarView::print() #ifndef KORG_NOPRINTER KOCoreHelper helper; CalPrinter printer( this, mCalendar, &helper ); - connect( this, TQT_SIGNAL(configChanged()), &printer, TQT_SLOT(updateConfig()) ); + connect( this, TQ_SIGNAL(configChanged()), &printer, TQ_SLOT(updateConfig()) ); KOrg::BaseView *currentView = mViewManager->currentView(); @@ -1802,8 +1802,8 @@ void CalendarView::exportWeb() // seem to load the config theirselves if ( settings ) settings->readConfig(); ExportWebDialog *dlg = new ExportWebDialog( settings, this ); - connect( dlg, TQT_SIGNAL( exportHTML( HTMLExportSettings* ) ), - this, TQT_SIGNAL( exportHTML( HTMLExportSettings* ) ) ); + connect( dlg, TQ_SIGNAL( exportHTML( HTMLExportSettings* ) ), + this, TQ_SIGNAL( exportHTML( HTMLExportSettings* ) ) ); dlg->show(); } @@ -2472,8 +2472,8 @@ void CalendarView::deleteIncidence(Incidence *incidence, bool force) void CalendarView::connectIncidenceEditor( KOIncidenceEditor *editor ) { - connect( this, TQT_SIGNAL( newIncidenceChanger( IncidenceChangerBase* ) ), - editor, TQT_SLOT( setIncidenceChanger( IncidenceChangerBase* ) ) ); + connect( this, TQ_SIGNAL( newIncidenceChanger( IncidenceChangerBase* ) ), + editor, TQ_SLOT( setIncidenceChanger( IncidenceChangerBase* ) ) ); editor->setIncidenceChanger( mChanger ); } diff --git a/korganizer/datechecker.cpp b/korganizer/datechecker.cpp index 2be3d060..ebe73465 100644 --- a/korganizer/datechecker.cpp +++ b/korganizer/datechecker.cpp @@ -55,8 +55,8 @@ void DateChecker::enableRollover( RolloverType r ) case FollowMonth: if ( !mUpdateTimer ) { mUpdateTimer = new TQTimer( this, "mUpdateTimer" ); - connect( mUpdateTimer, TQT_SIGNAL( timeout() ), - TQT_SLOT( possiblyPastMidnight() ) ); + connect( mUpdateTimer, TQ_SIGNAL( timeout() ), + TQ_SLOT( possiblyPastMidnight() ) ); } mUpdateTimer->start( 0, true ); mLastDayChecked = TQDate::currentDate(); diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp index b2b8e8a0..3ff76fec 100644 --- a/korganizer/datenavigatorcontainer.cpp +++ b/korganizer/datenavigatorcontainer.cpp @@ -68,26 +68,26 @@ DateNavigatorContainer::~DateNavigatorContainer() void DateNavigatorContainer::connectNavigatorView( KDateNavigator *v ) { - connect( v, TQT_SIGNAL( datesSelected( const KCal::DateList & ) ), - TQT_SIGNAL( datesSelected( const KCal::DateList & ) ) ); - connect( v, TQT_SIGNAL( incidenceDropped( Incidence *, const TQDate & ) ), - TQT_SIGNAL( incidenceDropped( Incidence *, const TQDate & ) ) ); - connect( v, TQT_SIGNAL( incidenceDroppedMove( Incidence *, const TQDate & ) ), - TQT_SIGNAL( incidenceDroppedMove( Incidence *, const TQDate & ) ) ); - connect( v, TQT_SIGNAL( weekClicked( const TQDate & ) ), - TQT_SIGNAL( weekClicked( const TQDate & ) ) ); - - connect( v, TQT_SIGNAL( goPrevious() ), TQT_SIGNAL( goPrevious() ) ); - connect( v, TQT_SIGNAL( goNext() ), TQT_SIGNAL( goNext() ) ); - - connect( v, TQT_SIGNAL( nextYearClicked() ), TQT_SIGNAL( nextYearClicked() ) ); - connect( v, TQT_SIGNAL( prevYearClicked() ), TQT_SIGNAL( prevYearClicked() ) ); - - connect( v, TQT_SIGNAL( prevMonthClicked() ), this, TQT_SLOT( goPrevMonth() ) ); - connect( v, TQT_SIGNAL( nextMonthClicked() ), this, TQT_SLOT( goNextMonth() ) ); - - connect( v, TQT_SIGNAL( monthSelected( int ) ), TQT_SIGNAL( monthSelected( int ) ) ); - connect( v, TQT_SIGNAL( yearSelected( int ) ), TQT_SIGNAL( yearSelected( int ) ) ); + connect( v, TQ_SIGNAL( datesSelected( const KCal::DateList & ) ), + TQ_SIGNAL( datesSelected( const KCal::DateList & ) ) ); + connect( v, TQ_SIGNAL( incidenceDropped( Incidence *, const TQDate & ) ), + TQ_SIGNAL( incidenceDropped( Incidence *, const TQDate & ) ) ); + connect( v, TQ_SIGNAL( incidenceDroppedMove( Incidence *, const TQDate & ) ), + TQ_SIGNAL( incidenceDroppedMove( Incidence *, const TQDate & ) ) ); + connect( v, TQ_SIGNAL( weekClicked( const TQDate & ) ), + TQ_SIGNAL( weekClicked( const TQDate & ) ) ); + + connect( v, TQ_SIGNAL( goPrevious() ), TQ_SIGNAL( goPrevious() ) ); + connect( v, TQ_SIGNAL( goNext() ), TQ_SIGNAL( goNext() ) ); + + connect( v, TQ_SIGNAL( nextYearClicked() ), TQ_SIGNAL( nextYearClicked() ) ); + connect( v, TQ_SIGNAL( prevYearClicked() ), TQ_SIGNAL( prevYearClicked() ) ); + + connect( v, TQ_SIGNAL( prevMonthClicked() ), this, TQ_SLOT( goPrevMonth() ) ); + connect( v, TQ_SIGNAL( nextMonthClicked() ), this, TQ_SLOT( goNextMonth() ) ); + + connect( v, TQ_SIGNAL( monthSelected( int ) ), TQ_SIGNAL( monthSelected( int ) ) ); + connect( v, TQ_SIGNAL( yearSelected( int ) ), TQ_SIGNAL( yearSelected( int ) ) ); } void DateNavigatorContainer::setCalendar( Calendar *cal ) @@ -211,7 +211,7 @@ void DateNavigatorContainer::resizeEvent( TQResizeEvent * ) kdDebug(5850) << " SIZEHINT: " << sizeHint() << endl; kdDebug(5850) << " MINIMUM SIZE: " << minimumSize() << endl; #endif - TQTimer::singleShot( 0, this, TQT_SLOT( resizeAllContents() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( resizeAllContents() ) ); } void DateNavigatorContainer::resizeAllContents() diff --git a/korganizer/exportwebdialog.cpp b/korganizer/exportwebdialog.cpp index 156ed702..a6b09b78 100644 --- a/korganizer/exportwebdialog.cpp +++ b/korganizer/exportwebdialog.cpp @@ -81,8 +81,8 @@ ExportWebDialog::ExportWebDialog( HTMLExportSettings *settings, TQWidget *parent // setupFreeBusyPage(); // setupAdvancedPage(); - connect( this, TQT_SIGNAL( user1Clicked() ), TQT_SLOT( slotOk() ) ); - connect( this, TQT_SIGNAL( cancelClicked() ), TQT_SLOT( reject() ) ); + connect( this, TQ_SIGNAL( user1Clicked() ), TQ_SLOT( slotOk() ) ); + connect( this, TQ_SIGNAL( cancelClicked() ), TQ_SLOT( reject() ) ); readConfig(); updateState(); @@ -149,9 +149,9 @@ void ExportWebDialog::setupGeneralPage() topLayout->addWidget( typeGroup ); // addWidBool( mSettings->weekViewItem(), typeGroup ); mMonthViewCheckBox = addWidBool( mSettings->monthViewItem(), typeGroup )->checkBox(); - connect( mMonthViewCheckBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateState()) ); + connect( mMonthViewCheckBox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateState()) ); mEventListCheckBox = addWidBool( mSettings->eventViewItem(), typeGroup )->checkBox(); - connect( mEventListCheckBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateState()) ); + connect( mEventListCheckBox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateState()) ); addWidBool( mSettings->todoViewItem(), typeGroup ); // addWidBool( mSettings->journalViewItem(), typeGroup ); // addWidBool( mSettings->freeBusyViewItem(), typeGroup ); @@ -162,8 +162,8 @@ void ExportWebDialog::setupGeneralPage() topLayout->addWidget(destGroup); KPrefsWidPath *pathWid = addWidPath( mSettings->outputFileItem(), destGroup, "text/html", KFile::File ); - connect( pathWid->urlRequester(), TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SLOT( slotTextChanged( const TQString & ) ) ); + connect( pathWid->urlRequester(), TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SLOT( slotTextChanged( const TQString & ) ) ); topLayout->addStretch( 1 ); } diff --git a/korganizer/filtereditdialog.cpp b/korganizer/filtereditdialog.cpp index 74f5a48c..6a2ef703 100644 --- a/korganizer/filtereditdialog.cpp +++ b/korganizer/filtereditdialog.cpp @@ -53,11 +53,11 @@ FilterEditDialog::FilterEditDialog( TQPtrList<CalFilter> *filters, { setMainWidget( mFilterEdit = new FilterEdit(filters, this)); - connect(mFilterEdit, TQT_SIGNAL(dataConsistent(bool)), - TQT_SLOT(setDialogConsistent(bool))); + connect(mFilterEdit, TQ_SIGNAL(dataConsistent(bool)), + TQ_SLOT(setDialogConsistent(bool))); updateFilterList(); - connect( mFilterEdit, TQT_SIGNAL( editCategories() ), TQT_SIGNAL( editCategories() ) ); - connect( mFilterEdit, TQT_SIGNAL( filterChanged() ), TQT_SIGNAL( filterChanged() ) ); + connect( mFilterEdit, TQ_SIGNAL( editCategories() ), TQ_SIGNAL( editCategories() ) ); + connect( mFilterEdit, TQ_SIGNAL( filterChanged() ), TQ_SIGNAL( filterChanged() ) ); } FilterEditDialog::~FilterEditDialog() @@ -99,11 +99,11 @@ FilterEdit::FilterEdit(TQPtrList<CalFilter> *filters, TQWidget *parent) TQWhatsThis::add( mNewButton, i18n( "Press this button to define a new filter." ) ); TQWhatsThis::add( mDeleteButton, i18n( "Press this button to remove the currently active filter." ) ); - connect( mRulesList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(filterSelected()) ); - connect( mNewButton, TQT_SIGNAL( clicked() ), TQT_SLOT( bNewPressed() ) ); - connect( mDeleteButton, TQT_SIGNAL( clicked() ), TQT_SLOT( bDeletePressed() ) ); - connect( mNameLineEdit, TQT_SIGNAL( textChanged(const TQString &) ), TQT_SLOT( updateSelectedName(const TQString &) ) ); - connect( mCatEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editCategorySelection() ) ); + connect( mRulesList, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(filterSelected()) ); + connect( mNewButton, TQ_SIGNAL( clicked() ), TQ_SLOT( bNewPressed() ) ); + connect( mDeleteButton, TQ_SIGNAL( clicked() ), TQ_SLOT( bDeletePressed() ) ); + connect( mNameLineEdit, TQ_SIGNAL( textChanged(const TQString &) ), TQ_SLOT( updateSelectedName(const TQString &) ) ); + connect( mCatEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editCategorySelection() ) ); } FilterEdit::~FilterEdit() { @@ -231,10 +231,10 @@ void FilterEdit::editCategorySelection() if ( !mCategorySelectDialog ) { mCategorySelectDialog = new KPIM::CategorySelectDialog( KOPrefs::instance(), this, "filterCatSelect" ); connect( mCategorySelectDialog, - TQT_SIGNAL( categoriesSelected( const TQStringList & ) ), - TQT_SLOT( updateCategorySelection( const TQStringList & ) ) ); - connect( mCategorySelectDialog, TQT_SIGNAL( editCategories() ), - TQT_SIGNAL( editCategories() ) ); + TQ_SIGNAL( categoriesSelected( const TQStringList & ) ), + TQ_SLOT( updateCategorySelection( const TQStringList & ) ) ); + connect( mCategorySelectDialog, TQ_SIGNAL( editCategories() ), + TQ_SIGNAL( editCategories() ) ); } mCategorySelectDialog->setSelected( current->categoryList() ); diff --git a/korganizer/freebusymanager.cpp b/korganizer/freebusymanager.cpp index 9aa7ed82..8f41a837 100644 --- a/korganizer/freebusymanager.cpp +++ b/korganizer/freebusymanager.cpp @@ -82,10 +82,10 @@ FreeBusyDownloadJob::FreeBusyDownloadJob( const TQString &email, const KURL &url KOrg::MainWindow *korg = ActionManager::findInstance( KURL() ); job->setWindow( korg->topLevelWidget() ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotResult( TDEIO::Job * ) ) ); - connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQ_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); TDEIO::Scheduler::scheduleJob( job ); } @@ -339,8 +339,8 @@ void FreeBusyManager::publishFreeBusy() KOrg::MainWindow *korg = ActionManager::findInstance( KURL() ); job->setWindow( korg->topLevelWidget() ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotUploadFreeBusyResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotUploadFreeBusyResult( TDEIO::Job * ) ) ); } } @@ -406,15 +406,15 @@ bool FreeBusyManager::processRetrieveQueue() FreeBusyDownloadJob *job = new FreeBusyDownloadJob( email, sourceURL, this, "freebusy_download_job" ); - connect( job, TQT_SIGNAL( freeBusyDownloaded( KCal::FreeBusy *, + connect( job, TQ_SIGNAL( freeBusyDownloaded( KCal::FreeBusy *, const TQString & ) ), - TQT_SIGNAL( freeBusyRetrieved( KCal::FreeBusy *, const TQString & ) ) ); - connect( job, TQT_SIGNAL( freeBusyDownloaded( KCal::FreeBusy *, + TQ_SIGNAL( freeBusyRetrieved( KCal::FreeBusy *, const TQString & ) ) ); + connect( job, TQ_SIGNAL( freeBusyDownloaded( KCal::FreeBusy *, const TQString & ) ), - TQT_SLOT( processRetrieveQueue() ) ); + TQ_SLOT( processRetrieveQueue() ) ); - connect( job, TQT_SIGNAL( freeBusyDownloadError( const TQString& ) ), - this, TQT_SLOT( slotFreeBusyDownloadError( const TQString& ) ) ); + connect( job, TQ_SIGNAL( freeBusyDownloadError( const TQString& ) ), + this, TQ_SLOT( slotFreeBusyDownloadError( const TQString& ) ) ); return true; } diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp index 0ceec954..08d57be5 100644 --- a/korganizer/journalentry.cpp +++ b/korganizer/journalentry.cpp @@ -75,8 +75,8 @@ JournalDateEntry::JournalDateEntry( Calendar *calendar, TQWidget *parent ) : mTitle = new JournalTitleLable( this ); mTitle->setMargin(2); mTitle->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); - connect( mTitle, TQT_SIGNAL( linkClicked( const TQString & ) ), - this, TQT_SLOT( emitNewJournal() ) ); + connect( mTitle, TQ_SIGNAL( linkClicked( const TQString & ) ), + this, TQ_SLOT( emitNewJournal() ) ); } JournalDateEntry::~JournalDateEntry() @@ -120,16 +120,16 @@ void JournalDateEntry::addJournal( Journal *j ) entry->setIncidenceChanger( mChanger ); mEntries.insert( j, entry ); - connect( this, TQT_SIGNAL( setIncidenceChangerSignal( IncidenceChangerBase * ) ), - entry, TQT_SLOT( setIncidenceChanger( IncidenceChangerBase * ) ) ); - connect( this, TQT_SIGNAL( setDateSignal( const TQDate & ) ), - entry, TQT_SLOT( setDate( const TQDate & ) ) ); - connect( this, TQT_SIGNAL( flushEntries() ), - entry, TQT_SLOT( flushEntry() ) ); - connect( entry, TQT_SIGNAL( deleteIncidence( Incidence* ) ), - this, TQT_SIGNAL( deleteIncidence( Incidence* ) ) ); - connect( entry, TQT_SIGNAL( editIncidence( Incidence*, const TQDate& ) ), - this, TQT_SIGNAL( editIncidence( Incidence*, const TQDate& ) ) ); + connect( this, TQ_SIGNAL( setIncidenceChangerSignal( IncidenceChangerBase * ) ), + entry, TQ_SLOT( setIncidenceChanger( IncidenceChangerBase * ) ) ); + connect( this, TQ_SIGNAL( setDateSignal( const TQDate & ) ), + entry, TQ_SLOT( setDate( const TQDate & ) ) ); + connect( this, TQ_SIGNAL( flushEntries() ), + entry, TQ_SLOT( flushEntry() ) ); + connect( entry, TQ_SIGNAL( deleteIncidence( Incidence* ) ), + this, TQ_SIGNAL( deleteIncidence( Incidence* ) ) ); + connect( entry, TQ_SIGNAL( editIncidence( Incidence*, const TQDate& ) ), + this, TQ_SIGNAL( editIncidence( Incidence*, const TQDate& ) ) ); } Journal::List JournalDateEntry::journals() const @@ -203,8 +203,8 @@ JournalEntry::JournalEntry( Journal* j, TQWidget *parent ) : mLayout->addWidget( mTimeCheck, 0, 2 ); mTimeEdit = new KTimeEdit( this ); mLayout->addWidget( mTimeEdit, 0, 3 ); - connect( mTimeCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(timeCheckBoxToggled(bool)) ); + connect( mTimeCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(timeCheckBoxToggled(bool)) ); TQWhatsThis::add( mTimeCheck, i18n("Determines whether this journal entry has " "a time associated with it") ); TQWhatsThis::add( mTimeEdit, i18n( "Sets the time associated with this journal " @@ -217,7 +217,7 @@ JournalEntry::JournalEntry( Journal* j, TQWidget *parent ) : TQToolTip::add( mDeleteButton, i18n("Delete this journal entry") ); TQWhatsThis::add( mDeleteButton, i18n("Delete this journal entry") ); mLayout->addWidget( mDeleteButton, 0, 4 ); - connect( mDeleteButton, TQT_SIGNAL(pressed()), this, TQT_SLOT(deleteItem()) ); + connect( mDeleteButton, TQ_SIGNAL(pressed()), this, TQ_SLOT(deleteItem()) ); mEditButton = new TQToolButton( this, "editButton" ); mEditButton->setPixmap( KOGlobals::self()->smallIcon( "edit" ) ); @@ -225,7 +225,7 @@ JournalEntry::JournalEntry( Journal* j, TQWidget *parent ) : TQToolTip::add( mEditButton, i18n("Edit this journal entry") ); TQWhatsThis::add( mEditButton, i18n("Opens an editor dialog for this journal entry") ); mLayout->addWidget( mEditButton, 0, 5 ); - connect( mEditButton, TQT_SIGNAL(clicked()), this, TQT_SLOT( editItem() ) ); + connect( mEditButton, TQ_SIGNAL(clicked()), this, TQ_SLOT( editItem() ) ); #ifndef KORG_NOPRINTER mPrintButton = new TQToolButton( this, "printButton" ); @@ -234,15 +234,15 @@ JournalEntry::JournalEntry( Journal* j, TQWidget *parent ) : TQToolTip::add( mPrintButton, i18n("Print this journal entry") ); TQWhatsThis::add( mPrintButton, i18n("Opens the print dialog for this journal entry") ); mLayout->addWidget( mPrintButton, 0, 6 ); - connect( mPrintButton, TQT_SIGNAL(clicked()), this, TQT_SLOT( printItem() ) ); + connect( mPrintButton, TQ_SIGNAL(clicked()), this, TQ_SLOT( printItem() ) ); #endif mEditor = new KTextEdit(this); mLayout->addMultiCellWidget( mEditor, 1, 2, 0, 6 ); - connect( mTitleEdit, TQT_SIGNAL(textChanged( const TQString& )), TQT_SLOT(setDirty()) ); - connect( mTimeCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setDirty()) ); - connect( mTimeEdit, TQT_SIGNAL(timeChanged(TQTime)), TQT_SLOT(setDirty()) ); - connect( mEditor, TQT_SIGNAL(textChanged()), TQT_SLOT(setDirty()) ); + connect( mTitleEdit, TQ_SIGNAL(textChanged( const TQString& )), TQ_SLOT(setDirty()) ); + connect( mTimeCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setDirty()) ); + connect( mTimeEdit, TQ_SIGNAL(timeChanged(TQTime)), TQ_SLOT(setDirty()) ); + connect( mEditor, TQ_SIGNAL(textChanged()), TQ_SLOT(setDirty()) ); mEditor->installEventFilter(this); @@ -283,7 +283,7 @@ void JournalEntry::printItem() if ( mJournal ) { KOCoreHelper helper; CalPrinter printer( this, 0, &helper ); - connect( this, TQT_SIGNAL(configChanged()), &printer, TQT_SLOT(updateConfig()) ); + connect( this, TQ_SIGNAL(configChanged()), &printer, TQ_SLOT(updateConfig()) ); Incidence::List selectedIncidences; selectedIncidences.append( mJournal ); diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp index 918b8958..94f74a66 100644 --- a/korganizer/kdatenavigator.cpp +++ b/korganizer/kdatenavigator.cpp @@ -53,12 +53,12 @@ KDateNavigator::KDateNavigator( TQWidget *parent, const char *name ) mNavigatorBar = new NavigatorBar( this ); topLayout->addMultiCellWidget( mNavigatorBar, 0, 0, 0, 7 ); - connect( mNavigatorBar, TQT_SIGNAL( prevYearClicked() ), TQT_SIGNAL( prevYearClicked() ) ); - connect( mNavigatorBar, TQT_SIGNAL( prevMonthClicked() ), TQT_SIGNAL( prevMonthClicked() ) ); - connect( mNavigatorBar, TQT_SIGNAL( nextMonthClicked() ), TQT_SIGNAL( nextMonthClicked() ) ); - connect( mNavigatorBar, TQT_SIGNAL( nextYearClicked() ), TQT_SIGNAL( nextYearClicked() ) ); - connect( mNavigatorBar, TQT_SIGNAL( monthSelected( int ) ), TQT_SIGNAL( monthSelected( int ) ) ); - connect( mNavigatorBar, TQT_SIGNAL( yearSelected( int ) ), TQT_SIGNAL( yearSelected( int ) ) ); + connect( mNavigatorBar, TQ_SIGNAL( prevYearClicked() ), TQ_SIGNAL( prevYearClicked() ) ); + connect( mNavigatorBar, TQ_SIGNAL( prevMonthClicked() ), TQ_SIGNAL( prevMonthClicked() ) ); + connect( mNavigatorBar, TQ_SIGNAL( nextMonthClicked() ), TQ_SIGNAL( nextMonthClicked() ) ); + connect( mNavigatorBar, TQ_SIGNAL( nextYearClicked() ), TQ_SIGNAL( nextYearClicked() ) ); + connect( mNavigatorBar, TQ_SIGNAL( monthSelected( int ) ), TQ_SIGNAL( monthSelected( int ) ) ); + connect( mNavigatorBar, TQ_SIGNAL( yearSelected( int ) ), TQ_SIGNAL( yearSelected( int ) ) ); int i; TQString generalFont = TDEGlobalSettings::generalFont().family(); @@ -84,13 +84,13 @@ KDateNavigator::KDateNavigator( TQWidget *parent, const char *name ) mDayMatrix = new KODayMatrix( this, "KDateNavigator::dayMatrix" ); - connect( mDayMatrix, TQT_SIGNAL( selected( const KCal::DateList & ) ), - TQT_SIGNAL( datesSelected( const KCal::DateList & ) ) ); + connect( mDayMatrix, TQ_SIGNAL( selected( const KCal::DateList & ) ), + TQ_SIGNAL( datesSelected( const KCal::DateList & ) ) ); - connect( mDayMatrix, TQT_SIGNAL( incidenceDropped( Incidence *, const TQDate & ) ), - TQT_SIGNAL( incidenceDropped( Incidence *, const TQDate & ) ) ); - connect( mDayMatrix, TQT_SIGNAL( incidenceDroppedMove( Incidence * , const TQDate & ) ), - TQT_SIGNAL( incidenceDroppedMove( Incidence *, const TQDate & ) ) ); + connect( mDayMatrix, TQ_SIGNAL( incidenceDropped( Incidence *, const TQDate & ) ), + TQ_SIGNAL( incidenceDropped( Incidence *, const TQDate & ) ) ); + connect( mDayMatrix, TQ_SIGNAL( incidenceDroppedMove( Incidence * , const TQDate & ) ), + TQ_SIGNAL( incidenceDroppedMove( Incidence *, const TQDate & ) ) ); topLayout->addMultiCellWidget( mDayMatrix, 2, 7, 1, 7 ); diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp index 0ed15858..b7a0e1de 100644 --- a/korganizer/koagenda.cpp +++ b/korganizer/koagenda.cpp @@ -69,7 +69,7 @@ MarcusBains::MarcusBains(KOAgenda *_agenda,const char *name ) setMargin(0); setBackgroundColor(TQt::red); minutes = new TQTimer(this); - connect(minutes, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateLocation())); + connect(minutes, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateLocation())); minutes->start(0, true); mTimeBox = new TQLabel(this); @@ -257,8 +257,8 @@ void KOAgenda::init() // effect. Has to be fixed. setFocusPolicy( TQWidget::WheelFocus ); - connect( &mScrollUpTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( scrollUp() ) ); - connect( &mScrollDownTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( scrollDown() ) ); + connect( &mScrollUpTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( scrollUp() ) ); + connect( &mScrollDownTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( scrollDown() ) ); mStartCell = TQPoint( 0, 0 ); mEndCell = TQPoint( 0, 0 ); @@ -305,8 +305,8 @@ void KOAgenda::init() calculateWorkingHours(); - connect( verticalScrollBar(), TQT_SIGNAL( valueChanged( int ) ), - TQT_SLOT( checkScrollBoundaries( int ) ) ); + connect( verticalScrollBar(), TQ_SIGNAL( valueChanged( int ) ), + TQ_SLOT( checkScrollBoundaries( int ) ) ); // Create the Marcus Bains line. if( mAllDayMode ) { @@ -1604,10 +1604,10 @@ KOAgendaItem *KOAgenda::insertItem( Incidence *incidence, const TQDate &qd, int mActionType = NOP; KOAgendaItem *agendaItem = new KOAgendaItem( mCalendar, incidence, qd, viewport(), itemPos, itemCount ); - connect( agendaItem, TQT_SIGNAL( removeAgendaItem( KOAgendaItem * ) ), - TQT_SLOT( removeAgendaItem( KOAgendaItem * ) ) ); - connect( agendaItem, TQT_SIGNAL( showAgendaItem( KOAgendaItem * ) ), - TQT_SLOT( showAgendaItem( KOAgendaItem * ) ) ); + connect( agendaItem, TQ_SIGNAL( removeAgendaItem( KOAgendaItem * ) ), + TQ_SLOT( removeAgendaItem( KOAgendaItem * ) ) ); + connect( agendaItem, TQ_SIGNAL( showAgendaItem( KOAgendaItem * ) ), + TQ_SLOT( showAgendaItem( KOAgendaItem * ) ) ); if ( YBottom <= YTop ) { kdDebug(5850) << "KOAgenda::insertItem(): Text: " << agendaItem->text() << " YSize<0" << endl; @@ -1649,10 +1649,10 @@ KOAgendaItem *KOAgenda::insertAllDayItem( Incidence *event, const TQDate &qd, mActionType = NOP; KOAgendaItem *agendaItem = new KOAgendaItem( mCalendar, event, qd, viewport(), 1, 1 ); - connect( agendaItem, TQT_SIGNAL( removeAgendaItem( KOAgendaItem* ) ), - TQT_SLOT( removeAgendaItem( KOAgendaItem* ) ) ); - connect( agendaItem, TQT_SIGNAL( showAgendaItem( KOAgendaItem* ) ), - TQT_SLOT( showAgendaItem( KOAgendaItem* ) ) ); + connect( agendaItem, TQ_SIGNAL( removeAgendaItem( KOAgendaItem* ) ), + TQ_SLOT( removeAgendaItem( KOAgendaItem* ) ) ); + connect( agendaItem, TQ_SIGNAL( showAgendaItem( KOAgendaItem* ) ), + TQ_SLOT( showAgendaItem( KOAgendaItem* ) ) ); agendaItem->setCellXY( XBegin, 0, 0 ); agendaItem->setCellXRight( XEnd ); @@ -1799,7 +1799,7 @@ bool KOAgenda::removeAgendaItem( KOAgendaItem *item ) } mItemsToDelete.append( thisItem ); - TQTimer::singleShot( 0, this, TQT_SLOT( deleteItemsToDelete() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( deleteItemsToDelete() ) ); return taken; } @@ -1843,7 +1843,7 @@ void KOAgenda::resizeEvent ( TQResizeEvent *ev ) mGridSpacingY = mDesiredGridSpacingY; } calculateWorkingHours(); - TQTimer::singleShot( 0, this, TQT_SLOT( resizeAllContents() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( resizeAllContents() ) ); emit gridSpacingYChanged( mGridSpacingY * 4 ); TQScrollView::resizeEvent(ev); } diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index 3e47ad63..1bde3dbe 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp @@ -315,7 +315,7 @@ KOAgendaView::KOAgendaView( Calendar *cal, mExpandButton->setPixmap( mNotExpandedPixmap ); mExpandButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); - connect( mExpandButton, TQT_SIGNAL( clicked() ), TQT_SIGNAL( toggleExpand() ) ); + connect( mExpandButton, TQ_SIGNAL( clicked() ), TQ_SIGNAL( toggleExpand() ) ); } else { TQLabel *label = new TQLabel( i18n("All Day"), mDummyAllDayLeft ); label->setAlignment( TQt::AlignRight | TQt::AlignVCenter | TQt::WordBreak ); @@ -373,27 +373,27 @@ KOAgendaView::KOAgendaView( Calendar *cal, updateTimeBarWidth(); // Scrolling - connect(mAgenda->verticalScrollBar(),TQT_SIGNAL(valueChanged(int)), - mTimeLabels, TQT_SLOT(positionChanged())); + connect(mAgenda->verticalScrollBar(),TQ_SIGNAL(valueChanged(int)), + mTimeLabels, TQ_SLOT(positionChanged())); connect( mAgenda, - TQT_SIGNAL( zoomView( const int, const TQPoint & ,const TQt::Orientation ) ), - TQT_SLOT( zoomView( const int, const TQPoint &, const TQt::Orientation ) ) ); + TQ_SIGNAL( zoomView( const int, const TQPoint & ,const TQt::Orientation ) ), + TQ_SLOT( zoomView( const int, const TQPoint &, const TQt::Orientation ) ) ); - connect(mTimeLabels->verticalScrollBar(),TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(setContentsPos(int))); + connect(mTimeLabels->verticalScrollBar(),TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(setContentsPos(int))); // Create Events, depends on type of agenda - connect( mAgenda, TQT_SIGNAL(newTimeSpanSignal(const TQPoint &, const TQPoint &)), - TQT_SLOT(newTimeSpanSelected(const TQPoint &, const TQPoint &))); - connect( mAllDayAgenda, TQT_SIGNAL(newTimeSpanSignal(const TQPoint &, const TQPoint &)), - TQT_SLOT(newTimeSpanSelectedAllDay(const TQPoint &, const TQPoint &))); + connect( mAgenda, TQ_SIGNAL(newTimeSpanSignal(const TQPoint &, const TQPoint &)), + TQ_SLOT(newTimeSpanSelected(const TQPoint &, const TQPoint &))); + connect( mAllDayAgenda, TQ_SIGNAL(newTimeSpanSignal(const TQPoint &, const TQPoint &)), + TQ_SLOT(newTimeSpanSelectedAllDay(const TQPoint &, const TQPoint &))); // event indicator update - connect( mAgenda, TQT_SIGNAL(lowerYChanged(int)), - TQT_SLOT(updateEventIndicatorTop(int))); - connect( mAgenda, TQT_SIGNAL(upperYChanged(int)), - TQT_SLOT(updateEventIndicatorBottom(int))); + connect( mAgenda, TQ_SIGNAL(lowerYChanged(int)), + TQ_SLOT(updateEventIndicatorTop(int))); + connect( mAgenda, TQ_SIGNAL(upperYChanged(int)), + TQ_SLOT(updateEventIndicatorBottom(int))); if ( !readOnly() ) { connectAgenda( mAgenda, mAgendaPopup, mAllDayAgenda ); @@ -417,53 +417,53 @@ KOAgendaView::~KOAgendaView() void KOAgendaView::connectAgenda( KOAgenda *agenda, TQPopupMenu *popup, KOAgenda *otherAgenda ) { - connect( agenda, TQT_SIGNAL(showIncidencePopupSignal(Calendar *,Incidence *,const TQDate &)), - popup, TQT_SLOT(showIncidencePopup(Calendar *,Incidence *,const TQDate &)) ); + connect( agenda, TQ_SIGNAL(showIncidencePopupSignal(Calendar *,Incidence *,const TQDate &)), + popup, TQ_SLOT(showIncidencePopup(Calendar *,Incidence *,const TQDate &)) ); - connect( agenda, TQT_SIGNAL(showNewEventPopupSignal()), - TQT_SLOT(showNewEventPopup()) ); + connect( agenda, TQ_SIGNAL(showNewEventPopupSignal()), + TQ_SLOT(showNewEventPopup()) ); // Create/Show/Edit/Delete Event - connect( agenda, TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &)), - TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &)) ); + connect( agenda, TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &)), + TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &)) ); - connect( agenda, TQT_SIGNAL(newStartSelectSignal()), - otherAgenda, TQT_SLOT(clearSelection()) ); - connect( agenda, TQT_SIGNAL(newStartSelectSignal()), - TQT_SIGNAL(timeSpanSelectionChanged()) ); + connect( agenda, TQ_SIGNAL(newStartSelectSignal()), + otherAgenda, TQ_SLOT(clearSelection()) ); + connect( agenda, TQ_SIGNAL(newStartSelectSignal()), + TQ_SIGNAL(timeSpanSelectionChanged()) ); - connect( agenda, TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)), - TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)) ); - connect( agenda, TQT_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)), - TQT_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)) ); - connect( agenda, TQT_SIGNAL(deleteIncidenceSignal(Incidence *)), - TQT_SIGNAL(deleteIncidenceSignal(Incidence *)) ); + connect( agenda, TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)), + TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)) ); + connect( agenda, TQ_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)), + TQ_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)) ); + connect( agenda, TQ_SIGNAL(deleteIncidenceSignal(Incidence *)), + TQ_SIGNAL(deleteIncidenceSignal(Incidence *)) ); - connect( agenda, TQT_SIGNAL(startMultiModify(const TQString &)), - TQT_SIGNAL(startMultiModify(const TQString &)) ); - connect( agenda, TQT_SIGNAL(endMultiModify()), - TQT_SIGNAL(endMultiModify()) ); + connect( agenda, TQ_SIGNAL(startMultiModify(const TQString &)), + TQ_SIGNAL(startMultiModify(const TQString &)) ); + connect( agenda, TQ_SIGNAL(endMultiModify()), + TQ_SIGNAL(endMultiModify()) ); - connect( agenda, TQT_SIGNAL(itemModified(KOAgendaItem *)), - TQT_SLOT(updateEventDates(KOAgendaItem *)) ); + connect( agenda, TQ_SIGNAL(itemModified(KOAgendaItem *)), + TQ_SLOT(updateEventDates(KOAgendaItem *)) ); - connect( agenda, TQT_SIGNAL(enableAgendaUpdate(bool)), - TQT_SLOT(enableAgendaUpdate(bool)) ); + connect( agenda, TQ_SIGNAL(enableAgendaUpdate(bool)), + TQ_SLOT(enableAgendaUpdate(bool)) ); // drag signals - connect( agenda, TQT_SIGNAL(startDragSignal(Incidence *)), - TQT_SLOT(startDrag(Incidence *)) ); + connect( agenda, TQ_SIGNAL(startDragSignal(Incidence *)), + TQ_SLOT(startDrag(Incidence *)) ); // synchronize selections - connect( agenda, TQT_SIGNAL(incidenceSelected(Incidence *,const TQDate &)), - otherAgenda, TQT_SLOT(deselectItem()) ); - connect( agenda, TQT_SIGNAL(incidenceSelected(Incidence *,const TQDate &)), - TQT_SIGNAL(incidenceSelected(Incidence *,const TQDate &)) ); + connect( agenda, TQ_SIGNAL(incidenceSelected(Incidence *,const TQDate &)), + otherAgenda, TQ_SLOT(deselectItem()) ); + connect( agenda, TQ_SIGNAL(incidenceSelected(Incidence *,const TQDate &)), + TQ_SIGNAL(incidenceSelected(Incidence *,const TQDate &)) ); // rescheduling of todos by d'n'd - connect( agenda, TQT_SIGNAL(droppedToDo(Todo *,const TQPoint &,bool)), - TQT_SLOT(slotTodoDropped(Todo *,const TQPoint &,bool)) ); + connect( agenda, TQ_SIGNAL(droppedToDo(Todo *,const TQPoint &,bool)), + TQ_SLOT(slotTodoDropped(Todo *,const TQPoint &,bool)) ); } @@ -682,7 +682,7 @@ void KOAgendaView::createDayLabels( bool force ) if ( !mIsSideBySide ) mLayoutDayLabels->addSpacing(mAgenda->verticalScrollBar()->width()); mDayLabels->show(); - TQTimer::singleShot( 0, this, TQT_SLOT( updateDayLabelSizes() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( updateDayLabelSizes() ) ); } void KOAgendaView::enableAgendaUpdate( bool enable ) @@ -1117,7 +1117,7 @@ void KOAgendaView::updateEventDates( KOAgendaItem *item ) if ( !result ) { mPendingChanges = true; - TQTimer::singleShot( 0, this, TQT_SLOT(updateView()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(updateView()) ); return; } @@ -1131,7 +1131,7 @@ void KOAgendaView::updateEventDates( KOAgendaItem *item ) // recreated. All others have to!!! if ( incidence->doesRecur() ) { mUpdateItem = incidence; - TQTimer::singleShot( 0, this, TQT_SLOT( doUpdateItem() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( doUpdateItem() ) ); } enableAgendaUpdate( true ); diff --git a/korganizer/koattendeeeditor.cpp b/korganizer/koattendeeeditor.cpp index 8d831e07..5c8ddc39 100644 --- a/korganizer/koattendeeeditor.cpp +++ b/korganizer/koattendeeeditor.cpp @@ -109,9 +109,9 @@ void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * layout) mNameEdit->setClickMessage( i18n("Click to add a new attendee") ); attendeeLabel->setBuddy( mNameEdit ); mNameEdit->installEventFilter( this ); - connect( mNameEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SLOT( updateAttendee() ) ); - connect( mNameEdit, TQT_SIGNAL(returnPressed()), TQT_SLOT(expandAttendee()) ); + connect( mNameEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SLOT( updateAttendee() ) ); + connect( mNameEdit, TQ_SIGNAL(returnPressed()), TQ_SLOT(expandAttendee()) ); topLayout->addMultiCellWidget( mNameEdit, 0, 0, 1, 2 ); whatsThis = i18n("Edits the role of the attendee selected " @@ -125,8 +125,8 @@ void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * layout) TQWhatsThis::add( mRoleCombo, whatsThis ); mRoleCombo->insertStringList( Attendee::roleList() ); attendeeRoleLabel->setBuddy( mRoleCombo ); - connect( mRoleCombo, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( updateAttendee() ) ); + connect( mRoleCombo, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( updateAttendee() ) ); topLayout->addWidget( mRoleCombo, 1, 1 ); mDelegateLabel = new TQLabel( parent ); @@ -151,8 +151,8 @@ void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * layout) mStatusCombo->insertItem( KOGlobals::self()->smallIcon( "help" ), Attendee::statusName( Attendee::InProcess ) ); statusLabel->setBuddy( mStatusCombo ); - connect( mStatusCombo, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( updateAttendee() ) ); + connect( mStatusCombo, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( updateAttendee() ) ); topLayout->addWidget( mStatusCombo, 2, 1 ); topLayout->setColStretch( 2, 1 ); @@ -163,7 +163,7 @@ void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * layout) "selected in the list above to request " "a response concerning attendance.") ); mRsvpButton->setText( i18n("Re&quest response") ); - connect( mRsvpButton, TQT_SIGNAL( clicked() ), TQT_SLOT( updateAttendee() ) ); + connect( mRsvpButton, TQ_SIGNAL( clicked() ), TQ_SLOT( updateAttendee() ) ); topLayout->addWidget( mRsvpButton, 2, 2 ); TQWidget *buttonBox = new TQWidget( parent ); @@ -179,7 +179,7 @@ void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * layout) "from your addressbook, click the 'Select Addressee' " "button instead.") ); buttonLayout->addWidget( mAddButton ); - connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addNewAttendee() ) ); + connect( mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( addNewAttendee() ) ); mRemoveButton = new TQPushButton( i18n("&Remove"), buttonBox ); TQWhatsThis::add( mRemoveButton, @@ -193,7 +193,7 @@ void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * layout) i18n("Opens your address book, allowing you to select " "new attendees from it.") ); buttonLayout->addWidget( mAddressBookButton ); - connect( mAddressBookButton, TQT_SIGNAL( clicked() ), TQT_SLOT( openAddressBook() ) ); + connect( mAddressBookButton, TQ_SIGNAL( clicked() ), TQ_SLOT( openAddressBook() ) ); topLayout->addMultiCellWidget( buttonBox, 0, 3, 3, 3 ); @@ -277,7 +277,7 @@ void KOAttendeeEditor::addNewAttendee() // We don't want the hint again mNameEdit->setClickMessage( "" ); mNameEdit->setFocus(); - TQTimer::singleShot( 0, mNameEdit, TQT_SLOT( selectAll() ) ); + TQTimer::singleShot( 0, mNameEdit, TQ_SLOT( selectAll() ) ); } void KOAttendeeEditor::readEvent(KCal::Incidence * incidence) diff --git a/korganizer/kocounterdialog.cpp b/korganizer/kocounterdialog.cpp index 5341e1d0..dc6a76ea 100644 --- a/korganizer/kocounterdialog.cpp +++ b/korganizer/kocounterdialog.cpp @@ -39,8 +39,8 @@ KOCounterDialog::KOCounterDialog( Calendar *calendar, TQWidget *parent, const ch mEventViewer = new KOEventViewer( calendar, this ); setMainWidget( mEventViewer ); - connect( this, TQT_SIGNAL( user1Clicked() ), TQT_SLOT( slotCancel() ) ); - connect( this, TQT_SIGNAL( user2Clicked() ), TQT_SLOT( slotOk( ) ) ); + connect( this, TQ_SIGNAL( user1Clicked() ), TQ_SLOT( slotCancel() ) ); + connect( this, TQ_SIGNAL( user2Clicked() ), TQ_SLOT( slotOk( ) ) ); // FIXME: Set a sensible size (based on the content?). setMinimumSize( 300, 200 ); diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index d78bb43e..0a575a77 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp @@ -125,9 +125,9 @@ void KODayMatrix::setCalendar( Calendar *cal ) mCalendar->registerObserver( this ); CalendarResources *calres = dynamic_cast<CalendarResources*>( cal ); if ( calres ) { - connect( calres, TQT_SIGNAL(signalResourceAdded(ResourceCalendar *)), TQT_SLOT(resourcesChanged()) ); - connect( calres, TQT_SIGNAL(signalResourceModified( ResourceCalendar *)), TQT_SLOT(resourcesChanged()) ); - connect( calres, TQT_SIGNAL(signalResourceDeleted(ResourceCalendar *)), TQT_SLOT(resourcesChanged()) ); + connect( calres, TQ_SIGNAL(signalResourceAdded(ResourceCalendar *)), TQ_SLOT(resourcesChanged()) ); + connect( calres, TQ_SIGNAL(signalResourceModified( ResourceCalendar *)), TQ_SLOT(resourcesChanged()) ); + connect( calres, TQ_SIGNAL(signalResourceDeleted(ResourceCalendar *)), TQ_SLOT(resourcesChanged()) ); } setAcceptDrops( mCalendar ); diff --git a/korganizer/kodialogmanager.cpp b/korganizer/kodialogmanager.cpp index 20ed0259..17bb056c 100644 --- a/korganizer/kodialogmanager.cpp +++ b/korganizer/kodialogmanager.cpp @@ -93,8 +93,8 @@ KODialogManager::KODialogManager( CalendarView *mainView ) : // don't set any specific parent for the dialog, as its kept around and reused // in different cases where it should have different parents KWin::setMainWindow( mCategoryEditDialog, 0 ); - connect( mainView, TQT_SIGNAL( categoriesChanged() ), - mCategoryEditDialog, TQT_SLOT( reload() ) ); + connect( mainView, TQ_SIGNAL( categoriesChanged() ), + mCategoryEditDialog, TQ_SLOT( reload() ) ); KOGlobals::fitDialogToScreen( mCategoryEditDialog ); } @@ -123,20 +123,20 @@ void KODialogManager::showOptionsDialog() // mOptionsDialog = new TDEConfigureDialog( TDEConfigureDialog::Configurable ); // mOptionsDialog = new TDEConfigureDialog( mMainView ); connect( mOptionsDialog->dialog(), - TQT_SIGNAL( configCommitted( const TQCString & ) ), - mMainView, TQT_SLOT( updateConfig() ) ); + TQ_SIGNAL( configCommitted( const TQCString & ) ), + mMainView, TQ_SLOT( updateConfig() ) ); #else mOptionsDialog = new KCMultiDialog( mMainView, "KorganizerPreferences" ); - connect( mOptionsDialog, TQT_SIGNAL( configCommitted( const TQCString & ) ), - mMainView, TQT_SLOT( updateConfig( const TQCString& ) ) ); + connect( mOptionsDialog, TQ_SIGNAL( configCommitted( const TQCString & ) ), + mMainView, TQ_SLOT( updateConfig( const TQCString& ) ) ); #if 0 - connect( mOptionsDialog, TQT_SIGNAL( applyClicked() ), - mMainView, TQT_SLOT( updateConfig() ) ); - connect( mOptionsDialog, TQT_SIGNAL( okClicked() ), - mMainView, TQT_SLOT( updateConfig() ) ); + connect( mOptionsDialog, TQ_SIGNAL( applyClicked() ), + mMainView, TQ_SLOT( updateConfig() ) ); + connect( mOptionsDialog, TQ_SIGNAL( okClicked() ), + mMainView, TQ_SLOT( updateConfig() ) ); // @TODO Find a way to do this with KCMultiDialog - connect(mCategoryEditDialog,TQT_SIGNAL(categoryConfigChanged()), - mOptionsDialog,TQT_SLOT(updateCategories())); + connect(mCategoryEditDialog,TQ_SIGNAL(categoryConfigChanged()), + mOptionsDialog,TQ_SLOT(updateCategories())); #endif TQStringList modules; @@ -172,13 +172,13 @@ void KODialogManager::showSearchDialog() { if ( !mSearchDialog ) { mSearchDialog = new SearchDialog( mMainView->calendar(), mMainView ); - connect( mSearchDialog, TQT_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)), - mMainView, TQT_SLOT(showIncidence(Incidence *,const TQDate &)) ); - connect( mSearchDialog, TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)), - mMainView, TQT_SLOT(editIncidence(Incidence *,const TQDate &)) ); - connect( mSearchDialog, TQT_SIGNAL(deleteIncidenceSignal(Incidence *)), - mMainView, TQT_SLOT(deleteIncidence(Incidence *)) ); - connect( mMainView, TQT_SIGNAL(closingDown()),mSearchDialog,TQT_SLOT(reject()) ); + connect( mSearchDialog, TQ_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)), + mMainView, TQ_SLOT(showIncidence(Incidence *,const TQDate &)) ); + connect( mSearchDialog, TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)), + mMainView, TQ_SLOT(editIncidence(Incidence *,const TQDate &)) ); + connect( mSearchDialog, TQ_SIGNAL(deleteIncidenceSignal(Incidence *)), + mMainView, TQ_SLOT(deleteIncidence(Incidence *)) ); + connect( mMainView, TQ_SIGNAL(closingDown()),mSearchDialog,TQ_SLOT(reject()) ); } // make sure the widget is on top again mSearchDialog->show(); @@ -190,10 +190,10 @@ void KODialogManager::showArchiveDialog() #ifndef KORG_NOARCHIVE if (!mArchiveDialog) { mArchiveDialog = new ArchiveDialog(mMainView->calendar(),mMainView); - connect(mArchiveDialog,TQT_SIGNAL(eventsDeleted()), - mMainView,TQT_SLOT(updateView())); - connect(mArchiveDialog,TQT_SIGNAL(autoArchivingSettingsModified()), - mMainView,TQT_SLOT(slotAutoArchivingSettingsModified())); + connect(mArchiveDialog,TQ_SIGNAL(eventsDeleted()), + mMainView,TQ_SLOT(updateView())); + connect(mArchiveDialog,TQ_SIGNAL(autoArchivingSettingsModified()), + mMainView,TQ_SLOT(slotAutoArchivingSettingsModified())); } mArchiveDialog->show(); mArchiveDialog->raise(); @@ -207,12 +207,12 @@ void KODialogManager::showFilterEditDialog( TQPtrList<CalFilter> *filters ) { if ( !mFilterEditDialog ) { mFilterEditDialog = new FilterEditDialog( filters, mMainView ); - connect( mFilterEditDialog, TQT_SIGNAL( filterChanged() ), - mMainView, TQT_SLOT( updateFilter() ) ); - connect( mFilterEditDialog, TQT_SIGNAL( editCategories() ), - mCategoryEditDialog, TQT_SLOT( show() ) ); - connect( mCategoryEditDialog, TQT_SIGNAL( categoryConfigChanged() ), - mFilterEditDialog, TQT_SLOT( updateCategoryConfig() ) ); + connect( mFilterEditDialog, TQ_SIGNAL( filterChanged() ), + mMainView, TQ_SLOT( updateFilter() ) ); + connect( mFilterEditDialog, TQ_SIGNAL( editCategories() ), + mCategoryEditDialog, TQ_SLOT( show() ) ); + connect( mCategoryEditDialog, TQ_SIGNAL( categoryConfigChanged() ), + mFilterEditDialog, TQ_SLOT( updateCategoryConfig() ) ); } mFilterEditDialog->show(); mFilterEditDialog->raise(); @@ -241,29 +241,29 @@ void KODialogManager::connectTypeAhead( KOEventEditor *editor, { if ( editor && agenda ) { agenda->setTypeAheadReceiver( editor->typeAheadReceiver() ); - connect( editor, TQT_SIGNAL( focusReceivedSignal() ), - agenda, TQT_SLOT( finishTypeAhead() ) ); + connect( editor, TQ_SIGNAL( focusReceivedSignal() ), + agenda, TQ_SLOT( finishTypeAhead() ) ); } } void KODialogManager::connectEditor( KOIncidenceEditor*editor ) { - connect( editor, TQT_SIGNAL( deleteIncidenceSignal( Incidence * ) ), - mMainView, TQT_SLOT( deleteIncidence( Incidence * ) ) ); - - connect( mCategoryEditDialog, TQT_SIGNAL( categoryConfigChanged() ), - editor, TQT_SIGNAL( updateCategoryConfig() ) ); - connect( editor, TQT_SIGNAL( editCategories() ), - mCategoryEditDialog, TQT_SLOT( show() ) ); - - connect( editor, TQT_SIGNAL( dialogClose( Incidence * ) ), - mMainView, TQT_SLOT( dialogClosing( Incidence * ) ) ); - connect( editor, TQT_SIGNAL( editCanceled( Incidence * ) ), - mMainView, TQT_SLOT( editCanceled( Incidence * ) ) ); - connect( mMainView, TQT_SIGNAL( closingDown() ), editor, TQT_SLOT( reject() ) ); - - connect( editor, TQT_SIGNAL( deleteAttendee( Incidence * ) ), - mMainView, TQT_SIGNAL( cancelAttendees( Incidence * ) ) ); + connect( editor, TQ_SIGNAL( deleteIncidenceSignal( Incidence * ) ), + mMainView, TQ_SLOT( deleteIncidence( Incidence * ) ) ); + + connect( mCategoryEditDialog, TQ_SIGNAL( categoryConfigChanged() ), + editor, TQ_SIGNAL( updateCategoryConfig() ) ); + connect( editor, TQ_SIGNAL( editCategories() ), + mCategoryEditDialog, TQ_SLOT( show() ) ); + + connect( editor, TQ_SIGNAL( dialogClose( Incidence * ) ), + mMainView, TQ_SLOT( dialogClosing( Incidence * ) ) ); + connect( editor, TQ_SIGNAL( editCanceled( Incidence * ) ), + mMainView, TQ_SLOT( editCanceled( Incidence * ) ) ); + connect( mMainView, TQ_SIGNAL( closingDown() ), editor, TQ_SLOT( reject() ) ); + + connect( editor, TQ_SIGNAL( deleteAttendee( Incidence * ) ), + mMainView, TQ_SIGNAL( cancelAttendees( Incidence * ) ) ); } KOTodoEditor *KODialogManager::getTodoEditor() diff --git a/korganizer/koeditoralarms.cpp b/korganizer/koeditoralarms.cpp index 1415eef5..e7d1beb9 100644 --- a/korganizer/koeditoralarms.cpp +++ b/korganizer/koeditoralarms.cpp @@ -206,25 +206,25 @@ KOEditorAlarms::KOEditorAlarms( const TQCString &type, mWidget->mAlarmList->setResizeMode( TQListView::LastColumn ); mWidget->mAlarmList->setColumnWidthMode( 0, TQListView::Maximum ); mWidget->mAlarmList->setColumnWidthMode( 1, TQListView::Maximum ); - connect( mWidget->mAlarmList, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), - TQT_SLOT( selectionChanged( TQListViewItem * ) ) ); - connect( mWidget->mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAdd() ) ); - connect( mWidget->mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRemove() ) ); - connect( mWidget->mDuplicateButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotDuplicate() ) ); - - connect( mWidget->mAlarmOffset, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( changed() ) ); - connect( mWidget->mOffsetUnit, TQT_SIGNAL( activated( int ) ), TQT_SLOT( changed() ) ); - connect( mWidget->mBeforeAfter, TQT_SIGNAL( activated( int ) ), TQT_SLOT( changed() ) ); - connect( mWidget->mRepeats, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( changed() ) ); - connect( mWidget->mRepeatCount, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( changed() ) ); - connect( mWidget->mRepeatInterval, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( changed() ) ); - connect( mWidget->mAlarmType, TQT_SIGNAL(clicked(int)), TQT_SLOT( changed() ) ); - connect( mWidget->mDisplayText, TQT_SIGNAL( textChanged() ), TQT_SLOT( changed() ) ); - connect( mWidget->mSoundFile, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( changed() ) ); - connect( mWidget->mApplication, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( changed() ) ); - connect( mWidget->mAppArguments, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( changed() ) ); - connect( mWidget->mEmailAddress, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( changed() ) ); - connect( mWidget->mEmailText, TQT_SIGNAL( textChanged() ), TQT_SLOT( changed() ) ); + connect( mWidget->mAlarmList, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), + TQ_SLOT( selectionChanged( TQListViewItem * ) ) ); + connect( mWidget->mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotAdd() ) ); + connect( mWidget->mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotRemove() ) ); + connect( mWidget->mDuplicateButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotDuplicate() ) ); + + connect( mWidget->mAlarmOffset, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( changed() ) ); + connect( mWidget->mOffsetUnit, TQ_SIGNAL( activated( int ) ), TQ_SLOT( changed() ) ); + connect( mWidget->mBeforeAfter, TQ_SIGNAL( activated( int ) ), TQ_SLOT( changed() ) ); + connect( mWidget->mRepeats, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( changed() ) ); + connect( mWidget->mRepeatCount, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( changed() ) ); + connect( mWidget->mRepeatInterval, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( changed() ) ); + connect( mWidget->mAlarmType, TQ_SIGNAL(clicked(int)), TQ_SLOT( changed() ) ); + connect( mWidget->mDisplayText, TQ_SIGNAL( textChanged() ), TQ_SLOT( changed() ) ); + connect( mWidget->mSoundFile, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( changed() ) ); + connect( mWidget->mApplication, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( changed() ) ); + connect( mWidget->mAppArguments, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( changed() ) ); + connect( mWidget->mEmailAddress, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( changed() ) ); + connect( mWidget->mEmailText, TQ_SIGNAL( textChanged() ), TQ_SLOT( changed() ) ); init(); diff --git a/korganizer/koeditorattachments.cpp b/korganizer/koeditorattachments.cpp index 70cf8c79..669fd636 100644 --- a/korganizer/koeditorattachments.cpp +++ b/korganizer/koeditorattachments.cpp @@ -224,10 +224,10 @@ AttachmentEditDialog::AttachmentEditDialog( AttachmentListItem *item, i18n( "Enter the path to the attachment file or use the " "file browser by pressing the adjacent button" ) ); grid->addMultiCellWidget( mURLRequester, 4, 4, 1, 2 ); - connect( mURLRequester, TQT_SIGNAL(urlSelected(const TQString &)), - TQT_SLOT(urlSelected(const TQString &)) ); - connect( mURLRequester, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( urlChanged( const TQString& ) ) ); + connect( mURLRequester, TQ_SIGNAL(urlSelected(const TQString &)), + TQ_SLOT(urlSelected(const TQString &)) ); + connect( mURLRequester, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( urlChanged( const TQString& ) ) ); urlChanged( item->uri() ); } else { uint size = item->attachment()->size(); @@ -324,8 +324,8 @@ AttachmentIconView::AttachmentIconView( KOEditorAttachments* parent ) setMaxItemWidth( TQMAX(maxItemWidth(), 250) ); setMinimumHeight( TQMAX(fontMetrics().height(), 16) + 12 ); - connect( this, TQT_SIGNAL( dropped ( TQDropEvent *, const TQValueList<TQIconDragItem> & ) ), - this, TQT_SLOT( handleDrop( TQDropEvent *, const TQValueList<TQIconDragItem> & ) ) ); + connect( this, TQ_SIGNAL( dropped ( TQDropEvent *, const TQValueList<TQIconDragItem> & ) ), + this, TQ_SLOT( handleDrop( TQDropEvent *, const TQValueList<TQIconDragItem> & ) ) ); } KURL AttachmentIconView::tempFileForAttachment( KCal::Attachment *attachment ) @@ -462,12 +462,12 @@ KOEditorAttachments::KOEditorAttachments( int spacing, TQWidget *parent, i18n("Displays a list of current items (files, mail, etc.) " "that have been associated with this event or to-do. ") ); topLayout->addWidget( mAttachments ); - connect( mAttachments, TQT_SIGNAL( doubleClicked( TQIconViewItem * ) ), - TQT_SLOT( showAttachment( TQIconViewItem * ) ) ); - connect( mAttachments, TQT_SIGNAL(selectionChanged()), - TQT_SLOT(selectionChanged()) ); - connect( mAttachments, TQT_SIGNAL(contextMenuRequested(TQIconViewItem*,const TQPoint&)), - TQT_SLOT(contextMenu(TQIconViewItem*,const TQPoint&)) ); + connect( mAttachments, TQ_SIGNAL( doubleClicked( TQIconViewItem * ) ), + TQ_SLOT( showAttachment( TQIconViewItem * ) ) ); + connect( mAttachments, TQ_SIGNAL(selectionChanged()), + TQ_SLOT(selectionChanged()) ); + connect( mAttachments, TQ_SIGNAL(contextMenuRequested(TQIconViewItem*,const TQPoint&)), + TQ_SLOT(contextMenu(TQIconViewItem*,const TQPoint&)) ); TQPushButton *addButton = new TQPushButton( this ); addButton->setIconSet( SmallIconSet( "add" ) ); @@ -477,7 +477,7 @@ KOEditorAttachments::KOEditorAttachments( int spacing, TQWidget *parent, "to add to this event or to-do as link or as " "inline data." ) ); topLayout->addWidget( addButton ); - connect( addButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotAdd()) ); + connect( addButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotAdd()) ); mRemoveBtn = new TQPushButton( this ); mRemoveBtn->setIconSet( SmallIconSet( "remove" ) ); @@ -486,33 +486,33 @@ KOEditorAttachments::KOEditorAttachments( int spacing, TQWidget *parent, i18n("Removes the attachment selected in the list above " "from this event or to-do.") ); topLayout->addWidget( mRemoveBtn ); - connect( mRemoveBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemove()) ); + connect( mRemoveBtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemove()) ); mContextMenu = new TDEPopupMenu( this ); TDEActionCollection* ac = new TDEActionCollection( this, this ); - mOpenAction = new TDEAction( i18n("Open"), 0, this, TQT_SLOT(slotShow()), ac ); + mOpenAction = new TDEAction( i18n("Open"), 0, this, TQ_SLOT(slotShow()), ac ); mOpenAction->plug( mContextMenu ); - mSaveAsAction = new TDEAction( i18n( "Save As..." ), 0, this, TQT_SLOT(slotSaveAs()), ac ); + mSaveAsAction = new TDEAction( i18n( "Save As..." ), 0, this, TQ_SLOT(slotSaveAs()), ac ); mSaveAsAction->plug( mContextMenu ); mContextMenu->insertSeparator(); - mCopyAction = KStdAction::copy(this, TQT_SLOT(slotCopy()), ac ); + mCopyAction = KStdAction::copy(this, TQ_SLOT(slotCopy()), ac ); mCopyAction->plug( mContextMenu ); - mCutAction = KStdAction::cut(this, TQT_SLOT(slotCut()), ac ); + mCutAction = KStdAction::cut(this, TQ_SLOT(slotCut()), ac ); mCutAction->plug( mContextMenu ); - TDEAction *action = KStdAction::paste(this, TQT_SLOT(slotPaste()), ac ); + TDEAction *action = KStdAction::paste(this, TQ_SLOT(slotPaste()), ac ); action->plug( mContextMenu ); mContextMenu->insertSeparator(); - mDeleteAction = new TDEAction( i18n( "&Remove" ), 0, this, TQT_SLOT(slotRemove()), ac ); + mDeleteAction = new TDEAction( i18n( "&Remove" ), 0, this, TQ_SLOT(slotRemove()), ac ); mDeleteAction->plug( mContextMenu ); mDeleteAction->setShortcut( Key_Delete ); mContextMenu->insertSeparator(); - mEditAction = new TDEAction( i18n( "&Properties..." ), 0, this, TQT_SLOT(slotEdit()), ac ); + mEditAction = new TDEAction( i18n( "&Properties..." ), 0, this, TQ_SLOT(slotEdit()), ac ); mEditAction->plug( mContextMenu ); selectionChanged(); @@ -691,7 +691,7 @@ void KOEditorAttachments::slotEdit() AttachmentEditDialog *dialog = new AttachmentEditDialog( attitem, mAttachments ); dialog->mInline->setEnabled( false ); dialog->setModal( false ); - connect( dialog, TQT_SIGNAL(hidden()), dialog, TQT_SLOT(delayedDestruct()) ); + connect( dialog, TQ_SIGNAL(hidden()), dialog, TQ_SLOT(delayedDestruct()) ); dialog->show(); } } @@ -854,7 +854,7 @@ void KOEditorAttachments::readIncidence( KCal::Incidence *i ) addAttachment( (*it) ); } if ( mAttachments->count() > 0 ) { - TQTimer::singleShot( 0, mAttachments, TQT_SLOT(arrangeItemsInGrid()) ); + TQTimer::singleShot( 0, mAttachments, TQ_SLOT(arrangeItemsInGrid()) ); } } diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp index 95d21176..9d570f16 100644 --- a/korganizer/koeditordetails.cpp +++ b/korganizer/koeditordetails.cpp @@ -208,17 +208,17 @@ KOEditorDetails::KOEditorDetails( int spacing, TQWidget *parent, mListView->setFixedHeight( 78 ); } - connect( mListView, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), - TQT_SLOT( updateAttendeeInput() ) ); + connect( mListView, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), + TQ_SLOT( updateAttendeeInput() ) ); #ifndef KORG_NODND - connect( mListView, TQT_SIGNAL( dropped( Attendee * ) ), - TQT_SLOT( slotInsertAttendee( Attendee * ) ) ); + connect( mListView, TQ_SIGNAL( dropped( Attendee * ) ), + TQ_SLOT( slotInsertAttendee( Attendee * ) ) ); #endif topLayout->addWidget( mListView ); initEditWidgets( this, topLayout ); - connect( mRemoveButton, TQT_SIGNAL(clicked()), TQT_SLOT(removeAttendee()) ); + connect( mRemoveButton, TQ_SIGNAL(clicked()), TQ_SLOT(removeAttendee()) ); updateAttendeeInput(); } diff --git a/korganizer/koeditorfreebusy.cpp b/korganizer/koeditorfreebusy.cpp index 62d874dd..05db9b5d 100644 --- a/korganizer/koeditorfreebusy.cpp +++ b/korganizer/koeditorfreebusy.cpp @@ -263,15 +263,15 @@ KOEditorFreeBusy::KOEditorFreeBusy( int spacing, TQWidget *parent, scaleCombo->insertItem( i18n( "Month" ) ); scaleCombo->insertItem( i18n( "Automatic" ) ); scaleCombo->setCurrentItem( 0 ); // start with "hour" - connect( scaleCombo, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( slotScaleChanged( int ) ) ); + connect( scaleCombo, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( slotScaleChanged( int ) ) ); controlLayout->addWidget( scaleCombo ); TQPushButton *button = new TQPushButton( i18n( "Center on Start" ), this ); TQWhatsThis::add( button, i18n("Centers the Gantt chart on the start time " "and day of this event.") ); - connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( slotCenterOnStart() ) ); + connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( slotCenterOnStart() ) ); controlLayout->addWidget( button ); controlLayout->addStretch( 1 ); @@ -280,7 +280,7 @@ KOEditorFreeBusy::KOEditorFreeBusy( int spacing, TQWidget *parent, TQWhatsThis::add( button, i18n("Moves the event to a date and time when all the " "attendees are free.") ); - connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( slotPickDate() ) ); + connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( slotPickDate() ) ); controlLayout->addWidget( button ); controlLayout->addStretch( 1 ); @@ -290,7 +290,7 @@ KOEditorFreeBusy::KOEditorFreeBusy( int spacing, TQWidget *parent, i18n("Reloads Free/Busy data for all attendees from " "the corresponding servers.") ); controlLayout->addWidget( button ); - connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( manualReload() ) ); + connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( manualReload() ) ); mGanttView = new KDGanttView( this, "mGanttView" ); TQWhatsThis::add( mGanttView, @@ -330,37 +330,37 @@ KOEditorFreeBusy::KOEditorFreeBusy( int spacing, TQWidget *parent, mEventRectangle->setColor( TQt::magenta ); mGanttView->addIntervalBackgroundColor( mEventRectangle ); - connect( mGanttView, TQT_SIGNAL ( timeIntervalSelected( const TQDateTime &, + connect( mGanttView, TQ_SIGNAL ( timeIntervalSelected( const TQDateTime &, const TQDateTime & ) ), - mGanttView, TQT_SLOT( zoomToSelection( const TQDateTime &, + mGanttView, TQ_SLOT( zoomToSelection( const TQDateTime &, const TQDateTime & ) ) ); - connect( mGanttView, TQT_SIGNAL( lvItemDoubleClicked( KDGanttViewItem * ) ), - TQT_SLOT( editFreeBusyUrl( KDGanttViewItem * ) ) ); - connect( mGanttView, TQT_SIGNAL( intervalColorRectangleMoved( const TQDateTime&, const TQDateTime& ) ), - this, TQT_SLOT( slotIntervalColorRectangleMoved( const TQDateTime&, const TQDateTime& ) ) ); - - connect( mGanttView, TQT_SIGNAL(lvSelectionChanged(KDGanttViewItem*)), - this, TQT_SLOT(updateAttendeeInput()) ); - connect( mGanttView, TQT_SIGNAL(lvItemLeftClicked(KDGanttViewItem*)), - this, TQT_SLOT(showAttendeeStatusMenu()) ); - connect( mGanttView, TQT_SIGNAL(lvItemRightClicked(KDGanttViewItem*)), - this, TQT_SLOT(showAttendeeStatusMenu()) ); - connect( mGanttView, TQT_SIGNAL(lvMouseButtonClicked(int, KDGanttViewItem*, const TQPoint&, int)), - this, TQT_SLOT(listViewClicked(int, KDGanttViewItem*)) ); + connect( mGanttView, TQ_SIGNAL( lvItemDoubleClicked( KDGanttViewItem * ) ), + TQ_SLOT( editFreeBusyUrl( KDGanttViewItem * ) ) ); + connect( mGanttView, TQ_SIGNAL( intervalColorRectangleMoved( const TQDateTime&, const TQDateTime& ) ), + this, TQ_SLOT( slotIntervalColorRectangleMoved( const TQDateTime&, const TQDateTime& ) ) ); + + connect( mGanttView, TQ_SIGNAL(lvSelectionChanged(KDGanttViewItem*)), + this, TQ_SLOT(updateAttendeeInput()) ); + connect( mGanttView, TQ_SIGNAL(lvItemLeftClicked(KDGanttViewItem*)), + this, TQ_SLOT(showAttendeeStatusMenu()) ); + connect( mGanttView, TQ_SIGNAL(lvItemRightClicked(KDGanttViewItem*)), + this, TQ_SLOT(showAttendeeStatusMenu()) ); + connect( mGanttView, TQ_SIGNAL(lvMouseButtonClicked(int, KDGanttViewItem*, const TQPoint&, int)), + this, TQ_SLOT(listViewClicked(int, KDGanttViewItem*)) ); FreeBusyManager *m = KOGroupware::instance()->freeBusyManager(); - connect( m, TQT_SIGNAL( freeBusyRetrieved( KCal::FreeBusy *, const TQString & ) ), - TQT_SLOT( slotInsertFreeBusy( KCal::FreeBusy *, const TQString & ) ) ); + connect( m, TQ_SIGNAL( freeBusyRetrieved( KCal::FreeBusy *, const TQString & ) ), + TQ_SLOT( slotInsertFreeBusy( KCal::FreeBusy *, const TQString & ) ) ); - connect( &mReloadTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( autoReload() ) ); + connect( &mReloadTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( autoReload() ) ); initEditWidgets( this, topLayout ); - connect( mRemoveButton, TQT_SIGNAL(clicked()), - TQT_SLOT(removeAttendee()) ); + connect( mRemoveButton, TQ_SIGNAL(clicked()), + TQ_SLOT(removeAttendee()) ); slotOrganizerChanged( mOrganizerCombo->currentText() ); - connect( mOrganizerCombo, TQT_SIGNAL( activated(const TQString&) ), - this, TQT_SLOT( slotOrganizerChanged(const TQString&) ) ); + connect( mOrganizerCombo, TQ_SIGNAL( activated(const TQString&) ), + this, TQ_SLOT( slotOrganizerChanged(const TQString&) ) ); //suppress the buggy consequences of clicks on the time header widget mGanttView->timeHeaderWidget()->installEventFilter( this ); diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp index 3c961ebf..c8c70277 100644 --- a/korganizer/koeditorgeneral.cpp +++ b/korganizer/koeditorgeneral.cpp @@ -114,8 +114,8 @@ void KOEditorGeneral::initHeader( TQWidget *parent,TQBoxLayout *topLayout) mSummaryEdit = new FocusLineEdit( parent ); TQWhatsThis::add( mSummaryEdit, whatsThis ); - connect( mSummaryEdit, TQT_SIGNAL( focusReceivedSignal() ), - TQT_SIGNAL( focusReceivedSignal() ) ); + connect( mSummaryEdit, TQ_SIGNAL( focusReceivedSignal() ), + TQ_SIGNAL( focusReceivedSignal() ) ); headerLayout->addWidget(mSummaryEdit,1,1); summaryLabel->setBuddy( mSummaryEdit ); @@ -152,7 +152,7 @@ void KOEditorGeneral::initHeader( TQWidget *parent,TQBoxLayout *topLayout) mCategoriesButton = new TQPushButton( parent ); mCategoriesButton->setText(i18n("Select...")); TQWhatsThis::add( mCategoriesButton, whatsThis ); - connect(mCategoriesButton,TQT_SIGNAL(clicked()),TQT_SLOT(selectCategories())); + connect(mCategoriesButton,TQ_SIGNAL(clicked()),TQ_SLOT(selectCategories())); thirdLineLayout->addWidget( mCategoriesButton ); } @@ -209,7 +209,7 @@ void KOEditorGeneral::initAlarm( TQWidget *parent, TQBoxLayout *topLayout ) i18n( "Push this button to create an advanced set of reminders " "for this event or to-do." ) ); TQToolTip::add( mAlarmAdvancedButton, i18n( "Set an advanced reminder" ) ); - connect( mAlarmAdvancedButton, TQT_SIGNAL(clicked()), TQT_SLOT(editAlarms()) ); + connect( mAlarmAdvancedButton, TQ_SIGNAL(clicked()), TQ_SLOT(editAlarms()) ); alarmLayout->addWidget( mAlarmAdvancedButton ); mSimpleAlarmBox = new TQHBox( parent ); @@ -247,17 +247,17 @@ void KOEditorGeneral::initAlarm( TQWidget *parent, TQBoxLayout *topLayout ) mAlarmTimeEdit->setEnabled( false ); mAlarmIncrCombo->setEnabled( false ); mAlarmInfoLabel->setEnabled( false ); - connect( mAlarmButton, TQT_SIGNAL(toggled(bool)), mAlarmAdvancedButton, TQT_SLOT(setEnabled(bool)) ); - connect( mAlarmButton, TQT_SIGNAL(toggled(bool)), mAlarmTimeEdit, TQT_SLOT(setEnabled(bool)) ); - connect( mAlarmButton, TQT_SIGNAL(toggled(bool)), mAlarmIncrCombo, TQT_SLOT(setEnabled(bool)) ); - connect( mAlarmButton, TQT_SIGNAL(toggled(bool)), mAlarmInfoLabel, TQT_SLOT(setEnabled(bool)) ); + connect( mAlarmButton, TQ_SIGNAL(toggled(bool)), mAlarmAdvancedButton, TQ_SLOT(setEnabled(bool)) ); + connect( mAlarmButton, TQ_SIGNAL(toggled(bool)), mAlarmTimeEdit, TQ_SLOT(setEnabled(bool)) ); + connect( mAlarmButton, TQ_SIGNAL(toggled(bool)), mAlarmIncrCombo, TQ_SLOT(setEnabled(bool)) ); + connect( mAlarmButton, TQ_SIGNAL(toggled(bool)), mAlarmInfoLabel, TQ_SLOT(setEnabled(bool)) ); } void KOEditorGeneral::initAttachments(TQWidget *parent,TQBoxLayout *topLayout) { mAttachments = new KOEditorAttachments( KDialog::spacingHint(), parent ); - connect( mAttachments, TQT_SIGNAL( openURL( const KURL & ) ) , - this, TQT_SIGNAL( openURL( const KURL & ) ) ); + connect( mAttachments, TQ_SIGNAL( openURL( const KURL & ) ) , + this, TQ_SIGNAL( openURL( const KURL & ) ) ); topLayout->addWidget( mAttachments, 1 ); } @@ -290,8 +290,8 @@ void KOEditorGeneral::selectCategories() KOGlobals::fitDialogToScreen( categoryDialog ); categoryDialog->setSelected( mCategories ); - connect(categoryDialog, TQT_SIGNAL(editCategories()), this, TQT_SIGNAL(openCategoryDialog())); - connect(this, TQT_SIGNAL(updateCategoryConfig()), categoryDialog, TQT_SLOT(updateCategoryConfig())); + connect(categoryDialog, TQ_SIGNAL(editCategories()), this, TQ_SIGNAL(openCategoryDialog())); + connect(this, TQ_SIGNAL(updateCategoryConfig()), categoryDialog, TQ_SLOT(updateCategoryConfig())); if ( categoryDialog->exec() ) { setCategories( categoryDialog->selectedCategories() ); diff --git a/korganizer/koeditorgeneralevent.cpp b/korganizer/koeditorgeneralevent.cpp index a5835ae3..2772fbee 100644 --- a/korganizer/koeditorgeneralevent.cpp +++ b/korganizer/koeditorgeneralevent.cpp @@ -60,10 +60,10 @@ KOEditorGeneralEvent::KOEditorGeneralEvent(TQObject* parent, const char* name) : KOEditorGeneral( parent, name) { - connect( this, TQT_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & )), - TQT_SLOT( setDuration() ) ); - connect( this, TQT_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & )), - TQT_SLOT( emitDateTimeStr() )); + connect( this, TQ_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & )), + TQ_SLOT( setDuration() ) ); + connect( this, TQ_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & )), + TQ_SLOT( emitDateTimeStr() )); } KOEditorGeneralEvent::~KOEditorGeneralEvent() @@ -130,22 +130,22 @@ void KOEditorGeneralEvent::initTime(TQWidget *parent,TQBoxLayout *topLayout) mAlldayEventCheckbox = new TQCheckBox(i18n("All-&day"),timeBoxFrame); layoutTimeBox->addWidget( mAlldayEventCheckbox, 0, 3 ); - connect(mAlldayEventCheckbox, TQT_SIGNAL(toggled(bool)),TQT_SLOT(associateTime(bool))); + connect(mAlldayEventCheckbox, TQ_SIGNAL(toggled(bool)),TQ_SLOT(associateTime(bool))); mDurationLabel = new TQLabel( timeBoxFrame ); layoutTimeBox->addWidget( mDurationLabel, 1, 3 ); // time widgets are checked if they contain a valid time - connect(mStartTimeEdit, TQT_SIGNAL(timeChanged(TQTime)), - this, TQT_SLOT(startTimeChanged(TQTime))); - connect(mEndTimeEdit, TQT_SIGNAL(timeChanged(TQTime)), - this, TQT_SLOT(endTimeChanged(TQTime))); + connect(mStartTimeEdit, TQ_SIGNAL(timeChanged(TQTime)), + this, TQ_SLOT(startTimeChanged(TQTime))); + connect(mEndTimeEdit, TQ_SIGNAL(timeChanged(TQTime)), + this, TQ_SLOT(endTimeChanged(TQTime))); // date widgets are checked if they contain a valid date - connect(mStartDateEdit, TQT_SIGNAL(dateChanged(const TQDate&)), - this, TQT_SLOT(startDateChanged(const TQDate&))); - connect(mEndDateEdit, TQT_SIGNAL(dateChanged(const TQDate&)), - this, TQT_SLOT(endDateChanged(const TQDate&))); + connect(mStartDateEdit, TQ_SIGNAL(dateChanged(const TQDate&)), + this, TQ_SLOT(startDateChanged(const TQDate&))); + connect(mEndDateEdit, TQ_SIGNAL(dateChanged(const TQDate&)), + this, TQ_SLOT(endDateChanged(const TQDate&))); TQLabel *label = new TQLabel( i18n( "Recurrence:" ), timeBoxFrame ); layoutTimeBox->addWidget( label, 2, 0 ); @@ -154,7 +154,7 @@ void KOEditorGeneralEvent::initTime(TQWidget *parent,TQBoxLayout *topLayout) mRecEditButton = new TQPushButton( timeBoxFrame ); mRecEditButton->setIconSet( KOGlobals::self()->smallIconSet( "recur", 16 ) ); recLayout->addWidget( mRecEditButton ); - connect( mRecEditButton, TQT_SIGNAL(clicked()), TQT_SIGNAL(editRecurrence()) ); + connect( mRecEditButton, TQ_SIGNAL(clicked()), TQ_SIGNAL(editRecurrence()) ); mRecEditLabel = new TQLabel( TQString(), timeBoxFrame ); recLayout->addWidget( mRecEditLabel ); recLayout->addStretch( 1 ); @@ -206,12 +206,12 @@ void KOEditorGeneralEvent::initInvitationBar(TQWidget * parent, TQBoxLayout * la barLayout->addWidget( label ); barLayout->addStretch( 1 ); TQPushButton *button = new TQPushButton( i18n("Accept"), mInvitationBar ); - connect( button, TQT_SIGNAL(clicked()), TQT_SIGNAL(acceptInvitation()) ); - connect( button, TQT_SIGNAL(clicked()), mInvitationBar, TQT_SLOT(hide()) ); + connect( button, TQ_SIGNAL(clicked()), TQ_SIGNAL(acceptInvitation()) ); + connect( button, TQ_SIGNAL(clicked()), mInvitationBar, TQ_SLOT(hide()) ); barLayout->addWidget( button ); button = new TQPushButton( i18n("Decline"), mInvitationBar ); - connect( button, TQT_SIGNAL(clicked()), TQT_SIGNAL(declineInvitation()) ); - connect( button, TQT_SIGNAL(clicked()), mInvitationBar, TQT_SLOT(hide()) ); + connect( button, TQ_SIGNAL(clicked()), TQ_SIGNAL(declineInvitation()) ); + connect( button, TQ_SIGNAL(clicked()), mInvitationBar, TQ_SLOT(hide()) ); barLayout->addWidget( button ); mInvitationBar->hide(); diff --git a/korganizer/koeditorgeneraljournal.cpp b/korganizer/koeditorgeneraljournal.cpp index e1134a02..34191bed 100644 --- a/korganizer/koeditorgeneraljournal.cpp +++ b/korganizer/koeditorgeneraljournal.cpp @@ -94,8 +94,8 @@ void KOEditorGeneralJournal::initDate( TQWidget *parent, TQBoxLayout *topLayout mTimeEdit = new KTimeEdit( parent ); dateLayout->addWidget( mTimeEdit ); - connect( mTimeCheckBox, TQT_SIGNAL(toggled(bool)), - mTimeEdit, TQT_SLOT(setEnabled(bool)) ); + connect( mTimeCheckBox, TQ_SIGNAL(toggled(bool)), + mTimeEdit, TQ_SLOT(setEnabled(bool)) ); dateLayout->addStretch(); setTime( TQTime( -1, -1, -1 ) ); diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp index e46e450d..b871575b 100644 --- a/korganizer/koeditorgeneraltodo.cpp +++ b/korganizer/koeditorgeneraltodo.cpp @@ -113,46 +113,46 @@ void KOEditorGeneralTodo::initTime(TQWidget *parent,TQBoxLayout *topLayout) mStartCheck = new TQCheckBox(i18n("Sta&rt:"),timeBoxFrame); TQWhatsThis::add( mStartCheck, whatsThis ); layoutTimeBox->addWidget(mStartCheck,0,0); - connect(mStartCheck,TQT_SIGNAL(toggled(bool)),TQT_SLOT(enableStartEdit(bool))); - connect(mStartCheck,TQT_SIGNAL(toggled(bool)),TQT_SLOT(startDateModified())); + connect(mStartCheck,TQ_SIGNAL(toggled(bool)),TQ_SLOT(enableStartEdit(bool))); + connect(mStartCheck,TQ_SIGNAL(toggled(bool)),TQ_SLOT(startDateModified())); mStartDateEdit = new KDateEdit(timeBoxFrame); TQWhatsThis::add( mStartDateEdit, whatsThis ); layoutTimeBox->addWidget(mStartDateEdit,0,1); - connect(mStartDateEdit,TQT_SIGNAL(dateChanged(const TQDate&)),TQT_SLOT(startDateModified())); + connect(mStartDateEdit,TQ_SIGNAL(dateChanged(const TQDate&)),TQ_SLOT(startDateModified())); mStartTimeEdit = new KTimeEdit(timeBoxFrame); TQWhatsThis::add( mStartTimeEdit, i18n("Sets the start time for this to-do.") ); layoutTimeBox->addWidget(mStartTimeEdit,0,2); - connect(mStartTimeEdit,TQT_SIGNAL(timeChanged(TQTime)),TQT_SLOT(startDateModified())); + connect(mStartTimeEdit,TQ_SIGNAL(timeChanged(TQTime)),TQ_SLOT(startDateModified())); whatsThis = i18n("Sets the due date for this to-do."); mDueCheck = new TQCheckBox(i18n("&Due:"),timeBoxFrame); TQWhatsThis::add( mDueCheck, whatsThis ); layoutTimeBox->addWidget(mDueCheck,1,0); - connect(mDueCheck,TQT_SIGNAL(toggled(bool)),TQT_SLOT(enableDueEdit(bool))); - connect(mDueCheck,TQT_SIGNAL(toggled(bool)),TQT_SIGNAL(dueDateEditToggle(bool))); - connect(mDueCheck,TQT_SIGNAL(toggled(bool)),TQT_SLOT(dateChanged())); + connect(mDueCheck,TQ_SIGNAL(toggled(bool)),TQ_SLOT(enableDueEdit(bool))); + connect(mDueCheck,TQ_SIGNAL(toggled(bool)),TQ_SIGNAL(dueDateEditToggle(bool))); + connect(mDueCheck,TQ_SIGNAL(toggled(bool)),TQ_SLOT(dateChanged())); mDueDateEdit = new KDateEdit(timeBoxFrame); TQWhatsThis::add( mDueDateEdit, whatsThis ); layoutTimeBox->addWidget(mDueDateEdit,1,1); - connect(mDueDateEdit,TQT_SIGNAL(dateChanged(const TQDate&)),TQT_SLOT(dateChanged())); + connect(mDueDateEdit,TQ_SIGNAL(dateChanged(const TQDate&)),TQ_SLOT(dateChanged())); mDueTimeEdit = new KTimeEdit(timeBoxFrame); TQWhatsThis::add( mDueTimeEdit, i18n("Sets the due time for this to-do.") ); layoutTimeBox->addWidget(mDueTimeEdit,1,2); - connect(mDueTimeEdit,TQT_SIGNAL(timeChanged( TQTime )),TQT_SLOT(dateChanged())); + connect(mDueTimeEdit,TQ_SIGNAL(timeChanged( TQTime )),TQ_SLOT(dateChanged())); mTimeButton = new TQCheckBox(i18n("Ti&me associated"),timeBoxFrame); TQWhatsThis::add( mTimeButton, i18n("Sets whether or not this to-do's start and due dates " "have times associated with them.") ); layoutTimeBox->addWidget( mTimeButton, 0, 3 ); - connect(mTimeButton,TQT_SIGNAL(toggled(bool)),TQT_SLOT(enableTimeEdits(bool))); - connect(mTimeButton,TQT_SIGNAL(toggled(bool)),TQT_SLOT(dateChanged())); + connect(mTimeButton,TQ_SIGNAL(toggled(bool)),TQ_SLOT(enableTimeEdits(bool))); + connect(mTimeButton,TQ_SIGNAL(toggled(bool)),TQ_SLOT(dateChanged())); TQLabel *label = new TQLabel( i18n( "Recurrence:" ), timeBoxFrame ); layoutTimeBox->addWidget( label, 3, 0 ); @@ -161,7 +161,7 @@ void KOEditorGeneralTodo::initTime(TQWidget *parent,TQBoxLayout *topLayout) mRecEditButton = new TQPushButton( timeBoxFrame ); mRecEditButton->setIconSet( KOGlobals::self()->smallIconSet( "recur", 16 ) ); recLayout->addWidget( mRecEditButton ); - connect( mRecEditButton, TQT_SIGNAL(clicked()), TQT_SIGNAL(editRecurrence()) ); + connect( mRecEditButton, TQ_SIGNAL(clicked()), TQ_SIGNAL(editRecurrence()) ); mRecEditLabel = new TQLabel( TQString(), timeBoxFrame ); recLayout->addWidget( mRecEditLabel ); recLayout->addStretch( 1 ); @@ -195,7 +195,7 @@ void KOEditorGeneralTodo::initCompletion( TQWidget *parent, TQBoxLayout *topLayo TQWhatsThis::add( mCompletedToggle, i18n( "Click this checkbox to toggle the completed percentage of the to-do " "between 0% or 100%" ) ); - connect( mCompletedToggle, TQT_SIGNAL(clicked()), TQT_SLOT(completedChanged()) ); + connect( mCompletedToggle, TQ_SIGNAL(clicked()), TQ_SLOT(completedChanged()) ); completionLayout->addWidget( mCompletedToggle ); label->setBuddy( mCompletedToggle ); @@ -209,7 +209,7 @@ void KOEditorGeneralTodo::initCompletion( TQWidget *parent, TQBoxLayout *topLayo TQString label = i18n( "Percent complete", "%1 %" ).arg( i ); mCompletedCombo->insertItem( label ); } - connect( mCompletedCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(completedChanged(int)) ); + connect( mCompletedCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(completedChanged(int)) ); completionLayout->addWidget( mCompletedCombo ); mCompletedLabel = new TQLabel( i18n( "completed on", "on" ), parent ); diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp index ea73d2fb..5a5beae6 100644 --- a/korganizer/koeditorrecurrence.cpp +++ b/korganizer/koeditorrecurrence.cpp @@ -620,12 +620,12 @@ ExceptionsWidget::ExceptionsWidget( TQWidget *parent, const char *name ) : boxLayout->setRowStretch( 4, 1 ); boxLayout->setColStretch( 1, 3 ); - connect( addExceptionButton, TQT_SIGNAL( clicked() ), - TQT_SLOT( addException() ) ); - connect( changeExceptionButton, TQT_SIGNAL( clicked() ), - TQT_SLOT( changeException() ) ); - connect( deleteExceptionButton, TQT_SIGNAL( clicked() ), - TQT_SLOT( deleteException() ) ); + connect( addExceptionButton, TQ_SIGNAL( clicked() ), + TQ_SLOT( addException() ) ); + connect( changeExceptionButton, TQ_SIGNAL( clicked() ), + TQ_SLOT( changeException() ) ); + connect( deleteExceptionButton, TQ_SIGNAL( clicked() ), + TQ_SLOT( deleteException() ) ); } void ExceptionsWidget::addException() @@ -765,12 +765,12 @@ RecurrenceRangeWidget::RecurrenceRangeWidget( TQWidget *parent, endDateLayout->addStretch( 1 ); - connect( mNoEndDateButton, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( showCurrentRange() ) ); - connect( mEndDurationButton, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( showCurrentRange() ) ); - connect( mEndDateButton, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( showCurrentRange() ) ); + connect( mNoEndDateButton, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( showCurrentRange() ) ); + connect( mEndDurationButton, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( showCurrentRange() ) ); + connect( mEndDateButton, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( showCurrentRange() ) ); } void RecurrenceRangeWidget::setDefaults( const TQDateTime &from ) @@ -887,7 +887,7 @@ RecurrenceChooser::RecurrenceChooser( TQWidget *parent, const char *name ) : topLayout->addWidget( mTypeCombo ); - connect( mTypeCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( emitChoice() ) ); + connect( mTypeCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( emitChoice() ) ); } else { mTypeCombo = 0; @@ -912,14 +912,14 @@ RecurrenceChooser::RecurrenceChooser( TQWidget *parent, const char *name ) : i18n("Sets the event or to-do to recur yearly according " "to the specified rules.") ); - connect( mDailyButton, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( emitChoice() ) ); - connect( mWeeklyButton, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( emitChoice() ) ); - connect( mMonthlyButton, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( emitChoice() ) ); - connect( mYearlyButton, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( emitChoice() ) ); + connect( mDailyButton, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( emitChoice() ) ); + connect( mWeeklyButton, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( emitChoice() ) ); + connect( mMonthlyButton, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( emitChoice() ) ); + connect( mYearlyButton, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( emitChoice() ) ); } } @@ -975,8 +975,8 @@ KOEditorRecurrence::KOEditorRecurrence( TQWidget* parent, const char *name ) : TQWhatsThis::add( mEnabledCheck, i18n("Enables recurrence for this event or to-do according " "to the specified rules.") ); - connect( mEnabledCheck, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( setRecurrenceEnabled( bool ) ) ); + connect( mEnabledCheck, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( setRecurrenceEnabled( bool ) ) ); topLayout->addMultiCellWidget( mEnabledCheck, 0, 0, 0, 1 ); @@ -1013,8 +1013,8 @@ KOEditorRecurrence::KOEditorRecurrence( TQWidget* parent, const char *name ) : } mRecurrenceChooser = new RecurrenceChooser( mRuleBox ); - connect( mRecurrenceChooser, TQT_SIGNAL( chosen( int ) ), - TQT_SLOT( showCurrentRule( int ) ) ); + connect( mRecurrenceChooser, TQ_SIGNAL( chosen( int ) ), + TQ_SLOT( showCurrentRule( int ) ) ); if ( !KOPrefs::instance()->mCompactDialogs ) { TQFrame *ruleSepFrame = new TQFrame( mRuleBox ); @@ -1047,16 +1047,16 @@ KOEditorRecurrence::KOEditorRecurrence( TQWidget* parent, const char *name ) : i18n("Options concerning the time range during which " "this event or to-do should recur.") ); topLayout->addWidget( mRecurrenceRangeButton, 3, 0 ); - connect( mRecurrenceRangeButton, TQT_SIGNAL( clicked() ), - TQT_SLOT( showRecurrenceRangeDialog() ) ); + connect( mRecurrenceRangeButton, TQ_SIGNAL( clicked() ), + TQ_SLOT( showRecurrenceRangeDialog() ) ); mExceptionsWidget = 0; mExceptionsDialog = new ExceptionsDialog( this ); mExceptions = mExceptionsDialog; mExceptionsButton = new TQPushButton( i18n("Exceptions..."), this ); topLayout->addWidget( mExceptionsButton, 4, 0 ); - connect( mExceptionsButton, TQT_SIGNAL( clicked() ), - TQT_SLOT( showExceptionsDialog() ) ); + connect( mExceptionsButton, TQ_SIGNAL( clicked() ), + TQ_SLOT( showExceptionsDialog() ) ); } else { mRecurrenceRangeWidget = new RecurrenceRangeWidget( this ); diff --git a/korganizer/koeventeditor.cpp b/korganizer/koeventeditor.cpp index 5fd3a21d..6bc3c0be 100644 --- a/korganizer/koeventeditor.cpp +++ b/korganizer/koeventeditor.cpp @@ -70,39 +70,39 @@ void KOEventEditor::init() setupDesignerTabs( "event" ); // Propagate date time settings to recurrence tab - connect( mGeneral, TQT_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & ) ), - mRecurrence, TQT_SLOT( setDateTimes( const TQDateTime &, const TQDateTime &) ) ); - connect( mGeneral, TQT_SIGNAL( dateTimeStrChanged( const TQString & ) ), - mRecurrence, TQT_SLOT( setDateTimeStr( const TQString & ) ) ); - connect( mFreeBusy, TQT_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & ) ), - mRecurrence, TQT_SLOT( setDateTimes( const TQDateTime &, const TQDateTime & ) ) ); + connect( mGeneral, TQ_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & ) ), + mRecurrence, TQ_SLOT( setDateTimes( const TQDateTime &, const TQDateTime &) ) ); + connect( mGeneral, TQ_SIGNAL( dateTimeStrChanged( const TQString & ) ), + mRecurrence, TQ_SLOT( setDateTimeStr( const TQString & ) ) ); + connect( mFreeBusy, TQ_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & ) ), + mRecurrence, TQ_SLOT( setDateTimes( const TQDateTime &, const TQDateTime & ) ) ); // Propagate date time settings to gantt tab and back - connect( mGeneral, TQT_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & ) ), - mFreeBusy, TQT_SLOT( slotUpdateGanttView( const TQDateTime &, const TQDateTime & ) ) ); - connect( mFreeBusy, TQT_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & ) ), - mGeneral, TQT_SLOT( setDateTimes( const TQDateTime &, const TQDateTime & ) ) ); - - connect( mGeneral, TQT_SIGNAL( focusReceivedSignal() ), - TQT_SIGNAL( focusReceivedSignal() ) ); - - connect( mGeneral, TQT_SIGNAL( openCategoryDialog() ), - TQT_SIGNAL( editCategories() ) ); - connect( this, TQT_SIGNAL( updateCategoryConfig() ), - mGeneral, TQT_SIGNAL( updateCategoryConfig() ) ); - - connect( mFreeBusy, TQT_SIGNAL(updateAttendeeSummary(int)), - mGeneral, TQT_SLOT(updateAttendeeSummary(int)) ); - - connect( mGeneral, TQT_SIGNAL(editRecurrence()), - mRecurrenceDialog, TQT_SLOT(show()) ); - connect( mRecurrenceDialog, TQT_SIGNAL(okClicked()), - TQT_SLOT(updateRecurrenceSummary()) ); - - connect( mGeneral, TQT_SIGNAL(acceptInvitation()), - mFreeBusy, TQT_SLOT(acceptForMe()) ); - connect( mGeneral, TQT_SIGNAL(declineInvitation()), - mFreeBusy, TQT_SLOT(declineForMe()) ); + connect( mGeneral, TQ_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & ) ), + mFreeBusy, TQ_SLOT( slotUpdateGanttView( const TQDateTime &, const TQDateTime & ) ) ); + connect( mFreeBusy, TQ_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & ) ), + mGeneral, TQ_SLOT( setDateTimes( const TQDateTime &, const TQDateTime & ) ) ); + + connect( mGeneral, TQ_SIGNAL( focusReceivedSignal() ), + TQ_SIGNAL( focusReceivedSignal() ) ); + + connect( mGeneral, TQ_SIGNAL( openCategoryDialog() ), + TQ_SIGNAL( editCategories() ) ); + connect( this, TQ_SIGNAL( updateCategoryConfig() ), + mGeneral, TQ_SIGNAL( updateCategoryConfig() ) ); + + connect( mFreeBusy, TQ_SIGNAL(updateAttendeeSummary(int)), + mGeneral, TQ_SLOT(updateAttendeeSummary(int)) ); + + connect( mGeneral, TQ_SIGNAL(editRecurrence()), + mRecurrenceDialog, TQ_SLOT(show()) ); + connect( mRecurrenceDialog, TQ_SIGNAL(okClicked()), + TQ_SLOT(updateRecurrenceSummary()) ); + + connect( mGeneral, TQ_SIGNAL(acceptInvitation()), + mFreeBusy, TQ_SLOT(acceptForMe()) ); + connect( mGeneral, TQ_SIGNAL(declineInvitation()), + mFreeBusy, TQ_SLOT(declineForMe()) ); } void KOEventEditor::reload() @@ -154,10 +154,10 @@ void KOEventEditor::setupGeneral() mGeneral->initTime(topFrame,topLayout); mGeneral->initDescription(topFrame,topLayout); mGeneral->initAttachments(topFrame,topLayout); - connect( mGeneral, TQT_SIGNAL( openURL( const KURL& ) ), - this, TQT_SLOT( openURL( const KURL& ) ) ); - connect( this, TQT_SIGNAL( signalAddAttachments( const TQStringList&, const TQStringList&, bool ) ), - mGeneral, TQT_SLOT( addAttachments( const TQStringList&, const TQStringList&, bool ) ) ); + connect( mGeneral, TQ_SIGNAL( openURL( const KURL& ) ), + this, TQ_SLOT( openURL( const KURL& ) ) ); + connect( this, TQ_SIGNAL( signalAddAttachments( const TQStringList&, const TQStringList&, bool ) ), + mGeneral, TQ_SLOT( addAttachments( const TQStringList&, const TQStringList&, bool ) ) ); } mGeneral->finishSetup(); diff --git a/korganizer/koeventpopupmenu.cpp b/korganizer/koeventpopupmenu.cpp index 73a0942e..1ab4b89e 100644 --- a/korganizer/koeventpopupmenu.cpp +++ b/korganizer/koeventpopupmenu.cpp @@ -50,44 +50,44 @@ KOEventPopupMenu::KOEventPopupMenu() mCurrentDate = TQDate(); mHasAdditionalItems = false; - insertItem( i18n("&Show"), this, TQT_SLOT( popupShow() ) ); + insertItem( i18n("&Show"), this, TQ_SLOT( popupShow() ) ); mEditOnlyItems.append( - insertItem(i18n("&Edit..."), this, TQT_SLOT( popupEdit() ) ) ); + insertItem(i18n("&Edit..."), this, TQ_SLOT( popupEdit() ) ) ); #ifndef KORG_NOPRINTER insertItem( KOGlobals::self()->smallIcon("printer"), i18n("&Print..."), - this, TQT_SLOT( print() ) ); + this, TQ_SLOT( print() ) ); #endif //------------------------------------------------------------------------ mEditOnlyItems.append( insertSeparator() ); mEditOnlyItems.append( insertItem( KOGlobals::self()->smallIcon("edit-cut"), i18n("&Cut"), - this, TQT_SLOT( popupCut() ) ) ); + this, TQ_SLOT( popupCut() ) ) ); mEditOnlyItems.append( insertItem( KOGlobals::self()->smallIcon("edit-copy"), i18n("&Copy"), - this, TQT_SLOT( popupCopy() ) ) ); + this, TQ_SLOT( popupCopy() ) ) ); // paste is always possible insertItem( KOGlobals::self()->smallIcon("edit-paste"), i18n("&Paste"), - this, TQT_SLOT( popupPaste() ) ); + this, TQ_SLOT( popupPaste() ) ); mEditOnlyItems.append( insertItem( KOGlobals::self()->smallIcon("edit-delete"), i18n("&Delete"), - this, TQT_SLOT( popupDelete() ) ) ); + this, TQ_SLOT( popupDelete() ) ) ); //------------------------------------------------------------------------ mEditOnlyItems.append( insertSeparator() ); mEditOnlyItems.append( insertItem( KOGlobals::self()->smallIcon("bell"), i18n("&Toggle Reminder"), - this, TQT_SLOT( popupAlarm() ) ) ); + this, TQ_SLOT( popupAlarm() ) ) ); //------------------------------------------------------------------------ mRecurrenceItems.append( insertSeparator() ); mRecurrenceItems.append( insertItem( i18n("&Dissociate This Occurrence"), - this, TQT_SLOT( dissociateOccurrence() ) ) ); + this, TQ_SLOT( dissociateOccurrence() ) ) ); mRecurrenceItems.append( insertItem( i18n("&Dissociate Future Occurrences"), - this, TQT_SLOT( dissociateFutureOccurrence() ) ) ); + this, TQ_SLOT( dissociateFutureOccurrence() ) ) ); insertSeparator(); insertItem( KOGlobals::self()->smallIcon("mail-forward"), i18n( "Send as iCalendar..."), - this, TQT_SLOT(forward()) ); + this, TQ_SLOT(forward()) ); } void KOEventPopupMenu::showIncidencePopup( Calendar *cal, Incidence *incidence, const TQDate &qd ) @@ -142,7 +142,7 @@ void KOEventPopupMenu::print() #ifndef KORG_NOPRINTER KOCoreHelper helper; CalPrinter printer( this, mCalendar, &helper ); - connect( this, TQT_SIGNAL(configChanged()), &printer, TQT_SLOT(updateConfig()) ); + connect( this, TQ_SIGNAL(configChanged()), &printer, TQ_SLOT(updateConfig()) ); Incidence::List selectedIncidences; selectedIncidences.append( mCurrentIncidence ); diff --git a/korganizer/koeventview.cpp b/korganizer/koeventview.cpp index 9bd038d2..7ac37573 100644 --- a/korganizer/koeventview.cpp +++ b/korganizer/koeventview.cpp @@ -61,24 +61,24 @@ KOEventPopupMenu *KOEventView::eventPopup() { KOEventPopupMenu *eventPopup = new KOEventPopupMenu; - connect( eventPopup, TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)), - TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)) ); - connect( eventPopup, TQT_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)), - TQT_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)) ); - connect( eventPopup, TQT_SIGNAL(deleteIncidenceSignal(Incidence *)), - TQT_SIGNAL(deleteIncidenceSignal(Incidence *)) ); - connect( eventPopup, TQT_SIGNAL(cutIncidenceSignal(Incidence *)), - TQT_SIGNAL(cutIncidenceSignal(Incidence *)) ); - connect( eventPopup, TQT_SIGNAL(copyIncidenceSignal(Incidence *)), - TQT_SIGNAL(copyIncidenceSignal(Incidence *)) ); - connect( eventPopup, TQT_SIGNAL(pasteIncidenceSignal()), - TQT_SIGNAL(pasteIncidenceSignal()) ); - connect( eventPopup, TQT_SIGNAL(toggleAlarmSignal(Incidence *)), - TQT_SIGNAL(toggleAlarmSignal(Incidence*)) ); - connect( eventPopup, TQT_SIGNAL(dissociateOccurrenceSignal(Incidence *,const TQDate &)), - TQT_SIGNAL(dissociateOccurrenceSignal(Incidence *,const TQDate &)) ); - connect( eventPopup, TQT_SIGNAL(dissociateFutureOccurrenceSignal(Incidence *,const TQDate &)), - TQT_SIGNAL(dissociateFutureOccurrenceSignal(Incidence *,const TQDate &)) ); + connect( eventPopup, TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)), + TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)) ); + connect( eventPopup, TQ_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)), + TQ_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)) ); + connect( eventPopup, TQ_SIGNAL(deleteIncidenceSignal(Incidence *)), + TQ_SIGNAL(deleteIncidenceSignal(Incidence *)) ); + connect( eventPopup, TQ_SIGNAL(cutIncidenceSignal(Incidence *)), + TQ_SIGNAL(cutIncidenceSignal(Incidence *)) ); + connect( eventPopup, TQ_SIGNAL(copyIncidenceSignal(Incidence *)), + TQ_SIGNAL(copyIncidenceSignal(Incidence *)) ); + connect( eventPopup, TQ_SIGNAL(pasteIncidenceSignal()), + TQ_SIGNAL(pasteIncidenceSignal()) ); + connect( eventPopup, TQ_SIGNAL(toggleAlarmSignal(Incidence *)), + TQ_SIGNAL(toggleAlarmSignal(Incidence*)) ); + connect( eventPopup, TQ_SIGNAL(dissociateOccurrenceSignal(Incidence *,const TQDate &)), + TQ_SIGNAL(dissociateOccurrenceSignal(Incidence *,const TQDate &)) ); + connect( eventPopup, TQ_SIGNAL(dissociateFutureOccurrenceSignal(Incidence *,const TQDate &)), + TQ_SIGNAL(dissociateFutureOccurrenceSignal(Incidence *,const TQDate &)) ); return eventPopup; } diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp index ddd4fcde..7d36b4aa 100644 --- a/korganizer/koeventviewer.cpp +++ b/korganizer/koeventviewer.cpp @@ -43,7 +43,7 @@ KOEventViewer::KOEventViewer( Calendar *calendar, TQWidget *parent, const char * : TQTextBrowser( parent, name ), mCalendar( calendar ), mDefaultText("") { mIncidence = 0; - connect( this, TQT_SIGNAL(highlighted(const TQString &)), TQT_SLOT(message(const TQString &)) ); + connect( this, TQ_SIGNAL(highlighted(const TQString &)), TQ_SLOT(message(const TQString &)) ); } KOEventViewer::~KOEventViewer() diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp index 7e783695..12a2f79d 100644 --- a/korganizer/koeventviewerdialog.cpp +++ b/korganizer/koeventviewerdialog.cpp @@ -43,7 +43,7 @@ KOEventViewerDialog::KOEventViewerDialog( Calendar *calendar, TQWidget *parent, setMinimumSize( 500, 500 ); resize( 520, 500 ); } - connect( this, TQT_SIGNAL(finished()), this, TQT_SLOT(delayedDestruct()) ); + connect( this, TQ_SIGNAL(finished()), this, TQ_SLOT(delayedDestruct()) ); } KOEventViewerDialog::~KOEventViewerDialog() diff --git a/korganizer/kogroupware.cpp b/korganizer/kogroupware.cpp index 6e86c857..5c8342ac 100644 --- a/korganizer/kogroupware.cpp +++ b/korganizer/kogroupware.cpp @@ -84,10 +84,10 @@ KOGroupware::KOGroupware( CalendarView* view, KCal::CalendarResources* cal ) watcher->addDir( locateLocal( "data", "korganizer/income.cancel/" ) ); watcher->addDir( locateLocal( "data", "korganizer/income.reply/" ) ); watcher->addDir( locateLocal( "data", "korganizer/income.delegated/" ) ); - connect( watcher, TQT_SIGNAL( dirty( const TQString& ) ), - this, TQT_SLOT( incomingDirChanged( const TQString& ) ) ); + connect( watcher, TQ_SIGNAL( dirty( const TQString& ) ), + this, TQ_SLOT( incomingDirChanged( const TQString& ) ) ); // Now set the ball rolling - TQTimer::singleShot( 0, this, TQT_SLOT(initialCheckForChanges()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(initialCheckForChanges()) ); } void KOGroupware::initialCheckForChanges() @@ -103,12 +103,12 @@ void KOGroupware::initialCheckForChanges() void KOGroupware::slotViewNewIncidenceChanger( IncidenceChangerBase* changer ) { // Call slot perhapsUploadFB if an incidence was added, changed or removed - connect( changer, TQT_SIGNAL( incidenceAdded( Incidence* ) ), - mFreeBusyManager, TQT_SLOT( slotPerhapsUploadFB() ) ); - connect( changer, TQT_SIGNAL( incidenceChanged( Incidence*, Incidence*, KOGlobals::WhatChanged ) ), - mFreeBusyManager, TQT_SLOT( slotPerhapsUploadFB() ) ); - connect( changer, TQT_SIGNAL( incidenceDeleted( Incidence * ) ), - mFreeBusyManager, TQT_SLOT( slotPerhapsUploadFB() ) ); + connect( changer, TQ_SIGNAL( incidenceAdded( Incidence* ) ), + mFreeBusyManager, TQ_SLOT( slotPerhapsUploadFB() ) ); + connect( changer, TQ_SIGNAL( incidenceChanged( Incidence*, Incidence*, KOGlobals::WhatChanged ) ), + mFreeBusyManager, TQ_SLOT( slotPerhapsUploadFB() ) ); + connect( changer, TQ_SIGNAL( incidenceDeleted( Incidence * ) ), + mFreeBusyManager, TQ_SLOT( slotPerhapsUploadFB() ) ); } FreeBusyManager *KOGroupware::freeBusyManager() @@ -116,10 +116,10 @@ FreeBusyManager *KOGroupware::freeBusyManager() if ( !mFreeBusyManager ) { mFreeBusyManager = new FreeBusyManager( this, "freebusymanager" ); mFreeBusyManager->setCalendar( mCalendar ); - connect( mCalendar, TQT_SIGNAL( calendarChanged() ), - mFreeBusyManager, TQT_SLOT( slotPerhapsUploadFB() ) ); - connect( mView, TQT_SIGNAL( newIncidenceChanger( IncidenceChangerBase* ) ), - this, TQT_SLOT( slotViewNewIncidenceChanger( IncidenceChangerBase* ) ) ); + connect( mCalendar, TQ_SIGNAL( calendarChanged() ), + mFreeBusyManager, TQ_SLOT( slotPerhapsUploadFB() ) ); + connect( mView, TQ_SIGNAL( newIncidenceChanger( IncidenceChangerBase* ) ), + this, TQ_SLOT( slotViewNewIncidenceChanger( IncidenceChangerBase* ) ) ); slotViewNewIncidenceChanger( mView->incidenceChanger() ); } diff --git a/korganizer/koincidenceeditor.cpp b/korganizer/koincidenceeditor.cpp index 40851e99..499a4580 100644 --- a/korganizer/koincidenceeditor.cpp +++ b/korganizer/koincidenceeditor.cpp @@ -75,8 +75,8 @@ KOIncidenceEditor::KOIncidenceEditor( const TQString &caption, setButtonText( Default, i18n("&Templates...") ); } - connect( this, TQT_SIGNAL( defaultClicked() ), TQT_SLOT( slotManageTemplates() ) ); - connect( this, TQT_SIGNAL( finished() ), TQT_SLOT( delayedDestruct() ) ); + connect( this, TQ_SIGNAL( defaultClicked() ), TQ_SLOT( slotManageTemplates() ) ); + connect( this, TQ_SIGNAL( finished() ), TQ_SLOT( delayedDestruct() ) ); } KOIncidenceEditor::~KOIncidenceEditor() @@ -139,12 +139,12 @@ void KOIncidenceEditor::slotManageTemplates() kdDebug(5850) << "KOIncidenceEditor::manageTemplates()" << endl; TemplateManagementDialog * const d = new TemplateManagementDialog( this, templates() ); - connect( d, TQT_SIGNAL( loadTemplate( const TQString& ) ), - this, TQT_SLOT( slotLoadTemplate( const TQString& ) ) ); - connect( d, TQT_SIGNAL( templatesChanged( const TQStringList& ) ), - this, TQT_SLOT( slotTemplatesChanged( const TQStringList& ) ) ); - connect( d, TQT_SIGNAL( saveTemplate( const TQString& ) ), - this, TQT_SLOT( slotSaveTemplate( const TQString& ) ) ); + connect( d, TQ_SIGNAL( loadTemplate( const TQString& ) ), + this, TQ_SLOT( slotLoadTemplate( const TQString& ) ) ); + connect( d, TQ_SIGNAL( templatesChanged( const TQStringList& ) ), + this, TQ_SLOT( slotTemplatesChanged( const TQStringList& ) ) ); + connect( d, TQ_SIGNAL( saveTemplate( const TQString& ) ), + this, TQ_SLOT( slotSaveTemplate( const TQString& ) ) ); d->exec(); return; } @@ -296,8 +296,8 @@ void KOIncidenceEditor::setupEmbeddedURLPage( const TQString &label, topFrame ); topLayout->addWidget( wid ); mEmbeddedURLPages.append( topFrame ); - connect( wid, TQT_SIGNAL( openURL( const KURL & ) ) , - this, TQT_SLOT( openURL( const KURL & ) ) ); + connect( wid, TQ_SIGNAL( openURL( const KURL & ) ) , + this, TQ_SLOT( openURL( const KURL & ) ) ); // TODO: Call this method only when the tab is actually activated! wid->loadContents(); } diff --git a/korganizer/kojournalview.cpp b/korganizer/kojournalview.cpp index 3bc78156..252bbc53 100644 --- a/korganizer/kojournalview.cpp +++ b/korganizer/kojournalview.cpp @@ -71,24 +71,24 @@ void KOJournalView::appendJournal( Journal*journal, const TQDate &dt) entry->setDate( dt ); entry->setIncidenceChanger( mChanger ); entry->show(); - connect( this, TQT_SIGNAL(flushEntries()), - entry, TQT_SIGNAL(flushEntries()) ); + connect( this, TQ_SIGNAL(flushEntries()), + entry, TQ_SIGNAL(flushEntries()) ); - connect( this, TQT_SIGNAL(setIncidenceChangerSignal(IncidenceChangerBase *)), - entry, TQT_SLOT(setIncidenceChanger( IncidenceChangerBase *)) ); + connect( this, TQ_SIGNAL(setIncidenceChangerSignal(IncidenceChangerBase *)), + entry, TQ_SLOT(setIncidenceChanger( IncidenceChangerBase *)) ); - connect( this, TQT_SIGNAL(journalEdited(Journal *)), - entry, TQT_SLOT(journalEdited(Journal *)) ); - connect( this, TQT_SIGNAL(journalDeleted(Journal *)), - entry, TQT_SLOT(journalDeleted(Journal *)) ); + connect( this, TQ_SIGNAL(journalEdited(Journal *)), + entry, TQ_SLOT(journalEdited(Journal *)) ); + connect( this, TQ_SIGNAL(journalDeleted(Journal *)), + entry, TQ_SLOT(journalDeleted(Journal *)) ); - connect( entry, TQT_SIGNAL(editIncidence(Incidence *,const TQDate &)), - this, TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)) ); - connect( entry, TQT_SIGNAL(deleteIncidence(Incidence *)), - this, TQT_SIGNAL(deleteIncidenceSignal(Incidence *)) ); + connect( entry, TQ_SIGNAL(editIncidence(Incidence *,const TQDate &)), + this, TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)) ); + connect( entry, TQ_SIGNAL(deleteIncidence(Incidence *)), + this, TQ_SIGNAL(deleteIncidenceSignal(Incidence *)) ); - connect( entry, TQT_SIGNAL(newJournal(ResourceCalendar *,const TQString &,const TQDate &)), - this, TQT_SIGNAL(newJournalSignal(ResourceCalendar *,const TQString &,const TQDate &)) ); + connect( entry, TQ_SIGNAL(newJournal(ResourceCalendar *,const TQString &,const TQDate &)), + this, TQ_SIGNAL(newJournalSignal(ResourceCalendar *,const TQString &,const TQDate &)) ); mEntries.insert( dt, entry ); } diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index a43e61ac..df52e88a 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp @@ -227,21 +227,21 @@ KOListView::KOListView( Calendar *calendar, /* mPopupMenu->insertSeparator(); mPopupMenu->insertItem(i18n("Show Dates"), this, - TQT_SLOT(showDates())); + TQ_SLOT(showDates())); mPopupMenu->insertItem(i18n("Hide Dates"), this, - TQT_SLOT(hideDates())); + TQ_SLOT(hideDates())); */ - connect( mListView, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - TQT_SLOT( defaultItemAction( TQListViewItem * ) ) ); - connect( mListView, TQT_SIGNAL( returnPressed( TQListViewItem * ) ), - TQT_SLOT( defaultItemAction( TQListViewItem * ) ) ); - connect( mListView, TQT_SIGNAL( rightButtonClicked ( TQListViewItem *, + connect( mListView, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + TQ_SLOT( defaultItemAction( TQListViewItem * ) ) ); + connect( mListView, TQ_SIGNAL( returnPressed( TQListViewItem * ) ), + TQ_SLOT( defaultItemAction( TQListViewItem * ) ) ); + connect( mListView, TQ_SIGNAL( rightButtonClicked ( TQListViewItem *, const TQPoint &, int ) ), - TQT_SLOT( popupMenu( TQListViewItem *, const TQPoint &, int ) ) ); - connect( mListView, TQT_SIGNAL( selectionChanged() ), - TQT_SLOT( processSelectionChange() ) ); + TQ_SLOT( popupMenu( TQListViewItem *, const TQPoint &, int ) ) ); + connect( mListView, TQ_SIGNAL( selectionChanged() ), + TQ_SLOT( processSelectionChange() ) ); // setMinimumSize(100,100); mListView->restoreLayout( KOGlobals::self()->config(), "KOListView Layout" ); diff --git a/korganizer/komessagebox.cpp b/korganizer/komessagebox.cpp index 9c843b59..641d5106 100644 --- a/korganizer/komessagebox.cpp +++ b/korganizer/komessagebox.cpp @@ -41,9 +41,9 @@ int KOMessageBox::fourBtnMsgBox( TQWidget *parent, TQMessageBox::Icon type, dialog->setButtonOK( button3 ); dialog->setButtonText( KDialogBase::Yes, button1.text() ); dialog->setButtonText( KDialogBase::No, button2.text() ); - TQObject::connect( dialog->actionButton( KDialogBase::Yes ), TQT_SIGNAL( clicked() ), dialog, TQT_SLOT(slotYes())); - TQObject::connect( dialog->actionButton( KDialogBase::No ), TQT_SIGNAL( clicked() ), dialog, TQT_SLOT(slotNo())); -// TQObject::connect( dialog, TQT_SIGNAL( noClicked() ), dialog, TQT_SLOT(slotNo())); + TQObject::connect( dialog->actionButton( KDialogBase::Yes ), TQ_SIGNAL( clicked() ), dialog, TQ_SLOT(slotYes())); + TQObject::connect( dialog->actionButton( KDialogBase::No ), TQ_SIGNAL( clicked() ), dialog, TQ_SLOT(slotNo())); +// TQObject::connect( dialog, TQ_SIGNAL( noClicked() ), dialog, TQ_SLOT(slotNo())); bool checkboxResult = false; diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index 9000361c..23b477e1 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp @@ -405,13 +405,13 @@ MonthViewCell::MonthViewCell( KOMonthView *parent) updateConfig(); - connect( mItemList, TQT_SIGNAL( doubleClicked( TQListBoxItem *) ), - TQT_SLOT( defaultAction( TQListBoxItem * ) ) ); - connect( mItemList, TQT_SIGNAL( rightButtonPressed( TQListBoxItem *, + connect( mItemList, TQ_SIGNAL( doubleClicked( TQListBoxItem *) ), + TQ_SLOT( defaultAction( TQListBoxItem * ) ) ); + connect( mItemList, TQ_SIGNAL( rightButtonPressed( TQListBoxItem *, const TQPoint &) ), - TQT_SLOT( contextMenu( TQListBoxItem * ) ) ); - connect( mItemList, TQT_SIGNAL( clicked( TQListBoxItem * ) ), - TQT_SLOT( select() ) ); + TQ_SLOT( contextMenu( TQListBoxItem * ) ) ); + connect( mItemList, TQ_SIGNAL( clicked( TQListBoxItem * ) ), + TQ_SLOT( select() ) ); } void MonthViewCell::setDate( const TQDate &date ) @@ -861,10 +861,10 @@ KOMonthView::KOMonthView( Calendar *calendar, TQWidget *parent, const char *name mCells.insert( row * mDaysPerWeek + col, cell ); dayLayout->addWidget( cell, row + 2, col ); - connect( cell, TQT_SIGNAL(defaultAction(Incidence *)), - TQT_SLOT(defaultAction(Incidence *)) ); - connect( cell, TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDate &)), - TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDate &)) ); + connect( cell, TQ_SIGNAL(defaultAction(Incidence *)), + TQ_SLOT(defaultAction(Incidence *)) ); + connect( cell, TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDate &)), + TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDate &)) ); } dayLayout->setRowStretch( row + 2, 1 ); } diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp index 498c8cf8..60fd3e45 100644 --- a/korganizer/koprefsdialog.cpp +++ b/korganizer/koprefsdialog.cpp @@ -92,8 +92,8 @@ KOPrefsDialogMain::KOPrefsDialogMain( TQWidget *parent, const char *name ) KPrefsWidBool *emailControlCenter = addWidBool( KOPrefs::instance()->emailControlCenterItem(), topFrame ); - connect(emailControlCenter->checkBox(),TQT_SIGNAL(toggled(bool)), - TQT_SLOT(toggleEmailSettings(bool))); + connect(emailControlCenter->checkBox(),TQ_SIGNAL(toggled(bool)), + TQ_SLOT(toggleEmailSettings(bool))); mUserEmailSettings = new TQGrid( 2, topFrame ); @@ -109,8 +109,8 @@ KOPrefsDialogMain::KOPrefsDialogMain( TQWidget *parent, const char *name ) TQHBox *intervalBox = new TQHBox( saveGroup ); addWidInt( KOPrefs::instance()->autoSaveIntervalItem(), intervalBox ); - connect( autoSave->checkBox(), TQT_SIGNAL( toggled( bool ) ), - intervalBox, TQT_SLOT( setEnabled( bool ) ) ); + connect( autoSave->checkBox(), TQ_SIGNAL( toggled( bool ) ), + intervalBox, TQ_SLOT( setEnabled( bool ) ) ); intervalBox->setSpacing( KDialog::spacingHint() ); new TQWidget( intervalBox ); @@ -171,8 +171,8 @@ class KOPrefsDialogTime : public KPrefsModule TQWhatsThis::add( timeZoneLabel, whatsThis ); mTimeZoneCombo = new TQComboBox( timeZoneBox ); - connect( mTimeZoneCombo, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( slotWidChanged() ) ); + connect( mTimeZoneCombo, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( slotWidChanged() ) ); FILE *f; char tempstring[101] = "Unknown"; @@ -264,8 +264,8 @@ class KOPrefsDialogTime : public KPrefsModule TQWhatsThis::add( holidayLabel, whatsThis ); mHolidayCombo = new TQComboBox( holidayRegBox ); - connect( mHolidayCombo, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( slotWidChanged() ) ); + connect( mHolidayCombo, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( slotWidChanged() ) ); TQWhatsThis::add( mHolidayCombo, whatsThis ); @@ -328,10 +328,10 @@ class KOPrefsDialogTime : public KPrefsModule new TQLabel( i18n( "Default reminder time:" ), remindersBox ); mReminderTimeSpin = new KIntSpinBox( remindersBox ); - connect( mReminderTimeSpin, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotWidChanged()) ); + connect( mReminderTimeSpin, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotWidChanged()) ); mReminderUnitsCombo = new KComboBox( remindersBox ); - connect( mReminderUnitsCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotWidChanged()) ); + connect( mReminderUnitsCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotWidChanged()) ); mReminderUnitsCombo->insertItem( i18n( "minute(s)" ) ); mReminderUnitsCombo->insertItem( i18n( "hour(s)" ) ); mReminderUnitsCombo->insertItem( i18n( "day(s)" ) ); @@ -351,8 +351,8 @@ class KOPrefsDialogTime : public KPrefsModule KURLRequester *rq = addWidPath( KOPrefs::instance()->audioFilePathItem(), audioFileRemindersBox, filter )->urlRequester(); rq->setEnabled( cb->isChecked() ); - connect( cb, TQT_SIGNAL(toggled(bool)), - rq, TQT_SLOT(setEnabled( bool)) ); + connect( cb, TQ_SIGNAL(toggled(bool)), + rq, TQ_SLOT(setEnabled( bool)) ); TQHBox *eventRemindersBox = new TQHBox( remindersGroupBox ); addWidBool( KOPrefs::instance()->defaultEventRemindersItem(), eventRemindersBox )->checkBox(); @@ -364,8 +364,8 @@ class KOPrefsDialogTime : public KPrefsModule topLayout->addWidget( alarmDefaultLabel, 6, 0 ); mAlarmTimeDefaultCheckBox = new TQCheckBox( topFrame ); topLayout->addWidget( mAlarmTimeDefaultCheckBox, 6, 1 ); - connect( mAlarmTimeDefaultCheckBox, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( slotWidChanged() ) ); + connect( mAlarmTimeDefaultCheckBox, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( slotWidChanged() ) ); TQGroupBox *workingHoursGroup = new TQGroupBox(1,TQt::Horizontal, i18n("Working Hours"), @@ -390,8 +390,8 @@ class KOPrefsDialogTime : public KPrefsModule "this box, or the working hours will not be " "marked with color." ) ); - connect( mWorkDays[ index ], TQT_SIGNAL( stateChanged( int ) ), - TQT_SLOT( slotWidChanged() ) ); + connect( mWorkDays[ index ], TQ_SIGNAL( stateChanged( int ) ), + TQ_SLOT( slotWidChanged() ) ); } TQHBox *workStartBox = new TQHBox(workingHoursGroup); @@ -542,8 +542,8 @@ class KOPrefsDialogViews : public KPrefsModule KPrefsWidBool *marcusBainsShowSeconds = addWidBool( KOPrefs::instance()->marcusBainsShowSecondsItem(), agendaGroup ); - connect( marcusBainsEnabled->checkBox(), TQT_SIGNAL( toggled( bool ) ), - marcusBainsShowSeconds->checkBox(), TQT_SLOT( setEnabled( bool ) ) ); + connect( marcusBainsEnabled->checkBox(), TQ_SIGNAL( toggled( bool ) ), + marcusBainsShowSeconds->checkBox(), TQ_SLOT( setEnabled( bool ) ) ); addWidBool( KOPrefs::instance()->selectionStartsEditorItem(), agendaGroup ); @@ -711,13 +711,13 @@ KOPrefsDialogColors::KOPrefsDialogColors( TQWidget *parent, const char *name ) i18n( "Select here the event category you want to modify. " "You can change the selected category color using " "the button below." ) ); - connect(mCategoryCombo,TQT_SIGNAL(activated(int)),TQT_SLOT(updateCategoryColor())); + connect(mCategoryCombo,TQ_SIGNAL(activated(int)),TQ_SLOT(updateCategoryColor())); mCategoryButton = new KColorButton(categoryGroup); TQWhatsThis::add( mCategoryButton, i18n( "Choose here the color of the event category selected " "using the combo box above." ) ); - connect(mCategoryButton,TQT_SIGNAL(changed(const TQColor &)),TQT_SLOT(setCategoryColor())); + connect(mCategoryButton,TQ_SIGNAL(changed(const TQColor &)),TQ_SLOT(setCategoryColor())); updateCategoryColor(); // resources colors @@ -730,13 +730,13 @@ KOPrefsDialogColors::KOPrefsDialogColors( TQWidget *parent, const char *name ) i18n( "Select here resource you want to modify. " "You can change the selected resource color using " "the button below." ) ); - connect(mResourceCombo,TQT_SIGNAL(activated(int)),TQT_SLOT(updateResourceColor())); + connect(mResourceCombo,TQ_SIGNAL(activated(int)),TQ_SLOT(updateResourceColor())); mResourceButton = new KColorButton(resourceGroup); TQWhatsThis::add( mResourceButton, i18n( "Choose here the color of the resource selected " "using the combo box above." ) ); - connect(mResourceButton,TQT_SIGNAL(changed(const TQColor &)),TQT_SLOT(setResourceColor())); + connect(mResourceButton,TQ_SIGNAL(changed(const TQColor &)),TQ_SLOT(setResourceColor())); updateResources(); topLayout->setRowStretch(9,1); @@ -865,8 +865,8 @@ KOPrefsDialogGroupScheduling::KOPrefsDialogGroupScheduling( TQWidget *parent, co topFrame ); topLayout->addMultiCellWidget(useGroupwareBool->checkBox(),0,0,0,1); // FIXME: This radio button should only be available when KMail is chosen -// connect(thekmailradiobuttonupthere,TQT_SIGNAL(toggled(bool)), -// useGroupwareBool->checkBox(), TQT_SLOT(enabled(bool))); +// connect(thekmailradiobuttonupthere,TQ_SIGNAL(toggled(bool)), +// useGroupwareBool->checkBox(), TQ_SLOT(enabled(bool))); KPrefsWidBool *bcc = addWidBool( KOPrefs::instance()->bccItem(), topFrame ); @@ -927,10 +927,10 @@ KOPrefsDialogGroupScheduling::KOPrefsDialogGroupScheduling( TQWidget *parent, co topLayout->addWidget(del,6,1); //topLayout->setRowStretch(2,1); - connect(add, TQT_SIGNAL( clicked() ), this, TQT_SLOT(addItem()) ); - connect(del, TQT_SIGNAL( clicked() ), this, TQT_SLOT(removeItem()) ); - connect(aEmailsEdit,TQT_SIGNAL( textChanged(const TQString&) ), this,TQT_SLOT(updateItem())); - connect(mAMails,TQT_SIGNAL(selectionChanged(TQListViewItem *)),TQT_SLOT(updateInput())); + connect(add, TQ_SIGNAL( clicked() ), this, TQ_SLOT(addItem()) ); + connect(del, TQ_SIGNAL( clicked() ), this, TQ_SLOT(removeItem()) ); + connect(aEmailsEdit,TQ_SIGNAL( textChanged(const TQString&) ), this,TQ_SLOT(updateItem())); + connect(mAMails,TQ_SIGNAL(selectionChanged(TQListViewItem *)),TQ_SLOT(updateInput())); load(); } @@ -1018,7 +1018,7 @@ KOPrefsDialogGroupwareScheduling::KOPrefsDialogGroupwareScheduling( TQWidget *pa : KPrefsModule( KOPrefs::instance(), parent, name ) { mGroupwarePage = new KOGroupwarePrefsPage( this ); - connect( mGroupwarePage, TQT_SIGNAL( changed() ), TQT_SLOT( slotWidChanged() ) ); + connect( mGroupwarePage, TQ_SIGNAL( changed() ), TQ_SLOT( slotWidChanged() ) ); ( new TQVBoxLayout( this ) )->addWidget( mGroupwarePage ); load(); @@ -1127,12 +1127,12 @@ KOPrefsDialogPlugins::KOPrefsDialogPlugins( TQWidget *parent, const char* name ) buttonRowLayout->addWidget( mConfigureButton ); buttonRowLayout->addItem( new TQSpacerItem(1, 1, TQSizePolicy::Expanding) ); topLayout->addWidget( buttonRow ); - connect( mConfigureButton, TQT_SIGNAL( clicked() ), TQT_SLOT( configure() ) ); + connect( mConfigureButton, TQ_SIGNAL( clicked() ), TQ_SLOT( configure() ) ); - connect( mListView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), - TQT_SLOT( selectionChanged( TQListViewItem* ) ) ); - connect( mListView, TQT_SIGNAL( clicked( TQListViewItem* ) ), - TQT_SLOT( slotWidChanged() ) ); + connect( mListView, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ), + TQ_SLOT( selectionChanged( TQListViewItem* ) ) ); + connect( mListView, TQ_SIGNAL( clicked( TQListViewItem* ) ), + TQ_SLOT( slotWidChanged() ) ); load(); // usrReadConfig(); diff --git a/korganizer/korgac/alarmdialog.cpp b/korganizer/korgac/alarmdialog.cpp index 3cc29582..80610483 100644 --- a/korganizer/korgac/alarmdialog.cpp +++ b/korganizer/korgac/alarmdialog.cpp @@ -109,8 +109,8 @@ AlarmDialog::AlarmDialog( KCal::CalendarResources *calendar, TQWidget *parent, c // User3 => Dismiss Selected // Ok => Suspend - connect( calendar, TQT_SIGNAL(calendarChanged()), - this, TQT_SLOT(slotCalendarChanged()) ); + connect( calendar, TQ_SIGNAL(calendarChanged()), + this, TQ_SLOT(slotCalendarChanged()) ); TDEGlobal::iconLoader()->addAppDir( "tdepim" ); setButtonOK( i18n( "Suspend" ) ); @@ -135,10 +135,10 @@ AlarmDialog::AlarmDialog( KCal::CalendarResources *calendar, TQWidget *parent, c mIncidenceListView->setShowSortIndicator( true ); mIncidenceListView->setAllColumnsShowFocus( true ); mIncidenceListView->setSelectionMode( TQListView::Extended ); - connect( mIncidenceListView, TQT_SIGNAL(selectionChanged()), TQT_SLOT(updateButtons()) ); - connect( mIncidenceListView, TQT_SIGNAL(doubleClicked(TQListViewItem*)), TQT_SLOT(edit()) ); - connect( mIncidenceListView, TQT_SIGNAL(currentChanged(TQListViewItem*)), TQT_SLOT(showDetails()) ); - connect( mIncidenceListView, TQT_SIGNAL(selectionChanged()), TQT_SLOT(showDetails()) ); + connect( mIncidenceListView, TQ_SIGNAL(selectionChanged()), TQ_SLOT(updateButtons()) ); + connect( mIncidenceListView, TQ_SIGNAL(doubleClicked(TQListViewItem*)), TQ_SLOT(edit()) ); + connect( mIncidenceListView, TQ_SIGNAL(currentChanged(TQListViewItem*)), TQ_SLOT(showDetails()) ); + connect( mIncidenceListView, TQ_SIGNAL(selectionChanged()), TQ_SLOT(showDetails()) ); mDetailView = new KOEventViewer( mCalendar, mSplitter ); mDetailView->setFocus(); // set focus here to start with to make it harder @@ -160,7 +160,7 @@ AlarmDialog::AlarmDialog( KCal::CalendarResources *calendar, TQWidget *parent, c mSuspendUnit->insertItem( i18n("week(s)") ); mSuspendUnit->setCurrentItem( defSuspendUnit ); - connect( &mSuspendTimer, TQT_SIGNAL(timeout()), TQT_SLOT(wakeUp()) ); + connect( &mSuspendTimer, TQ_SIGNAL(timeout()), TQ_SLOT(wakeUp()) ); setMainWidget( mIncidenceListView ); mIncidenceListView->setMinimumSize( 500, 50 ); diff --git a/korganizer/korgac/alarmdockwindow.cpp b/korganizer/korgac/alarmdockwindow.cpp index 92b8002c..a5cb277e 100644 --- a/korganizer/korgac/alarmdockwindow.cpp +++ b/korganizer/korgac/alarmdockwindow.cpp @@ -64,16 +64,16 @@ AlarmDockWindow::AlarmDockWindow( const char *name ) setPixmap( alarmsEnabled ? mPixmapEnabled : mPixmapDisabled ); // Set up the context menu - mSuspendAll = contextMenu()->insertItem( i18n("Suspend All"), this, TQT_SLOT( slotSuspendAll() ) ); - mDismissAll = contextMenu()->insertItem( i18n("Dismiss All"), this, TQT_SLOT( slotDismissAll() ) ); + mSuspendAll = contextMenu()->insertItem( i18n("Suspend All"), this, TQ_SLOT( slotSuspendAll() ) ); + mDismissAll = contextMenu()->insertItem( i18n("Dismiss All"), this, TQ_SLOT( slotDismissAll() ) ); contextMenu()->setItemEnabled( mSuspendAll, false ); contextMenu()->setItemEnabled( mDismissAll, false ); contextMenu()->insertSeparator(); mAlarmsEnabledId = contextMenu()->insertItem( i18n("Reminders Enabled"), this, - TQT_SLOT( toggleAlarmsEnabled() ) ); + TQ_SLOT( toggleAlarmsEnabled() ) ); mAutostartId = contextMenu()->insertItem( i18n("Start Reminder Daemon at Login"), this, - TQT_SLOT( toggleAutostart() ) ); + TQ_SLOT( toggleAutostart() ) ); contextMenu()->setItemChecked( mAutostartId, autostart ); contextMenu()->setItemChecked( mAlarmsEnabledId, alarmsEnabled ); @@ -86,15 +86,15 @@ AlarmDockWindow::AlarmDockWindow( const char *name ) kdDebug(5890) << "No Quit standard action." << endl; } else { #if KDE_IS_VERSION(3,3,90) - quit->disconnect( TQT_SIGNAL( activated() ), this, - TQT_SLOT( maybeQuit() ) ); - connect( quit, TQT_SIGNAL( activated() ), TQT_SLOT( slotQuit() ) ); + quit->disconnect( TQ_SIGNAL( activated() ), this, + TQ_SLOT( maybeQuit() ) ); + connect( quit, TQ_SIGNAL( activated() ), TQ_SLOT( slotQuit() ) ); } #else //FIXME: remove for KDE 4.0 - quit->disconnect( TQT_SIGNAL( activated() ), tqApp, - TQT_SLOT( closeAllWindows() ) ); + quit->disconnect( TQ_SIGNAL( activated() ), tqApp, + TQ_SLOT( closeAllWindows() ) ); } - connect( this, TQT_SIGNAL( quitSelected() ), TQT_SLOT( slotQuit() ) ); + connect( this, TQ_SIGNAL( quitSelected() ), TQ_SLOT( slotQuit() ) ); #endif TQToolTip::add(this, mName ); diff --git a/korganizer/korgac/koalarmclient.cpp b/korganizer/korgac/koalarmclient.cpp index 2a87c7fd..37478ca0 100644 --- a/korganizer/korgac/koalarmclient.cpp +++ b/korganizer/korgac/koalarmclient.cpp @@ -46,8 +46,8 @@ KOAlarmClient::KOAlarmClient( TQObject *parent, const char *name ) mDocker = new AlarmDockWindow; mDocker->show(); - connect( this, TQT_SIGNAL( reminderCount( int ) ), mDocker, TQT_SLOT( slotUpdate( int ) ) ); - connect( mDocker, TQT_SIGNAL( quitSignal() ), TQT_SLOT( slotQuit() ) ); + connect( this, TQ_SIGNAL( reminderCount( int ) ), mDocker, TQ_SLOT( slotUpdate( int ) ) ); + connect( mDocker, TQ_SIGNAL( quitSignal() ), TQ_SLOT( slotQuit() ) ); TDEConfig c( locate( "config", "korganizerrc" ) ); c.setGroup( "Time & Date" ); @@ -58,7 +58,7 @@ KOAlarmClient::KOAlarmClient( TQObject *parent, const char *name ) mCalendar->readConfig(); mCalendar->load(); - connect( &mCheckTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( checkAlarms() ) ); + connect( &mCheckTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( checkAlarms() ) ); TDEConfig *config = kapp->config(); config->setGroup( "Alarms" ); @@ -132,10 +132,10 @@ void KOAlarmClient::createReminder( KCal::CalendarResources *calendar, if ( !mDialog ) { mDialog = new AlarmDialog( calendar ); - connect( mDialog, TQT_SIGNAL(reminderCount(int)), mDocker, TQT_SLOT(slotUpdate(int)) ); - connect( mDocker, TQT_SIGNAL(suspendAllSignal()), mDialog, TQT_SLOT(suspendAll()) ); - connect( mDocker, TQT_SIGNAL(dismissAllSignal()), mDialog, TQT_SLOT(dismissAll()) ); - connect( this, TQT_SIGNAL( saveAllSignal() ), mDialog, TQT_SLOT( slotSave() ) ); + connect( mDialog, TQ_SIGNAL(reminderCount(int)), mDocker, TQ_SLOT(slotUpdate(int)) ); + connect( mDocker, TQ_SIGNAL(suspendAllSignal()), mDialog, TQ_SLOT(suspendAll()) ); + connect( mDocker, TQ_SIGNAL(dismissAllSignal()), mDialog, TQ_SLOT(dismissAll()) ); + connect( this, TQ_SIGNAL( saveAllSignal() ), mDialog, TQ_SLOT( slotSave() ) ); } mDialog->addIncidence( incidence, dt, displayText ); diff --git a/korganizer/korganizer.cpp b/korganizer/korganizer.cpp index d9f7933a..16bf76bc 100644 --- a/korganizer/korganizer.cpp +++ b/korganizer/korganizer.cpp @@ -128,8 +128,8 @@ void KOrganizer::init( bool document ) } mActionManager->init(); - connect( mActionManager, TQT_SIGNAL( actionNew( const KURL & ) ), - TQT_SLOT( newMainWindow( const KURL & ) ) ); + connect( mActionManager, TQ_SIGNAL( actionNew( const KURL & ) ), + TQ_SLOT( newMainWindow( const KURL & ) ) ); mActionManager->loadParts(); @@ -139,7 +139,7 @@ void KOrganizer::init( bool document ) KStatusBar *bar = statusBar(); bar->insertItem( "", ID_GENERAL, 10 ); - connect( bar, TQT_SIGNAL( pressed( int ) ), TQT_SLOT( statusBarPressed( int ) ) ); + connect( bar, TQ_SIGNAL( pressed( int ) ), TQ_SLOT( statusBarPressed( int ) ) ); KPIM::ProgressDialog *progressDialog = new KPIM::ProgressDialog( bar, this ); progressDialog->hide(); @@ -150,8 +150,8 @@ void KOrganizer::init( bool document ) bar->addWidget( progressWidget, 0, true ); - connect( mActionManager->view(), TQT_SIGNAL( statusMessage( const TQString & ) ), - TQT_SLOT( showStatusMessage( const TQString & ) ) ); + connect( mActionManager->view(), TQ_SIGNAL( statusMessage( const TQString & ) ), + TQ_SLOT( showStatusMessage( const TQString & ) ) ); setStandardToolBarMenuEnabled( true ); setTitle(); @@ -208,9 +208,9 @@ void KOrganizer::initActions() setStandardToolBarMenuEnabled( true ); createStandardStatusBarAction(); - KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection()); - KStdAction::configureToolbars(this, TQT_SLOT(configureToolbars() ), actionCollection()); - KStdAction::quit( this, TQT_SLOT( close() ), actionCollection() ); + KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(configureToolbars() ), actionCollection()); + KStdAction::quit( this, TQ_SLOT( close() ), actionCollection() ); setAutoSaveSettings(); createGUI( 0 ); diff --git a/korganizer/korganizer_part.cpp b/korganizer/korganizer_part.cpp index b318dc98..ab1b3c12 100644 --- a/korganizer/korganizer_part.cpp +++ b/korganizer/korganizer_part.cpp @@ -109,10 +109,10 @@ KOrganizerPart::KOrganizerPart( TQWidget *parentWidget, const char *widgetName, KParts::InfoExtension *ie = new KParts::InfoExtension( this, "KOrganizerInfo" ); - connect( mView, TQT_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ), - TQT_SLOT( slotChangeInfo( Incidence *,const TQDate & ) ) ); - connect( this, TQT_SIGNAL( textChanged( const TQString & ) ), - ie, TQT_SIGNAL( textChanged( const TQString & ) ) ); + connect( mView, TQ_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ), + TQ_SLOT( slotChangeInfo( Incidence *,const TQDate & ) ) ); + connect( this, TQ_SIGNAL( textChanged( const TQString & ) ), + ie, TQ_SIGNAL( textChanged( const TQString & ) ) ); mActionManager->init(); mActionManager->readSettings(); diff --git a/korganizer/kotimelineview.cpp b/korganizer/kotimelineview.cpp index a93c6d68..fc2bf0cf 100644 --- a/korganizer/kotimelineview.cpp +++ b/korganizer/kotimelineview.cpp @@ -62,18 +62,18 @@ KOTimelineView::KOTimelineView(Calendar *calendar, TQWidget *parent, vbox->addWidget( mGantt ); - connect( mGantt, TQT_SIGNAL(gvCurrentChanged(KDGanttViewItem*)), - TQT_SLOT(itemSelected(KDGanttViewItem*)) ); - connect( mGantt, TQT_SIGNAL(itemDoubleClicked(KDGanttViewItem*)), - TQT_SLOT(itemDoubleClicked(KDGanttViewItem*)) ); - connect( mGantt, TQT_SIGNAL(itemRightClicked(KDGanttViewItem*)), - TQT_SLOT(itemRightClicked(KDGanttViewItem*)) ); - connect( mGantt, TQT_SIGNAL(gvItemMoved(KDGanttViewItem*)), - TQT_SLOT(itemMoved(KDGanttViewItem*)) ); - connect( mGantt, TQT_SIGNAL(rescaling(KDGanttView::Scale)), - TQT_SLOT(overscale(KDGanttView::Scale)) ); - connect( mGantt, TQT_SIGNAL( dateTimeDoubleClicked( const TQDateTime& ) ), - TQT_SLOT( newEventWithHint( const TQDateTime& ) ) ); + connect( mGantt, TQ_SIGNAL(gvCurrentChanged(KDGanttViewItem*)), + TQ_SLOT(itemSelected(KDGanttViewItem*)) ); + connect( mGantt, TQ_SIGNAL(itemDoubleClicked(KDGanttViewItem*)), + TQ_SLOT(itemDoubleClicked(KDGanttViewItem*)) ); + connect( mGantt, TQ_SIGNAL(itemRightClicked(KDGanttViewItem*)), + TQ_SLOT(itemRightClicked(KDGanttViewItem*)) ); + connect( mGantt, TQ_SIGNAL(gvItemMoved(KDGanttViewItem*)), + TQ_SLOT(itemMoved(KDGanttViewItem*)) ); + connect( mGantt, TQ_SIGNAL(rescaling(KDGanttView::Scale)), + TQ_SLOT(overscale(KDGanttView::Scale)) ); + connect( mGantt, TQ_SIGNAL( dateTimeDoubleClicked( const TQDateTime& ) ), + TQ_SLOT( newEventWithHint( const TQDateTime& ) ) ); } KOTimelineView::~KOTimelineView() diff --git a/korganizer/kotodoeditor.cpp b/korganizer/kotodoeditor.cpp index a17e0d99..3a41d1ff 100644 --- a/korganizer/kotodoeditor.cpp +++ b/korganizer/kotodoeditor.cpp @@ -68,21 +68,21 @@ void KOTodoEditor::init() setupRecurrence(); setupAttendeesTab(); - connect( mGeneral, TQT_SIGNAL( dateTimeStrChanged( const TQString & ) ), - mRecurrence, TQT_SLOT( setDateTimeStr( const TQString & ) ) ); - connect( mGeneral, TQT_SIGNAL( signalDateTimeChanged( const TQDateTime &, const TQDateTime & ) ), - mRecurrence, TQT_SLOT( setDateTimes( const TQDateTime &, const TQDateTime & ) ) ); + connect( mGeneral, TQ_SIGNAL( dateTimeStrChanged( const TQString & ) ), + mRecurrence, TQ_SLOT( setDateTimeStr( const TQString & ) ) ); + connect( mGeneral, TQ_SIGNAL( signalDateTimeChanged( const TQDateTime &, const TQDateTime & ) ), + mRecurrence, TQ_SLOT( setDateTimes( const TQDateTime &, const TQDateTime & ) ) ); - connect( mGeneral, TQT_SIGNAL( openCategoryDialog() ), - TQT_SIGNAL( editCategories() ) ); + connect( mGeneral, TQ_SIGNAL( openCategoryDialog() ), + TQ_SIGNAL( editCategories() ) ); - connect( mDetails, TQT_SIGNAL(updateAttendeeSummary(int)), - mGeneral, TQT_SLOT(updateAttendeeSummary(int)) ); + connect( mDetails, TQ_SIGNAL(updateAttendeeSummary(int)), + mGeneral, TQ_SLOT(updateAttendeeSummary(int)) ); - connect( mGeneral, TQT_SIGNAL(editRecurrence()), - mRecurrenceDialog, TQT_SLOT(show()) ); - connect( mRecurrenceDialog, TQT_SIGNAL(okClicked()), - TQT_SLOT(updateRecurrenceSummary()) ); + connect( mGeneral, TQ_SIGNAL(editRecurrence()), + mRecurrenceDialog, TQ_SLOT(show()) ); + connect( mRecurrenceDialog, TQ_SIGNAL(okClicked()), + TQ_SLOT(updateRecurrenceSummary()) ); } void KOTodoEditor::reload() @@ -131,10 +131,10 @@ void KOTodoEditor::setupGeneral() mGeneral->iniStatus(topFrame,topLayout); mGeneral->initDescription(topFrame,topLayout); mGeneral->initAttachments(topFrame,topLayout); - connect( mGeneral, TQT_SIGNAL( openURL( const KURL& ) ), - this, TQT_SLOT( openURL( const KURL& ) ) ); - connect( this, TQT_SIGNAL( signalAddAttachments( const TQStringList&, const TQStringList&, bool ) ), - mGeneral, TQT_SLOT( addAttachments( const TQStringList&, const TQStringList&, bool ) ) ); + connect( mGeneral, TQ_SIGNAL( openURL( const KURL& ) ), + this, TQ_SLOT( openURL( const KURL& ) ) ); + connect( this, TQ_SIGNAL( signalAddAttachments( const TQStringList&, const TQStringList&, bool ) ), + mGeneral, TQ_SLOT( addAttachments( const TQStringList&, const TQStringList&, bool ) ) ); } mGeneral->finishSetup(); } diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp index b919602e..bbbb71db 100644 --- a/korganizer/kotodoview.cpp +++ b/korganizer/kotodoview.cpp @@ -424,16 +424,16 @@ KOTodoView::KOTodoView( Calendar *calendar, TQWidget *parent, const char* name) mPriority[ mPriorityPopupMenu->insertItem( i18n( "7" ) ) ] = 7; mPriority[ mPriorityPopupMenu->insertItem( i18n( "8" ) ) ] = 8; mPriority[ mPriorityPopupMenu->insertItem( i18n( "9 (lowest)" ) ) ] = 9; - connect( mPriorityPopupMenu, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( setNewPriority( int ) )); + connect( mPriorityPopupMenu, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( setNewPriority( int ) )); mPercentageCompletedPopupMenu = new TQPopupMenu(this); for (int i = 0; i <= 100; i+=10) { TQString label = TQString ("%1 %").arg (i); mPercentage[mPercentageCompletedPopupMenu->insertItem (label)] = i; } - connect( mPercentageCompletedPopupMenu, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( setNewPercentage( int ) ) ); + connect( mPercentageCompletedPopupMenu, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( setNewPercentage( int ) ) ); mMovePopupMenu = new KDatePickerPopup( KDatePickerPopup::NoDate | @@ -445,76 +445,76 @@ KOTodoView::KOTodoView( Calendar *calendar, TQWidget *parent, const char* name) KDatePickerPopup::Words ); - connect( mMovePopupMenu, TQT_SIGNAL( dateChanged( TQDate )), - TQT_SLOT( setNewDate( TQDate ) ) ); - connect( mCopyPopupMenu, TQT_SIGNAL( dateChanged( TQDate )), - TQT_SLOT( copyTodoToDate( TQDate ) ) ); + connect( mMovePopupMenu, TQ_SIGNAL( dateChanged( TQDate )), + TQ_SLOT( setNewDate( TQDate ) ) ); + connect( mCopyPopupMenu, TQ_SIGNAL( dateChanged( TQDate )), + TQ_SLOT( copyTodoToDate( TQDate ) ) ); mItemPopupMenu = new TQPopupMenu(this); mItemPopupMenu->insertItem(i18n("&Show"), this, - TQT_SLOT (showTodo())); + TQ_SLOT (showTodo())); mItemPopupMenu->insertItem(i18n("&Edit..."), this, - TQT_SLOT (editTodo()), 0, ePopupEdit ); + TQ_SLOT (editTodo()), 0, ePopupEdit ); #ifndef KORG_NOPRINTER - mItemPopupMenu->insertItem(KOGlobals::self()->smallIcon("printer"), i18n("&Print..."), this, TQT_SLOT( printTodo() ) ); + mItemPopupMenu->insertItem(KOGlobals::self()->smallIcon("printer"), i18n("&Print..."), this, TQ_SLOT( printTodo() ) ); #endif mItemPopupMenu->insertItem(KOGlobals::self()->smallIconSet("edit-delete"), i18n("&Delete"), this, - TQT_SLOT (deleteTodo()), 0, ePopupDelete ); + TQ_SLOT (deleteTodo()), 0, ePopupDelete ); mItemPopupMenu->insertSeparator(); mItemPopupMenu->insertItem(KOGlobals::self()->smallIconSet("todo"), i18n("New &To-do..."), this, - TQT_SLOT (newTodo()) ); + TQ_SLOT (newTodo()) ); mItemPopupMenu->insertItem(i18n("New Su&b-to-do..."), this, - TQT_SLOT (newSubTodo())); + TQ_SLOT (newSubTodo())); mItemPopupMenu->insertItem( i18n("&Make this To-do Independent"), this, - TQT_SIGNAL( unSubTodoSignal() ), 0, ePopupUnSubTodo ); + TQ_SIGNAL( unSubTodoSignal() ), 0, ePopupUnSubTodo ); mItemPopupMenu->insertItem( i18n("Make all Sub-to-dos &Independent"), this, - TQT_SIGNAL( unAllSubTodoSignal() ), 0, ePopupUnAllSubTodo ); + TQ_SIGNAL( unAllSubTodoSignal() ), 0, ePopupUnAllSubTodo ); mItemPopupMenu->insertSeparator(); mItemPopupMenu->insertItem( i18n("&Copy To"), mCopyPopupMenu, ePopupCopyTo ); mItemPopupMenu->insertItem(i18n("&Move To"), mMovePopupMenu, ePopupMoveTo ); mItemPopupMenu->insertSeparator(); mItemPopupMenu->insertItem(i18n("delete completed to-dos","Pur&ge Completed"), - this, TQT_SLOT( purgeCompleted() ) ); + this, TQ_SLOT( purgeCompleted() ) ); - connect( mMovePopupMenu, TQT_SIGNAL( dateChanged( TQDate ) ), - mItemPopupMenu, TQT_SLOT( hide() ) ); - connect( mCopyPopupMenu, TQT_SIGNAL( dateChanged( TQDate ) ), - mItemPopupMenu, TQT_SLOT( hide() ) ); + connect( mMovePopupMenu, TQ_SIGNAL( dateChanged( TQDate ) ), + mItemPopupMenu, TQ_SLOT( hide() ) ); + connect( mCopyPopupMenu, TQ_SIGNAL( dateChanged( TQDate ) ), + mItemPopupMenu, TQ_SLOT( hide() ) ); mPopupMenu = new TQPopupMenu(this); mPopupMenu->insertItem(KOGlobals::self()->smallIconSet("todo"), i18n("&New To-do..."), this, - TQT_SLOT(newTodo()) ); + TQ_SLOT(newTodo()) ); mPopupMenu->insertItem(i18n("delete completed to-dos","&Purge Completed"), - this, TQT_SLOT(purgeCompleted())); + this, TQ_SLOT(purgeCompleted())); mDocPrefs = new DocPrefs( name ); // Double clicking conflicts with opening/closing the subtree - connect( mTodoListView, TQT_SIGNAL( doubleClicked( TQListViewItem *, + connect( mTodoListView, TQ_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int ) ), - TQT_SLOT( editItem( TQListViewItem *, const TQPoint &, int ) ) ); - connect( mTodoListView, TQT_SIGNAL( returnPressed( TQListViewItem * ) ), - TQT_SLOT( editItem( TQListViewItem * ) ) ); - connect( mTodoListView, TQT_SIGNAL( contextMenuRequested( TQListViewItem *, + TQ_SLOT( editItem( TQListViewItem *, const TQPoint &, int ) ) ); + connect( mTodoListView, TQ_SIGNAL( returnPressed( TQListViewItem * ) ), + TQ_SLOT( editItem( TQListViewItem * ) ) ); + connect( mTodoListView, TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), - TQT_SLOT( popupMenu( TQListViewItem *, const TQPoint &, int ) ) ); - connect( mTodoListView, TQT_SIGNAL( expanded( TQListViewItem * ) ), - TQT_SLOT( itemStateChanged( TQListViewItem * ) ) ); - connect( mTodoListView, TQT_SIGNAL( collapsed( TQListViewItem * ) ), - TQT_SLOT( itemStateChanged( TQListViewItem * ) ) ); + TQ_SLOT( popupMenu( TQListViewItem *, const TQPoint &, int ) ) ); + connect( mTodoListView, TQ_SIGNAL( expanded( TQListViewItem * ) ), + TQ_SLOT( itemStateChanged( TQListViewItem * ) ) ); + connect( mTodoListView, TQ_SIGNAL( collapsed( TQListViewItem * ) ), + TQ_SLOT( itemStateChanged( TQListViewItem * ) ) ); #if 0 - connect(mTodoListView,TQT_SIGNAL(selectionChanged(TQListViewItem *)), - TQT_SLOT(selectionChanged(TQListViewItem *))); - connect(mTodoListView,TQT_SIGNAL(clicked(TQListViewItem *)), - TQT_SLOT(selectionChanged(TQListViewItem *))); - connect(mTodoListView,TQT_SIGNAL(pressed(TQListViewItem *)), - TQT_SLOT(selectionChanged(TQListViewItem *))); + connect(mTodoListView,TQ_SIGNAL(selectionChanged(TQListViewItem *)), + TQ_SLOT(selectionChanged(TQListViewItem *))); + connect(mTodoListView,TQ_SIGNAL(clicked(TQListViewItem *)), + TQ_SLOT(selectionChanged(TQListViewItem *))); + connect(mTodoListView,TQ_SIGNAL(pressed(TQListViewItem *)), + TQ_SLOT(selectionChanged(TQListViewItem *))); #endif - connect( mTodoListView, TQT_SIGNAL(selectionChanged() ), - TQT_SLOT( processSelectionChange() ) ); - connect( mQuickAdd, TQT_SIGNAL( returnPressed () ), - TQT_SLOT( addQuickTodo() ) ); + connect( mTodoListView, TQ_SIGNAL(selectionChanged() ), + TQ_SLOT( processSelectionChange() ) ); + connect( mQuickAdd, TQ_SIGNAL( returnPressed () ), + TQ_SLOT( addQuickTodo() ) ); new KOTodoListViewToolTip( mTodoListView->viewport(), calendar, mTodoListView ); } @@ -648,7 +648,7 @@ bool KOTodoView::scheduleRemoveTodoItem( KOTodoViewItem *todoItem ) { if ( todoItem ) { mItemsToDelete.append( todoItem ); - TQTimer::singleShot( 0, this, TQT_SLOT( removeTodoItems() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( removeTodoItems() ) ); return true; } else return false; @@ -731,13 +731,13 @@ void KOTodoView::changeIncidenceDisplay(Incidence *incidence, int action) } break; default: - TQTimer::singleShot( 0, this, TQT_SLOT( updateView() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( updateView() ) ); } } else { // use a TQTimer here, because when marking todos finished using // the checkbox, this slot gets called, but we cannot update the views // because we're still inside KOTodoViewItem::stateChange - TQTimer::singleShot(0,this,TQT_SLOT(updateView())); + TQTimer::singleShot(0,this,TQ_SLOT(updateView())); } } @@ -857,7 +857,7 @@ void KOTodoView::printTodo() #ifndef KORG_NOPRINTER KOCoreHelper helper; CalPrinter printer( this, BaseView::calendar(), &helper ); - connect( this, TQT_SIGNAL(configChanged()), &printer, TQT_SLOT(updateConfig()) ); + connect( this, TQ_SIGNAL(configChanged()), &printer, TQ_SLOT(updateConfig()) ); Incidence::List selectedIncidences; selectedIncidences.append( mActiveItem->todo() ); @@ -1015,8 +1015,8 @@ TQPopupMenu *KOTodoView::getCategoryPopupMenu( KOTodoViewItem *todoItem ) tempMenu->setItemChecked( index, true ); } - connect ( tempMenu, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( changedCategories( int ) ) ); + connect ( tempMenu, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( changedCategories( int ) ) ); return tempMenu; } @@ -1067,7 +1067,7 @@ void KOTodoView::setNewPercentageDelayed( KOTodoViewItem *item, int percentage ) { mPercentChangedMap.append( qMakePair( item, percentage ) ); - TQTimer::singleShot( 0, this, TQT_SLOT( processDelayedNewPercentage() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( processDelayedNewPercentage() ) ); } void KOTodoView::processDelayedNewPercentage() diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index 2ee92b12..b983d953 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp @@ -225,60 +225,60 @@ void KOViewManager::connectView(KOrg::BaseView *view) if (!view) return; // selecting an incidence - connect( view, TQT_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ), - mMainView, TQT_SLOT( processMainViewSelection( Incidence *,const TQDate & ) ) ); + connect( view, TQ_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ), + mMainView, TQ_SLOT( processMainViewSelection( Incidence *,const TQDate & ) ) ); // showing/editing/deleting an incidence. The calendar view takes care of the action. - connect( view, TQT_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)), - mMainView, TQT_SLOT(showIncidence(Incidence *,const TQDate &)) ); - connect( view, TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)), - mMainView, TQT_SLOT(editIncidence(Incidence *,const TQDate &)) ); - connect( view, TQT_SIGNAL(deleteIncidenceSignal(Incidence *)), - mMainView, TQT_SLOT(deleteIncidence(Incidence *)) ); - connect( view, TQT_SIGNAL(copyIncidenceSignal(Incidence *)), - mMainView, TQT_SLOT(copyIncidence(Incidence *)) ); - connect( view, TQT_SIGNAL(cutIncidenceSignal(Incidence *)), - mMainView, TQT_SLOT(cutIncidence(Incidence *)) ); - connect( view, TQT_SIGNAL(pasteIncidenceSignal()), - mMainView, TQT_SLOT(pasteIncidence())); - connect( view, TQT_SIGNAL(toggleAlarmSignal(Incidence *)), - mMainView, TQT_SLOT(toggleAlarm(Incidence *)) ); - connect( view,TQT_SIGNAL(dissociateOccurrenceSignal(Incidence *,const TQDate &)), - mMainView, TQT_SLOT(dissociateOccurrence(Incidence *,const TQDate &)) ); - connect( view,TQT_SIGNAL(dissociateFutureOccurrenceSignal(Incidence *,const TQDate &)), - mMainView, TQT_SLOT(dissociateFutureOccurrence(Incidence *,const TQDate &)) ); + connect( view, TQ_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)), + mMainView, TQ_SLOT(showIncidence(Incidence *,const TQDate &)) ); + connect( view, TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)), + mMainView, TQ_SLOT(editIncidence(Incidence *,const TQDate &)) ); + connect( view, TQ_SIGNAL(deleteIncidenceSignal(Incidence *)), + mMainView, TQ_SLOT(deleteIncidence(Incidence *)) ); + connect( view, TQ_SIGNAL(copyIncidenceSignal(Incidence *)), + mMainView, TQ_SLOT(copyIncidence(Incidence *)) ); + connect( view, TQ_SIGNAL(cutIncidenceSignal(Incidence *)), + mMainView, TQ_SLOT(cutIncidence(Incidence *)) ); + connect( view, TQ_SIGNAL(pasteIncidenceSignal()), + mMainView, TQ_SLOT(pasteIncidence())); + connect( view, TQ_SIGNAL(toggleAlarmSignal(Incidence *)), + mMainView, TQ_SLOT(toggleAlarm(Incidence *)) ); + connect( view,TQ_SIGNAL(dissociateOccurrenceSignal(Incidence *,const TQDate &)), + mMainView, TQ_SLOT(dissociateOccurrence(Incidence *,const TQDate &)) ); + connect( view,TQ_SIGNAL(dissociateFutureOccurrenceSignal(Incidence *,const TQDate &)), + mMainView, TQ_SLOT(dissociateFutureOccurrence(Incidence *,const TQDate &)) ); // signals to create new incidences - connect( view, TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &)), - mMainView, TQT_SLOT(newEvent(ResourceCalendar *,const TQString &)) ); - connect( view, TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDate &)), - mMainView, TQT_SLOT(newEvent(ResourceCalendar *,const TQString &,const TQDate &)) ); - connect( view, TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &)), - mMainView, TQT_SLOT(newEvent(ResourceCalendar *,const TQString &,const TQDateTime &)) ); - connect( view, TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &,const TQDateTime &)), - mMainView, TQT_SLOT(newEvent(ResourceCalendar *,const TQString &,const TQDateTime &,const TQDateTime &)) ); - - connect( view, TQT_SIGNAL(newTodoSignal(ResourceCalendar *,const TQString &,const TQDate &)), - mMainView, TQT_SLOT(newTodo(ResourceCalendar *,const TQString &,const TQDate &)) ); - connect( view, TQT_SIGNAL(newSubTodoSignal(Todo *)), - mMainView, TQT_SLOT(newSubTodo(Todo *)) ); - - connect( view, TQT_SIGNAL(newJournalSignal(ResourceCalendar *,const TQString &,const TQDate &)), - mMainView, TQT_SLOT(newJournal(ResourceCalendar *,const TQString &,const TQDate &)) ); + connect( view, TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &)), + mMainView, TQ_SLOT(newEvent(ResourceCalendar *,const TQString &)) ); + connect( view, TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDate &)), + mMainView, TQ_SLOT(newEvent(ResourceCalendar *,const TQString &,const TQDate &)) ); + connect( view, TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &)), + mMainView, TQ_SLOT(newEvent(ResourceCalendar *,const TQString &,const TQDateTime &)) ); + connect( view, TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &,const TQDateTime &)), + mMainView, TQ_SLOT(newEvent(ResourceCalendar *,const TQString &,const TQDateTime &,const TQDateTime &)) ); + + connect( view, TQ_SIGNAL(newTodoSignal(ResourceCalendar *,const TQString &,const TQDate &)), + mMainView, TQ_SLOT(newTodo(ResourceCalendar *,const TQString &,const TQDate &)) ); + connect( view, TQ_SIGNAL(newSubTodoSignal(Todo *)), + mMainView, TQ_SLOT(newSubTodo(Todo *)) ); + + connect( view, TQ_SIGNAL(newJournalSignal(ResourceCalendar *,const TQString &,const TQDate &)), + mMainView, TQ_SLOT(newJournal(ResourceCalendar *,const TQString &,const TQDate &)) ); // reload settings - connect(mMainView, TQT_SIGNAL(configChanged()), view, TQT_SLOT(updateConfig())); + connect(mMainView, TQ_SIGNAL(configChanged()), view, TQ_SLOT(updateConfig())); // Notifications about added, changed and deleted incidences - connect( mMainView, TQT_SIGNAL( dayPassed( const TQDate & ) ), - view, TQT_SLOT( dayPassed( const TQDate & ) ) ); - connect( view, TQT_SIGNAL( startMultiModify( const TQString & ) ), - mMainView, TQT_SLOT( startMultiModify( const TQString & ) ) ); - connect( view, TQT_SIGNAL( endMultiModify() ), - mMainView, TQT_SLOT( endMultiModify() ) ); - - connect( mMainView, TQT_SIGNAL( newIncidenceChanger( IncidenceChangerBase* ) ), - view, TQT_SLOT( setIncidenceChanger( IncidenceChangerBase * ) ) ); + connect( mMainView, TQ_SIGNAL( dayPassed( const TQDate & ) ), + view, TQ_SLOT( dayPassed( const TQDate & ) ) ); + connect( view, TQ_SIGNAL( startMultiModify( const TQString & ) ), + mMainView, TQ_SLOT( startMultiModify( const TQString & ) ) ); + connect( view, TQ_SIGNAL( endMultiModify() ), + mMainView, TQ_SLOT( endMultiModify() ) ); + + connect( mMainView, TQ_SIGNAL( newIncidenceChanger( IncidenceChangerBase* ) ), + view, TQ_SLOT( setIncidenceChanger( IncidenceChangerBase * ) ) ); view->setIncidenceChanger( mMainView->incidenceChanger() ); } @@ -287,12 +287,12 @@ void KOViewManager::connectTodoView( KOTodoView* todoView ) if (!todoView) return; // SIGNALS/SLOTS FOR TODO VIEW - connect( todoView, TQT_SIGNAL( purgeCompletedSignal() ), - mMainView, TQT_SLOT( purgeCompleted() ) ); - connect( todoView, TQT_SIGNAL( unSubTodoSignal() ), - mMainView, TQT_SLOT( todo_unsub() ) ); - connect( todoView, TQT_SIGNAL( unAllSubTodoSignal() ), - mMainView, TQT_SLOT( makeSubTodosIndependent() ) ); + connect( todoView, TQ_SIGNAL( purgeCompletedSignal() ), + mMainView, TQ_SLOT( purgeCompleted() ) ); + connect( todoView, TQ_SIGNAL( unSubTodoSignal() ), + mMainView, TQ_SLOT( todo_unsub() ) ); + connect( todoView, TQ_SIGNAL( unAllSubTodoSignal() ), + mMainView, TQ_SLOT( makeSubTodosIndependent() ) ); } void KOViewManager::zoomInHorizontally() @@ -357,8 +357,8 @@ void KOViewManager::showAgendaView() TQWidget *parent = mMainView->viewStack(); if ( !mAgendaViewTabs && showBoth ) { mAgendaViewTabs = new TQTabWidget( mMainView->viewStack() ); - connect( mAgendaViewTabs, TQT_SIGNAL( currentChanged( TQWidget* ) ), - this, TQT_SLOT( currentAgendaViewTabChanged( TQWidget* ) ) ); + connect( mAgendaViewTabs, TQ_SIGNAL( currentChanged( TQWidget* ) ), + this, TQ_SLOT( currentAgendaViewTabChanged( TQWidget* ) ) ); parent = mAgendaViewTabs; TDEConfig *config = KOGlobals::self()->config(); @@ -374,13 +374,13 @@ void KOViewManager::showAgendaView() addView(mAgendaView); - connect(mAgendaView, TQT_SIGNAL( toggleExpand() ), - mMainView, TQT_SLOT( toggleExpand() ) ); - connect(mMainView, TQT_SIGNAL( calendarViewExpanded( bool ) ), - mAgendaView, TQT_SLOT( setExpandedButton( bool ) ) ); + connect(mAgendaView, TQ_SIGNAL( toggleExpand() ), + mMainView, TQ_SLOT( toggleExpand() ) ); + connect(mMainView, TQ_SIGNAL( calendarViewExpanded( bool ) ), + mAgendaView, TQ_SLOT( setExpandedButton( bool ) ) ); - connect( mAgendaView,TQT_SIGNAL( zoomViewHorizontally(const TQDate &, int )), - mMainView->dateNavigator(),TQT_SLOT( selectDates( const TQDate &, int ) ) ); + connect( mAgendaView,TQ_SIGNAL( zoomViewHorizontally(const TQDate &, int )), + mMainView->dateNavigator(),TQ_SLOT( selectDates( const TQDate &, int ) ) ); mAgendaView->readSettings(); } @@ -391,13 +391,13 @@ void KOViewManager::showAgendaView() addView(mAgendaSideBySideView); -/* connect(mAgendaSideBySideView, TQT_SIGNAL( toggleExpand() ), - mMainView, TQT_SLOT( toggleExpand() ) ); - connect(mMainView, TQT_SIGNAL( calendarViewExpanded( bool ) ), - mAgendaSideBySideView, TQT_SLOT( setExpandedButton( bool ) ) ); +/* connect(mAgendaSideBySideView, TQ_SIGNAL( toggleExpand() ), + mMainView, TQ_SLOT( toggleExpand() ) ); + connect(mMainView, TQ_SIGNAL( calendarViewExpanded( bool ) ), + mAgendaSideBySideView, TQ_SLOT( setExpandedButton( bool ) ) ); - connect( mAgendaSideBySideView,TQT_SIGNAL( zoomViewHorizontally(const TQDate &, int )), - mMainView->dateNavigator(),TQT_SLOT( selectDates( const TQDate &, int ) ) );*/ + connect( mAgendaSideBySideView,TQ_SIGNAL( zoomViewHorizontally(const TQDate &, int )), + mMainView->dateNavigator(),TQ_SLOT( selectDates( const TQDate &, int ) ) );*/ } if ( showBoth && mAgendaViewTabs ) { diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp index 7b8ab992..7c8ce447 100644 --- a/korganizer/kowhatsnextview.cpp +++ b/korganizer/kowhatsnextview.cpp @@ -70,7 +70,7 @@ KOWhatsNextView::KOWhatsNextView(Calendar *calendar, TQWidget *parent, // dateLabel->setAlignment(AlignCenter); mView = new WhatsNextTextBrowser(this); - connect(mView,TQT_SIGNAL(showIncidence(const TQString &)),TQT_SLOT(showIncidence(const TQString &))); + connect(mView,TQ_SIGNAL(showIncidence(const TQString &)),TQ_SLOT(showIncidence(const TQString &))); TQBoxLayout *topLayout = new TQVBoxLayout(this); // topLayout->addWidget(dateLabel); diff --git a/korganizer/multiagendaview.cpp b/korganizer/multiagendaview.cpp index cc21b249..e900fa48 100644 --- a/korganizer/multiagendaview.cpp +++ b/korganizer/multiagendaview.cpp @@ -142,13 +142,13 @@ void MultiAgendaView::recreateViews() } setupViews(); - TQTimer::singleShot( 0, this, TQT_SLOT(slotResizeScrollView()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotResizeScrollView()) ); mTimeLabels->updateConfig(); - connect( mTimeLabels->verticalScrollBar(), TQT_SIGNAL(valueChanged(int)), - mScrollBar, TQT_SLOT(setValue(int)) ); - connect( mScrollBar, TQT_SIGNAL(valueChanged(int)), - mTimeLabels, TQT_SLOT(positionChanged(int)) ); + connect( mTimeLabels->verticalScrollBar(), TQ_SIGNAL(valueChanged(int)), + mScrollBar, TQ_SLOT(setValue(int)) ); + connect( mScrollBar, TQ_SIGNAL(valueChanged(int)), + mTimeLabels, TQ_SLOT(positionChanged(int)) ); installSplitterEventFilter( mLeftSplitter ); installSplitterEventFilter( mRightSplitter ); @@ -163,7 +163,7 @@ void MultiAgendaView::recreateViews() mLeftSplitter->setSizes( sizes ); mRightSplitter->setSizes( sizes ); - TQTimer::singleShot( 0, this, TQT_SLOT(setupScrollBar()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(setupScrollBar()) ); mTimeLabels->positionChanged(); } @@ -185,79 +185,79 @@ void MultiAgendaView::setupViews() FOREACH_VIEW( agenda ) { if ( !agenda->readOnly() ) { connect( agenda, - TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &)), - TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &)) ); + TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &)), + TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &)) ); connect( agenda, - TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDate &)), - TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDate &)) ); + TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDate &)), + TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDate &)) ); connect( agenda, - TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &)), - TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &)) ); + TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &)), + TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &)) ); connect( agenda, - TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &,const TQDateTime &)), - TQT_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &,const TQDateTime&)) ); + TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &,const TQDateTime &)), + TQ_SIGNAL(newEventSignal(ResourceCalendar *,const TQString &,const TQDateTime &,const TQDateTime&)) ); connect( agenda, - TQT_SIGNAL(newTodoSignal(ResourceCalendar *,const TQString &,const TQDate &)), - TQT_SIGNAL(newTodoSignal(ResourceCalendar *,const TQString &,const TQDate &)) ); + TQ_SIGNAL(newTodoSignal(ResourceCalendar *,const TQString &,const TQDate &)), + TQ_SIGNAL(newTodoSignal(ResourceCalendar *,const TQString &,const TQDate &)) ); connect( agenda, - TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)), - TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)) ); + TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)), + TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)) ); connect( agenda, - TQT_SIGNAL(deleteIncidenceSignal(Incidence *)), - TQT_SIGNAL(deleteIncidenceSignal(Incidence *)) ); + TQ_SIGNAL(deleteIncidenceSignal(Incidence *)), + TQ_SIGNAL(deleteIncidenceSignal(Incidence *)) ); connect( agenda, - TQT_SIGNAL(startMultiModify(const TQString &)), - TQT_SIGNAL(startMultiModify(const TQString &)) ); + TQ_SIGNAL(startMultiModify(const TQString &)), + TQ_SIGNAL(startMultiModify(const TQString &)) ); connect( agenda, - TQT_SIGNAL(endMultiModify()), - TQT_SIGNAL(endMultiModify()) ); + TQ_SIGNAL(endMultiModify()), + TQ_SIGNAL(endMultiModify()) ); connect( agenda, - TQT_SIGNAL(cutIncidenceSignal(Incidence*)), - TQT_SIGNAL(cutIncidenceSignal(Incidence*)) ); + TQ_SIGNAL(cutIncidenceSignal(Incidence*)), + TQ_SIGNAL(cutIncidenceSignal(Incidence*)) ); connect( agenda, - TQT_SIGNAL(pasteIncidenceSignal()), - TQT_SIGNAL(pasteIncidenceSignal()) ); + TQ_SIGNAL(pasteIncidenceSignal()), + TQ_SIGNAL(pasteIncidenceSignal()) ); connect( agenda, - TQT_SIGNAL(toggleAlarmSignal(Incidence*)), - TQT_SIGNAL(toggleAlarmSignal(Incidence*)) ); + TQ_SIGNAL(toggleAlarmSignal(Incidence*)), + TQ_SIGNAL(toggleAlarmSignal(Incidence*)) ); connect( agenda, - TQT_SIGNAL(dissociateOccurrenceSignal(Incidence*, const TQDate&)), - TQT_SIGNAL(dissociateOccurrenceSignal(Incidence*, const TQDate&)) ); + TQ_SIGNAL(dissociateOccurrenceSignal(Incidence*, const TQDate&)), + TQ_SIGNAL(dissociateOccurrenceSignal(Incidence*, const TQDate&)) ); connect( agenda, - TQT_SIGNAL(dissociateFutureOccurrenceSignal(Incidence*, const TQDate&)), - TQT_SIGNAL(dissociateFutureOccurrenceSignal(Incidence*, const TQDate&)) ); + TQ_SIGNAL(dissociateFutureOccurrenceSignal(Incidence*, const TQDate&)), + TQ_SIGNAL(dissociateFutureOccurrenceSignal(Incidence*, const TQDate&)) ); } connect( agenda, - TQT_SIGNAL(copyIncidenceSignal(Incidence*)), - TQT_SIGNAL(copyIncidenceSignal(Incidence*)) ); + TQ_SIGNAL(copyIncidenceSignal(Incidence*)), + TQ_SIGNAL(copyIncidenceSignal(Incidence*)) ); connect( agenda, - TQT_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)), - TQT_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)) ); + TQ_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)), + TQ_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)) ); connect( agenda, - TQT_SIGNAL(incidenceSelected(Incidence *,const TQDate &)), - TQT_SIGNAL(incidenceSelected(Incidence *,const TQDate &)) ); + TQ_SIGNAL(incidenceSelected(Incidence *,const TQDate &)), + TQ_SIGNAL(incidenceSelected(Incidence *,const TQDate &)) ); connect( agenda, - TQT_SIGNAL(incidenceSelected(Incidence*,const TQDate &)), - TQT_SLOT(slotSelectionChanged()) ); + TQ_SIGNAL(incidenceSelected(Incidence*,const TQDate &)), + TQ_SLOT(slotSelectionChanged()) ); connect( agenda, - TQT_SIGNAL(timeSpanSelectionChanged()), - TQT_SLOT(slotClearTimeSpanSelection()) ); + TQ_SIGNAL(timeSpanSelectionChanged()), + TQ_SLOT(slotClearTimeSpanSelection()) ); disconnect( agenda->agenda(), - TQT_SIGNAL(zoomView(const int,const TQPoint&,const TQt::Orientation)), + TQ_SIGNAL(zoomView(const int,const TQPoint&,const TQt::Orientation)), agenda, 0 ); connect( agenda->agenda(), - TQT_SIGNAL(zoomView(const int,const TQPoint&,const TQt::Orientation)), - TQT_SLOT(zoomView(const int,const TQPoint&,const TQt::Orientation)) ); + TQ_SIGNAL(zoomView(const int,const TQPoint&,const TQt::Orientation)), + TQ_SLOT(zoomView(const int,const TQPoint&,const TQt::Orientation)) ); } KOAgenda *anAgenda = mAgendaViews.first()->agenda(); - connect( anAgenda, TQT_SIGNAL(lowerYChanged(int) ), TQT_SLOT(resizeSpacers(int)) ); + connect( anAgenda, TQ_SIGNAL(lowerYChanged(int) ), TQ_SLOT(resizeSpacers(int)) ); FOREACH_VIEW( agenda ) { agenda->readSettings(); @@ -409,10 +409,10 @@ void MultiAgendaView::addView( const TQString &label, ResourceCalendar *res, con box->show(); mTimeLabels->setAgenda( av->agenda() ); - connect( av->agenda()->verticalScrollBar(), TQT_SIGNAL(valueChanged(int)), - mTimeLabels, TQT_SLOT(positionChanged(int)) ); - connect( mTimeLabels->verticalScrollBar(), TQT_SIGNAL(valueChanged(int)), - av, TQT_SLOT(setContentsPos(int)) ); + connect( av->agenda()->verticalScrollBar(), TQ_SIGNAL(valueChanged(int)), + mTimeLabels, TQ_SLOT(positionChanged(int)) ); + connect( mTimeLabels->verticalScrollBar(), TQ_SIGNAL(valueChanged(int)), + av, TQ_SLOT(setContentsPos(int)) ); av->installEventFilter( this ); installSplitterEventFilter( av->splitter() ); @@ -471,7 +471,7 @@ bool MultiAgendaView::eventFilter(TQObject * obj, TQEvent * event) mLastMovedSplitter = mLeftSplitter; else if ( mRightSplitter == obj->parent() ) mLastMovedSplitter = mRightSplitter; - TQTimer::singleShot( 0, this, TQT_SLOT(resizeSplitters()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(resizeSplitters()) ); } } diff --git a/korganizer/navigatorbar.cpp b/korganizer/navigatorbar.cpp index 223cbb98..23581036 100644 --- a/korganizer/navigatorbar.cpp +++ b/korganizer/navigatorbar.cpp @@ -118,12 +118,12 @@ NavigatorBar::NavigatorBar( TQWidget *parent, const char *name ) ctrlLayout->addWidget( mNextMonth ); ctrlLayout->addWidget( mNextYear ); - connect( mPrevYear, TQT_SIGNAL( clicked() ), TQT_SIGNAL( prevYearClicked() ) ); - connect( mPrevMonth, TQT_SIGNAL( clicked() ), TQT_SIGNAL( prevMonthClicked() ) ); - connect( mNextMonth, TQT_SIGNAL( clicked() ), TQT_SIGNAL( nextMonthClicked() ) ); - connect( mNextYear, TQT_SIGNAL( clicked() ), TQT_SIGNAL( nextYearClicked() ) ); - connect( mMonth, TQT_SIGNAL( clicked() ), TQT_SLOT( selectMonthFromMenu() ) ); - connect( mYear, TQT_SIGNAL( clicked() ), TQT_SLOT( selectYearFromMenu() ) ); + connect( mPrevYear, TQ_SIGNAL( clicked() ), TQ_SIGNAL( prevYearClicked() ) ); + connect( mPrevMonth, TQ_SIGNAL( clicked() ), TQ_SIGNAL( prevMonthClicked() ) ); + connect( mNextMonth, TQ_SIGNAL( clicked() ), TQ_SIGNAL( nextMonthClicked() ) ); + connect( mNextYear, TQ_SIGNAL( clicked() ), TQ_SIGNAL( nextYearClicked() ) ); + connect( mMonth, TQ_SIGNAL( clicked() ), TQ_SLOT( selectMonthFromMenu() ) ); + connect( mYear, TQ_SIGNAL( clicked() ), TQ_SLOT( selectYearFromMenu() ) ); } NavigatorBar::~NavigatorBar() diff --git a/korganizer/plugins/exchange/exchange.cpp b/korganizer/plugins/exchange/exchange.cpp index e0bc1ab7..3a55cba9 100644 --- a/korganizer/plugins/exchange/exchange.cpp +++ b/korganizer/plugins/exchange/exchange.cpp @@ -69,29 +69,29 @@ Exchange::Exchange(KOrg::MainWindow *parent, const char *name) : setXMLFile("plugins/exchangeui.rc"); - new TDEAction(i18n("&Download..."), 0, this, TQT_SLOT(download()), + new TDEAction(i18n("&Download..."), 0, this, TQ_SLOT(download()), actionCollection(), "exchange_download"); - TDEAction *action = new TDEAction(i18n("&Upload Event..."), 0, this, TQT_SLOT(upload()), + TDEAction *action = new TDEAction(i18n("&Upload Event..."), 0, this, TQ_SLOT(upload()), actionCollection(), "exchange_upload"); - TQObject::connect(mainWindow()->view(),TQT_SIGNAL(incidenceSelected(Incidence *)), - this, TQT_SLOT(slotIncidenceSelected(Incidence *))); + TQObject::connect(mainWindow()->view(),TQ_SIGNAL(incidenceSelected(Incidence *)), + this, TQ_SLOT(slotIncidenceSelected(Incidence *))); action->setEnabled( false ); - TQObject::connect(this,TQT_SIGNAL(enableIncidenceActions(bool)), - action,TQT_SLOT(setEnabled(bool))); + TQObject::connect(this,TQ_SIGNAL(enableIncidenceActions(bool)), + action,TQ_SLOT(setEnabled(bool))); - action = new TDEAction(i18n("De&lete Event"), 0, this, TQT_SLOT(remove()), + action = new TDEAction(i18n("De&lete Event"), 0, this, TQ_SLOT(remove()), actionCollection(), "exchange_delete"); - TQObject::connect(this,TQT_SIGNAL(enableIncidenceActions(bool)), - action,TQT_SLOT(setEnabled(bool))); + TQObject::connect(this,TQ_SIGNAL(enableIncidenceActions(bool)), + action,TQ_SLOT(setEnabled(bool))); action->setEnabled( false ); - new TDEAction(i18n("&Configure..."), 0, this, TQT_SLOT(configure()), + new TDEAction(i18n("&Configure..."), 0, this, TQ_SLOT(configure()), actionCollection(), "exchange_configure"); - connect( this, TQT_SIGNAL( calendarChanged() ), mainWindow()->view(), TQT_SLOT( updateView() ) ); - connect( this, TQT_SIGNAL( calendarChanged(const TQDate &, const TQDate &)), - mainWindow()->view(), TQT_SLOT(updateView(const TQDate &, const TQDate &)) ); + connect( this, TQ_SIGNAL( calendarChanged() ), mainWindow()->view(), TQ_SLOT( updateView() ) ); + connect( this, TQ_SIGNAL( calendarChanged(const TQDate &, const TQDate &)), + mainWindow()->view(), TQ_SLOT(updateView(const TQDate &, const TQDate &)) ); } Exchange::~Exchange() diff --git a/korganizer/plugins/exchange/exchangeconfig.cpp b/korganizer/plugins/exchange/exchangeconfig.cpp index 106fc867..913482f3 100644 --- a/korganizer/plugins/exchange/exchangeconfig.cpp +++ b/korganizer/plugins/exchange/exchangeconfig.cpp @@ -53,7 +53,7 @@ ExchangeConfig::ExchangeConfig( KPIM::ExchangeAccount* account, TQWidget* parent m_user = new KLineEdit( mAccount->account(), topFrame ); topLayout->addWidget( new TQLabel( i18n( "User:" ), topFrame ), 2, 0 ); topLayout->addWidget( m_user, 2, 1 ); - connect( m_user, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotUserChanged(const TQString&)) ); + connect( m_user, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotUserChanged(const TQString&)) ); m_password = new KLineEdit( mAccount->password(), topFrame ); topLayout->addWidget( new TQLabel( i18n( "Password:" ), topFrame ), 3, 0 ); @@ -62,7 +62,7 @@ ExchangeConfig::ExchangeConfig( KPIM::ExchangeAccount* account, TQWidget* parent m_autoMailbox = new TQCheckBox( i18n( "Determine mailbox automatically" ), topFrame ); topLayout->addMultiCellWidget( m_autoMailbox, 4, 4, 0, 1 ); - connect( m_autoMailbox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleAuto(bool)) ); + connect( m_autoMailbox, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggleAuto(bool)) ); m_mailbox= new KLineEdit( mAccount->mailbox(), topFrame ); topLayout->addWidget( new TQLabel( i18n( "Mailbox URL:" ), topFrame ), 5, 0 ); @@ -70,7 +70,7 @@ ExchangeConfig::ExchangeConfig( KPIM::ExchangeAccount* account, TQWidget* parent m_tryFindMailbox = new TQPushButton( "&Find", topFrame ); topLayout->addWidget( m_tryFindMailbox, 5, 2 ); - connect( m_tryFindMailbox, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFindClicked()) ); + connect( m_tryFindMailbox, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFindClicked()) ); kapp->config()->setGroup( "Calendar/Exchange Plugin" ); bool autoChecked = kapp->config()->readBoolEntry( "auto-mailbox", true ); diff --git a/korganizer/plugins/projectview/koprojectview.cpp b/korganizer/plugins/projectview/koprojectview.cpp index 033b6ba6..8b0e5cbf 100644 --- a/korganizer/plugins/projectview/koprojectview.cpp +++ b/korganizer/plugins/projectview/koprojectview.cpp @@ -79,15 +79,15 @@ KOProjectView::KOProjectView(Calendar *calendar,TQWidget* parent, TQPushButton *zoomIn = new TQPushButton(i18n("Zoom In"),this); topBar->addWidget(zoomIn,0); - connect(zoomIn,TQT_SIGNAL(clicked()),TQT_SLOT(zoomIn())); + connect(zoomIn,TQ_SIGNAL(clicked()),TQ_SLOT(zoomIn())); TQPushButton *zoomOut = new TQPushButton(i18n("Zoom Out"),this); topBar->addWidget(zoomOut,0); - connect(zoomOut,TQT_SIGNAL(clicked()),TQT_SLOT(zoomOut())); + connect(zoomOut,TQ_SIGNAL(clicked()),TQ_SLOT(zoomOut())); TQPushButton *menuButton = new TQPushButton(i18n("Select Mode"),this); topBar->addWidget(menuButton,0); - connect(menuButton,TQT_SIGNAL(clicked()),TQT_SLOT(showModeMenu())); + connect(menuButton,TQ_SIGNAL(clicked()),TQ_SLOT(showModeMenu())); createMainTask(); @@ -239,8 +239,8 @@ KGanttItem *KOProjectView::createTask(KGanttItem *parent,Todo *todo) KGanttItem *task = new KOProjectViewItem(todo,parent,todo->summary(),startDt, endDt); - connect(task,TQT_SIGNAL(changed(KGanttItem*, KGanttItem::Change)), - TQT_SLOT(taskChanged(KGanttItem*,KGanttItem::Change))); + connect(task,TQ_SIGNAL(changed(KGanttItem*, KGanttItem::Change)), + TQ_SLOT(taskChanged(KGanttItem*,KGanttItem::Change))); if (todo->relations().count() > 0) { task->setBrush(TQBrush(TQColor(240,240,240), TQBrush::Dense4Pattern)); } diff --git a/korganizer/plugins/projectview/projectview.cpp b/korganizer/plugins/projectview/projectview.cpp index 60257623..db354184 100644 --- a/korganizer/plugins/projectview/projectview.cpp +++ b/korganizer/plugins/projectview/projectview.cpp @@ -52,7 +52,7 @@ ProjectView::ProjectView(KOrg::MainWindow *parent, const char *name) : setXMLFile("plugins/projectviewui.rc"); - new TDEAction(i18n("&Project"), "project", 0, this, TQT_SLOT(showView()), + new TDEAction(i18n("&Project"), "project", 0, this, TQ_SLOT(showView()), actionCollection(), "view_project"); } diff --git a/korganizer/plugins/timespanview/kotimespanview.cpp b/korganizer/plugins/timespanview/kotimespanview.cpp index 8445edf4..00910bfe 100644 --- a/korganizer/plugins/timespanview/kotimespanview.cpp +++ b/korganizer/plugins/timespanview/kotimespanview.cpp @@ -44,7 +44,7 @@ KOTimeSpanView::KOTimeSpanView(Calendar *calendar, TQWidget *parent, mTimeSpanWidget = new TimeSpanWidget( this ); topLayout->addWidget( mTimeSpanWidget ); - connect( mTimeSpanWidget, TQT_SIGNAL( dateRangeChanged() ), TQT_SLOT( updateView() ) ); + connect( mTimeSpanWidget, TQ_SIGNAL( dateRangeChanged() ), TQ_SLOT( updateView() ) ); } KOTimeSpanView::~KOTimeSpanView() diff --git a/korganizer/plugins/timespanview/timespanview.cpp b/korganizer/plugins/timespanview/timespanview.cpp index 4b3df7ef..5ff4cf0a 100644 --- a/korganizer/plugins/timespanview/timespanview.cpp +++ b/korganizer/plugins/timespanview/timespanview.cpp @@ -51,7 +51,7 @@ TimespanView::TimespanView(KOrg::MainWindow *parent, const char *name) : setXMLFile( "plugins/timespanviewui.rc" ); - new TDEAction( i18n("&Timespan"), "timespan", 0, this, TQT_SLOT( showView() ), + new TDEAction( i18n("&Timespan"), "timespan", 0, this, TQ_SLOT( showView() ), actionCollection(), "view_timespan" ); } diff --git a/korganizer/plugins/timespanview/timespanwidget.cpp b/korganizer/plugins/timespanview/timespanwidget.cpp index 8b0ff4b3..99f529b3 100644 --- a/korganizer/plugins/timespanview/timespanwidget.cpp +++ b/korganizer/plugins/timespanview/timespanwidget.cpp @@ -63,19 +63,19 @@ TimeSpanWidget::TimeSpanWidget( TQWidget *parent, const char *name ) : TQBoxLayout *buttonLayout = new TQHBoxLayout( rightPaneLayout ); TQPushButton *zoomInButton = new TQPushButton( i18n("Zoom In"), rightPane ); - connect( zoomInButton, TQT_SIGNAL( clicked() ), TQT_SLOT( zoomIn() ) ); + connect( zoomInButton, TQ_SIGNAL( clicked() ), TQ_SLOT( zoomIn() ) ); buttonLayout->addWidget( zoomInButton ); TQPushButton *zoomOutButton = new TQPushButton( i18n("Zoom Out"), rightPane ); - connect( zoomOutButton, TQT_SIGNAL( clicked() ), TQT_SLOT( zoomOut() ) ); + connect( zoomOutButton, TQ_SIGNAL( clicked() ), TQ_SLOT( zoomOut() ) ); buttonLayout->addWidget( zoomOutButton ); TQPushButton *centerButton = new TQPushButton( i18n("Center View"), rightPane ); - connect( centerButton, TQT_SIGNAL( clicked() ), TQT_SLOT( centerView() ) ); + connect( centerButton, TQ_SIGNAL( clicked() ), TQ_SLOT( centerView() ) ); buttonLayout->addWidget( centerButton ); - connect(mLineView->horizontalScrollBar(),TQT_SIGNAL(valueChanged(int)), - mTimeLine,TQT_SLOT(setContentsPos(int))); + connect(mLineView->horizontalScrollBar(),TQ_SIGNAL(valueChanged(int)), + mTimeLine,TQ_SLOT(setContentsPos(int))); } TimeSpanWidget::~TimeSpanWidget() diff --git a/korganizer/previewdialog.cpp b/korganizer/previewdialog.cpp index dade7791..8e77504a 100644 --- a/korganizer/previewdialog.cpp +++ b/korganizer/previewdialog.cpp @@ -64,8 +64,8 @@ PreviewDialog::PreviewDialog( const KURL &url, TQWidget *parent ) topLayout->setSpacing( spacingHint() ); topLayout->setMargin( marginHint() ); - connect( this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(slotMerge()) ); - connect( this, TQT_SIGNAL(user2Clicked()), TQT_SLOT(slotAdd()) ); + connect( this, TQ_SIGNAL(user1Clicked()), TQ_SLOT(slotMerge()) ); + connect( this, TQ_SIGNAL(user2Clicked()), TQ_SLOT(slotAdd()) ); // when someone edits a kmail attachment he's editing a tmp file, check for that // and if it's a tmp file then open a save dialog diff --git a/korganizer/printing/calprinter.cpp b/korganizer/printing/calprinter.cpp index b202cb6d..8a9a6cb2 100644 --- a/korganizer/printing/calprinter.cpp +++ b/korganizer/printing/calprinter.cpp @@ -202,7 +202,7 @@ CalPrintDialog::CalPrintDialog( KOrg::PrintPlugin::List plugins, splitterRightLayout->addWidget( mOrientationSelection, 1, 1 ); // signals and slots connections - connect( mTypeGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( setPrintType( int ) ) ); + connect( mTypeGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( setPrintType( int ) ) ); orientationLabel->setBuddy( mOrientationSelection ); // First insert the config widgets into the widget stack. This possibly assigns diff --git a/korganizer/publishdialog.cpp b/korganizer/publishdialog.cpp index c8366add..5e597524 100644 --- a/korganizer/publishdialog.cpp +++ b/korganizer/publishdialog.cpp @@ -46,18 +46,18 @@ PublishDialog::PublishDialog( TQWidget* parent, const char* name, setMainWidget( mWidget ); mWidget->mNameLineEdit->setEnabled( false ); mWidget->mEmailLineEdit->setEnabled( false ); - connect( mWidget->mAddressListView, TQT_SIGNAL( selectionChanged(TQListViewItem *) ), - TQT_SLOT(updateInput())); - connect( mWidget->mNew, TQT_SIGNAL( clicked() ), - TQT_SLOT( addItem() ) ); - connect( mWidget->mRemove, TQT_SIGNAL( clicked() ), - TQT_SLOT( removeItem() ) ); - connect( mWidget->mSelectAddressee, TQT_SIGNAL( clicked() ), - TQT_SLOT( openAddressbook() ) ); - connect( mWidget->mNameLineEdit, TQT_SIGNAL( textChanged(const TQString&) ), - TQT_SLOT( updateItem() ) ); - connect( mWidget->mEmailLineEdit, TQT_SIGNAL( textChanged(const TQString&) ), - TQT_SLOT( updateItem() ) ); + connect( mWidget->mAddressListView, TQ_SIGNAL( selectionChanged(TQListViewItem *) ), + TQ_SLOT(updateInput())); + connect( mWidget->mNew, TQ_SIGNAL( clicked() ), + TQ_SLOT( addItem() ) ); + connect( mWidget->mRemove, TQ_SIGNAL( clicked() ), + TQ_SLOT( removeItem() ) ); + connect( mWidget->mSelectAddressee, TQ_SIGNAL( clicked() ), + TQ_SLOT( openAddressbook() ) ); + connect( mWidget->mNameLineEdit, TQ_SIGNAL( textChanged(const TQString&) ), + TQ_SLOT( updateItem() ) ); + connect( mWidget->mEmailLineEdit, TQ_SIGNAL( textChanged(const TQString&) ), + TQ_SLOT( updateItem() ) ); } PublishDialog::~PublishDialog() diff --git a/korganizer/resourceview.cpp b/korganizer/resourceview.cpp index ea640bb9..d8d1b637 100644 --- a/korganizer/resourceview.cpp +++ b/korganizer/resourceview.cpp @@ -100,23 +100,23 @@ CalendarViewExtension *ResourceViewFactory::create( TQWidget *parent ) { mResourceView = new ResourceView( mCalendar, mCalendarView, parent ); - TQObject::connect( mResourceView, TQT_SIGNAL( resourcesChanged() ), - mCalendarView, TQT_SLOT( resourcesChanged() ) ); - TQObject::connect( mResourceView, TQT_SIGNAL( resourcesChanged() ), - mCalendarView, TQT_SLOT( updateCategories() ) ); + TQObject::connect( mResourceView, TQ_SIGNAL( resourcesChanged() ), + mCalendarView, TQ_SLOT( resourcesChanged() ) ); + TQObject::connect( mResourceView, TQ_SIGNAL( resourcesChanged() ), + mCalendarView, TQ_SLOT( updateCategories() ) ); TQObject::connect( mCalendar, - TQT_SIGNAL( signalResourceAdded( ResourceCalendar * ) ), + TQ_SIGNAL( signalResourceAdded( ResourceCalendar * ) ), mResourceView, - TQT_SLOT( addResourceItem( ResourceCalendar * ) ) ); + TQ_SLOT( addResourceItem( ResourceCalendar * ) ) ); TQObject::connect( mCalendar, - TQT_SIGNAL( signalResourceModified( ResourceCalendar * ) ), + TQ_SIGNAL( signalResourceModified( ResourceCalendar * ) ), mResourceView, - TQT_SLOT( updateResourceItem( ResourceCalendar * ) ) ); - TQObject::connect( mCalendar, TQT_SIGNAL( signalResourceAdded( ResourceCalendar * ) ), - mCalendarView, TQT_SLOT( updateCategories() ) ); - TQObject::connect( mCalendar, TQT_SIGNAL( signalResourceModified( ResourceCalendar * ) ), - mCalendarView, TQT_SLOT( updateCategories() ) ); + TQ_SLOT( updateResourceItem( ResourceCalendar * ) ) ); + TQObject::connect( mCalendar, TQ_SIGNAL( signalResourceAdded( ResourceCalendar * ) ), + mCalendarView, TQ_SLOT( updateCategories() ) ); + TQObject::connect( mCalendar, TQ_SIGNAL( signalResourceModified( ResourceCalendar * ) ), + mCalendarView, TQ_SLOT( updateCategories() ) ); return mResourceView; } @@ -322,17 +322,17 @@ ResourceView::ResourceView( CalendarResources *calendar, mListView->setResizeMode( TQListView::LastColumn ); topLayout->addWidget( mListView ); - connect( mListView, TQT_SIGNAL( clicked( TQListViewItem * ) ), - TQT_SLOT( currentChanged( TQListViewItem * ) ) ); - connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addResource() ) ); - connect( mDeleteButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeResource() ) ); - connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editResource() ) ); - connect( mListView, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, + connect( mListView, TQ_SIGNAL( clicked( TQListViewItem * ) ), + TQ_SLOT( currentChanged( TQListViewItem * ) ) ); + connect( mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( addResource() ) ); + connect( mDeleteButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeResource() ) ); + connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editResource() ) ); + connect( mListView, TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), - TQT_SLOT( editResource() ) ); - connect( mListView, TQT_SIGNAL( contextMenuRequested ( TQListViewItem *, + TQ_SLOT( editResource() ) ); + connect( mListView, TQ_SIGNAL( contextMenuRequested ( TQListViewItem *, const TQPoint &, int ) ), - TQT_SLOT( contextMenuRequested( TQListViewItem *, const TQPoint &, + TQ_SLOT( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ) ); updateView(); @@ -449,21 +449,21 @@ void ResourceView::addResourceItem( ResourceCalendar *resource ) item->update(); } - connect( resource, TQT_SIGNAL( signalSubresourceAdded( ResourceCalendar *, + connect( resource, TQ_SIGNAL( signalSubresourceAdded( ResourceCalendar *, const TQString &, const TQString &, const TQString & ) ), - TQT_SLOT( slotSubresourceAdded( ResourceCalendar *, const TQString &, + TQ_SLOT( slotSubresourceAdded( ResourceCalendar *, const TQString &, const TQString &, const TQString & ) ) ); - connect( resource, TQT_SIGNAL( signalSubresourceRemoved( ResourceCalendar *, + connect( resource, TQ_SIGNAL( signalSubresourceRemoved( ResourceCalendar *, const TQString &, const TQString & ) ), - TQT_SLOT( slotSubresourceRemoved( ResourceCalendar *, const TQString &, + TQ_SLOT( slotSubresourceRemoved( ResourceCalendar *, const TQString &, const TQString & ) ) ); - connect( resource, TQT_SIGNAL( resourceSaved( ResourceCalendar * ) ), - TQT_SLOT( closeResource( ResourceCalendar * ) ) ); + connect( resource, TQ_SIGNAL( resourceSaved( ResourceCalendar * ) ), + TQ_SLOT( closeResource( ResourceCalendar * ) ) ); updateResourceList(); emit resourcesChanged(); @@ -686,44 +686,44 @@ void ResourceView::contextMenuRequested ( TQListViewItem *lvitem, const TQPoint ResourceItem *item = static_cast<ResourceItem *>( lvitem ); TQPopupMenu *menu = new TQPopupMenu( this ); - connect( menu, TQT_SIGNAL( aboutToHide() ), menu, TQT_SLOT( deleteLater() ) ); + connect( menu, TQ_SIGNAL( aboutToHide() ), menu, TQ_SLOT( deleteLater() ) ); if ( item ) { int reloadId = menu->insertItem( i18n("Re&load"), this, - TQT_SLOT( reloadResource() ) ); + TQ_SLOT( reloadResource() ) ); menu->setItemEnabled( reloadId, item->resource()->isActive() ); int saveId = menu->insertItem( i18n("&Save"), this, - TQT_SLOT( saveResource() ) ); + TQ_SLOT( saveResource() ) ); menu->setItemEnabled( saveId, item->resource()->isActive() ); menu->insertSeparator(); - menu->insertItem( i18n("Show &Info"), this, TQT_SLOT( showInfo() ) ); + menu->insertItem( i18n("Show &Info"), this, TQ_SLOT( showInfo() ) ); //FIXME: This is better on the resource dialog if ( KOPrefs::instance()->agendaViewColors() != KOPrefs::CategoryOnly ) { TQPopupMenu *assignMenu= new TQPopupMenu( menu ); - assignMenu->insertItem( i18n( "&Assign Color" ), this, TQT_SLOT( assignColor() ) ); + assignMenu->insertItem( i18n( "&Assign Color" ), this, TQ_SLOT( assignColor() ) ); if ( item->resourceColor().isValid() ) - assignMenu->insertItem( i18n( "&Disable Color" ), this, TQT_SLOT( disableColor() ) ); + assignMenu->insertItem( i18n( "&Disable Color" ), this, TQ_SLOT( disableColor() ) ); menu->insertItem( i18n( "Resources Colors" ), assignMenu ); } if ( item->isSubresource() && ( item->resource()->type() == "imap" || item->resource()->type() == "scalix" ) ) { if ( item->resourceIdentifier().contains( "/.INBOX.directory/" ) ) { - menu->insertItem( i18n("&Rename..."), this, TQT_SLOT( editResource() ) ); + menu->insertItem( i18n("&Rename..."), this, TQ_SLOT( editResource() ) ); } } else { - menu->insertItem( i18n("&Edit..."), this, TQT_SLOT( editResource() ) ); + menu->insertItem( i18n("&Edit..."), this, TQ_SLOT( editResource() ) ); } - menu->insertItem( i18n("&Remove"), this, TQT_SLOT( removeResource() ) ); + menu->insertItem( i18n("&Remove"), this, TQ_SLOT( removeResource() ) ); if ( item->resource() != manager->standardResource() ) { menu->insertSeparator(); menu->insertItem( i18n("Use as &Default Calendar"), this, - TQT_SLOT( setStandard() ) ); + TQ_SLOT( setStandard() ) ); } menu->insertSeparator(); } - menu->insertItem( i18n("&Add..."), this, TQT_SLOT( addResource() ) ); + menu->insertItem( i18n("&Add..."), this, TQ_SLOT( addResource() ) ); menu->popup( pos ); } diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp index f2ddb4a8..4087a810 100644 --- a/korganizer/searchdialog.cpp +++ b/korganizer/searchdialog.cpp @@ -63,8 +63,8 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent) subLayout->addWidget( searchLabel ); subLayout->addWidget( searchEdit ); searchEdit->setFocus(); - connect( searchEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( searchTextChanged( const TQString & ) ) ); + connect( searchEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( searchTextChanged( const TQString & ) ) ); TQHButtonGroup *itemsGroup = new TQHButtonGroup( i18n("Search For"), topFrame ); @@ -117,15 +117,15 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent) KOGlobals::fitDialogToScreen( this, true ); } - connect( this,TQT_SIGNAL(user1Clicked()),TQT_SLOT(doSearch())); + connect( this,TQ_SIGNAL(user1Clicked()),TQ_SLOT(doSearch())); // Propagate edit and delete event signals from event list view - connect( listView, TQT_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)), - TQT_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)) ); - connect( listView, TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)), - TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)) ); - connect( listView, TQT_SIGNAL(deleteIncidenceSignal(Incidence *)), - TQT_SIGNAL(deleteIncidenceSignal(Incidence *)) ); + connect( listView, TQ_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)), + TQ_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)) ); + connect( listView, TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)), + TQ_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)) ); + connect( listView, TQ_SIGNAL(deleteIncidenceSignal(Incidence *)), + TQ_SIGNAL(deleteIncidenceSignal(Incidence *)) ); } SearchDialog::~SearchDialog() diff --git a/korganizer/statusdialog.cpp b/korganizer/statusdialog.cpp index 1d406447..d46f018c 100644 --- a/korganizer/statusdialog.cpp +++ b/korganizer/statusdialog.cpp @@ -56,11 +56,11 @@ StatusDialog::StatusDialog(TQWidget* parent, const char* name) : TQBoxLayout *buttonLayout = new TQHBoxLayout( topLayout ); TQPushButton *ok = new KPushButton(KStdGuiItem::ok(), this); - connect ( ok,TQT_SIGNAL(clicked()), this,TQT_SLOT(accept()) ); + connect ( ok,TQ_SIGNAL(clicked()), this,TQ_SLOT(accept()) ); buttonLayout->addWidget( ok ); TQPushButton *cancel = new KPushButton(KStdGuiItem::cancel(), this); - connect ( cancel,TQT_SIGNAL(clicked()), this,TQT_SLOT(reject()) ); + connect ( cancel,TQ_SIGNAL(clicked()), this,TQ_SLOT(reject()) ); buttonLayout->addWidget( cancel ); } diff --git a/korganizer/templatemanagementdialog.cpp b/korganizer/templatemanagementdialog.cpp index 57209cd0..3d673c37 100644 --- a/korganizer/templatemanagementdialog.cpp +++ b/korganizer/templatemanagementdialog.cpp @@ -52,15 +52,15 @@ TemplateManagementDialog::TemplateManagementDialog(TQWidget *parent, const TQStr { m_base = new TemplateManagementDialog_base( this, "template_management_dialog_base" ); setMainWidget( m_base ); - connect( m_base->m_buttonAdd, TQT_SIGNAL( clicked() ), - TQT_SLOT( slotAddTemplate() ) ); - connect( m_base->m_buttonDelete, TQT_SIGNAL( clicked() ), - TQT_SLOT( slotDeleteTemplate() ) ); + connect( m_base->m_buttonAdd, TQ_SIGNAL( clicked() ), + TQ_SLOT( slotAddTemplate() ) ); + connect( m_base->m_buttonDelete, TQ_SIGNAL( clicked() ), + TQ_SLOT( slotDeleteTemplate() ) ); m_base->m_listBox->insertStringList( m_templates ); - connect( m_base->m_listBox, TQT_SIGNAL( selectionChanged( TQListBoxItem * ) ), - TQT_SLOT( slotUpdateDeleteButton( TQListBoxItem * ) ) ); - connect( m_base->m_buttonApply, TQT_SIGNAL( clicked() ), - TQT_SLOT( slotApplyTemplate() ) ); + connect( m_base->m_listBox, TQ_SIGNAL( selectionChanged( TQListBoxItem * ) ), + TQ_SLOT( slotUpdateDeleteButton( TQListBoxItem * ) ) ); + connect( m_base->m_buttonApply, TQ_SIGNAL( clicked() ), + TQ_SLOT( slotApplyTemplate() ) ); } @@ -75,7 +75,7 @@ void TemplateManagementDialog::slotAddTemplate() if ( m_templates.find( newTemplate) != m_templates.end() ) { int rc = KMessageBox::warningContinueCancel( this, i18n("A template with that name already exists, do you want to overwrite it?."), i18n("Duplicate Template Name"), i18n("Overwrite")); if ( rc == KMessageBox::Cancel ) { - TQTimer::singleShot(0, this, TQT_SLOT( slotAddTemplate() ) ); + TQTimer::singleShot(0, this, TQ_SLOT( slotAddTemplate() ) ); return; } duplicate = true; diff --git a/korganizer/timelabels.cpp b/korganizer/timelabels.cpp index 27a253c0..19ae5721 100644 --- a/korganizer/timelabels.cpp +++ b/korganizer/timelabels.cpp @@ -230,10 +230,10 @@ void TimeLabels::setAgenda( KOAgenda* agenda ) { mAgenda = agenda; - connect(mAgenda, TQT_SIGNAL(mousePosSignal(const TQPoint &)), this, TQT_SLOT(mousePosChanged(const TQPoint &))); - connect(mAgenda, TQT_SIGNAL(enterAgenda()), this, TQT_SLOT(showMousePos())); - connect(mAgenda, TQT_SIGNAL(leaveAgenda()), this, TQT_SLOT(hideMousePos())); - connect(mAgenda, TQT_SIGNAL(gridSpacingYChanged( double ) ), this, TQT_SLOT( setCellHeight( double ) ) ); + connect(mAgenda, TQ_SIGNAL(mousePosSignal(const TQPoint &)), this, TQ_SLOT(mousePosChanged(const TQPoint &))); + connect(mAgenda, TQ_SIGNAL(enterAgenda()), this, TQ_SLOT(showMousePos())); + connect(mAgenda, TQ_SIGNAL(leaveAgenda()), this, TQ_SLOT(hideMousePos())); + connect(mAgenda, TQ_SIGNAL(gridSpacingYChanged( double ) ), this, TQ_SLOT( setCellHeight( double ) ) ); } diff --git a/korn/accountmanager.cpp b/korn/accountmanager.cpp index 187f79bd..5a30e56a 100644 --- a/korn/accountmanager.cpp +++ b/korn/accountmanager.cpp @@ -84,12 +84,12 @@ void AccountManager::readConfig( TDEConfig* config, const int index ) } //TODO: connect some stuff - connect( kiodrop, TQT_SIGNAL( changed( int, KMailDrop* ) ), this, TQT_SLOT( slotChanged( int, KMailDrop* ) ) ); - connect( kiodrop, TQT_SIGNAL( showPassivePopup( TQPtrList< KornMailSubject >*, int, bool, const TQString& ) ), - this, TQT_SLOT( slotShowPassivePopup( TQPtrList< KornMailSubject >*, int, bool, const TQString& ) ) ); - connect( kiodrop, TQT_SIGNAL( showPassivePopup( const TQString&, const TQString& ) ), - this, TQT_SLOT( slotShowPassivePopup( const TQString&, const TQString& ) ) ); - connect( kiodrop, TQT_SIGNAL( validChanged( bool ) ), this, TQT_SLOT( slotValidChanged( bool ) ) ); + connect( kiodrop, TQ_SIGNAL( changed( int, KMailDrop* ) ), this, TQ_SLOT( slotChanged( int, KMailDrop* ) ) ); + connect( kiodrop, TQ_SIGNAL( showPassivePopup( TQPtrList< KornMailSubject >*, int, bool, const TQString& ) ), + this, TQ_SLOT( slotShowPassivePopup( TQPtrList< KornMailSubject >*, int, bool, const TQString& ) ) ); + connect( kiodrop, TQ_SIGNAL( showPassivePopup( const TQString&, const TQString& ) ), + this, TQ_SLOT( slotShowPassivePopup( const TQString&, const TQString& ) ) ); + connect( kiodrop, TQ_SIGNAL( validChanged( bool ) ), this, TQ_SLOT( slotValidChanged( bool ) ) ); kiodrop->readGeneralConfigGroup( *masterGroup ); if( !kiodrop->readConfigGroup( *accountGroup ) || !kiodrop->readConfigGroup( *configmap, nproto ) ) @@ -119,9 +119,9 @@ void AccountManager::readConfig( TDEConfig* config, const int index ) DCOPDrop *dcopdrop = new DCOPDrop; Dropinfo *info = new Dropinfo; - connect( dcopdrop, TQT_SIGNAL( changed( int, KMailDrop* ) ), this, TQT_SLOT( slotChanged( int, KMailDrop* ) ) ); - connect( dcopdrop, TQT_SIGNAL( showPassivePopup( TQPtrList< KornMailSubject >*, int, bool, const TQString& ) ), - this, TQT_SLOT( slotShowPassivePopup( TQPtrList< KornMailSubject >*, int, bool, const TQString& ) ) ); + connect( dcopdrop, TQ_SIGNAL( changed( int, KMailDrop* ) ), this, TQ_SLOT( slotChanged( int, KMailDrop* ) ) ); + connect( dcopdrop, TQ_SIGNAL( showPassivePopup( TQPtrList< KornMailSubject >*, int, bool, const TQString& ) ), + this, TQ_SLOT( slotShowPassivePopup( TQPtrList< KornMailSubject >*, int, bool, const TQString& ) ) ); dcopdrop->readConfigGroup( *masterGroup ); dcopdrop->setDCOPName( *it ); diff --git a/korn/boxcontainer.cpp b/korn/boxcontainer.cpp index d881b6c8..44e1e8ab 100644 --- a/korn/boxcontainer.cpp +++ b/korn/boxcontainer.cpp @@ -76,7 +76,7 @@ void BoxContainer::slotShowConfiguration() void BoxContainer::addItem( BoxContainerItem* item ) { - connect( item, TQT_SIGNAL( showConfiguration() ), this, TQT_SLOT( slotShowConfiguration() ) ); + connect( item, TQ_SIGNAL( showConfiguration() ), this, TQ_SLOT( slotShowConfiguration() ) ); _items->append( item ); } diff --git a/korn/boxcontaineritem.cpp b/korn/boxcontaineritem.cpp index 386baaef..7575ba7c 100644 --- a/korn/boxcontaineritem.cpp +++ b/korn/boxcontaineritem.cpp @@ -164,7 +164,7 @@ void BoxContainerItem::runCommand( const TQString& cmd ) TDEProcess *process = new TDEProcess; process->setUseShell( true ); *process << cmd; - connect( process, TQT_SIGNAL( processExited (TDEProcess *) ), this, TQT_SLOT( processExited( TDEProcess * ) ) ); + connect( process, TQ_SIGNAL( processExited (TDEProcess *) ), this, TQ_SLOT( processExited( TDEProcess * ) ) ); process->start(); } @@ -194,21 +194,21 @@ void BoxContainerItem::mouseButtonPressed( TQt::ButtonState state ) void BoxContainerItem::fillTDEPopupMenu( TDEPopupMenu* popupMenu, TDEActionCollection* actions ) const { - /*popupMenu->insertItem( i18n( "&Configure" ), this, TQT_SLOT( slotConfigure() ) ); - popupMenu->insertItem( i18n( "&Recheck" ), this, TQT_SLOT( slotRecheck() ) ); - popupMenu->insertItem( i18n( "R&eset Counter" ), this, TQT_SLOT( slotReset() ) ); - popupMenu->insertItem( i18n( "&View Emails" ), this, TQT_SLOT( slotView() ) ); - popupMenu->insertItem( i18n( "R&un Command" ), this, TQT_SLOT( slotRunCommand() ) );*/ - - (new TDEAction( i18n("&Configure"), TDEShortcut(), this, TQT_SLOT( slotConfigure() ), actions ))->plug( popupMenu ); - (new TDEAction( i18n("&Recheck"), TDEShortcut(), this, TQT_SLOT( slotRecheck() ), actions ))->plug( popupMenu ); - (new TDEAction( i18n("R&eset Counter"), TDEShortcut(), this, TQT_SLOT( slotReset() ), actions ))->plug( popupMenu ); - (new TDEAction( i18n("&View Emails"), TDEShortcut(), this, TQT_SLOT( slotView() ), actions ))->plug( popupMenu ); - (new TDEAction( i18n("R&un Command"), TDEShortcut(), this, TQT_SLOT( slotRunCommand() ), actions ))->plug( popupMenu ); + /*popupMenu->insertItem( i18n( "&Configure" ), this, TQ_SLOT( slotConfigure() ) ); + popupMenu->insertItem( i18n( "&Recheck" ), this, TQ_SLOT( slotRecheck() ) ); + popupMenu->insertItem( i18n( "R&eset Counter" ), this, TQ_SLOT( slotReset() ) ); + popupMenu->insertItem( i18n( "&View Emails" ), this, TQ_SLOT( slotView() ) ); + popupMenu->insertItem( i18n( "R&un Command" ), this, TQ_SLOT( slotRunCommand() ) );*/ + + (new TDEAction( i18n("&Configure"), TDEShortcut(), this, TQ_SLOT( slotConfigure() ), actions ))->plug( popupMenu ); + (new TDEAction( i18n("&Recheck"), TDEShortcut(), this, TQ_SLOT( slotRecheck() ), actions ))->plug( popupMenu ); + (new TDEAction( i18n("R&eset Counter"), TDEShortcut(), this, TQ_SLOT( slotReset() ), actions ))->plug( popupMenu ); + (new TDEAction( i18n("&View Emails"), TDEShortcut(), this, TQ_SLOT( slotView() ), actions ))->plug( popupMenu ); + (new TDEAction( i18n("R&un Command"), TDEShortcut(), this, TQ_SLOT( slotRunCommand() ), actions ))->plug( popupMenu ); popupMenu->insertSeparator(); - KStdAction::help( this, TQT_SLOT( help() ), actions )->plug( popupMenu ); - KStdAction::reportBug( this, TQT_SLOT( reportBug() ), actions )->plug( popupMenu ); - KStdAction::aboutApp( this, TQT_SLOT( about() ), actions )->plug( popupMenu ); + KStdAction::help( this, TQ_SLOT( help() ), actions )->plug( popupMenu ); + KStdAction::reportBug( this, TQ_SLOT( reportBug() ), actions )->plug( popupMenu ); + KStdAction::aboutApp( this, TQ_SLOT( about() ), actions )->plug( popupMenu ); } void BoxContainerItem::showPassivePopup( TQWidget* parent, TQPtrList< KornMailSubject >* list, int total, diff --git a/korn/dcopdrop.cpp b/korn/dcopdrop.cpp index 660bc849..55edda74 100644 --- a/korn/dcopdrop.cpp +++ b/korn/dcopdrop.cpp @@ -106,7 +106,7 @@ TQValueVector< KornMailSubject >* DCOPDrop::doReadSubjects( bool * ) * This way, the function is really asynchrone. * So, the return value arraves before any data arrives. */ - TQTimer::singleShot( 1, this, TQT_SLOT( doReadSubjectsASync( void ) ) ); + TQTimer::singleShot( 1, this, TQ_SLOT( doReadSubjectsASync( void ) ) ); /* * A empty TQValueVector is made here. diff --git a/korn/dockeditem.cpp b/korn/dockeditem.cpp index b197a2d0..34b483cc 100644 --- a/korn/dockeditem.cpp +++ b/korn/dockeditem.cpp @@ -42,9 +42,9 @@ DockedItem::DockedItem( TQWidget * parent, const char * name ) { this->fillTDEPopupMenu( _systemtray->contextMenu(), _systemtray->actionCollection() ); - connect( _systemtray, TQT_SIGNAL( quitSelected() ), kapp, TQT_SLOT( quit() ) ); - connect( _systemtray, TQT_SIGNAL( mouseButtonPressed( TQt::ButtonState ) ), - this, TQT_SLOT( mouseButtonPressed( TQt::ButtonState ) ) ); + connect( _systemtray, TQ_SIGNAL( quitSelected() ), kapp, TQ_SLOT( quit() ) ); + connect( _systemtray, TQ_SIGNAL( mouseButtonPressed( TQt::ButtonState ) ), + this, TQ_SLOT( mouseButtonPressed( TQt::ButtonState ) ) ); } DockedItem::~DockedItem() diff --git a/korn/hvitem.cpp b/korn/hvitem.cpp index aaedb649..12954379 100644 --- a/korn/hvitem.cpp +++ b/korn/hvitem.cpp @@ -39,9 +39,9 @@ HVItem::HVItem( TQWidget *parent, const char *name ) _popup->insertTitle( kapp->miniIcon(), kapp->caption() ); this->fillTDEPopupMenu( _popup, _actions ); _popup->insertSeparator(); - KStdAction::quit( kapp, TQT_SLOT( quit() ), _actions )->plug( _popup ); + KStdAction::quit( kapp, TQ_SLOT( quit() ), _actions )->plug( _popup ); - connect( _label, TQT_SIGNAL( mouseButtonPressed( TQt::ButtonState ) ), this, TQT_SLOT( mouseButtonPressed( TQt::ButtonState ) ) ); + connect( _label, TQ_SIGNAL( mouseButtonPressed( TQt::ButtonState ) ), this, TQ_SLOT( mouseButtonPressed( TQt::ButtonState ) ) ); } HVItem::~HVItem() diff --git a/korn/imap_proto.cpp b/korn/imap_proto.cpp index caedb459..aae646d9 100644 --- a/korn/imap_proto.cpp +++ b/korn/imap_proto.cpp @@ -50,15 +50,15 @@ void Imap_Protocol::configFields( TQPtrVector< TQWidget >* vector, const TQObjec result->append( new TextInput( (TQWidget*)vector->at( 0 ), i18n( "Server" ), TextInput::text, "", "server" ) ); result->append( new TextInput( (TQWidget*)vector->at( 0 ), i18n( "Port" ), 0, 65535, "143", "port" ) ); result->append( new ComboInput( (TQWidget*)vector->at( 0 ), i18n( "Encryption" ), encrList, "tls=auto", "encryption" ) ); - TQObject::connect( (TQObject*)result->last()->rightWidget(), TQT_SIGNAL( activated( int) ), - configDialog, TQT_SLOT( slotSSLChanged() ) ); + TQObject::connect( (TQObject*)result->last()->rightWidget(), TQ_SIGNAL( activated( int) ), + configDialog, TQ_SLOT( slotSSLChanged() ) ); result->append( new TextInput( (TQWidget*)vector->at( 1 ), i18n( "Username" ), TextInput::text, "", "username" ) ); result->append( new TextInput( (TQWidget*)vector->at( 1 ), i18n( "Mailbox" ), TextInput::text, "INBOX", "mailbox" ) ); result->append( new TextInput( (TQWidget*)vector->at( 1 ), i18n( "Password" ), TextInput::password, "", "password" ) ); result->append( new CheckboxInput( (TQWidget*)vector->at( 1 ), i18n( "Save password" ), "true", "savepassword" ) ); - TQObject::connect( (TQObject*)result->last()->rightWidget(), TQT_SIGNAL( toggled( bool ) ), - (TQObject*)result->prev()->rightWidget(), TQT_SLOT( setEnabled( bool ) ) ); + TQObject::connect( (TQObject*)result->last()->rightWidget(), TQ_SIGNAL( toggled( bool ) ), + (TQObject*)result->prev()->rightWidget(), TQ_SLOT( setEnabled( bool ) ) ); result->last()->setValue( "false" ); result->append( new ComboInput( (TQWidget*)vector->at( 1 ), i18n( "Authentication" ), authList, "auth=*", "auth" ) ); } diff --git a/korn/keditlistboxman.cpp b/korn/keditlistboxman.cpp index 440b2c83..a3e8b4d4 100644 --- a/korn/keditlistboxman.cpp +++ b/korn/keditlistboxman.cpp @@ -96,12 +96,12 @@ void KEditListBoxManager::setSubGroupName( const TQString& name ) void KEditListBoxManager::init() { - connect( this, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotChanged() ) ); - connect( this, TQT_SIGNAL( added( const TQString& ) ), this, TQT_SLOT( slotAdded( const TQString& ) ) ); - connect( this, TQT_SIGNAL( removed( const TQString& ) ), this, TQT_SLOT( slotRemoved( const TQString& ) ) ); + connect( this, TQ_SIGNAL( changed() ), this, TQ_SLOT( slotChanged() ) ); + connect( this, TQ_SIGNAL( added( const TQString& ) ), this, TQ_SLOT( slotAdded( const TQString& ) ) ); + connect( this, TQ_SIGNAL( removed( const TQString& ) ), this, TQ_SLOT( slotRemoved( const TQString& ) ) ); - connect( this->listBox(), TQT_SIGNAL( doubleClicked( TQListBoxItem * ) ), this, TQT_SLOT( slotActivated( TQListBoxItem * ) ) ); - connect( this->listBox(), TQT_SIGNAL( returnPressed( TQListBoxItem * ) ), this, TQT_SLOT( slotActivated( TQListBoxItem * ) ) ); + connect( this->listBox(), TQ_SIGNAL( doubleClicked( TQListBoxItem * ) ), this, TQ_SLOT( slotActivated( TQListBoxItem * ) ) ); + connect( this->listBox(), TQ_SIGNAL( returnPressed( TQListBoxItem * ) ), this, TQ_SLOT( slotActivated( TQListBoxItem * ) ) ); } void KEditListBoxManager::readNames() diff --git a/korn/kornaccountcfgimpl.cpp b/korn/kornaccountcfgimpl.cpp index 439a4aea..bf1e614c 100644 --- a/korn/kornaccountcfgimpl.cpp +++ b/korn/kornaccountcfgimpl.cpp @@ -49,8 +49,8 @@ KornAccountCfgImpl::KornAccountCfgImpl( TQWidget * parent, const char * name ) _groupBoxes( 0 ), _accountinput( new TQPtrList< AccountInput >() ) { - connect( parent, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOK() ) ); - connect( parent, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( slotCancel() ) ); + connect( parent, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotOK() ) ); + connect( parent, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT( slotCancel() ) ); this->cbProtocol->insertStringList( Protocols::getProtocols() ); diff --git a/korn/kornboxcfgimpl.cpp b/korn/kornboxcfgimpl.cpp index 7d29e1f5..cd9cbdf3 100644 --- a/korn/kornboxcfgimpl.cpp +++ b/korn/kornboxcfgimpl.cpp @@ -56,13 +56,13 @@ KornBoxCfgImpl::KornBoxCfgImpl( TQWidget * parent, const char * name ) if( lbRight->text() == "Right" ) lbRight->setText( i18n( "Right" ) ); - connect( parent, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOK() ) ); - connect( parent, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( slotCancel() ) ); + connect( parent, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotOK() ) ); + connect( parent, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT( slotCancel() ) ); elbAccounts->setTitle( i18n( "Accounts" ) ); - connect( elbAccounts, TQT_SIGNAL( elementsSwapped( int, int ) ), this, TQT_SLOT( slotAccountsSwapped( int, int ) ) ); - connect( elbAccounts, TQT_SIGNAL( elementDeleted( int ) ), this, TQT_SLOT( slotAccountDeleted( int ) ) ); + connect( elbAccounts, TQ_SIGNAL( elementsSwapped( int, int ) ), this, TQ_SLOT( slotAccountsSwapped( int, int ) ) ); + connect( elbAccounts, TQ_SIGNAL( elementDeleted( int ) ), this, TQ_SLOT( slotAccountDeleted( int ) ) ); } KornBoxCfgImpl::~KornBoxCfgImpl() @@ -247,7 +247,7 @@ void KornBoxCfgImpl::slotEditBox() _base->setMainWidget( widget ); - connect( _base, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotDialogDestroyed() ) ); + connect( _base, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotDialogDestroyed() ) ); _group = new TDEConfigGroup( _config, TQString( "korn-%1-%2" ). arg( _index ).arg(elbAccounts->listBox()->currentItem() ) ); diff --git a/korn/korncfgimpl.cpp b/korn/korncfgimpl.cpp index c4fa1359..f0e4f983 100644 --- a/korn/korncfgimpl.cpp +++ b/korn/korncfgimpl.cpp @@ -47,12 +47,12 @@ KornCfgImpl::KornCfgImpl( TQWidget * parent, const char * name ) elbBoxes->setConfig( _config ); elbBoxes->setTitle( i18n( "Boxes" ) ); - connect( parent, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOK() ) ); - connect( parent, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( slotCancel() ) ); - connect( parent, TQT_SIGNAL( applyClicked() ), this, TQT_SLOT( slotApply() ) ); + connect( parent, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotOK() ) ); + connect( parent, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT( slotCancel() ) ); + connect( parent, TQ_SIGNAL( applyClicked() ), this, TQ_SLOT( slotApply() ) ); - connect( elbBoxes, TQT_SIGNAL( elementsSwapped( int, int ) ), this, TQT_SLOT( slotElementsSwapped( int, int ) ) ); - connect( elbBoxes, TQT_SIGNAL( elementDeleted( int ) ), this, TQT_SLOT( slotElementDeleted( int ) ) ); + connect( elbBoxes, TQ_SIGNAL( elementsSwapped( int, int ) ), this, TQ_SLOT( slotElementsSwapped( int, int ) ) ); + connect( elbBoxes, TQ_SIGNAL( elementDeleted( int ) ), this, TQ_SLOT( slotElementDeleted( int ) ) ); readConfig(); } @@ -74,7 +74,7 @@ void KornCfgImpl::slotEditBox() KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true ); KornBoxCfgImpl *widget = new KornBoxCfgImpl( _base, "Box Widget" ); - connect( _base, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotDialogDestroyed() ) ); + connect( _base, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotDialogDestroyed() ) ); _base->setMainWidget( widget ); widget->readConfig( _config, elbBoxes->listBox()->currentItem() ); diff --git a/korn/kornshell.cpp b/korn/kornshell.cpp index 60c090b1..ec3c7caf 100644 --- a/korn/kornshell.cpp +++ b/korn/kornshell.cpp @@ -43,7 +43,7 @@ KornShell::KornShell( TQWidget * parent, const char * name ) if( kapp->isRestored() ) { _config->setGroup( "korn" ); - TQTimer::singleShot( _config->readNumEntry( "session_startup_delay", 2000 ), this, TQT_SLOT(readConfig()) ); + TQTimer::singleShot( _config->readNumEntry( "session_startup_delay", 2000 ), this, TQ_SLOT(readConfig()) ); kdDebug() << "startup delayed" << endl; } else @@ -84,8 +84,8 @@ void KornShell::optionDlg() KornCfgImpl *widget = new KornCfgImpl( _configDialog, "Configuration widget" ); _configDialog->setMainWidget( widget ); - connect( _configDialog, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotDialogClosed() ) ); - connect( _configDialog, TQT_SIGNAL( applyClicked() ), this, TQT_SLOT( slotApply() ) ); + connect( _configDialog, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotDialogClosed() ) ); + connect( _configDialog, TQ_SIGNAL( applyClicked() ), this, TQ_SLOT( slotApply() ) ); _configDialog->show(); } @@ -105,7 +105,7 @@ void KornShell::readConfig() else _box = new DockedContainer( this, "docked container" ); - connect( _box, TQT_SIGNAL( showConfiguration() ), this, TQT_SLOT( optionDlg() ) ); + connect( _box, TQ_SIGNAL( showConfiguration() ), this, TQ_SLOT( optionDlg() ) ); _box->readConfig( _config ); diff --git a/korn/maildlg.cpp b/korn/maildlg.cpp index d912c447..71db3da3 100644 --- a/korn/maildlg.cpp +++ b/korn/maildlg.cpp @@ -17,7 +17,7 @@ KornMailDlg::KornMailDlg( TQWidget *parent ) _editCtrl = new KEdit(page); topLayout->addWidget(_editCtrl, 10); _editCtrl->setReadOnly(true); - connect(this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(showFullMessage())); + connect(this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(showFullMessage())); setInitialSize(TQSize(TQApplication::desktop()->width()*9/10, TQApplication::desktop()->height()/2)); } @@ -46,14 +46,14 @@ void KornMailDlg::showFullMessage() tqApp->processEvents(); // connect the mailbox with the progress dialog in case it supports progress bars - connect(_mailDrop, TQT_SIGNAL(readMailTotalSteps(int)), _progress, TQT_SLOT(setTotalSteps(int))); - connect(_mailDrop, TQT_SIGNAL(readMailProgress(int)), _progress, TQT_SLOT(setProgress(int))); + connect(_mailDrop, TQ_SIGNAL(readMailTotalSteps(int)), _progress, TQ_SLOT(setTotalSteps(int))); + connect(_mailDrop, TQ_SIGNAL(readMailProgress(int)), _progress, TQ_SLOT(setProgress(int))); tqApp->processEvents(); // connect the mailbox's cancel button - connect(_progress, TQT_SIGNAL(canceled()), this, TQT_SLOT(loadMailCanceled())); + connect(_progress, TQ_SIGNAL(canceled()), this, TQ_SLOT(loadMailCanceled())); - connect(_mailDrop, TQT_SIGNAL(readMailReady(TQString*)), this, TQT_SLOT(readMailReady(TQString*))); + connect(_mailDrop, TQ_SIGNAL(readMailReady(TQString*)), this, TQ_SLOT(readMailReady(TQString*))); // now load the mail fully if( _mailDrop->synchrone() ) @@ -100,7 +100,7 @@ void KornMailDlg::deleteProgress() _progress->setProgress(_progress->totalSteps()); _progress->hide(); - disconnect( _mailDrop, TQT_SIGNAL(readMailReady(TQString*)), this, TQT_SLOT(readMailReady(TQString*))); + disconnect( _mailDrop, TQ_SIGNAL(readMailReady(TQString*)), this, TQ_SLOT(readMailReady(TQString*))); delete _progress; _progress = 0; diff --git a/korn/maildrop.cpp b/korn/maildrop.cpp index 2224c74e..b9747906 100644 --- a/korn/maildrop.cpp +++ b/korn/maildrop.cpp @@ -37,7 +37,7 @@ KMailDrop::KMailDrop() : _style(Plain), _lastCount(0) { - connect(this, TQT_SIGNAL(changed( int, KMailDrop* )), TQT_SLOT(setCount( int, KMailDrop* ))); + connect(this, TQ_SIGNAL(changed( int, KMailDrop* )), TQ_SLOT(setCount( int, KMailDrop* ))); //Set default colours; this prevents black (TQColor::invalid) boxes after creating a new box. _bgColour = TQApplication::palette().active().background(); diff --git a/korn/nntp_proto.cpp b/korn/nntp_proto.cpp index f5c59a77..645f73bc 100644 --- a/korn/nntp_proto.cpp +++ b/korn/nntp_proto.cpp @@ -41,8 +41,8 @@ void Nntp_Protocol::configFields( TQPtrVector< TQWidget >* vector, const TQObjec result->append( new TextInput( (TQWidget*)vector->at( 1 ), i18n( "Username" ), TextInput::text, "", "username" ) ); result->append( new TextInput( (TQWidget*)vector->at( 1 ), i18n( "Password" ), TextInput::password, "", "password" ) ); result->append( new CheckboxInput( (TQWidget*)vector->at( 1 ), i18n( "Save password" ), "true", "savepassword" ) ); - TQObject::connect( (TQObject*)result->last()->rightWidget(), TQT_SIGNAL( toggled( bool ) ), - (TQObject*)result->prev()->rightWidget(), TQT_SLOT( setEnabled( bool ) ) ); + TQObject::connect( (TQObject*)result->last()->rightWidget(), TQ_SIGNAL( toggled( bool ) ), + (TQObject*)result->prev()->rightWidget(), TQ_SLOT( setEnabled( bool ) ) ); result->last()->setValue( "false" ); } diff --git a/korn/pop3_proto.cpp b/korn/pop3_proto.cpp index 732f85cf..37b44dc3 100644 --- a/korn/pop3_proto.cpp +++ b/korn/pop3_proto.cpp @@ -50,14 +50,14 @@ void Pop3_Protocol::configFields( TQPtrVector< TQWidget >* vector, const TQObjec result->append( new TextInput( (TQWidget*)vector->at( 0 ), i18n( "Server" ), TextInput::text, "", "server" ) ); result->append( new TextInput( (TQWidget*)vector->at( 0 ), i18n( "Port" ), 0, 65535, "110", "port" ) ); result->append( new ComboInput( (TQWidget*)vector->at( 0 ), i18n( "Encryption" ), encrList, "tls=auto", "encryption" ) ); - TQObject::connect( (TQObject*)result->last()->rightWidget(), TQT_SIGNAL( activated( int) ), - configDialog, TQT_SLOT( slotSSLChanged() ) ); + TQObject::connect( (TQObject*)result->last()->rightWidget(), TQ_SIGNAL( activated( int) ), + configDialog, TQ_SLOT( slotSSLChanged() ) ); result->append( new TextInput( (TQWidget*)vector->at( 1 ), i18n( "Username" ), TextInput::text, "", "username" ) ); result->append( new TextInput( (TQWidget*)vector->at( 1 ), i18n( "Password" ), TextInput::password, "", "password" ) ); result->append( new CheckboxInput( (TQWidget*)vector->at( 1 ), i18n( "Save password" ), "true", "savepassword" ) ); - TQObject::connect( (TQObject*)result->last()->rightWidget(), TQT_SIGNAL( toggled( bool ) ), - (TQObject*)result->prev()->rightWidget(), TQT_SLOT( setEnabled( bool ) ) ); + TQObject::connect( (TQObject*)result->last()->rightWidget(), TQ_SIGNAL( toggled( bool ) ), + (TQObject*)result->prev()->rightWidget(), TQ_SLOT( setEnabled( bool ) ) ); result->last()->setValue( "false" ); result->append( new ComboInput( (TQWidget*)vector->at( 1 ), i18n( "Authentication" ), authList, "", "auth" ) ); } diff --git a/korn/subjectsdlg.cpp b/korn/subjectsdlg.cpp index f3e4b3f4..4b10691d 100644 --- a/korn/subjectsdlg.cpp +++ b/korn/subjectsdlg.cpp @@ -93,14 +93,14 @@ KornSubjectsDlg::KornSubjectsDlg( TQWidget *parent ) _list->setItemMargin(3); // connect the selection changed and double click events of the list view - connect(_list, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(listSelectionChanged())); - connect(_list, TQT_SIGNAL(executed(TQListViewItem *)), this, TQT_SLOT(doubleClicked(TQListViewItem *))); + connect(_list, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(listSelectionChanged())); + connect(_list, TQ_SIGNAL(executed(TQListViewItem *)), this, TQ_SLOT(doubleClicked(TQListViewItem *))); // connect the buttons - connect(invertSelButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(invertSelection())); - connect(clearSelButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeSelection())); - connect(showButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(showMessage())); - connect(deleteButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteMessage())); + connect(invertSelButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(invertSelection())); + connect(clearSelButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeSelection())); + connect(showButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(showMessage())); + connect(deleteButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteMessage())); setInitialSize(TQSize(TQApplication::desktop()->width(), TQApplication::desktop()->height())); } @@ -215,7 +215,7 @@ void KornSubjectsDlg::showSubjectsDlg( const TQString& name ) void KornSubjectsDlg::closeDialog( ) { - disconnect( this, TQT_SIGNAL( finished() ), this, TQT_SLOT( closeDialog() ) ); + disconnect( this, TQ_SIGNAL( finished() ), this, TQ_SLOT( closeDialog() ) ); } //---------------------------- @@ -253,13 +253,13 @@ void KornSubjectsDlg::prepareStep1Subjects( KMailDrop *drop ) _subjects->progress->setProgress( 0 ); _subjects->atRechecking = true; - connect( drop, TQT_SIGNAL( rechecked() ), this, TQT_SLOT( slotReloadRechecked() ) ); + connect( drop, TQ_SIGNAL( rechecked() ), this, TQ_SLOT( slotReloadRechecked() ) ); drop->recheck(); } void KornSubjectsDlg::removeStep1Subjects( KMailDrop *drop ) { - disconnect( drop, TQT_SIGNAL( rechecked() ), this, TQT_SLOT( slotReloadRechecked() ) ); + disconnect( drop, TQ_SIGNAL( rechecked() ), this, TQ_SLOT( slotReloadRechecked() ) ); } void KornSubjectsDlg::prepareStep2Subjects( KMailDrop *drop ) @@ -267,11 +267,11 @@ void KornSubjectsDlg::prepareStep2Subjects( KMailDrop *drop ) _subjects->progress->setText( i18n( "Fetching messages..." ) ); _subjects->atRechecking = false; - connect( drop, TQT_SIGNAL( readSubject( KornMailSubject* ) ), this, TQT_SLOT( subjectAvailable( KornMailSubject* ) ) ); - connect( drop, TQT_SIGNAL( readSubjectsReady( bool ) ), this, TQT_SLOT( subjectsReady( bool ) ) ); - connect( drop, TQT_SIGNAL( readSubjectsTotalSteps( int ) ), _subjects->progress, TQT_SLOT( setNumberOfSteps( int ) ) ); - connect( drop, TQT_SIGNAL( readSubjectsProgress( int ) ), _subjects->progress, TQT_SLOT( setProgress( int ) ) ); - connect( _subjects->progress, TQT_SIGNAL( cancelPressed() ), drop, TQT_SLOT( readSubjectsCanceled() ) ); + connect( drop, TQ_SIGNAL( readSubject( KornMailSubject* ) ), this, TQ_SLOT( subjectAvailable( KornMailSubject* ) ) ); + connect( drop, TQ_SIGNAL( readSubjectsReady( bool ) ), this, TQ_SLOT( subjectsReady( bool ) ) ); + connect( drop, TQ_SIGNAL( readSubjectsTotalSteps( int ) ), _subjects->progress, TQ_SLOT( setNumberOfSteps( int ) ) ); + connect( drop, TQ_SIGNAL( readSubjectsProgress( int ) ), _subjects->progress, TQ_SLOT( setProgress( int ) ) ); + connect( _subjects->progress, TQ_SIGNAL( cancelPressed() ), drop, TQ_SLOT( readSubjectsCanceled() ) ); if( _subjects->it->current()->canReadSubjects() ) _subjects->it->current()->readSubjects( 0 ); @@ -281,11 +281,11 @@ void KornSubjectsDlg::prepareStep2Subjects( KMailDrop *drop ) void KornSubjectsDlg::removeStep2Subjects( KMailDrop *drop ) { - disconnect( drop, TQT_SIGNAL( readSubject( KornMailSubject* ) ), this, TQT_SLOT( subjectAvailable( KornMailSubject* ) ) ); - disconnect( drop, TQT_SIGNAL( readSubjectsReady( bool ) ), this, TQT_SLOT( subjectsReady( bool ) ) ); - disconnect( drop, TQT_SIGNAL( readSubjectsTotalSteps( int ) ), _subjects->progress, TQT_SLOT( setNumberOfSteps( int ) ) ); - disconnect( drop, TQT_SIGNAL( readSubjectsProgress( int ) ), _subjects->progress, TQT_SLOT( setProgress( int ) ) ); - disconnect( _subjects->progress, TQT_SIGNAL( cancelPressed() ), drop, TQT_SLOT( readSubjectsCanceled() ) ); + disconnect( drop, TQ_SIGNAL( readSubject( KornMailSubject* ) ), this, TQ_SLOT( subjectAvailable( KornMailSubject* ) ) ); + disconnect( drop, TQ_SIGNAL( readSubjectsReady( bool ) ), this, TQ_SLOT( subjectsReady( bool ) ) ); + disconnect( drop, TQ_SIGNAL( readSubjectsTotalSteps( int ) ), _subjects->progress, TQ_SLOT( setNumberOfSteps( int ) ) ); + disconnect( drop, TQ_SIGNAL( readSubjectsProgress( int ) ), _subjects->progress, TQ_SLOT( setProgress( int ) ) ); + disconnect( _subjects->progress, TQ_SIGNAL( cancelPressed() ), drop, TQ_SLOT( readSubjectsCanceled() ) ); } bool KornSubjectsDlg::makeSubjectsStruct() @@ -299,7 +299,7 @@ bool KornSubjectsDlg::makeSubjectsStruct() _subjects->progress = new DoubleProgressDialog( this, "progress" ); _subjects->atRechecking = true; - connect( _subjects->progress, TQT_SIGNAL( cancelPressed() ), this, TQT_SLOT( slotSubjectsCanceled() ) ); + connect( _subjects->progress, TQ_SIGNAL( cancelPressed() ), this, TQ_SLOT( slotSubjectsCanceled() ) ); return true; } @@ -309,7 +309,7 @@ void KornSubjectsDlg::deleteSubjectsStruct() if( !_subjects ) return; - disconnect( _subjects->progress, TQT_SIGNAL( cancelPressed() ), this, TQT_SLOT( slotSubjectsCanceled() ) ); + disconnect( _subjects->progress, TQ_SIGNAL( cancelPressed() ), this, TQ_SLOT( slotSubjectsCanceled() ) ); this->unsetCursor(); @@ -441,12 +441,12 @@ void KornSubjectsDlg::makeDeleteStruct() _delete->progress = new TQProgressDialog( this, "progress" ); _delete->totalNumberOfMessages = 0; - connect( _delete->progress, TQT_SIGNAL( canceled() ), this, TQT_SLOT( slotDeleteCanceled() ) ); + connect( _delete->progress, TQ_SIGNAL( canceled() ), this, TQ_SLOT( slotDeleteCanceled() ) ); } void KornSubjectsDlg::deleteDeleteStruct() { - disconnect( _delete->progress, TQT_SIGNAL( canceled() ), this, TQT_SLOT( slotDeleteCanceled() ) ); + disconnect( _delete->progress, TQ_SIGNAL( canceled() ), this, TQ_SLOT( slotDeleteCanceled() ) ); delete _delete->messages; delete _delete->ids; @@ -487,7 +487,7 @@ void KornSubjectsDlg::deleteNextMessage() { if( _delete->messages->count() == 0 ) //No more messages to delete { - TQTimer::singleShot( 100, this, TQT_SLOT( reloadSubjects() ) ); + TQTimer::singleShot( 100, this, TQ_SLOT( reloadSubjects() ) ); deleteDeleteStruct(); //reloadSubjects(); //Reload all subjects again return; @@ -499,12 +499,12 @@ void KornSubjectsDlg::deleteNextMessage() fillDeleteIdList( _delete->drop ); // Connect the progress bar signals of the mail box - connect( _delete->drop, TQT_SIGNAL( deleteMailsTotalSteps( int ) ), _delete->progress, TQT_SLOT( setTotalSteps( int ) ) ); - connect( _delete->drop, TQT_SIGNAL( deleteMailsProgress( int ) ), _delete->progress, TQT_SLOT( setProgress( int ) ) ); - connect( _delete->drop, TQT_SIGNAL( deleteMailsReady( bool ) ), this, TQT_SLOT( deleteMailsReady( bool ) ) ); + connect( _delete->drop, TQ_SIGNAL( deleteMailsTotalSteps( int ) ), _delete->progress, TQ_SLOT( setTotalSteps( int ) ) ); + connect( _delete->drop, TQ_SIGNAL( deleteMailsProgress( int ) ), _delete->progress, TQ_SLOT( setProgress( int ) ) ); + connect( _delete->drop, TQ_SIGNAL( deleteMailsReady( bool ) ), this, TQ_SLOT( deleteMailsReady( bool ) ) ); // connect the cancel button of the progress bar - connect( _delete->progress, TQT_SIGNAL( canceled() ), _delete->drop, TQT_SLOT( deleteMailsCanceled() ) ); + connect( _delete->progress, TQ_SIGNAL( canceled() ), _delete->drop, TQ_SLOT( deleteMailsCanceled() ) ); // delete the mails _delete->drop->deleteMails( _delete->ids, 0 ); @@ -515,12 +515,12 @@ void KornSubjectsDlg::deleteMailsReady( bool /*success*/ ) if( !_delete ) return; - disconnect( _delete->drop, TQT_SIGNAL( deleteMailsTotalSteps( int ) ), _delete->progress, TQT_SLOT( setTotalSteps( int ) ) ); - disconnect( _delete->drop, TQT_SIGNAL( deleteMailsProgress( int ) ), _delete->progress, TQT_SLOT( setProgress( int ) ) ); - disconnect( _delete->drop, TQT_SIGNAL( deleteMailsReady( bool ) ), this, TQT_SLOT( deleteMailsReady( bool ) ) ); + disconnect( _delete->drop, TQ_SIGNAL( deleteMailsTotalSteps( int ) ), _delete->progress, TQ_SLOT( setTotalSteps( int ) ) ); + disconnect( _delete->drop, TQ_SIGNAL( deleteMailsProgress( int ) ), _delete->progress, TQ_SLOT( setProgress( int ) ) ); + disconnect( _delete->drop, TQ_SIGNAL( deleteMailsReady( bool ) ), this, TQ_SLOT( deleteMailsReady( bool ) ) ); // disconnect the cancel button of the progress bar - disconnect( _delete->progress, TQT_SIGNAL( canceled() ), _delete->drop, TQT_SLOT( deleteMailsCanceled() ) ); + disconnect( _delete->progress, TQ_SIGNAL( canceled() ), _delete->drop, TQ_SLOT( deleteMailsCanceled() ) ); deleteNextMessage(); } diff --git a/korn/tdeio.cpp b/korn/tdeio.cpp index faf05214..afabf5a3 100644 --- a/korn/tdeio.cpp +++ b/korn/tdeio.cpp @@ -466,10 +466,10 @@ bool KKioDrop::startProcess() // only reading stdin yet - connect( _process,TQT_SIGNAL(receivedStdout( TDEProcess *, char *, int)), - this, TQT_SLOT(receivedStdout( TDEProcess *,char *,int)) ); - connect( _process, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(processExit(TDEProcess*)) ); + connect( _process,TQ_SIGNAL(receivedStdout( TDEProcess *, char *, int)), + this, TQ_SLOT(receivedStdout( TDEProcess *,char *,int)) ); + connect( _process, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(processExit(TDEProcess*)) ); *_process << _kurl->path(); _process->start( TDEProcess::NotifyOnExit, TDEProcess::Stdout ); diff --git a/korn/tdeio_count.cpp b/korn/tdeio_count.cpp index 515e322b..3c35a6a4 100644 --- a/korn/tdeio_count.cpp +++ b/korn/tdeio_count.cpp @@ -95,9 +95,9 @@ void TDEIO_Count::count( KKioDrop *drop ) return; } - connect( _slave, TQT_SIGNAL( error( int, const TQString& ) ), _tdeio, TQT_SLOT( slotConnectionError( int, const TQString& ) ) ); - connect( _slave, TQT_SIGNAL( warning( const TQString& ) ), _tdeio, TQT_SLOT( slotConnectionWarning( const TQString& ) ) ); - connect( _slave, TQT_SIGNAL( infoMessage( const TQString& ) ), _tdeio, TQT_SLOT( slotConnectionInfoMessage( const TQString& ) ) ); + connect( _slave, TQ_SIGNAL( error( int, const TQString& ) ), _tdeio, TQ_SLOT( slotConnectionError( int, const TQString& ) ) ); + connect( _slave, TQ_SIGNAL( warning( const TQString& ) ), _tdeio, TQ_SLOT( slotConnectionWarning( const TQString& ) ) ); + connect( _slave, TQ_SIGNAL( infoMessage( const TQString& ) ), _tdeio, TQ_SLOT( slotConnectionInfoMessage( const TQString& ) ) ); /* * _protocol->recheckConnectKURL could have change kurl and metadata in order to have the right @@ -125,9 +125,9 @@ void TDEIO_Count::count( KKioDrop *drop ) _job = TDEIO::listDir( kurl, false ); _job->addMetaData( metadata ); - connect( _job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( result( TDEIO::Job* ) ) ); - connect( _job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ), - this, TQT_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) ); + connect( _job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( result( TDEIO::Job* ) ) ); + connect( _job, TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ), + this, TQ_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) ); if( _protocol->connectionBased() ) TDEIO::Scheduler::assignJobToSlave( _slave, _job ); @@ -140,9 +140,9 @@ void TDEIO_Count::stopActiveCount() if( !_new_mailurls ) return; - disconnect( _job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( result( TDEIO::Job* ) ) ); - disconnect( _job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ), - this, TQT_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) ); + disconnect( _job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( result( TDEIO::Job* ) ) ); + disconnect( _job, TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ), + this, TQ_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) ); TDEIO::Scheduler::cancelJob( _job ); @@ -175,8 +175,8 @@ void TDEIO_Count::showPassive( const TQString& id ) _subjects_pending++; - connect( subject, TQT_SIGNAL( readSubject( KornMailSubject* ) ), this, TQT_SLOT( addtoPassivePopup( KornMailSubject* ) ) ); - connect( subject, TQT_SIGNAL( finished( TDEIO_Single_Subject* ) ), this, TQT_SLOT( deleteSingleSubject( TDEIO_Single_Subject* ) ) ); + connect( subject, TQ_SIGNAL( readSubject( KornMailSubject* ) ), this, TQ_SLOT( addtoPassivePopup( KornMailSubject* ) ) ); + connect( subject, TQ_SIGNAL( finished( TDEIO_Single_Subject* ) ), this, TQ_SLOT( deleteSingleSubject( TDEIO_Single_Subject* ) ) ); } void TDEIO_Count::disconnectSlave() @@ -213,9 +213,9 @@ void TDEIO_Count::result( TDEIO::Job* job ) _tdeio->emitValidChanged(); } - disconnect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( result( TDEIO::Job* ) ) ); - disconnect( job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ), - this, TQT_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) ); + disconnect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( result( TDEIO::Job* ) ) ); + disconnect( job, TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ), + this, TQ_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) ); disconnectSlave(); diff --git a/korn/tdeio_delete.cpp b/korn/tdeio_delete.cpp index f26b5fe3..6b8b06fe 100644 --- a/korn/tdeio_delete.cpp +++ b/korn/tdeio_delete.cpp @@ -142,7 +142,7 @@ void TDEIO_Delete::deleteItem( const KornMailId *item, KURL kurl, TDEIO::MetaDat else return; //Unknown deleteFunction - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotResult( TDEIO::Job* ) ) ); job->addMetaData( metadata ); @@ -161,7 +161,7 @@ void TDEIO_Delete::commitDelete( KURL kurl, TDEIO::MetaData metadata, const TDEI TDEIO::TransferJob *job = TDEIO::get( kurl, true, false ); job->addMetaData( metadata ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotResult( TDEIO::Job* ) ) ); _jobs->append( dynamic_cast< TDEIO::Job* >( job ) ); diff --git a/korn/tdeio_read.cpp b/korn/tdeio_read.cpp index c34e7429..ee61243d 100644 --- a/korn/tdeio_read.cpp +++ b/korn/tdeio_read.cpp @@ -60,8 +60,8 @@ void TDEIO_Read::readMail( const KornMailId *& mailid, KKioDrop* drop ) _job = TDEIO::get( kurl, false, false ); _job->addMetaData( metadata ); - connect( _job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotResult( TDEIO::Job* ) ) ); - connect( _job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray & ) ) ); + connect( _job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotResult( TDEIO::Job* ) ) ); + connect( _job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray & ) ) ); } void TDEIO_Read::canceled( ) diff --git a/korn/tdeio_single_subject.cpp b/korn/tdeio_single_subject.cpp index 3ac765de..9e3975cc 100644 --- a/korn/tdeio_single_subject.cpp +++ b/korn/tdeio_single_subject.cpp @@ -65,9 +65,9 @@ void TDEIO_Single_Subject::init( TDEIO::Slave *& slave) _job = TDEIO::get( *_kurl, false, false ); _job->addMetaData( *_metadata ); - connect( _job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotResult( TDEIO::Job* ) ) ); - connect( _job, TQT_SIGNAL( data (TDEIO::Job *, const TQByteArray &) ), - this, TQT_SLOT( slotData(TDEIO::Job *, const TQByteArray &) ) ); + connect( _job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotResult( TDEIO::Job* ) ) ); + connect( _job, TQ_SIGNAL( data (TDEIO::Job *, const TQByteArray &) ), + this, TQ_SLOT( slotData(TDEIO::Job *, const TQByteArray &) ) ); if( _protocol->connectionBased( ) && slave ) TDEIO::Scheduler::assignJobToSlave( slave , _job ); diff --git a/korn/tdeio_subjects.cpp b/korn/tdeio_subjects.cpp index 985a89e5..47b51458 100644 --- a/korn/tdeio_subjects.cpp +++ b/korn/tdeio_subjects.cpp @@ -127,8 +127,8 @@ void TDEIO_Subjects::startJob( const TQString &name, const long size ) subject = new TDEIO_Single_Subject( this, name.latin1(), kurl, metadata, _protocol, _slave, name, size ); - connect( subject, TQT_SIGNAL( readSubject( KornMailSubject* ) ), this, TQT_SLOT( slotReadSubject( KornMailSubject* ) ) ); - connect( subject, TQT_SIGNAL( finished( TDEIO_Single_Subject* ) ), this, TQT_SLOT( slotFinished( TDEIO_Single_Subject* ) ) ); + connect( subject, TQ_SIGNAL( readSubject( KornMailSubject* ) ), this, TQ_SLOT( slotReadSubject( KornMailSubject* ) ) ); + connect( subject, TQ_SIGNAL( finished( TDEIO_Single_Subject* ) ), this, TQ_SLOT( slotFinished( TDEIO_Single_Subject* ) ) ); _jobs->append( subject ); } diff --git a/ktnef/gui/ktnefmain.cpp b/ktnef/gui/ktnefmain.cpp index 09e1b4f5..3755fed0 100644 --- a/ktnef/gui/ktnefmain.cpp +++ b/ktnef/gui/ktnefmain.cpp @@ -85,19 +85,19 @@ KTNEFMain::~KTNEFMain() void KTNEFMain::setupActions() { // File menu - KStdAction::open(this, TQT_SLOT(openFile()), actionCollection()); - KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); + KStdAction::open(this, TQ_SLOT(openFile()), actionCollection()); + KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection()); // Action menu - new TDEAction(i18n("View"), TQString("viewmag"), 0, this, TQT_SLOT(viewFile()), actionCollection(), "view_file"); - new TDEAction(i18n("View With..."), TQString("package_applications"), 0, this, TQT_SLOT(viewFileAs()), actionCollection(), "view_file_as"); - new TDEAction(i18n("Extract"), 0, this, TQT_SLOT(extractFile()), actionCollection(), "extract_file"); - new TDEAction(i18n("Extract To..."), TQString("ktnef_extract_to"), 0, this, TQT_SLOT(extractFileTo()), actionCollection(), "extract_file_to"); - new TDEAction(i18n("Extract All To..."), TQString("ktnef_extract_all_to"), 0, this, TQT_SLOT(extractAllFiles()), actionCollection(), "extract_all_files"); - new TDEAction( i18n( "Message Properties" ), "help", 0, this, TQT_SLOT( slotShowMessageProperties() ), actionCollection(), "msg_properties" ); - new TDEAction(i18n("Properties"), TQString("contents"), 0, this, TQT_SLOT(propertiesFile()), actionCollection(), "properties_file"); - new TDEAction( i18n( "Show Message Text" ), "mail_generic", 0, this, TQT_SLOT( slotShowMessageText() ), actionCollection(), "msg_text" ); - new TDEAction( i18n( "Save Message Text As..." ), "document-save", 0, this, TQT_SLOT( slotSaveMessageText() ), actionCollection(), "msg_save" ); + new TDEAction(i18n("View"), TQString("viewmag"), 0, this, TQ_SLOT(viewFile()), actionCollection(), "view_file"); + new TDEAction(i18n("View With..."), TQString("package_applications"), 0, this, TQ_SLOT(viewFileAs()), actionCollection(), "view_file_as"); + new TDEAction(i18n("Extract"), 0, this, TQ_SLOT(extractFile()), actionCollection(), "extract_file"); + new TDEAction(i18n("Extract To..."), TQString("ktnef_extract_to"), 0, this, TQ_SLOT(extractFileTo()), actionCollection(), "extract_file_to"); + new TDEAction(i18n("Extract All To..."), TQString("ktnef_extract_all_to"), 0, this, TQ_SLOT(extractAllFiles()), actionCollection(), "extract_all_files"); + new TDEAction( i18n( "Message Properties" ), "help", 0, this, TQ_SLOT( slotShowMessageProperties() ), actionCollection(), "msg_properties" ); + new TDEAction(i18n("Properties"), TQString("contents"), 0, this, TQ_SLOT(propertiesFile()), actionCollection(), "properties_file"); + new TDEAction( i18n( "Show Message Text" ), "mail_generic", 0, this, TQ_SLOT( slotShowMessageText() ), actionCollection(), "msg_text" ); + new TDEAction( i18n( "Save Message Text As..." ), "document-save", 0, this, TQ_SLOT( slotSaveMessageText() ), actionCollection(), "msg_save" ); actionCollection()->action("view_file")->setEnabled(false); actionCollection()->action("view_file_as")->setEnabled(false); actionCollection()->action("extract_file")->setEnabled(false); @@ -106,12 +106,12 @@ void KTNEFMain::setupActions() actionCollection()->action("properties_file")->setEnabled(false); // Option menu - new TDEAction(i18n("Default Folder..."), TQString("folder_open"), 0, this, TQT_SLOT(optionDefaultDir()), actionCollection(), "options_default_dir"); + new TDEAction(i18n("Default Folder..."), TQString("folder_open"), 0, this, TQ_SLOT(optionDefaultDir()), actionCollection(), "options_default_dir"); createStandardStatusBarAction(); setStandardToolBarMenuEnabled(true); - KStdAction::configureToolbars(this, TQT_SLOT(slotEditToolbars()), actionCollection()); - KStdAction::keyBindings( this, TQT_SLOT( slotConfigureKeys() ), actionCollection() ); + KStdAction::configureToolbars(this, TQ_SLOT(slotEditToolbars()), actionCollection()); + KStdAction::keyBindings( this, TQ_SLOT( slotConfigureKeys() ), actionCollection() ); createGUI(); } @@ -135,10 +135,10 @@ void KTNEFMain::setupTNEF() parser_ = new KTNEFParser; setCentralWidget(view_); - connect(view_, TQT_SIGNAL(selectionChanged()), TQT_SLOT(viewSelectionChanged())); - connect(view_, TQT_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint&,int)), TQT_SLOT(viewRightButtonPressed(TQListViewItem*,const TQPoint&,int))); - connect(view_, TQT_SIGNAL(doubleClicked(TQListViewItem*)), TQT_SLOT(viewDoubleClicked(TQListViewItem*))); - connect(view_, TQT_SIGNAL(dragRequested(const TQValueList<KTNEFAttach*>&)), TQT_SLOT(viewDragRequested(const TQValueList<KTNEFAttach*>&))); + connect(view_, TQ_SIGNAL(selectionChanged()), TQ_SLOT(viewSelectionChanged())); + connect(view_, TQ_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint&,int)), TQ_SLOT(viewRightButtonPressed(TQListViewItem*,const TQPoint&,int))); + connect(view_, TQ_SIGNAL(doubleClicked(TQListViewItem*)), TQ_SLOT(viewDoubleClicked(TQListViewItem*))); + connect(view_, TQ_SIGNAL(dragRequested(const TQValueList<KTNEFAttach*>&)), TQ_SLOT(viewDragRequested(const TQValueList<KTNEFAttach*>&))); } void KTNEFMain::loadFile(const TQString& filename) @@ -321,16 +321,16 @@ void KTNEFMain::viewRightButtonPressed(TQListViewItem*, const TQPoint& p, int) { if (list->count() == 1u) { - m.insertItem(SmallIcon("viewmag"), i18n("View"), this, TQT_SLOT(viewFile())); - m.insertItem(SmallIcon("package_applications"), i18n("View With..."), this, TQT_SLOT(viewFileAs())); + m.insertItem(SmallIcon("viewmag"), i18n("View"), this, TQ_SLOT(viewFile())); + m.insertItem(SmallIcon("package_applications"), i18n("View With..."), this, TQ_SLOT(viewFileAs())); m.insertSeparator(); } - m.insertItem(i18n("Extract"), this, TQT_SLOT(extractFile())); - m.insertItem(SmallIcon("ktnef_extract_to"), i18n("Extract To..."), this, TQT_SLOT(extractFileTo())); + m.insertItem(i18n("Extract"), this, TQ_SLOT(extractFile())); + m.insertItem(SmallIcon("ktnef_extract_to"), i18n("Extract To..."), this, TQ_SLOT(extractFileTo())); if (list->count() == 1u) { m.insertSeparator(); - m.insertItem(SmallIcon("contents"), i18n("Properties"), this, TQT_SLOT(propertiesFile())); + m.insertItem(SmallIcon("contents"), i18n("Properties"), this, TQ_SLOT(propertiesFile())); } } else if ( list->count() == 0 ) @@ -360,7 +360,7 @@ void KTNEFMain::slotEditToolbars() { saveMainWindowSettings( TDEGlobal::config(), TQString::fromLatin1("MainWindow") ); KEditToolbar dlg(actionCollection()); - connect(&dlg, TQT_SIGNAL( newToolbarConfig() ), this, TQT_SLOT( slotNewToolbarConfig() )); + connect(&dlg, TQ_SIGNAL( newToolbarConfig() ), this, TQ_SLOT( slotNewToolbarConfig() )); dlg.exec(); } diff --git a/ktnef/gui/ktnefview.cpp b/ktnef/gui/ktnefview.cpp index a28a7d51..058a11c2 100644 --- a/ktnef/gui/ktnefview.cpp +++ b/ktnef/gui/ktnefview.cpp @@ -75,7 +75,7 @@ KTNEFView::KTNEFView(TQWidget *parent, const char *name) setSelectionMode(TQListView::Extended); setHScrollBarMode(TQScrollView::AlwaysOff); setVScrollBarMode(TQScrollView::AlwaysOn); - TQTimer::singleShot( 0, this, TQT_SLOT(adjustColumnWidth()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(adjustColumnWidth()) ); } KTNEFView::~KTNEFView() diff --git a/libkcal/calendarresources.cpp b/libkcal/calendarresources.cpp index bfc493ba..2787a89c 100644 --- a/libkcal/calendarresources.cpp +++ b/libkcal/calendarresources.cpp @@ -131,8 +131,8 @@ void CalendarResources::init( const TQString &family ) mDestinationPolicy = mStandardPolicy; mPendingDeleteFromResourceMap = false; - connect( this, TQT_SIGNAL(batchAddingBegins()), this, TQT_SLOT(beginAddingIncidences()) ); - connect( this, TQT_SIGNAL(batchAddingEnds()), this, TQT_SLOT(endAddingIncidences()) ); + connect( this, TQ_SIGNAL(batchAddingBegins()), this, TQ_SLOT(beginAddingIncidences()) ); + connect( this, TQ_SIGNAL(batchAddingEnds()), this, TQ_SLOT(endAddingIncidences()) ); } CalendarResources::~CalendarResources() @@ -756,17 +756,17 @@ Journal::List CalendarResources::rawJournalsForDate( const TQDate &date ) void CalendarResources::connectResource( ResourceCalendar *resource ) { - connect( resource, TQT_SIGNAL( resourceChanged( ResourceCalendar * ) ), - TQT_SIGNAL( calendarChanged() ) ); - connect( resource, TQT_SIGNAL( resourceSaved( ResourceCalendar * ) ), - TQT_SIGNAL( calendarSaved() ) ); + connect( resource, TQ_SIGNAL( resourceChanged( ResourceCalendar * ) ), + TQ_SIGNAL( calendarChanged() ) ); + connect( resource, TQ_SIGNAL( resourceSaved( ResourceCalendar * ) ), + TQ_SIGNAL( calendarSaved() ) ); - connect( resource, TQT_SIGNAL( resourceLoadError( ResourceCalendar *, + connect( resource, TQ_SIGNAL( resourceLoadError( ResourceCalendar *, const TQString & ) ), - TQT_SLOT( slotLoadError( ResourceCalendar *, const TQString & ) ) ); - connect( resource, TQT_SIGNAL( resourceSaveError( ResourceCalendar *, + TQ_SLOT( slotLoadError( ResourceCalendar *, const TQString & ) ) ); + connect( resource, TQ_SIGNAL( resourceSaveError( ResourceCalendar *, const TQString & ) ), - TQT_SLOT( slotSaveError( ResourceCalendar *, const TQString & ) ) ); + TQ_SLOT( slotSaveError( ResourceCalendar *, const TQString & ) ) ); } ResourceCalendar *CalendarResources::resource( Incidence *incidence ) diff --git a/libkcal/calselectdialog.cpp b/libkcal/calselectdialog.cpp index b72a1627..c2a7f897 100644 --- a/libkcal/calselectdialog.cpp +++ b/libkcal/calselectdialog.cpp @@ -65,10 +65,10 @@ CalSelectDialog::CalSelectDialog( const TQString &caption, const TQString &label mListBox->ensureCurrentVisible(); layout->addWidget( mListBox, 10 ); - connect( mListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem *)), - TQT_SLOT(slotOk()) ); - connect( mListBox, TQT_SIGNAL(returnPressed(TQListBoxItem *)), - TQT_SLOT(slotOk()) ); + connect( mListBox, TQ_SIGNAL(doubleClicked(TQListBoxItem *)), + TQ_SLOT(slotOk()) ); + connect( mListBox, TQ_SIGNAL(returnPressed(TQListBoxItem *)), + TQ_SLOT(slotOk()) ); mListBox->setFocus(); diff --git a/libkcal/resourcecached.cpp b/libkcal/resourcecached.cpp index 38110431..dcd161ce 100644 --- a/libkcal/resourcecached.cpp +++ b/libkcal/resourcecached.cpp @@ -55,8 +55,8 @@ ResourceCached::ResourceCached( const TDEConfig* config ) mSavePolicy( SaveNever ), mSaveInterval( 10 ), mSaveTimer( 0, "mSaveTimer" ), mIdMapper( "kcal/uidmaps/" ) { - connect( &mReloadTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotReload() ) ); - connect( &mSaveTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotSave() ) ); + connect( &mReloadTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotReload() ) ); + connect( &mSaveTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotSave() ) ); } ResourceCached::~ResourceCached() diff --git a/libkcal/resourcecachedconfig.cpp b/libkcal/resourcecachedconfig.cpp index a1940e99..6d6ada34 100644 --- a/libkcal/resourcecachedconfig.cpp +++ b/libkcal/resourcecachedconfig.cpp @@ -48,8 +48,8 @@ ResourceCachedReloadConfig::ResourceCachedReloadConfig( TQWidget *parent, TQRadioButton *intervalRadio = new TQRadioButton( i18n("Regular interval"), mGroup ); - connect( intervalRadio, TQT_SIGNAL( stateChanged( int ) ), - TQT_SLOT( slotIntervalStateChanged( int ) ) ); + connect( intervalRadio, TQ_SIGNAL( stateChanged( int ) ), + TQ_SLOT( slotIntervalStateChanged( int ) ) ); TQHBox *intervalBox = new TQHBox( mGroup ); new TQLabel( i18n("Interval in minutes"), intervalBox ); mIntervalSpin = new TQSpinBox( 1,900, 1,intervalBox ); @@ -88,8 +88,8 @@ ResourceCachedSaveConfig::ResourceCachedSaveConfig( TQWidget *parent, TQRadioButton *intervalRadio = new TQRadioButton( i18n("Regular interval"), mGroup ); - connect( intervalRadio, TQT_SIGNAL( stateChanged( int ) ), - TQT_SLOT( slotIntervalStateChanged( int ) ) ); + connect( intervalRadio, TQ_SIGNAL( stateChanged( int ) ), + TQ_SLOT( slotIntervalStateChanged( int ) ) ); TQHBox *intervalBox = new TQHBox( mGroup ); new TQLabel( i18n("Interval in minutes"), intervalBox ); mIntervalSpin = new TQSpinBox( 1,900, 1,intervalBox ); diff --git a/libkcal/resourcelocal.cpp b/libkcal/resourcelocal.cpp index a193b0b7..7651daf5 100644 --- a/libkcal/resourcelocal.cpp +++ b/libkcal/resourcelocal.cpp @@ -111,12 +111,12 @@ void ResourceLocal::init() setSavePolicy( SaveDelayed ); - connect( &mDirWatch, TQT_SIGNAL( dirty( const TQString & ) ), - TQT_SLOT( reload() ) ); - connect( &mDirWatch, TQT_SIGNAL( created( const TQString & ) ), - TQT_SLOT( reload() ) ); - connect( &mDirWatch, TQT_SIGNAL( deleted( const TQString & ) ), - TQT_SLOT( reload() ) ); + connect( &mDirWatch, TQ_SIGNAL( dirty( const TQString & ) ), + TQ_SLOT( reload() ) ); + connect( &mDirWatch, TQ_SIGNAL( created( const TQString & ) ), + TQ_SLOT( reload() ) ); + connect( &mDirWatch, TQ_SIGNAL( deleted( const TQString & ) ), + TQ_SLOT( reload() ) ); mLock = new TDEABC::Lock( mURL.path() ); diff --git a/libkcal/resourcelocaldir.cpp b/libkcal/resourcelocaldir.cpp index 33fa42f7..0c22cae5 100644 --- a/libkcal/resourcelocaldir.cpp +++ b/libkcal/resourcelocaldir.cpp @@ -92,12 +92,12 @@ void ResourceLocalDir::init() setSavePolicy( SaveDelayed ); - connect( &mDirWatch, TQT_SIGNAL( dirty( const TQString & ) ), - TQT_SLOT( reload( const TQString & ) ) ); - connect( &mDirWatch, TQT_SIGNAL( created( const TQString & ) ), - TQT_SLOT( reload( const TQString & ) ) ); - connect( &mDirWatch, TQT_SIGNAL( deleted( const TQString & ) ), - TQT_SLOT( reload( const TQString & ) ) ); + connect( &mDirWatch, TQ_SIGNAL( dirty( const TQString & ) ), + TQ_SLOT( reload( const TQString & ) ) ); + connect( &mDirWatch, TQ_SIGNAL( created( const TQString & ) ), + TQ_SLOT( reload( const TQString & ) ) ); + connect( &mDirWatch, TQ_SIGNAL( deleted( const TQString & ) ), + TQ_SLOT( reload( const TQString & ) ) ); mLock = new TDEABC::Lock( mURL.path() ); diff --git a/libkpgp/kpgpui.cpp b/libkpgp/kpgpui.cpp index 08b2652a..cb870d73 100644 --- a/libkpgp/kpgpui.cpp +++ b/libkpgp/kpgpui.cpp @@ -82,7 +82,7 @@ PassphraseDialog::PassphraseDialog( TQWidget *parent, lineedit->setEchoMode(TQLineEdit::Password); lineedit->setMinimumWidth( fontMetrics().maxWidth()*20 ); lineedit->setFocus(); - connect( lineedit, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotOk()) ); + connect( lineedit, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(slotOk()) ); vlay->addWidget( label ); vlay->addWidget( lineedit ); @@ -146,8 +146,8 @@ Config::Config( TQWidget *parent, const char *name, bool encrypt ) << i18n("Do not use any encryption tool") ); label->setBuddy( toolCombo ); hbox->setStretchFactor( toolCombo, 1 ); - connect( toolCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SIGNAL( changed( void ) ) ); + connect( toolCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SIGNAL( changed( void ) ) ); // This is the place to add a KURLRequester to be used for asking // the user for the path to the executable... topLayout->addWidget( group ); @@ -156,8 +156,8 @@ Config::Config( TQWidget *parent, const char *name, bool encrypt ) mpOptionsGroupBox->layout()->setSpacing( KDialog::spacingHint() ); storePass = new TQCheckBox( i18n("&Keep passphrase in memory"), mpOptionsGroupBox ); - connect( storePass, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed( void ) ) ); + connect( storePass, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed( void ) ) ); msg = i18n( "<qt><p>When this option is enabled, the passphrase of your " "private key will be remembered by the application as long " "as the application is running. Thus you will only have to " @@ -173,8 +173,8 @@ Config::Config( TQWidget *parent, const char *name, bool encrypt ) if( encrypt ) { encToSelf = new TQCheckBox( i18n("Always encr&ypt to self"), mpOptionsGroupBox ); - connect( encToSelf, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed( void ) ) ); + connect( encToSelf, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed( void ) ) ); msg = i18n( "<qt><p>When this option is enabled, the message/file " "will not only be encrypted with the receiver's public key, " @@ -188,8 +188,8 @@ Config::Config( TQWidget *parent, const char *name, bool encrypt ) showCipherText = new TQCheckBox( i18n("&Show signed/encrypted text after " "composing"), mpOptionsGroupBox ); - connect( showCipherText, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed( void ) ) ); + connect( showCipherText, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed( void ) ) ); msg = i18n( "<qt><p>When this option is enabled, the signed/encrypted text " "will be shown in a separate window, enabling you to know how " @@ -200,8 +200,8 @@ Config::Config( TQWidget *parent, const char *name, bool encrypt ) showKeyApprovalDlg = new TQCheckBox( i18n("Always show the encryption " "keys &for approval"), mpOptionsGroupBox ); - connect( showKeyApprovalDlg, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed( void ) ) ); + connect( showKeyApprovalDlg, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed( void ) ) ); msg = i18n( "<qt><p>When this option is enabled, the application will " "always show you a list of public keys from which you can " "choose the one it will use for encryption. If it is off, " @@ -328,9 +328,9 @@ KeySelectionDialog::KeySelectionDialog( const KeyList& keyList, hlay->addWidget( le, 1 ); le->setFocus(); - connect( le, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotSearch(const TQString&)) ); - connect( mStartSearchTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotFilter()) ); + connect( le, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotSearch(const TQString&)) ); + connect( mStartSearchTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotFilter()) ); mListView = new TDEListView( page ); mListView->addColumn( i18n("Key ID") ); @@ -373,24 +373,24 @@ KeySelectionDialog::KeySelectionDialog( const KeyList& keyList, mListView->center( mListView->contentsX(), mListView->itemPos( lvi ) ); if( extendedSelection ) { - connect( mCheckSelectionTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotCheckSelection() ) ); - connect( mListView, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotSelectionChanged() ) ); + connect( mCheckSelectionTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotCheckSelection() ) ); + connect( mListView, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotSelectionChanged() ) ); } else { - connect( mListView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), - this, TQT_SLOT( slotSelectionChanged( TQListViewItem* ) ) ); + connect( mListView, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ), + this, TQ_SLOT( slotSelectionChanged( TQListViewItem* ) ) ); } - connect( mListView, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), this, TQT_SLOT( accept() ) ); + connect( mListView, TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), this, TQ_SLOT( accept() ) ); - connect( mListView, TQT_SIGNAL( contextMenuRequested( TQListViewItem*, + connect( mListView, TQ_SIGNAL( contextMenuRequested( TQListViewItem*, const TQPoint&, int ) ), - this, TQT_SLOT( slotRMB( TQListViewItem*, const TQPoint&, int ) ) ); + this, TQ_SLOT( slotRMB( TQListViewItem*, const TQPoint&, int ) ) ); setButtonText( KDialogBase::Default, i18n("&Reread Keys") ); - connect( this, TQT_SIGNAL( defaultClicked() ), - this, TQT_SLOT( slotRereadKeys() ) ); + connect( this, TQ_SIGNAL( defaultClicked() ), + this, TQ_SLOT( slotRereadKeys() ) ); } @@ -823,25 +823,25 @@ void KeySelectionDialog::slotRereadKeys() int offsetY = mListView->contentsY(); if( mListView->isMultiSelection() ) { - disconnect( mListView, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotSelectionChanged() ) ); + disconnect( mListView, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotSelectionChanged() ) ); } else { - disconnect( mListView, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), - this, TQT_SLOT( slotSelectionChanged( TQListViewItem * ) ) ); + disconnect( mListView, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), + this, TQ_SLOT( slotSelectionChanged( TQListViewItem * ) ) ); } initKeylist( keys, KeyIDList( mKeyIds ) ); slotFilter(); if( mListView->isMultiSelection() ) { - connect( mListView, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotSelectionChanged() ) ); + connect( mListView, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotSelectionChanged() ) ); slotSelectionChanged(); } else { - connect( mListView, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), - this, TQT_SLOT( slotSelectionChanged( TQListViewItem * ) ) ); + connect( mListView, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), + this, TQ_SLOT( slotSelectionChanged( TQListViewItem * ) ) ); } // restore the saved position of the contents @@ -886,8 +886,8 @@ void KeySelectionDialog::slotCheckSelection( TQListViewItem* plvi /* = 0 */ ) // As we might change the selection, we have to disconnect the slot // to prevent recursion - disconnect( mListView, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotSelectionChanged() ) ); + disconnect( mListView, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotSelectionChanged() ) ); KeyIDList newKeyIdList; TQValueList<TQListViewItem*> keysToBeChecked; @@ -989,8 +989,8 @@ void KeySelectionDialog::slotCheckSelection( TQListViewItem* plvi /* = 0 */ ) } enableButtonOK( keysAllowed ); - connect( mListView, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotSelectionChanged() ) ); + connect( mListView, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotSelectionChanged() ) ); } } @@ -1037,7 +1037,7 @@ void KeySelectionDialog::slotRMB( TQListViewItem* lvi, const TQPoint& pos, int ) mCurrentContextMenuItem = lvi; TQPopupMenu menu(this); - menu.insertItem( i18n( "Recheck Key" ), this, TQT_SLOT( slotRecheckKey() ) ); + menu.insertItem( i18n( "Recheck Key" ), this, TQ_SLOT( slotRecheckKey() ) ); menu.exec( pos ); } @@ -1189,8 +1189,8 @@ KeyRequester::KeyRequester( TQWidget * parent, bool multipleKeys, hlay->addWidget( mEraseButton ); hlay->addWidget( mDialogButton ); - connect( mEraseButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEraseButtonClicked()) ); - connect( mDialogButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotDialogButtonClicked()) ); + connect( mEraseButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotEraseButtonClicked()) ); + connect( mDialogButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotDialogButtonClicked()) ); setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed ) ); @@ -1470,12 +1470,12 @@ KeyApprovalDialog::KeyApprovalDialog( const TQStringList& addresses, default: encrPrefCombo->setCurrentItem( 0 ); } - connect( encrPrefCombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotPrefsChanged(int)) ); + connect( encrPrefCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotPrefsChanged(int)) ); mEncrPrefCombos.insert( i, encrPrefCombo ); } - connect( mChangeButtonGroup, TQT_SIGNAL(clicked(int)), - this, TQT_SLOT(slotChangeEncryptionKey(int)) ); + connect( mChangeButtonGroup, TQ_SIGNAL(clicked(int)), + this, TQ_SLOT(slotChangeEncryptionKey(int)) ); // calculate the optimal width for the dialog int dialogWidth = marginHint() diff --git a/libkpimexchange/core/exchangeaccount.cpp b/libkpimexchange/core/exchangeaccount.cpp index a033b6b0..9c801328 100644 --- a/libkpimexchange/core/exchangeaccount.cpp +++ b/libkpimexchange/core/exchangeaccount.cpp @@ -239,8 +239,8 @@ void ExchangeAccount::calcFolderURLs() TDEIO::DavJob* job = TDEIO::davPropFind( baseURL(), doc, "1", false ); job->addMetaData( "errorPage", "false" ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotFolderResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotFolderResult( TDEIO::Job * ) ) ); } void ExchangeAccount::slotFolderResult( TDEIO::Job *job ) diff --git a/libkpimexchange/core/exchangeclient.cpp b/libkpimexchange/core/exchangeclient.cpp index 5658c707..c3fdd380 100644 --- a/libkpimexchange/core/exchangeclient.cpp +++ b/libkpimexchange/core/exchangeclient.cpp @@ -131,8 +131,8 @@ void ExchangeClient::download( KCal::Calendar *calendar, const TQDate &start, ExchangeDownload *worker = new ExchangeDownload( mAccount, mWindow ); worker->download( calendar, start, end, showProgress ); connect( worker, - TQT_SIGNAL( finished( ExchangeDownload *, int, const TQString & ) ), - TQT_SLOT( slotDownloadFinished( ExchangeDownload *, int, + TQ_SIGNAL( finished( ExchangeDownload *, int, const TQString & ) ), + TQ_SLOT( slotDownloadFinished( ExchangeDownload *, int, const TQString & ) ) ); } @@ -149,11 +149,11 @@ void ExchangeClient::download( const TQDate &start, const TQDate &end, ExchangeDownload *worker = new ExchangeDownload( mAccount, mWindow ); worker->download( start, end, showProgress ); connect( worker, - TQT_SIGNAL( finished( ExchangeDownload *, int, const TQString & ) ), - TQT_SLOT( slotDownloadFinished( ExchangeDownload *, int, + TQ_SIGNAL( finished( ExchangeDownload *, int, const TQString & ) ), + TQ_SLOT( slotDownloadFinished( ExchangeDownload *, int, const TQString & ) ) ); - connect( worker, TQT_SIGNAL( gotEvent( KCal::Event *, const KURL & ) ), - TQT_SIGNAL( event( KCal::Event *, const KURL & ) ) ); + connect( worker, TQ_SIGNAL( gotEvent( KCal::Event *, const KURL & ) ), + TQ_SIGNAL( event( KCal::Event *, const KURL & ) ) ); } void ExchangeClient::upload( KCal::Event *event ) @@ -167,8 +167,8 @@ void ExchangeClient::upload( KCal::Event *event ) ExchangeUpload *worker = new ExchangeUpload( event, mAccount, mTimeZoneId, mWindow ); - connect( worker, TQT_SIGNAL( finished( ExchangeUpload *, int, const TQString & ) ), - TQT_SLOT( slotUploadFinished( ExchangeUpload *, int, const TQString & ) ) ); + connect( worker, TQ_SIGNAL( finished( ExchangeUpload *, int, const TQString & ) ), + TQ_SLOT( slotUploadFinished( ExchangeUpload *, int, const TQString & ) ) ); } void ExchangeClient::remove( KCal::Event *event ) @@ -179,8 +179,8 @@ void ExchangeClient::remove( KCal::Event *event ) } ExchangeDelete *worker = new ExchangeDelete( event, mAccount, mWindow ); - connect( worker, TQT_SIGNAL( finished( ExchangeDelete *, int, const TQString & ) ), - TQT_SLOT( slotRemoveFinished( ExchangeDelete *, int, const TQString & ) ) ); + connect( worker, TQ_SIGNAL( finished( ExchangeDelete *, int, const TQString & ) ), + TQ_SLOT( slotRemoveFinished( ExchangeDelete *, int, const TQString & ) ) ); } void ExchangeClient::slotDownloadFinished( ExchangeDownload *worker, @@ -217,8 +217,8 @@ int ExchangeClient::downloadSynchronous( KCal::Calendar *calendar, kdDebug() << "ExchangeClient::downloadSynchronous()" << endl; mClientState = WaitingForResult; - connect( this, TQT_SIGNAL( downloadFinished( int, const TQString & ) ), - TQT_SLOT( slotSyncFinished( int, const TQString & ) ) ); + connect( this, TQ_SIGNAL( downloadFinished( int, const TQString & ) ), + TQ_SLOT( slotSyncFinished( int, const TQString & ) ) ); download( calendar, start, end, showProgress ); @@ -230,8 +230,8 @@ int ExchangeClient::downloadSynchronous( KCal::Calendar *calendar, } while ( mClientState == WaitingForResult ); TQApplication::restoreOverrideCursor(); - disconnect( this, TQT_SIGNAL( downloadFinished( int, const TQString & ) ), - this, TQT_SLOT( slotSyncFinished( int, const TQString & ) ) ); + disconnect( this, TQ_SIGNAL( downloadFinished( int, const TQString & ) ), + this, TQ_SLOT( slotSyncFinished( int, const TQString & ) ) ); return mSyncResult; } @@ -239,8 +239,8 @@ int ExchangeClient::downloadSynchronous( KCal::Calendar *calendar, int ExchangeClient::uploadSynchronous( KCal::Event* event ) { mClientState = WaitingForResult; - connect( this, TQT_SIGNAL( uploadFinished( int, const TQString & ) ), - TQT_SLOT( slotSyncFinished( int, const TQString & ) ) ); + connect( this, TQ_SIGNAL( uploadFinished( int, const TQString & ) ), + TQ_SLOT( slotSyncFinished( int, const TQString & ) ) ); upload( event ); @@ -250,16 +250,16 @@ int ExchangeClient::uploadSynchronous( KCal::Event* event ) tqApp->processEvents(); } while ( mClientState == WaitingForResult ); TQApplication::restoreOverrideCursor(); - disconnect( this, TQT_SIGNAL( uploadFinished( int, const TQString & ) ), - this, TQT_SLOT( slotSyncFinished( int, const TQString & ) ) ); + disconnect( this, TQ_SIGNAL( uploadFinished( int, const TQString & ) ), + this, TQ_SLOT( slotSyncFinished( int, const TQString & ) ) ); return mSyncResult; } int ExchangeClient::removeSynchronous( KCal::Event* event ) { mClientState = WaitingForResult; - connect( this, TQT_SIGNAL( removeFinished( int, const TQString & ) ), - TQT_SLOT( slotSyncFinished( int, const TQString & ) ) ); + connect( this, TQ_SIGNAL( removeFinished( int, const TQString & ) ), + TQ_SLOT( slotSyncFinished( int, const TQString & ) ) ); remove( event ); @@ -269,8 +269,8 @@ int ExchangeClient::removeSynchronous( KCal::Event* event ) tqApp->processEvents(); } while ( mClientState == WaitingForResult ); TQApplication::restoreOverrideCursor(); - disconnect( this, TQT_SIGNAL( removeFinished( int, const TQString & ) ), - this, TQT_SLOT( slotSyncFinished( int, const TQString & ) ) ); + disconnect( this, TQ_SIGNAL( removeFinished( int, const TQString & ) ), + this, TQ_SLOT( slotSyncFinished( int, const TQString & ) ) ); return mSyncResult; } diff --git a/libkpimexchange/core/exchangedelete.cpp b/libkpimexchange/core/exchangedelete.cpp index 094b3b5c..d9e8c177 100644 --- a/libkpimexchange/core/exchangedelete.cpp +++ b/libkpimexchange/core/exchangedelete.cpp @@ -74,7 +74,7 @@ void ExchangeDelete::findUidSingleMaster( TQString const& uid ) TDEIO::DavJob* job = TDEIO::davSearch( mAccount->calendarURL(), "DAV:", "sql", query, false ); job->setWindow( mWindow ); - connect(job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotFindUidResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result( TDEIO::Job * )), this, TQ_SLOT(slotFindUidResult(TDEIO::Job *))); } void ExchangeDelete::slotFindUidResult( TDEIO::Job * job ) @@ -104,7 +104,7 @@ void ExchangeDelete::startDelete( const KURL& url ) { TDEIO::SimpleJob* job = TDEIO::file_delete( url, false ); // no GUI job->setWindow( mWindow ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotDeleteResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotDeleteResult( TDEIO::Job * ) ) ); } void ExchangeDelete::slotDeleteResult( TDEIO::Job* job ) diff --git a/libkpimexchange/core/exchangedownload.cpp b/libkpimexchange/core/exchangedownload.cpp index f3210d7c..55cecd1f 100644 --- a/libkpimexchange/core/exchangedownload.cpp +++ b/libkpimexchange/core/exchangedownload.cpp @@ -92,10 +92,10 @@ void ExchangeDownload::download( KCal::Calendar *calendar, const TQDate &start, mProgress = new ExchangeProgress(); mProgress->show(); - connect( this, TQT_SIGNAL( startDownload() ), mProgress, - TQT_SLOT( slotTransferStarted() ) ); - connect( this, TQT_SIGNAL(finishDownload() ), mProgress, - TQT_SLOT( slotTransferFinished() ) ); + connect( this, TQ_SIGNAL( startDownload() ), mProgress, + TQ_SLOT( slotTransferStarted() ) ); + connect( this, TQ_SIGNAL(finishDownload() ), mProgress, + TQ_SLOT( slotTransferFinished() ) ); #endif } @@ -112,8 +112,8 @@ void ExchangeDownload::download( KCal::Calendar *calendar, const TQDate &start, sql, false ); TDEIO::Scheduler::scheduleJob( job ); job->setWindow( mWindow ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotSearchResult( TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotSearchResult( TDEIO::Job *) ) ); } void ExchangeDownload::download( const TQDate& start, const TQDate& end, bool showProgress ) @@ -126,8 +126,8 @@ void ExchangeDownload::download( const TQDate& start, const TQDate& end, bool sh mProgress = new ExchangeProgress(); mProgress->show(); - connect( this, TQT_SIGNAL(startDownload()), mProgress, TQT_SLOT(slotTransferStarted()) ); - connect( this, TQT_SIGNAL(finishDownload()), mProgress, TQT_SLOT(slotTransferFinished()) ); + connect( this, TQ_SIGNAL(startDownload()), mProgress, TQ_SLOT(slotTransferStarted()) ); + connect( this, TQ_SIGNAL(finishDownload()), mProgress, TQ_SLOT(slotTransferFinished()) ); } TQString sql = dateSelectQuery( start, end.addDays( 1 ) ); @@ -137,8 +137,8 @@ void ExchangeDownload::download( const TQDate& start, const TQDate& end, bool sh TDEIO::DavJob *job = TDEIO::davSearch( mAccount->calendarURL(), "DAV:", "sql", sql, false ); TDEIO::Scheduler::scheduleJob(job); job->setWindow( mWindow ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotSearchResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotSearchResult( TDEIO::Job * ) ) ); } // Original query TODO: make query configurable @@ -301,8 +301,8 @@ void ExchangeDownload::handleRecurrence( TQString uid ) query, false ); TDEIO::Scheduler::scheduleJob( job ); job->setWindow( mWindow ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotMasterResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotMasterResult( TDEIO::Job * ) ) ); } void ExchangeDownload::readAppointment( const KURL& url ) @@ -349,8 +349,8 @@ void ExchangeDownload::readAppointment( const KURL& url ) TDEIO::Scheduler::scheduleJob( job ); job->setWindow( mWindow ); job->addMetaData( "errorPage", "false" ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotPropFindResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotPropFindResult( TDEIO::Job * ) ) ); } void ExchangeDownload::slotPropFindResult( TDEIO::Job *job ) diff --git a/libkpimexchange/core/exchangemonitor.cpp b/libkpimexchange/core/exchangemonitor.cpp index df52fdab..aadfb7c8 100644 --- a/libkpimexchange/core/exchangemonitor.cpp +++ b/libkpimexchange/core/exchangemonitor.cpp @@ -94,7 +94,7 @@ ExchangeMonitor::ExchangeMonitor( ExchangeAccount* account, int pollMode, const kdDebug() << "bind() returned false" << endl; mSocket->setBlocking( false ); mNotifier = new TQSocketNotifier( mSocket->socket(), TQSocketNotifier::Read ); - connect( mNotifier, TQT_SIGNAL(activated( int )), this, TQT_SLOT( slotActivated(int))); + connect( mNotifier, TQ_SIGNAL(activated( int )), this, TQ_SLOT( slotActivated(int))); //mSocket.setSocketFlags( KExtendedSocket::inetSocket | KExtendedSocket::passiveSocket | KExtendedSocket::datagramSocket | KExtendedSocket::bufferedSocket ); //mSocket.setHost( "jupiter.tbm.tudelft.nl" ); // Does this work? @@ -110,12 +110,12 @@ ExchangeMonitor::ExchangeMonitor( ExchangeAccount* account, int pollMode, const if ( mPollMode == Poll ) { mPollTimer = new TQTimer( this, "mPollTimer" ); - connect( mPollTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotPollTimer()) ); + connect( mPollTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotPollTimer()) ); mPollTimer->start( 60000 ); // 1 minute timer } mRenewTimer = new TQTimer( this, "mRenewTimer" ); - connect( mRenewTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotRenewTimer()) ); + connect( mRenewTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotRenewTimer()) ); mRenewTimer->start( mSubscriptionLifetime * 900 ); // 10% early so as to be in time } @@ -133,7 +133,7 @@ ExchangeMonitor::~ExchangeMonitor() job->addMetaData( "customHTTPHeader", headers ); // Can't do, this is a destructor! // job->addMetaData( "PropagateHttpHeader", "true" ); - // connect(job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotUnsubscribeResult(TDEIO::Job *))); + // connect(job, TQ_SIGNAL(result( TDEIO::Job * )), this, TQ_SLOT(slotUnsubscribeResult(TDEIO::Job *))); } kdDebug() << "Finished ExchangeMonitor destructor" << endl; @@ -161,7 +161,7 @@ void ExchangeMonitor::addWatch( const KURL &url, int mode, int depth ) TDEIO::DavJob *job = new TDEIO::DavJob( myURL, (int) TDEIO::DAV_SUBSCRIBE, TQString(), false ); job->addMetaData( "customHTTPHeader", headers ); job->addMetaData( "PropagateHttpHeader", "true" ); - connect(job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotSubscribeResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result( TDEIO::Job * )), this, TQ_SLOT(slotSubscribeResult(TDEIO::Job *))); } void ExchangeMonitor::removeWatch( const KURL &url ) @@ -182,7 +182,7 @@ void ExchangeMonitor::removeWatch( ID id ) TDEIO::DavJob *job = new TDEIO::DavJob( mAccount->calendarURL(), (int) TDEIO::DAV_UNSUBSCRIBE, TQString(), false ); job->addMetaData( "customHTTPHeader", "Subscription-id: " + TQString::number( id )); job->addMetaData( "PropagateHttpHeader", "true" ); - connect(job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotUnsubscribeResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result( TDEIO::Job * )), this, TQ_SLOT(slotUnsubscribeResult(TDEIO::Job *))); } void ExchangeMonitor::slotSubscribeResult( TDEIO::Job * job ) @@ -323,7 +323,7 @@ void ExchangeMonitor::poll( const IDList& IDs ) { // confirm it TDEIO::DavJob *job = new TDEIO::DavJob( mAccount->calendarURL(), (int) TDEIO::DAV_POLL, TQString(), false ); job->addMetaData( "customHTTPHeader", "Subscription-ID: " + makeIDString( IDs ) ); - connect(job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotPollResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result( TDEIO::Job * )), this, TQ_SLOT(slotPollResult(TDEIO::Job *))); } void ExchangeMonitor::slotPollResult( TDEIO::Job * job ) @@ -368,7 +368,7 @@ void ExchangeMonitor::slotRenewTimer() TDEIO::DavJob *job = new TDEIO::DavJob( mAccount->calendarURL(), (int) TDEIO::DAV_SUBSCRIBE, TQString(), false ); job->addMetaData( "customHTTPHeader", "Subscription-id: " + makeIDString( mSubscriptionMap.keys() ) ); - connect(job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotRenewResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result( TDEIO::Job * )), this, TQ_SLOT(slotRenewResult(TDEIO::Job *))); } void ExchangeMonitor::slotRenewResult( TDEIO::Job* job ) diff --git a/libkpimexchange/core/exchangeupload.cpp b/libkpimexchange/core/exchangeupload.cpp index 226202c5..8e49e0aa 100644 --- a/libkpimexchange/core/exchangeupload.cpp +++ b/libkpimexchange/core/exchangeupload.cpp @@ -88,8 +88,8 @@ void ExchangeUpload::findUid( TQString const &uid ) TDEIO::DavJob* job = TDEIO::davSearch( mAccount->calendarURL(), "DAV:", "sql", query, false ); job->setWindow( mWindow ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotFindUidResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotFindUidResult( TDEIO::Job * ) ) ); } void ExchangeUpload::slotFindUidResult( TDEIO::Job * job ) @@ -147,8 +147,8 @@ void ExchangeUpload::tryExist() TDEIO::DavJob *job = TDEIO::davPropFind( url, doc, "0", false ); job->setWindow( mWindow ); job->addMetaData( "errorPage", "false" ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotPropFindResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotPropFindResult( TDEIO::Job * ) ) ); } void ExchangeUpload::slotPropFindResult( TDEIO::Job *job ) @@ -332,8 +332,8 @@ void ExchangeUpload::startUpload( const KURL &url ) TDEIO::DavJob *job = TDEIO::davPropPatch( url, doc, false ); job->setWindow( mWindow ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotPatchResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotPatchResult( TDEIO::Job * ) ) ); } void ExchangeUpload::slotPatchResult( TDEIO::Job *job ) diff --git a/libkpimidentities/identitycombo.cpp b/libkpimidentities/identitycombo.cpp index 8644cb5a..200f93ac 100644 --- a/libkpimidentities/identitycombo.cpp +++ b/libkpimidentities/identitycombo.cpp @@ -48,9 +48,9 @@ IdentityCombo::IdentityCombo( IdentityManager* manager, TQWidget * parent, const { reloadCombo(); reloadUoidList(); - connect( this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotEmitChanged(int)) ); - connect( manager, TQT_SIGNAL(changed()), - TQT_SLOT(slotIdentityManagerChanged()) ); + connect( this, TQ_SIGNAL(activated(int)), TQ_SLOT(slotEmitChanged(int)) ); + connect( manager, TQ_SIGNAL(changed()), + TQ_SLOT(slotIdentityManagerChanged()) ); } TQString IdentityCombo::currentIdentityName() const { diff --git a/libtdenetwork/qgpgme/eventloopinteractor.cpp b/libtdenetwork/qgpgme/eventloopinteractor.cpp index 3e75bf89..34cc51f4 100644 --- a/libtdenetwork/qgpgme/eventloopinteractor.cpp +++ b/libtdenetwork/qgpgme/eventloopinteractor.cpp @@ -39,8 +39,8 @@ QGpgME::EventLoopInteractor::EventLoopInteractor( TQObject * parent, const char { if ( !parent ) if ( tqApp ) { - connect( tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(deleteLater()) ); - connect( tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SIGNAL(aboutToDestroy()) ); + connect( tqApp, TQ_SIGNAL(aboutToQuit()), TQ_SLOT(deleteLater()) ); + connect( tqApp, TQ_SIGNAL(aboutToQuit()), TQ_SIGNAL(aboutToDestroy()) ); } mSelf = this; } @@ -67,9 +67,9 @@ void * QGpgME::EventLoopInteractor::registerWatcher( int fd, Direction dir, bool TQSocketNotifier * sn = new TQSocketNotifier( fd, dir == Read ? TQSocketNotifier::Read : TQSocketNotifier::Write ); if ( dir == Read ) - connect( sn, TQT_SIGNAL(activated(int)), TQT_SLOT(slotReadActivity(int)) ); + connect( sn, TQ_SIGNAL(activated(int)), TQ_SLOT(slotReadActivity(int)) ); else - connect( sn, TQT_SIGNAL(activated(int)), TQT_SLOT(slotWriteActivity(int)) ); + connect( sn, TQ_SIGNAL(activated(int)), TQ_SLOT(slotWriteActivity(int)) ); ok = true; // Can above operations fails? return sn; } diff --git a/libtdepim/addresseelineedit.cpp b/libtdepim/addresseelineedit.cpp index 4060c451..77128b7a 100644 --- a/libtdepim/addresseelineedit.cpp +++ b/libtdepim/addresseelineedit.cpp @@ -151,8 +151,8 @@ void AddresseeLineEdit::init() completionSourceWeightsDeleter.setObject( s_completionSourceWeights, new TQMap<TQString,int> ); ldapClientToCompletionSourceMapDeleter.setObject( s_ldapClientToCompletionSourceMap, new TQMap<int,int> ); } -// connect( s_completion, TQT_SIGNAL( match( const TQString& ) ), -// this, TQT_SLOT( slotMatched( const TQString& ) ) ); +// connect( s_completion, TQ_SIGNAL( match( const TQString& ) ), +// this, TQ_SLOT( slotMatched( const TQString& ) ) ); if ( m_useCompletion ) { if ( !s_LDAPTimer ) { @@ -165,25 +165,25 @@ void AddresseeLineEdit::init() if ( !m_completionInitialized ) { setCompletionObject( s_completion, false ); - connect( this, TQT_SIGNAL( completion( const TQString& ) ), - this, TQT_SLOT( slotCompletion() ) ); - connect( this, TQT_SIGNAL( returnPressed( const TQString& ) ), - this, TQT_SLOT( slotReturnPressed( const TQString& ) ) ); + connect( this, TQ_SIGNAL( completion( const TQString& ) ), + this, TQ_SLOT( slotCompletion() ) ); + connect( this, TQ_SIGNAL( returnPressed( const TQString& ) ), + this, TQ_SLOT( slotReturnPressed( const TQString& ) ) ); TDECompletionBox *box = completionBox(); - connect( box, TQT_SIGNAL( highlighted( const TQString& ) ), - this, TQT_SLOT( slotPopupCompletion( const TQString& ) ) ); - connect( box, TQT_SIGNAL( userCancelled( const TQString& ) ), - TQT_SLOT( slotUserCancelled( const TQString& ) ) ); + connect( box, TQ_SIGNAL( highlighted( const TQString& ) ), + this, TQ_SLOT( slotPopupCompletion( const TQString& ) ) ); + connect( box, TQ_SIGNAL( userCancelled( const TQString& ) ), + TQ_SLOT( slotUserCancelled( const TQString& ) ) ); // The emitter is always called KPIM::IMAPCompletionOrder by contract if ( !connectDCOPSignal( 0, "KPIM::IMAPCompletionOrder", "orderChanged()", "slotIMAPCompletionOrderChanged()", false ) ) kdError() << "AddresseeLineEdit: connection to orderChanged() failed" << endl; - connect( s_LDAPTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotStartLDAPLookup() ) ); - connect( s_LDAPSearch, TQT_SIGNAL( searchData( const KPIM::LdapResultList& ) ), - TQT_SLOT( slotLDAPSearchData( const KPIM::LdapResultList& ) ) ); + connect( s_LDAPTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotStartLDAPLookup() ) ); + connect( s_LDAPSearch, TQ_SIGNAL( searchData( const KPIM::LdapResultList& ) ), + TQ_SLOT( slotLDAPSearchData( const KPIM::LdapResultList& ) ) ); m_completionInitialized = true; } @@ -607,7 +607,7 @@ void AddresseeLineEdit::loadContacts() TQApplication::restoreOverrideCursor(); if ( !m_addressBookConnected ) { - connect( addressBook, TQT_SIGNAL( addressBookChanged( AddressBook* ) ), TQT_SLOT( loadContacts() ) ); + connect( addressBook, TQ_SIGNAL( addressBookChanged( AddressBook* ) ), TQ_SLOT( loadContacts() ) ); m_addressBookConnected = true; } } @@ -925,7 +925,7 @@ TQPopupMenu* AddresseeLineEdit::createPopupMenu() menu->setItemVisible( ShortAutoCompletion, false ); menu->setItemVisible( PopupAutoCompletion, false ); menu->insertItem( i18n( "Configure Completion Order..." ), - this, TQT_SLOT( slotEditCompletionOrder() ) ); + this, TQ_SLOT( slotEditCompletionOrder() ) ); } return menu; } diff --git a/libtdepim/addresseeselector.cpp b/libtdepim/addresseeselector.cpp index e9a95be6..b89184e6 100644 --- a/libtdepim/addresseeselector.cpp +++ b/libtdepim/addresseeselector.cpp @@ -250,17 +250,17 @@ AddresseeSelector::~AddresseeSelector() void AddresseeSelector::init() { - connect( TDEABC::StdAddressBook::self( true ), TQT_SIGNAL( addressBookChanged( AddressBook* ) ), - this, TQT_SLOT( reloadAddressBook() ) ); - connect( mAddresseeFilter, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( updateAddresseeView() ) ); - connect( mAddressBookCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( updateAddresseeView() ) ); - - connect( mMoveMapper, TQT_SIGNAL( mapped( int ) ), - this, TQT_SLOT( move( int ) ) ); - connect( mRemoveMapper, TQT_SIGNAL( mapped( int ) ), - this, TQT_SLOT( remove( int ) ) ); + connect( TDEABC::StdAddressBook::self( true ), TQ_SIGNAL( addressBookChanged( AddressBook* ) ), + this, TQ_SLOT( reloadAddressBook() ) ); + connect( mAddresseeFilter, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( updateAddresseeView() ) ); + connect( mAddressBookCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( updateAddresseeView() ) ); + + connect( mMoveMapper, TQ_SIGNAL( mapped( int ) ), + this, TQ_SLOT( move( int ) ) ); + connect( mRemoveMapper, TQ_SIGNAL( mapped( int ) ), + this, TQ_SLOT( remove( int ) ) ); reloadAddressBook(); } @@ -298,8 +298,8 @@ void AddresseeSelector::initGUI() listView->setFullWidth( true ); mSelectionViews.append( listView ); - connect( listView, TQT_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ), - mRemoveMapper, TQT_SLOT( map() ) ); + connect( listView, TQ_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ), + mRemoveMapper, TQ_SLOT( map() ) ); mRemoveMapper->setMapping( listView, i ); TQVBoxLayout *buttonLayout = new TQVBoxLayout( this ); @@ -311,8 +311,8 @@ void AddresseeSelector::initGUI() moveButton->setIconSet( moveSet ); moveButton->setFixedSize( 30, 30 ); - connect( moveButton, TQT_SIGNAL( clicked() ), - mMoveMapper, TQT_SLOT( map() ) ); + connect( moveButton, TQ_SIGNAL( clicked() ), + mMoveMapper, TQ_SLOT( map() ) ); mMoveMapper->setMapping( moveButton, i ); // remove button @@ -320,8 +320,8 @@ void AddresseeSelector::initGUI() removeButton->setIconSet( removeSet ); removeButton->setFixedSize( 30, 30 ); - connect( removeButton, TQT_SIGNAL( clicked() ), - mRemoveMapper, TQT_SLOT( map() ) ); + connect( removeButton, TQ_SIGNAL( clicked() ), + mRemoveMapper, TQ_SLOT( map() ) ); mRemoveMapper->setMapping( removeButton, i ); buttonLayout->addWidget( moveButton ); diff --git a/libtdepim/addresseeview.cpp b/libtdepim/addresseeview.cpp index 16c9bbf2..defdecfa 100644 --- a/libtdepim/addresseeview.cpp +++ b/libtdepim/addresseeview.cpp @@ -64,12 +64,12 @@ AddresseeView::AddresseeView( TQWidget *parent, const char *name, TQStyleSheetItem *link = sheet->item( "a" ); link->setColor( TDEGlobalSettings::linkColor() ); - connect( this, TQT_SIGNAL( mailClick( const TQString&, const TQString& ) ), - this, TQT_SLOT( slotMailClicked( const TQString&, const TQString& ) ) ); - connect( this, TQT_SIGNAL( urlClick( const TQString& ) ), - this, TQT_SLOT( slotUrlClicked( const TQString& ) ) ); - connect( this, TQT_SIGNAL( highlighted( const TQString& ) ), - this, TQT_SLOT( slotHighlighted( const TQString& ) ) ); + connect( this, TQ_SIGNAL( mailClick( const TQString&, const TQString& ) ), + this, TQ_SLOT( slotMailClicked( const TQString&, const TQString& ) ) ); + connect( this, TQ_SIGNAL( urlClick( const TQString& ) ), + this, TQ_SLOT( slotUrlClicked( const TQString& ) ) ); + connect( this, TQ_SIGNAL( highlighted( const TQString& ) ), + this, TQ_SLOT( slotHighlighted( const TQString& ) ) ); setNotifyClick( true ); @@ -88,13 +88,13 @@ AddresseeView::AddresseeView( TQWidget *parent, const char *name, mActionShowCustomFields = new TDEToggleAction( i18n( "Show Custom Fields" ) ); mActionShowCustomFields->setCheckedState( i18n( "Hide Custom Fields" ) ); - connect( mActionShowBirthday, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( configChanged() ) ); - connect( mActionShowAddresses, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( configChanged() ) ); - connect( mActionShowEmails, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( configChanged() ) ); - connect( mActionShowPhones, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( configChanged() ) ); - connect( mActionShowURLs, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( configChanged() ) ); - connect( mActionShowIMAddresses, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( configChanged() ) ); - connect( mActionShowCustomFields, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( configChanged() ) ); + connect( mActionShowBirthday, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( configChanged() ) ); + connect( mActionShowAddresses, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( configChanged() ) ); + connect( mActionShowEmails, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( configChanged() ) ); + connect( mActionShowPhones, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( configChanged() ) ); + connect( mActionShowURLs, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( configChanged() ) ); + connect( mActionShowIMAddresses, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( configChanged() ) ); + connect( mActionShowCustomFields, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( configChanged() ) ); if ( !config ) { mConfig = new TDEConfig( "kaddressbookrc" ); @@ -106,10 +106,10 @@ AddresseeView::AddresseeView( TQWidget *parent, const char *name, // set up IMProxy to display contacts' IM presence and make connections to keep the display live mKIMProxy = ::KIMProxy::instance( kapp->dcopClient() ); - connect( mKIMProxy, TQT_SIGNAL( sigContactPresenceChanged( const TQString& ) ), - this, TQT_SLOT( slotPresenceChanged( const TQString& ) ) ); - connect( mKIMProxy, TQT_SIGNAL( sigPresenceInfoExpired() ), - this, TQT_SLOT( slotPresenceInfoExpired() ) ); + connect( mKIMProxy, TQ_SIGNAL( sigContactPresenceChanged( const TQString& ) ), + this, TQ_SLOT( slotPresenceChanged( const TQString& ) ) ); + connect( mKIMProxy, TQ_SIGNAL( sigPresenceInfoExpired() ), + this, TQ_SLOT( slotPresenceInfoExpired() ) ); } AddresseeView::~AddresseeView() @@ -547,10 +547,10 @@ void AddresseeView::updateView() TQMimeSourceFactory::defaultFactory()->setImage( imageURL, TQImage(mImageData) ); else { mImageJob = TDEIO::get( KURL( picture.url() ), false, false ); - connect( mImageJob, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), - this, TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) ); - connect( mImageJob, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( result( TDEIO::Job* ) ) ); + connect( mImageJob, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + this, TQ_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) ); + connect( mImageJob, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( result( TDEIO::Job* ) ) ); } } else { TQMimeSourceFactory::defaultFactory()->setPixmap( imageURL, diff --git a/libtdepim/addressesdialog.cpp b/libtdepim/addressesdialog.cpp index e0071ef0..deb9d1f2 100644 --- a/libtdepim/addressesdialog.cpp +++ b/libtdepim/addressesdialog.cpp @@ -241,8 +241,8 @@ AddresseeViewItem* AddressesDialog::selectedToItem() if ( !d->toItem ) { d->toItem = new AddresseeViewItem( d->ui->mSelectedView, i18n("To"), AddresseeViewItem::To ); - connect(d->toItem, TQT_SIGNAL(addressSelected(AddresseeViewItem*, bool)), - this, TQT_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); + connect(d->toItem, TQ_SIGNAL(addressSelected(AddresseeViewItem*, bool)), + this, TQ_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); } return d->toItem; } @@ -252,8 +252,8 @@ AddresseeViewItem* AddressesDialog::selectedCcItem() if ( !d->ccItem ) { d->ccItem = new AddresseeViewItem( d->ui->mSelectedView, i18n("CC"), AddresseeViewItem::CC ); - connect(d->ccItem, TQT_SIGNAL(addressSelected(AddresseeViewItem*, bool)), - this, TQT_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); + connect(d->ccItem, TQ_SIGNAL(addressSelected(AddresseeViewItem*, bool)), + this, TQ_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); } return d->ccItem; } @@ -263,8 +263,8 @@ AddresseeViewItem* AddressesDialog::selectedBccItem() if ( !d->bccItem ) { d->bccItem = new AddresseeViewItem( d->ui->mSelectedView, i18n("BCC"), AddresseeViewItem::BCC ); - connect(d->bccItem, TQT_SIGNAL(addressSelected(AddresseeViewItem*, bool)), - this, TQT_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); + connect(d->bccItem, TQ_SIGNAL(addressSelected(AddresseeViewItem*, bool)), + this, TQ_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); } return d->bccItem; } @@ -325,8 +325,8 @@ AddressesDialog::updateRecentAddresses() if ( !d->recent ) { d->recent = new AddresseeViewItem( d->ui->mAvailableView, recentGroup ); - connect(d->recent, TQT_SIGNAL(addressSelected(AddresseeViewItem*, bool)), - this, TQT_SLOT(availableAddressSelected(AddresseeViewItem*, bool))); + connect(d->recent, TQ_SIGNAL(addressSelected(AddresseeViewItem*, bool)), + this, TQ_SLOT(availableAddressSelected(AddresseeViewItem*, bool))); d->recent->setVisible( false ); d->groupDict.insert( recentGroup, d->recent ); } @@ -464,8 +464,8 @@ AddressesDialog::updateAvailableAddressees() static const TQString &personalGroup = TDEGlobal::staticQString( i18n( "Other Addresses" ) ); d->ui->mAvailableView->setRootIsDecorated( true ); d->personal = new AddresseeViewItem( d->ui->mAvailableView, personalGroup ); - //connect(d->personal, TQT_SIGNAL(addressSelected(AddresseeViewItem*, bool)), - // this, TQT_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); + //connect(d->personal, TQ_SIGNAL(addressSelected(AddresseeViewItem*, bool)), + // this, TQ_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); d->personal->setVisible( false ); d->groupDict.insert( personalGroup, d->personal ); @@ -570,36 +570,36 @@ AddressesDialog::selectedAddressSelected( AddresseeViewItem* item, bool selected void AddressesDialog::initConnections() { - connect( d->ui->mFilterEdit, TQT_SIGNAL(textChanged(const TQString &)), - TQT_SLOT(filterChanged(const TQString &)) ); - connect( d->ui->mToButton, TQT_SIGNAL(clicked()), - TQT_SLOT(addSelectedTo()) ); - connect( d->ui->mCCButton, TQT_SIGNAL(clicked()), - TQT_SLOT(addSelectedCC()) ); - connect( d->ui->mBCCButton, TQT_SIGNAL(clicked()), - TQT_SLOT(addSelectedBCC()) ); - connect( d->ui->mSaveAs, TQT_SIGNAL(clicked()), - TQT_SLOT(saveAs()) ); - connect( d->ui->mLdapSearch, TQT_SIGNAL(clicked()), - TQT_SLOT(searchLdap()) ); - connect( d->ui->mRemoveButton, TQT_SIGNAL(clicked()), - TQT_SLOT(removeEntry()) ); - connect( d->ui->mAvailableView, TQT_SIGNAL(selectionChanged()), - TQT_SLOT(availableSelectionChanged()) ); - connect( d->ui->mAvailableView, TQT_SIGNAL(doubleClicked(TQListViewItem*)), - TQT_SLOT(addSelectedTo()) ); - connect( d->ui->mSelectedView, TQT_SIGNAL(selectionChanged()), - TQT_SLOT(selectedSelectionChanged()) ); - connect( d->ui->mSelectedView, TQT_SIGNAL(doubleClicked(TQListViewItem*)), - TQT_SLOT(removeEntry()) ); + connect( d->ui->mFilterEdit, TQ_SIGNAL(textChanged(const TQString &)), + TQ_SLOT(filterChanged(const TQString &)) ); + connect( d->ui->mToButton, TQ_SIGNAL(clicked()), + TQ_SLOT(addSelectedTo()) ); + connect( d->ui->mCCButton, TQ_SIGNAL(clicked()), + TQ_SLOT(addSelectedCC()) ); + connect( d->ui->mBCCButton, TQ_SIGNAL(clicked()), + TQ_SLOT(addSelectedBCC()) ); + connect( d->ui->mSaveAs, TQ_SIGNAL(clicked()), + TQ_SLOT(saveAs()) ); + connect( d->ui->mLdapSearch, TQ_SIGNAL(clicked()), + TQ_SLOT(searchLdap()) ); + connect( d->ui->mRemoveButton, TQ_SIGNAL(clicked()), + TQ_SLOT(removeEntry()) ); + connect( d->ui->mAvailableView, TQ_SIGNAL(selectionChanged()), + TQ_SLOT(availableSelectionChanged()) ); + connect( d->ui->mAvailableView, TQ_SIGNAL(doubleClicked(TQListViewItem*)), + TQ_SLOT(addSelectedTo()) ); + connect( d->ui->mSelectedView, TQ_SIGNAL(selectionChanged()), + TQ_SLOT(selectedSelectionChanged()) ); + connect( d->ui->mSelectedView, TQ_SIGNAL(doubleClicked(TQListViewItem*)), + TQ_SLOT(removeEntry()) ); #ifndef TDEPIM_NEW_DISTRLISTS - connect( TDEABC::DistributionListWatcher::self(), TQT_SIGNAL( changed() ), - this, TQT_SLOT( updateAvailableAddressees() ) ); + connect( TDEABC::DistributionListWatcher::self(), TQ_SIGNAL( changed() ), + this, TQ_SLOT( updateAvailableAddressees() ) ); #endif - connect( TDEABC::StdAddressBook::self( true ), TQT_SIGNAL( addressBookChanged(AddressBook*) ), - this, TQT_SLOT( updateAvailableAddressees() ) ); + connect( TDEABC::StdAddressBook::self( true ), TQ_SIGNAL( addressBookChanged(AddressBook*) ), + this, TQ_SLOT( updateAvailableAddressees() ) ); } void @@ -619,8 +619,8 @@ AddressesDialog::addAddresseeToAvailable( const TDEABC::Addressee& addr, Address for ( uint i = 0; i < addr.emails().count(); ++i ) { AddresseeViewItem* addressee = new AddresseeViewItem( d->groupDict[ *it ], addr, i ); - connect(addressee, TQT_SIGNAL(addressSelected(AddresseeViewItem*, bool)), - this, TQT_SLOT(availableAddressSelected(AddresseeViewItem*, bool))); + connect(addressee, TQ_SIGNAL(addressSelected(AddresseeViewItem*, bool)), + this, TQ_SLOT(availableAddressSelected(AddresseeViewItem*, bool))); } } } @@ -634,8 +634,8 @@ AddressesDialog::addAddresseeToAvailable( const TDEABC::Addressee& addr, Address if ( defaultParent && noCategory ) { // only non-categorized items here AddresseeViewItem* addressee = new AddresseeViewItem( defaultParent, addr ); - connect(addressee, TQT_SIGNAL(addressSelected(AddresseeViewItem*, bool)), - this, TQT_SLOT(availableAddressSelected(AddresseeViewItem*, bool))); + connect(addressee, TQ_SIGNAL(addressSelected(AddresseeViewItem*, bool)), + this, TQ_SLOT(availableAddressSelected(AddresseeViewItem*, bool))); } } @@ -653,8 +653,8 @@ AddressesDialog::addAddresseeToSelected( const TDEABC::Addressee& addr, Addresse myChild = static_cast<AddresseeViewItem*>( myChild->nextSibling() ); } AddresseeViewItem* addressee = new AddresseeViewItem( defaultParent, addr ); - connect(addressee, TQT_SIGNAL(addressSelected(AddresseeViewItem*, bool)), - this, TQT_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); + connect(addressee, TQ_SIGNAL(addressSelected(AddresseeViewItem*, bool)), + this, TQ_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); defaultParent->setOpen( true ); } @@ -701,8 +701,8 @@ AddressesDialog::addAddresseesToSelected( AddresseeViewItem *parent, address->setVisible( false ); selectedToAvailableMapping.insert(address, newItem); selectedToAvailableMapping.insert(newItem, address); - connect(newItem, TQT_SIGNAL(addressSelected(AddresseeViewItem*, bool)), - this, TQT_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); + connect(newItem, TQ_SIGNAL(addressSelected(AddresseeViewItem*, bool)), + this, TQ_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); } parent->setOpen( true ); @@ -725,8 +725,8 @@ AddressesDialog::addSelectedTo() if ( !d->toItem ) { d->toItem = new AddresseeViewItem( d->ui->mSelectedView, i18n("To"), AddresseeViewItem::To ); - connect(d->toItem, TQT_SIGNAL(addressSelected(AddresseeViewItem*, bool)), - this, TQT_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); + connect(d->toItem, TQ_SIGNAL(addressSelected(AddresseeViewItem*, bool)), + this, TQ_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); } addAddresseesToSelected( d->toItem, selectedAvailableAddresses ); @@ -746,8 +746,8 @@ AddressesDialog::addSelectedCC() if ( !d->ccItem ) { d->ccItem = new AddresseeViewItem( d->ui->mSelectedView, i18n("CC"), AddresseeViewItem::CC ); - connect(d->ccItem , TQT_SIGNAL(addressSelected(AddresseeViewItem*, bool)), - this, TQT_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); + connect(d->ccItem , TQ_SIGNAL(addressSelected(AddresseeViewItem*, bool)), + this, TQ_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); } addAddresseesToSelected( d->ccItem, selectedAvailableAddresses ); @@ -767,8 +767,8 @@ AddressesDialog::addSelectedBCC() if ( !d->bccItem ) { d->bccItem = new AddresseeViewItem( d->ui->mSelectedView, i18n("BCC"), AddresseeViewItem::BCC ); - connect(d->bccItem , TQT_SIGNAL(addressSelected(AddresseeViewItem*, bool)), - this, TQT_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); + connect(d->bccItem , TQ_SIGNAL(addressSelected(AddresseeViewItem*, bool)), + this, TQ_SLOT(selectedAddressSelected(AddresseeViewItem*, bool))); } addAddresseesToSelected( d->bccItem, selectedAvailableAddresses ); @@ -946,8 +946,8 @@ AddressesDialog::searchLdap() { if ( !d->ldapSearchDialog ) { d->ldapSearchDialog = new LDAPSearchDialog( this ); - connect( d->ldapSearchDialog, TQT_SIGNAL( addresseesAdded() ), - TQT_SLOT(ldapSearchResult() ) ); + connect( d->ldapSearchDialog, TQ_SIGNAL( addresseesAdded() ), + TQ_SLOT(ldapSearchResult() ) ); } d->ldapSearchDialog->show(); } @@ -1169,8 +1169,8 @@ AddressesDialog::addDistributionLists() AddresseeViewItem *item = new AddresseeViewItem( d->topdist, dlist.name() ); d->dists.append( item ); - connect( item, TQT_SIGNAL( addressSelected( AddresseeViewItem*, bool ) ), - this, TQT_SLOT( availableAddressSelected( AddresseeViewItem*, bool ) ) ); + connect( item, TQ_SIGNAL( addressSelected( AddresseeViewItem*, bool ) ), + this, TQ_SLOT( availableAddressSelected( AddresseeViewItem*, bool ) ) ); #ifdef TDEPIM_NEW_DISTRLISTS KPIM::DistributionList::Entry::List::Iterator itemIt; diff --git a/libtdepim/categoryeditdialog.cpp b/libtdepim/categoryeditdialog.cpp index 26abbc07..d282596d 100644 --- a/libtdepim/categoryeditdialog.cpp +++ b/libtdepim/categoryeditdialog.cpp @@ -87,9 +87,9 @@ CategoryEditDialog::CategoryEditDialog( KPimPrefs *prefs, TQWidget* parent, fillList(); - connect( d->mAddButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( add() ) ); - connect( d->mEditButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( edit() ) ); - connect( d->mDeleteButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( remove() ) ); + connect( d->mAddButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( add() ) ); + connect( d->mEditButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( edit() ) ); + connect( d->mDeleteButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( remove() ) ); } /* diff --git a/libtdepim/categoryselectdialog.cpp b/libtdepim/categoryselectdialog.cpp index cf1b2ac6..d75948ad 100644 --- a/libtdepim/categoryselectdialog.cpp +++ b/libtdepim/categoryselectdialog.cpp @@ -44,10 +44,10 @@ CategorySelectDialog::CategorySelectDialog( KPimPrefs *prefs, TQWidget* parent, setCategories(); - connect( mWidget->mButtonEdit, TQT_SIGNAL(clicked()), - TQT_SIGNAL(editCategories()) ); - connect( mWidget->mButtonClear, TQT_SIGNAL(clicked()), - TQT_SLOT(clear()) ); + connect( mWidget->mButtonEdit, TQ_SIGNAL(clicked()), + TQ_SIGNAL(editCategories()) ); + connect( mWidget->mButtonClear, TQ_SIGNAL(clicked()), + TQ_SLOT(clear()) ); } void CategorySelectDialog::setCategories( const TQStringList &categoryList ) diff --git a/libtdepim/collectingprocess.cpp b/libtdepim/collectingprocess.cpp index e9d640ce..da665464 100644 --- a/libtdepim/collectingprocess.cpp +++ b/libtdepim/collectingprocess.cpp @@ -61,18 +61,18 @@ CollectingProcess::~CollectingProcess() { bool CollectingProcess::start( RunMode runmode, Communication comm ) { // prevent duplicate connection - disconnect( this, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), - this, TQT_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) ); + disconnect( this, TQ_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), + this, TQ_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) ); if ( comm & Stdout ) { - connect( this, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), - this, TQT_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) ); + connect( this, TQ_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), + this, TQ_SLOT( slotReceivedStdout( TDEProcess *, char *, int ) ) ); } // prevent duplicate connection - disconnect( this, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), - this, TQT_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) ); + disconnect( this, TQ_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), + this, TQ_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) ); if ( comm & Stderr ) { - connect( this, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), - this, TQT_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) ); + connect( this, TQ_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), + this, TQ_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) ); } return TDEProcess::start( runmode, comm ); } diff --git a/libtdepim/completionordereditor.cpp b/libtdepim/completionordereditor.cpp index 152790c7..8a3a25eb 100644 --- a/libtdepim/completionordereditor.cpp +++ b/libtdepim/completionordereditor.cpp @@ -235,10 +235,10 @@ CompletionOrderEditor::CompletionOrderEditor( KPIM::LdapSearch* ldapSearch, TQWidget* spacer = new TQWidget( upDownBox ); upDownBox->setStretchFactor( spacer, 100 ); - connect( mListView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), - TQT_SLOT( slotSelectionChanged( TQListViewItem* ) ) ); - connect( mUpButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotMoveUp() ) ); - connect( mDownButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotMoveDown() ) ); + connect( mListView, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ), + TQ_SLOT( slotSelectionChanged( TQListViewItem* ) ) ); + connect( mUpButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveUp() ) ); + connect( mDownButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveDown() ) ); } CompletionOrderEditor::~CompletionOrderEditor() diff --git a/libtdepim/designerfields.cpp b/libtdepim/designerfields.cpp index da7068bb..c93ae6f3 100644 --- a/libtdepim/designerfields.cpp +++ b/libtdepim/designerfields.cpp @@ -88,29 +88,29 @@ void DesignerFields::initGUI( const TQString &uiFile ) mWidgets.insert( name, widget ); if ( it.current()->inherits( "TQLineEdit" ) ) - connect( it.current(), TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SIGNAL( modified() ) ); + connect( it.current(), TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SIGNAL( modified() ) ); else if ( it.current()->inherits( "TQSpinBox" ) ) - connect( it.current(), TQT_SIGNAL( valueChanged( int ) ), - TQT_SIGNAL( modified() ) ); + connect( it.current(), TQ_SIGNAL( valueChanged( int ) ), + TQ_SIGNAL( modified() ) ); else if ( it.current()->inherits( "TQCheckBox" ) ) - connect( it.current(), TQT_SIGNAL( toggled( bool ) ), - TQT_SIGNAL( modified() ) ); + connect( it.current(), TQ_SIGNAL( toggled( bool ) ), + TQ_SIGNAL( modified() ) ); else if ( it.current()->inherits( "TQComboBox" ) ) - connect( it.current(), TQT_SIGNAL( activated( const TQString& ) ), - TQT_SIGNAL( modified() ) ); + connect( it.current(), TQ_SIGNAL( activated( const TQString& ) ), + TQ_SIGNAL( modified() ) ); else if ( it.current()->inherits( "TQDateTimeEdit" ) ) - connect( it.current(), TQT_SIGNAL( valueChanged( const TQDateTime& ) ), - TQT_SIGNAL( modified() ) ); + connect( it.current(), TQ_SIGNAL( valueChanged( const TQDateTime& ) ), + TQ_SIGNAL( modified() ) ); else if ( it.current()->inherits( "KDateTimeWidget" ) ) - connect( it.current(), TQT_SIGNAL( valueChanged( const TQDateTime& ) ), - TQT_SIGNAL( modified() ) ); + connect( it.current(), TQ_SIGNAL( valueChanged( const TQDateTime& ) ), + TQ_SIGNAL( modified() ) ); else if ( it.current()->inherits( "KDatePicker" ) ) - connect( it.current(), TQT_SIGNAL( dateChanged( TQDate ) ), - TQT_SIGNAL( modified() ) ); + connect( it.current(), TQ_SIGNAL( dateChanged( TQDate ) ), + TQ_SIGNAL( modified() ) ); else if ( it.current()->inherits( "TQTextEdit" ) ) - connect( it.current(), TQT_SIGNAL( textChanged() ), - TQT_SIGNAL( modified() ) ); + connect( it.current(), TQ_SIGNAL( textChanged() ), + TQ_SIGNAL( modified() ) ); if ( !widget->isEnabled() ) mDisabledWidgets.append( widget ); diff --git a/libtdepim/embeddedurlpage.cpp b/libtdepim/embeddedurlpage.cpp index 21838f50..4a3aed79 100644 --- a/libtdepim/embeddedurlpage.cpp +++ b/libtdepim/embeddedurlpage.cpp @@ -62,9 +62,9 @@ void EmbeddedURLPage::loadContents() } //void KParts::BrowserExtension::openURLRequestDelayed( const KURL &url, const KParts::URLArgs &args = KParts::URLArgs() ) KParts::BrowserExtension* be = KParts::BrowserExtension::childObject( mPart ); - connect( be, TQT_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs & ) ), -// mPart, TQT_SLOT( openURL( const KURL & ) ) ); - this, TQT_SIGNAL( openURL( const KURL & ) ) ); + connect( be, TQ_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs & ) ), +// mPart, TQ_SLOT( openURL( const KURL & ) ) ); + this, TQ_SIGNAL( openURL( const KURL & ) ) ); } } diff --git a/libtdepim/kcmdesignerfields.cpp b/libtdepim/kcmdesignerfields.cpp index 03c2f161..dd5ab8bf 100644 --- a/libtdepim/kcmdesignerfields.cpp +++ b/libtdepim/kcmdesignerfields.cpp @@ -129,7 +129,7 @@ class PageItem : public TQCheckListItem KCMDesignerFields::KCMDesignerFields( TQWidget *parent, const char *name ) : TDECModule( parent, name ) { - TQTimer::singleShot( 0, this, TQT_SLOT( delayedInit() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( delayedInit() ) ); TDEAboutData *about = new TDEAboutData( I18N_NOOP( "KCMDesignerfields" ), I18N_NOOP( "TQt Designer Fields Dialog" ), @@ -147,17 +147,17 @@ void KCMDesignerFields::delayedInit() initGUI(); - connect( mPageView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), - this, TQT_SLOT( updatePreview( TQListViewItem* ) ) ); - connect( mPageView, TQT_SIGNAL( clicked( TQListViewItem* ) ), - this, TQT_SLOT( itemClicked( TQListViewItem* ) ) ); + connect( mPageView, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ), + this, TQ_SLOT( updatePreview( TQListViewItem* ) ) ); + connect( mPageView, TQ_SIGNAL( clicked( TQListViewItem* ) ), + this, TQ_SLOT( itemClicked( TQListViewItem* ) ) ); - connect( mDeleteButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( deleteFile() ) ); - connect( mImportButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( importFile() ) ); - connect( mDesignerButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( startDesigner() ) ); + connect( mDeleteButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( deleteFile() ) ); + connect( mImportButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( importFile() ) ); + connect( mDesignerButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( startDesigner() ) ); load(); @@ -165,9 +165,9 @@ void KCMDesignerFields::delayedInit() KDirWatch *dw = new KDirWatch( this ); TDEStandardDirs::makeDir(localUiDir()); dw->addDir( localUiDir(), true ); - connect( dw, TQT_SIGNAL( created(const TQString&) ), TQT_SLOT( rebuildList() ) ); - connect( dw, TQT_SIGNAL( deleted(const TQString&) ), TQT_SLOT( rebuildList() ) ); - connect( dw, TQT_SIGNAL( dirty(const TQString&) ), TQT_SLOT( rebuildList() ) ); + connect( dw, TQ_SIGNAL( created(const TQString&) ), TQ_SLOT( rebuildList() ) ); + connect( dw, TQ_SIGNAL( deleted(const TQString&) ), TQ_SLOT( rebuildList() ) ); + connect( dw, TQ_SIGNAL( dirty(const TQString&) ), TQ_SLOT( rebuildList() ) ); } void KCMDesignerFields::deleteFile() diff --git a/libtdepim/kdateedit.cpp b/libtdepim/kdateedit.cpp index 52dbb26a..0f50f75b 100644 --- a/libtdepim/kdateedit.cpp +++ b/libtdepim/kdateedit.cpp @@ -80,17 +80,17 @@ KDateEdit::KDateEdit( TQWidget *parent, const char *name ) changeItem( today, 0 ); setMinimumSize( sizeHint() ); - connect( lineEdit(), TQT_SIGNAL( returnPressed() ), - this, TQT_SLOT( lineEnterPressed() ) ); - connect( this, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( slotTextChanged( const TQString& ) ) ); + connect( lineEdit(), TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( lineEnterPressed() ) ); + connect( this, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( slotTextChanged( const TQString& ) ) ); mPopup = new KDatePickerPopup( KDatePickerPopup::DatePicker | KDatePickerPopup::Words ); mPopup->hide(); mPopup->installEventFilter( this ); - connect( mPopup, TQT_SIGNAL( dateChanged( TQDate ) ), - TQT_SLOT( dateSelected( TQDate ) ) ); + connect( mPopup, TQ_SIGNAL( dateChanged( TQDate ) ), + TQ_SLOT( dateSelected( TQDate ) ) ); // handle keyword entry setupKeywords(); diff --git a/libtdepim/kdatepickerpopup.cpp b/libtdepim/kdatepickerpopup.cpp index d9ffe8c3..4b544b6f 100644 --- a/libtdepim/kdatepickerpopup.cpp +++ b/libtdepim/kdatepickerpopup.cpp @@ -35,10 +35,10 @@ KDatePickerPopup::KDatePickerPopup( int items, const TQDate &date, TQWidget *par mDatePicker = new KDatePicker( this ); mDatePicker->setCloseButton( false ); - connect( mDatePicker, TQT_SIGNAL( dateEntered( TQDate ) ), - TQT_SLOT( slotDateChanged( TQDate ) ) ); - connect( mDatePicker, TQT_SIGNAL( dateSelected( TQDate ) ), - TQT_SLOT( slotDateChanged( TQDate ) ) ); + connect( mDatePicker, TQ_SIGNAL( dateEntered( TQDate ) ), + TQ_SLOT( slotDateChanged( TQDate ) ) ); + connect( mDatePicker, TQ_SIGNAL( dateSelected( TQDate ) ), + TQ_SLOT( slotDateChanged( TQDate ) ) ); mDatePicker->setDate( date ); @@ -58,17 +58,17 @@ void KDatePickerPopup::buildMenu() } if ( mItems & Words ) { - insertItem( i18n("&Today"), this, TQT_SLOT( slotToday() ) ); - insertItem( i18n("To&morrow"), this, TQT_SLOT( slotTomorrow() ) ); - insertItem( i18n("Next &Week"), this, TQT_SLOT( slotNextWeek() ) ); - insertItem( i18n("Next M&onth"), this, TQT_SLOT( slotNextMonth() ) ); + insertItem( i18n("&Today"), this, TQ_SLOT( slotToday() ) ); + insertItem( i18n("To&morrow"), this, TQ_SLOT( slotTomorrow() ) ); + insertItem( i18n("Next &Week"), this, TQ_SLOT( slotNextWeek() ) ); + insertItem( i18n("Next M&onth"), this, TQ_SLOT( slotNextMonth() ) ); if ( mItems & NoDate ) insertSeparator(); } if ( mItems & NoDate ) - insertItem( i18n("No Date"), this, TQT_SLOT( slotNoDate() ) ); + insertItem( i18n("No Date"), this, TQ_SLOT( slotNoDate() ) ); } KDatePicker *KDatePickerPopup::datePicker() const diff --git a/libtdepim/kfoldertree.cpp b/libtdepim/kfoldertree.cpp index 58e35858..bccbc8aa 100644 --- a/libtdepim/kfoldertree.cpp +++ b/libtdepim/kfoldertree.cpp @@ -379,9 +379,9 @@ KFolderTree::KFolderTree( TQWidget *parent, const char* name ) disableAutoSelection(); setColumnWidth( 0, 120 ); //reasonable default size - disconnect( header(), TQT_SIGNAL( sizeChange( int, int, int ) ) ); - connect( header(), TQT_SIGNAL( sizeChange( int, int, int ) ), - TQT_SLOT( slotSizeChanged( int, int, int ) ) ); + disconnect( header(), TQ_SIGNAL( sizeChange( int, int, int ) ) ); + connect( header(), TQ_SIGNAL( sizeChange( int, int, int ) ), + TQ_SLOT( slotSizeChanged( int, int, int ) ) ); } //----------------------------------------------------------------------------- diff --git a/libtdepim/kimportdialog.cpp b/libtdepim/kimportdialog.cpp index 879b6156..44e7eddd 100644 --- a/libtdepim/kimportdialog.cpp +++ b/libtdepim/kimportdialog.cpp @@ -164,15 +164,15 @@ KImportDialog::KImportDialog(TQWidget* parent) new TQLabel(i18n("File to import:"),fileBox); KURLRequester *urlRequester = new KURLRequester(fileBox); urlRequester->setFilter( "*.csv" ); - connect(urlRequester,TQT_SIGNAL(returnPressed(const TQString &)), - TQT_SLOT(setFile(const TQString &))); - connect(urlRequester,TQT_SIGNAL(urlSelected(const TQString &)), - TQT_SLOT(setFile(const TQString &))); - connect(urlRequester->lineEdit(),TQT_SIGNAL(textChanged ( const TQString & )), - TQT_SLOT(slotUrlChanged(const TQString & ))); + connect(urlRequester,TQ_SIGNAL(returnPressed(const TQString &)), + TQ_SLOT(setFile(const TQString &))); + connect(urlRequester,TQ_SIGNAL(urlSelected(const TQString &)), + TQ_SLOT(setFile(const TQString &))); + connect(urlRequester->lineEdit(),TQ_SIGNAL(textChanged ( const TQString & )), + TQ_SLOT(slotUrlChanged(const TQString & ))); mTable = new TQTable(5,5,topBox); mTable->setMinimumHeight( 150 ); - connect(mTable,TQT_SIGNAL(selectionChanged()),TQT_SLOT(tableSelected())); + connect(mTable,TQ_SIGNAL(selectionChanged()),TQ_SLOT(tableSelected())); TQHBox *separatorBox = new TQHBox( topBox ); separatorBox->setSpacing( spacingHint() ); @@ -185,8 +185,8 @@ KImportDialog::KImportDialog(TQWidget* parent) mSeparatorCombo->insertItem( i18n( "Space" ) ); mSeparatorCombo->insertItem( "=" ); mSeparatorCombo->insertItem( ";" ); - connect(mSeparatorCombo, TQT_SIGNAL( activated(int) ), - this, TQT_SLOT( separatorClicked(int) ) ); + connect(mSeparatorCombo, TQ_SIGNAL( activated(int) ), + this, TQ_SLOT( separatorClicked(int) ) ); mSeparatorCombo->setCurrentItem( 0 ); TQHBox *rowsBox = new TQHBox( topBox ); @@ -208,34 +208,34 @@ KImportDialog::KImportDialog(TQWidget* parent) mHeaderList = new TQListView(listsBox); mHeaderList->addColumn(i18n("Header")); - connect(mHeaderList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(headerSelected(TQListViewItem*))); - connect(mHeaderList,TQT_SIGNAL(doubleClicked(TQListViewItem*)), - TQT_SLOT(assignColumn(TQListViewItem *))); + connect(mHeaderList, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(headerSelected(TQListViewItem*))); + connect(mHeaderList,TQ_SIGNAL(doubleClicked(TQListViewItem*)), + TQ_SLOT(assignColumn(TQListViewItem *))); mFormatCombo = new KComboBox( listsBox ); mFormatCombo->setDuplicatesEnabled( false ); TQPushButton *assignButton = new TQPushButton(i18n("Assign to Selected Column"), assignBox); - connect(assignButton,TQT_SIGNAL(clicked()),TQT_SLOT(assignColumn())); + connect(assignButton,TQ_SIGNAL(clicked()),TQ_SLOT(assignColumn())); TQPushButton *removeButton = new TQPushButton(i18n("Remove Assignment From Selected Column"), assignBox); - connect(removeButton,TQT_SIGNAL(clicked()),TQT_SLOT(removeColumn())); + connect(removeButton,TQ_SIGNAL(clicked()),TQ_SLOT(removeColumn())); TQPushButton *assignTemplateButton = new TQPushButton(i18n("Assign with Template..."), assignBox); - connect(assignTemplateButton,TQT_SIGNAL(clicked()),TQT_SLOT(assignTemplate())); + connect(assignTemplateButton,TQ_SIGNAL(clicked()),TQ_SLOT(assignTemplate())); TQPushButton *saveTemplateButton = new TQPushButton(i18n("Save Current Template"), assignBox); - connect(saveTemplateButton,TQT_SIGNAL(clicked()),TQT_SLOT(saveTemplate())); + connect(saveTemplateButton,TQ_SIGNAL(clicked()),TQ_SLOT(saveTemplate())); resize(500,300); - connect(this,TQT_SIGNAL(okClicked()),TQT_SLOT(applyConverter())); - connect(this,TQT_SIGNAL(applyClicked()),TQT_SLOT(applyConverter())); + connect(this,TQ_SIGNAL(okClicked()),TQ_SLOT(applyConverter())); + connect(this,TQ_SIGNAL(applyClicked()),TQ_SLOT(applyConverter())); enableButtonOK(!urlRequester->lineEdit()->text().isEmpty()); } diff --git a/libtdepim/kincidencechooser.cpp b/libtdepim/kincidencechooser.cpp index 1151d0cb..f11b0360 100644 --- a/libtdepim/kincidencechooser.cpp +++ b/libtdepim/kincidencechooser.cpp @@ -61,11 +61,11 @@ KIncidenceChooser::KIncidenceChooser(TQWidget *parent, char *name) : topLayout->addMultiCellWidget(b_box, iii,iii,0,2); ++iii; TQPushButton* button = new TQPushButton( i18n("Take Local"), b_box ); - connect ( button, TQT_SIGNAL( clicked()), this, TQT_SLOT (takeIncidence1() ) ); + connect ( button, TQ_SIGNAL( clicked()), this, TQ_SLOT (takeIncidence1() ) ); button = new TQPushButton( i18n("Take New"), b_box ); - connect ( button, TQT_SIGNAL( clicked()), this, TQT_SLOT (takeIncidence2() ) ); + connect ( button, TQ_SIGNAL( clicked()), this, TQ_SLOT (takeIncidence2() ) ); button = new TQPushButton( i18n("Take Both"), b_box ); - connect ( button, TQT_SIGNAL( clicked()), this, TQT_SLOT (takeBoth() ) ); + connect ( button, TQ_SIGNAL( clicked()), this, TQ_SLOT (takeBoth() ) ); topLayout->setSpacing(spacingHint()); topLayout->setMargin(marginHint()); // text is not translated, because text has to be set later @@ -78,7 +78,7 @@ KIncidenceChooser::KIncidenceChooser(TQWidget *parent, char *name) : mMod1lab = new TQLabel ( "Set Last modified", topFrame); topLayout->addWidget(mMod1lab,iii,1); mShowDetails1 = new TQPushButton( i18n("Show Details"),topFrame ); - connect ( mShowDetails1, TQT_SIGNAL( clicked()), this, TQT_SLOT (showIncidence1() ) ); + connect ( mShowDetails1, TQ_SIGNAL( clicked()), this, TQ_SLOT (showIncidence1() ) ); topLayout->addWidget(mShowDetails1,iii,2); ++iii; @@ -91,14 +91,14 @@ KIncidenceChooser::KIncidenceChooser(TQWidget *parent, char *name) : mMod2lab = new TQLabel ( "Set Last modified", topFrame); topLayout->addWidget(mMod2lab,iii,1); mShowDetails2 = new TQPushButton( i18n("Show Details"), topFrame); - connect ( mShowDetails2, TQT_SIGNAL( clicked()), this, TQT_SLOT (showIncidence2() ) ); + connect ( mShowDetails2, TQ_SIGNAL( clicked()), this, TQ_SLOT (showIncidence2() ) ); topLayout->addWidget(mShowDetails2,iii,2); ++iii; // #if 0 // commented out for now, because the diff code has too many bugs mDiffBut = new TQPushButton( i18n("Show Differences"), topFrame ); - connect ( mDiffBut, TQT_SIGNAL( clicked()), this, TQT_SLOT ( showDiff() ) ); + connect ( mDiffBut, TQ_SIGNAL( clicked()), this, TQ_SLOT ( showDiff() ) ); topLayout->addMultiCellWidget(mDiffBut, iii,iii,0,2); ++iii; #else @@ -118,7 +118,7 @@ KIncidenceChooser::KIncidenceChooser(TQWidget *parent, char *name) : mDisplayDiff = 0; mSelIncidence = 0; button = new TQPushButton( i18n("Apply This to All Conflicts of This Sync"), topFrame ); - connect ( button, TQT_SIGNAL( clicked()), this, TQT_SLOT ( setSyncMode() ) ); + connect ( button, TQ_SIGNAL( clicked()), this, TQ_SLOT ( setSyncMode() ) ); topLayout->addMultiCellWidget(button, iii,iii,0,2); } @@ -237,7 +237,7 @@ void KIncidenceChooser::showIncidence1() } mTbL = new KDialogBase( this, "", false /*not modal*/, mInc1lab->text(), KDialogBase::Ok ); mTbL->setEscapeButton( KDialogBase::Ok ); - connect( mTbL, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( detailsDialogClosed() ) ); + connect( mTbL, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( detailsDialogClosed() ) ); TQTextBrowser* textBrowser = new TQTextBrowser( mTbL ); mTbL->setMainWidget( textBrowser ); textBrowser->setText( KCal::IncidenceFormatter::extensiveDisplayString( mInc1 ) ); @@ -293,7 +293,7 @@ void KIncidenceChooser::showIncidence2() } mTbN = new KDialogBase( this, "", false /*not modal*/, mInc2lab->text(), KDialogBase::Ok ); mTbN->setEscapeButton( KDialogBase::Ok ); - connect( mTbN, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( detailsDialogClosed() ) ); + connect( mTbN, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( detailsDialogClosed() ) ); TQTextBrowser* textBrowser = new TQTextBrowser( mTbN ); mTbN->setMainWidget( textBrowser ); textBrowser->setText( KCal::IncidenceFormatter::extensiveDisplayString( mInc2 ) ); diff --git a/libtdepim/komposer/core/core.cpp b/libtdepim/komposer/core/core.cpp index 2616f8e2..3549a314 100644 --- a/libtdepim/komposer/core/core.cpp +++ b/libtdepim/komposer/core/core.cpp @@ -225,10 +225,10 @@ void Core::initCore() { m_pluginManager = new PluginManager( this ); - connect( m_pluginManager, TQT_SIGNAL(pluginLoaded(Plugin*)), - TQT_SLOT(slotPluginLoaded(Plugin*)) ); - connect( m_pluginManager, TQT_SIGNAL(allPluginsLoaded()), - TQT_SLOT(slotAllPluginsLoaded()) ); + connect( m_pluginManager, TQ_SIGNAL(pluginLoaded(Plugin*)), + TQ_SLOT(slotPluginLoaded(Plugin*)) ); + connect( m_pluginManager, TQ_SIGNAL(allPluginsLoaded()), + TQ_SLOT(slotAllPluginsLoaded()) ); m_pluginManager->loadAllPlugins(); @@ -238,39 +238,39 @@ Core::initCore() void Core::initConnections() { - connect( kapp, TQT_SIGNAL(shutDown()), - TQT_SLOT(slotQuit()) ); + connect( kapp, TQ_SIGNAL(shutDown()), + TQ_SLOT(slotQuit()) ); } void Core::createActions() { - KStdAction::close( this, TQT_SLOT(slotClose()), actionCollection() ); + KStdAction::close( this, TQ_SLOT(slotClose()), actionCollection() ); (void) new TDEAction( i18n( "&Send" ), "mail-send", CTRL+Key_Return, - this, TQT_SLOT(slotSendNow()), actionCollection(), + this, TQ_SLOT(slotSendNow()), actionCollection(), "send_default" ); (void) new TDEAction( i18n( "&Queue" ), "queue", 0, - this, TQT_SLOT(slotSendLater()), + this, TQ_SLOT(slotSendLater()), actionCollection(), "send_alternative" ); (void) new TDEAction( i18n( "Save in &Drafts Folder" ), "document-save", 0, - this, TQT_SLOT(slotSaveDraft()), + this, TQ_SLOT(slotSaveDraft()), actionCollection(), "save_in_drafts" ); (void) new TDEAction( i18n( "&Insert File..." ), "document-open", 0, - this, TQT_SLOT(slotInsertFile()), + this, TQ_SLOT(slotInsertFile()), actionCollection(), "insert_file" ); (void) new TDEAction( i18n( "&Address Book" ), "contents",0, - this, TQT_SLOT(slotAddrBook()), + this, TQ_SLOT(slotAddrBook()), actionCollection(), "addressbook" ); (void) new TDEAction( i18n( "&New Composer" ), "mail-message-new", TDEStdAccel::shortcut( TDEStdAccel::New ), - this, TQT_SLOT(slotNewComposer()), + this, TQ_SLOT(slotNewComposer()), actionCollection(), "new_composer" ); (void) new TDEAction( i18n( "&Attach File..." ), "attach", - 0, this, TQT_SLOT(slotAttachFile()), + 0, this, TQ_SLOT(slotAttachFile()), actionCollection(), "attach_file" ); } diff --git a/libtdepim/komposer/core/pluginmanager.cpp b/libtdepim/komposer/core/pluginmanager.cpp index 9a33b990..8c4e025d 100644 --- a/libtdepim/komposer/core/pluginmanager.cpp +++ b/libtdepim/komposer/core/pluginmanager.cpp @@ -78,7 +78,7 @@ PluginManager::PluginManager( TQObject *parent ) d->shutdownMode = Private::StartingUp; KSettings::Dispatcher::self()->registerInstance( TDEGlobal::instance(), - this, TQT_SLOT( loadAllPlugins() ) ); + this, TQ_SLOT( loadAllPlugins() ) ); d->plugins = KPluginInfo::fromServices( TDETrader::self()->query( TQString::fromLatin1( "Komposer/Plugin" ), @@ -168,7 +168,7 @@ PluginManager::shutdown() } } - TQTimer::singleShot( 3000, this, TQT_SLOT(slotShutdownTimeout()) ); + TQTimer::singleShot( 3000, this, TQ_SLOT(slotShutdownTimeout()) ); } void @@ -256,7 +256,7 @@ PluginManager::loadAllPlugins() } // Schedule the plugins to load - TQTimer::singleShot( 0, this, TQT_SLOT( slotLoadNextPlugin() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotLoadNextPlugin() ) ); } void PluginManager::slotLoadNextPlugin() @@ -278,7 +278,7 @@ void PluginManager::slotLoadNextPlugin() // allPluginsLoaded() signal's handling. This has the added benefit that // the signal is delayed one event loop, so the accounts are more likely // to be instantiated. - TQTimer::singleShot( 0, this, TQT_SLOT( slotLoadNextPlugin() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotLoadNextPlugin() ) ); } Plugin* @@ -289,7 +289,7 @@ PluginManager::loadPlugin( const TQString &pluginId, return loadPluginInternal( pluginId ); } else { d->pluginsToLoad.push( pluginId ); - TQTimer::singleShot( 0, this, TQT_SLOT( slotLoadNextPlugin() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotLoadNextPlugin() ) ); return 0; } } @@ -317,10 +317,10 @@ PluginManager::loadPluginInternal( const TQString &pluginId ) d->loadedPlugins.insert( info, plugin ); info->setPluginEnabled( true ); - connect( plugin, TQT_SIGNAL(destroyed(TQObject*)), - this, TQT_SLOT(slotPluginDestroyed(TQObject*)) ); - connect( plugin, TQT_SIGNAL(readyForUnload()), - this, TQT_SLOT(slotPluginReadyForUnload()) ); + connect( plugin, TQ_SIGNAL(destroyed(TQObject*)), + this, TQ_SLOT(slotPluginDestroyed(TQObject*)) ); + connect( plugin, TQ_SIGNAL(readyForUnload()), + this, TQ_SLOT(slotPluginReadyForUnload()) ); kdDebug() << k_funcinfo << "Successfully loaded plugin '" << pluginId << "'" << endl; @@ -396,7 +396,7 @@ PluginManager::slotPluginDestroyed( TQObject *plugin ) { // Use a timer to make sure any pending deleteLater() calls have // been handled first - TQTimer::singleShot( 0, this, TQT_SLOT(slotShutdownDone()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotShutdownDone()) ); } } diff --git a/libtdepim/komposer/core/prefsmodule.cpp b/libtdepim/komposer/core/prefsmodule.cpp index abacd0eb..f8260c10 100644 --- a/libtdepim/komposer/core/prefsmodule.cpp +++ b/libtdepim/komposer/core/prefsmodule.cpp @@ -81,8 +81,8 @@ EditorSelection::EditorSelection( const TQString &text, TQString &reference, m_editorsCombo = new KComboBox( m_box ); boxLayout->addWidget( m_editorsCombo ); - connect( m_editorsCombo, TQT_SIGNAL(activated(const TQString&)), - TQT_SLOT(slotActivated(const TQString&)) ); + connect( m_editorsCombo, TQ_SIGNAL(activated(const TQString&)), + TQ_SLOT(slotActivated(const TQString&)) ); } EditorSelection::~EditorSelection() diff --git a/libtdepim/komposer/core/tests/testmanager.cpp b/libtdepim/komposer/core/tests/testmanager.cpp index a690c67c..40fe5181 100644 --- a/libtdepim/komposer/core/tests/testmanager.cpp +++ b/libtdepim/komposer/core/tests/testmanager.cpp @@ -15,10 +15,10 @@ TestManager::TestManager( TQObject *parent ) : TQObject( parent ) { m_manager = new PluginManager( this ); - connect( m_manager, TQT_SIGNAL(pluginLoaded(Plugin*)), - TQT_SLOT(slotPluginLoaded(Plugin*)) ); - connect( m_manager, TQT_SIGNAL(allPluginsLoaded()), - TQT_SLOT(slotAllPluginsLoaded()) ); + connect( m_manager, TQ_SIGNAL(pluginLoaded(Plugin*)), + TQ_SLOT(slotPluginLoaded(Plugin*)) ); + connect( m_manager, TQ_SIGNAL(allPluginsLoaded()), + TQ_SLOT(slotAllPluginsLoaded()) ); m_manager->loadAllPlugins(); TQValueList<KPluginInfo*> plugins = m_manager->availablePlugins(); diff --git a/libtdepim/komposer/plugins/default/defaulteditor.cpp b/libtdepim/komposer/plugins/default/defaulteditor.cpp index fe059b9e..1aba9705 100644 --- a/libtdepim/komposer/plugins/default/defaulteditor.cpp +++ b/libtdepim/komposer/plugins/default/defaulteditor.cpp @@ -98,71 +98,71 @@ DefaultEditor::createActions( TDEActionCollection *ac ) // // File Actions // - (void) KStdAction::open( this, TQT_SLOT(open()), ac ); - (void) KStdAction::openRecent( this, TQT_SLOT(openURL(const KURL &)), ac ); - (void) KStdAction::save( this, TQT_SLOT(save()), ac ); - (void) KStdAction::saveAs( this, TQT_SLOT(saveAs()), ac ); + (void) KStdAction::open( this, TQ_SLOT(open()), ac ); + (void) KStdAction::openRecent( this, TQ_SLOT(openURL(const KURL &)), ac ); + (void) KStdAction::save( this, TQ_SLOT(save()), ac ); + (void) KStdAction::saveAs( this, TQ_SLOT(saveAs()), ac ); // // Edit Actions // - TDEAction *actionUndo = KStdAction::undo( m_textEdit, TQT_SLOT(undo()), ac ); + TDEAction *actionUndo = KStdAction::undo( m_textEdit, TQ_SLOT(undo()), ac ); actionUndo->setEnabled( false ); - connect( m_textEdit, TQT_SIGNAL(undoAvailable(bool)), - actionUndo, TQT_SLOT(setEnabled(bool)) ); + connect( m_textEdit, TQ_SIGNAL(undoAvailable(bool)), + actionUndo, TQ_SLOT(setEnabled(bool)) ); - TDEAction *actionRedo = KStdAction::redo( m_textEdit, TQT_SLOT(redo()), ac ); + TDEAction *actionRedo = KStdAction::redo( m_textEdit, TQ_SLOT(redo()), ac ); actionRedo->setEnabled( false ); - connect( m_textEdit, TQT_SIGNAL(redoAvailable(bool)), - actionRedo, TQT_SLOT(setEnabled(bool)) ); + connect( m_textEdit, TQ_SIGNAL(redoAvailable(bool)), + actionRedo, TQ_SLOT(setEnabled(bool)) ); - TDEAction *action_cut = KStdAction::cut( m_textEdit, TQT_SLOT(cut()), ac ); + TDEAction *action_cut = KStdAction::cut( m_textEdit, TQ_SLOT(cut()), ac ); action_cut->setEnabled( false ); - connect( m_textEdit, TQT_SIGNAL(copyAvailable(bool)), - action_cut, TQT_SLOT(setEnabled(bool)) ); + connect( m_textEdit, TQ_SIGNAL(copyAvailable(bool)), + action_cut, TQ_SLOT(setEnabled(bool)) ); - TDEAction *action_copy = KStdAction::copy( m_textEdit, TQT_SLOT(copy()), ac ); + TDEAction *action_copy = KStdAction::copy( m_textEdit, TQ_SLOT(copy()), ac ); action_copy->setEnabled( false ); - connect( m_textEdit, TQT_SIGNAL(copyAvailable(bool)), - action_copy, TQT_SLOT(setEnabled(bool)) ); + connect( m_textEdit, TQ_SIGNAL(copyAvailable(bool)), + action_copy, TQ_SLOT(setEnabled(bool)) ); - (void) KStdAction::print( this, TQT_SLOT(print()), ac ); + (void) KStdAction::print( this, TQ_SLOT(print()), ac ); - (void) KStdAction::paste( m_textEdit, TQT_SLOT(paste()), ac ); + (void) KStdAction::paste( m_textEdit, TQ_SLOT(paste()), ac ); (void) new TDEAction( i18n( "C&lear" ), 0, - m_textEdit, TQT_SLOT(removeSelectedText()), + m_textEdit, TQ_SLOT(removeSelectedText()), ac, "edit_clear" ); - (void) KStdAction::selectAll( m_textEdit, TQT_SLOT(selectAll()), ac ); + (void) KStdAction::selectAll( m_textEdit, TQ_SLOT(selectAll()), ac ); // // View Actions // - (void) KStdAction::zoomIn( m_textEdit, TQT_SLOT(zoomIn()), ac ); - (void) KStdAction::zoomOut( m_textEdit, TQT_SLOT(zoomOut()), ac ); + (void) KStdAction::zoomIn( m_textEdit, TQ_SLOT(zoomIn()), ac ); + (void) KStdAction::zoomOut( m_textEdit, TQ_SLOT(zoomOut()), ac ); // // Character Formatting // m_actionBold = new TDEToggleAction( i18n("&Bold"), "format-text-bold", CTRL+Key_B, ac, "format_bold" ); - connect( m_actionBold, TQT_SIGNAL(toggled(bool)), - m_textEdit, TQT_SLOT(setBold(bool)) ); + connect( m_actionBold, TQ_SIGNAL(toggled(bool)), + m_textEdit, TQ_SLOT(setBold(bool)) ); m_actionItalic = new TDEToggleAction( i18n("&Italic"), "format-text-italic", CTRL+Key_I, ac, "format_italic" ); - connect( m_actionItalic, TQT_SIGNAL(toggled(bool)), - m_textEdit, TQT_SLOT(setItalic(bool) )); + connect( m_actionItalic, TQ_SIGNAL(toggled(bool)), + m_textEdit, TQ_SLOT(setItalic(bool) )); m_actionUnderline = new TDEToggleAction( i18n("&Underline"), "format-text-underline", CTRL+Key_U, ac, "format_underline" ); - connect( m_actionUnderline, TQT_SIGNAL(toggled(bool)), - m_textEdit, TQT_SLOT(setUnderline(bool)) ); + connect( m_actionUnderline, TQ_SIGNAL(toggled(bool)), + m_textEdit, TQ_SLOT(setUnderline(bool)) ); (void) new TDEAction( i18n("Text &Color..."), "colorpicker", 0, - this, TQT_SLOT(formatColor()), + this, TQ_SLOT(formatColor()), ac, "format_color" ); // @@ -170,37 +170,37 @@ DefaultEditor::createActions( TDEActionCollection *ac ) // m_actionFont = new TDEFontAction( i18n("&Font"), 0, ac, "format_font" ); - connect( m_actionFont, TQT_SIGNAL(activated(const TQString &)), - m_textEdit, TQT_SLOT(setFamily(const TQString &)) ); + connect( m_actionFont, TQ_SIGNAL(activated(const TQString &)), + m_textEdit, TQ_SLOT(setFamily(const TQString &)) ); m_actionFontSize = new TDEFontSizeAction( i18n("Font &Size"), 0, ac, "format_font_size" ); - connect( m_actionFontSize, TQT_SIGNAL(fontSizeChanged(int)), - m_textEdit, TQT_SLOT(setPointSize(int)) ); + connect( m_actionFontSize, TQ_SIGNAL(fontSizeChanged(int)), + m_textEdit, TQ_SLOT(setPointSize(int)) ); // // Alignment // m_actionAlignLeft = new TDEToggleAction( i18n("Align &Left"), "format-text-direction-ltr", 0, ac, "format_align_left" ); - connect( m_actionAlignLeft, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(setAlignLeft(bool)) ); + connect( m_actionAlignLeft, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(setAlignLeft(bool)) ); m_actionAlignCenter = new TDEToggleAction( i18n("Align &Center"), "text_center", 0, ac, "format_align_center" ); - connect( m_actionAlignCenter, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(setAlignCenter(bool)) ); + connect( m_actionAlignCenter, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(setAlignCenter(bool)) ); m_actionAlignRight = new TDEToggleAction( i18n("Align &Right"), "format-text-direction-rtl", 0, ac, "format_align_right" ); - connect( m_actionAlignRight, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(setAlignRight(bool)) ); + connect( m_actionAlignRight, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(setAlignRight(bool)) ); m_actionAlignJustify = new TDEToggleAction( i18n("&Justify"), "text_block", 0, ac, "format_align_justify" ); - connect( m_actionAlignJustify, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(setAlignJustify(bool)) ); + connect( m_actionAlignJustify, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(setAlignJustify(bool)) ); m_actionAlignLeft->setExclusiveGroup( "alignment" ); m_actionAlignCenter->setExclusiveGroup( "alignment" ); @@ -210,19 +210,19 @@ DefaultEditor::createActions( TDEActionCollection *ac ) // // Tools // - (void) KStdAction::spelling( this, TQT_SLOT(checkSpelling()), ac ); + (void) KStdAction::spelling( this, TQ_SLOT(checkSpelling()), ac ); // // Setup enable/disable // updateActions(); - connect( m_textEdit, TQT_SIGNAL(currentFontChanged(const TQFont &)), - this, TQT_SLOT( updateFont() ) ); - connect( m_textEdit, TQT_SIGNAL(currentFontChanged(const TQFont &)), - this, TQT_SLOT(updateCharFmt()) ); - connect( m_textEdit, TQT_SIGNAL(cursorPositionChanged(int, int)), - this, TQT_SLOT(updateAligment()) ); + connect( m_textEdit, TQ_SIGNAL(currentFontChanged(const TQFont &)), + this, TQ_SLOT( updateFont() ) ); + connect( m_textEdit, TQ_SIGNAL(currentFontChanged(const TQFont &)), + this, TQ_SLOT(updateCharFmt()) ); + connect( m_textEdit, TQ_SIGNAL(cursorPositionChanged(int, int)), + this, TQ_SLOT(updateAligment()) ); } void diff --git a/libtdepim/kpixmapregionselectorwidget.cpp b/libtdepim/kpixmapregionselectorwidget.cpp index 19e90741..9cfe8f00 100644 --- a/libtdepim/kpixmapregionselectorwidget.cpp +++ b/libtdepim/kpixmapregionselectorwidget.cpp @@ -144,12 +144,12 @@ TDEPopupMenu *KPixmapRegionSelectorWidget::createPopupMenu() popup->insertTitle(i18n("Image Operations")); TDEAction *action = new TDEAction(i18n("&Rotate Clockwise"), "object-rotate-right", - 0, this, TQT_SLOT(rotateClockwise()), + 0, this, TQ_SLOT(rotateClockwise()), popup, "rotateclockwise"); action->plug(popup); action = new TDEAction(i18n("Rotate &Counterclockwise"), "object-rotate-left", - 0, this, TQT_SLOT(rotateCounterclockwise()), + 0, this, TQ_SLOT(rotateCounterclockwise()), popup, "rotatecounterclockwise"); action->plug(popup); diff --git a/libtdepim/kprefsdialog.cpp b/libtdepim/kprefsdialog.cpp index 6c313a98..b910dc33 100644 --- a/libtdepim/kprefsdialog.cpp +++ b/libtdepim/kprefsdialog.cpp @@ -103,7 +103,7 @@ KPrefsWidBool::KPrefsWidBool( TDEConfigSkeleton::ItemBool *item, TQWidget *paren : mItem( item ) { mCheck = new TQCheckBox( item->label(), parent); - connect( mCheck, TQT_SIGNAL( clicked() ), TQT_SIGNAL( changed() ) ); + connect( mCheck, TQ_SIGNAL( clicked() ), TQ_SIGNAL( changed() ) ); if ( !item->whatsThis().isNull() ) { TQWhatsThis::add( mCheck, item->whatsThis() ); } @@ -144,7 +144,7 @@ KPrefsWidInt::KPrefsWidInt( TDEConfigSkeleton::ItemInt *item, if ( !item->maxValue().isNull() ) { mSpin->setMaxValue( item->maxValue().toInt() ); } - connect( mSpin, TQT_SIGNAL( valueChanged( int ) ), TQT_SIGNAL( changed() ) ); + connect( mSpin, TQ_SIGNAL( valueChanged( int ) ), TQ_SIGNAL( changed() ) ); mLabel->setBuddy( mSpin ); TQString whatsThis = mItem->whatsThis(); if ( !whatsThis.isEmpty() ) { @@ -187,7 +187,7 @@ KPrefsWidColor::KPrefsWidColor( TDEConfigSkeleton::ItemColor *item, : mItem( item ) { mButton = new KColorButton( parent ); - connect( mButton, TQT_SIGNAL( changed( const TQColor & ) ), TQT_SIGNAL( changed() ) ); + connect( mButton, TQ_SIGNAL( changed( const TQColor & ) ), TQ_SIGNAL( changed() ) ); mLabel = new TQLabel( mButton, mItem->label()+':', parent ); mLabel->setBuddy( mButton ); TQString whatsThis = mItem->whatsThis(); @@ -232,7 +232,7 @@ KPrefsWidFont::KPrefsWidFont( TDEConfigSkeleton::ItemFont *item, mPreview->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); mButton = new TQPushButton( i18n("Choose..."), parent ); - connect( mButton, TQT_SIGNAL( clicked() ), TQT_SLOT( selectFont() ) ); + connect( mButton, TQ_SIGNAL( clicked() ), TQ_SLOT( selectFont() ) ); TQString whatsThis = mItem->whatsThis(); if (!whatsThis.isNull()) { TQWhatsThis::add(mPreview, whatsThis); @@ -287,7 +287,7 @@ KPrefsWidTime::KPrefsWidTime( TDEConfigSkeleton::ItemDateTime *item, mLabel = new TQLabel( mItem->label()+':', parent ); mTimeEdit = new KTimeEdit( parent ); mLabel->setBuddy( mTimeEdit ); - connect( mTimeEdit, TQT_SIGNAL( timeChanged( TQTime ) ), TQT_SIGNAL( changed() ) ); + connect( mTimeEdit, TQ_SIGNAL( timeChanged( TQTime ) ), TQ_SIGNAL( changed() ) ); TQString whatsThis = mItem->whatsThis(); if ( !whatsThis.isNull() ) { TQWhatsThis::add( mTimeEdit, whatsThis ); @@ -330,7 +330,7 @@ KPrefsWidDuration::KPrefsWidDuration( TDEConfigSkeleton::ItemDateTime *item, mTimeEdit->setDisplay( TQTimeEdit::Hours | TQTimeEdit::Minutes ); mTimeEdit->setRange( TQTime( 0, 1 ), TQTime( 24, 0 ) ); // [1min, 24hr] connect( mTimeEdit, - TQT_SIGNAL( valueChanged( const TQTime & ) ), TQT_SIGNAL( changed() ) ); + TQ_SIGNAL( valueChanged( const TQTime & ) ), TQ_SIGNAL( changed() ) ); TQString whatsThis = mItem->whatsThis(); if ( !whatsThis.isNull() ) { TQWhatsThis::add( mTimeEdit, whatsThis ); @@ -367,7 +367,7 @@ KPrefsWidDate::KPrefsWidDate( TDEConfigSkeleton::ItemDateTime *item, mLabel = new TQLabel( mItem->label()+':', parent ); mDateEdit = new KDateEdit( parent ); mLabel->setBuddy( mDateEdit ); - connect( mDateEdit, TQT_SIGNAL( dateChanged( const TQDate& ) ), TQT_SIGNAL( changed() ) ); + connect( mDateEdit, TQ_SIGNAL( dateChanged( const TQDate& ) ), TQ_SIGNAL( changed() ) ); TQString whatsThis = mItem->whatsThis(); if ( !whatsThis.isNull() ) { TQWhatsThis::add( mDateEdit, whatsThis ); @@ -402,7 +402,7 @@ KPrefsWidRadios::KPrefsWidRadios( TDEConfigSkeleton::ItemEnum *item, : mItem( item ) { mBox = new TQButtonGroup( 1, TQt::Horizontal, mItem->label(), parent ); - connect( mBox, TQT_SIGNAL( clicked( int ) ), TQT_SIGNAL( changed() ) ); + connect( mBox, TQ_SIGNAL( clicked( int ) ), TQ_SIGNAL( changed() ) ); } KPrefsWidRadios::~KPrefsWidRadios() @@ -446,7 +446,7 @@ KPrefsWidCombo::KPrefsWidCombo( TDEConfigSkeleton::ItemEnum *item, TQHBox *hbox = new TQHBox(parent); new TQLabel( mItem->label(), hbox ); mCombo = new TQComboBox( hbox ); - connect( mCombo, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( changed() ) ); + connect( mCombo, TQ_SIGNAL( activated( int ) ), TQ_SIGNAL( changed() ) ); } KPrefsWidCombo::~KPrefsWidCombo() @@ -483,8 +483,8 @@ KPrefsWidString::KPrefsWidString( TDEConfigSkeleton::ItemString *item, mLabel = new TQLabel( mItem->label()+':', parent ); mEdit = new TQLineEdit( parent ); mLabel->setBuddy( mEdit ); - connect( mEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SIGNAL( changed() ) ); + connect( mEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SIGNAL( changed() ) ); mEdit->setEchoMode( echomode ); TQString whatsThis = mItem->whatsThis(); if ( !whatsThis.isNull() ) { @@ -534,8 +534,8 @@ KPrefsWidPath::KPrefsWidPath( TDEConfigSkeleton::ItemPath *item, TQWidget *paren mLabel->setBuddy( mURLRequester ); mURLRequester->setMode( mode ); mURLRequester->setFilter( filter ); - connect( mURLRequester, TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SIGNAL( changed() ) ); + connect( mURLRequester, TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SIGNAL( changed() ) ); TQString whatsThis = mItem->whatsThis(); if ( !whatsThis.isNull() ) { TQWhatsThis::add( mURLRequester, whatsThis ); @@ -742,8 +742,8 @@ KPrefsDialog::KPrefsDialog( TDEConfigSkeleton *prefs, TQWidget *parent, char *na // TODO: This seems to cause a crash on exit. Investigate later. // mPrefsWids.setAutoDelete(true); -// connect(this,TQT_SIGNAL(defaultClicked()),TQT_SLOT(setDefaults())); - connect(this,TQT_SIGNAL(cancelClicked()),TQT_SLOT(reject())); +// connect(this,TQ_SIGNAL(defaultClicked()),TQ_SLOT(setDefaults())); + connect(this,TQ_SIGNAL(cancelClicked()),TQ_SLOT(reject())); } KPrefsDialog::~KPrefsDialog() @@ -869,7 +869,7 @@ void KPrefsModule::addWid( KPrefsWid *wid ) { KPrefsWidManager::addWid( wid ); - connect( wid, TQT_SIGNAL( changed() ), TQT_SLOT( slotWidChanged() ) ); + connect( wid, TQ_SIGNAL( changed() ), TQ_SLOT( slotWidChanged() ) ); } void KPrefsModule::slotWidChanged() diff --git a/libtdepim/kscoring.cpp b/libtdepim/kscoring.cpp index 0213f082..b0ebf72d 100644 --- a/libtdepim/kscoring.cpp +++ b/libtdepim/kscoring.cpp @@ -84,7 +84,7 @@ NotifyDialog::NotifyDialog(TQWidget* p) TQCheckBox *check = new TQCheckBox(i18n("Do not show this message again"),f); check->setChecked(true); topL->addWidget(check); - connect(check,TQT_SIGNAL(toggled(bool)),TQT_SLOT(slotShowAgainToggled(bool))); + connect(check,TQ_SIGNAL(toggled(bool)),TQ_SLOT(slotShowAgainToggled(bool))); } void NotifyDialog::slotShowAgainToggled(bool flag) diff --git a/libtdepim/kscoringeditor.cpp b/libtdepim/kscoringeditor.cpp index 6d8aef90..1a536e82 100644 --- a/libtdepim/kscoringeditor.cpp +++ b/libtdepim/kscoringeditor.cpp @@ -76,7 +76,7 @@ SingleConditionWidget::SingleConditionWidget(KScoringManager *m,TQWidget *p, con matches->insertStringList(KScoringExpression::conditionNames()); TQToolTip::add(matches,i18n("Select the type of match")); firstRow->addWidget(matches,1); - connect( matches, TQT_SIGNAL( activated( int ) ), TQT_SLOT( toggleRegExpButton( int ) ) ); + connect( matches, TQ_SIGNAL( activated( int ) ), TQ_SLOT( toggleRegExpButton( int ) ) ); TQHBoxLayout *secondRow = new TQHBoxLayout( topL ); secondRow->setSpacing( 1 ); expr = new KLineEdit( this ); @@ -86,7 +86,7 @@ SingleConditionWidget::SingleConditionWidget(KScoringManager *m,TQWidget *p, con secondRow->addWidget( expr ); regExpButton = new TQPushButton( i18n("Edit..."), this ); secondRow->addWidget( regExpButton ); - connect( regExpButton, TQT_SIGNAL( clicked() ), TQT_SLOT( showRegExpDialog() ) ); + connect( regExpButton, TQ_SIGNAL( clicked() ), TQ_SLOT( showRegExpDialog() ) ); // occupy at much width as possible setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Fixed)); @@ -251,7 +251,7 @@ SingleActionWidget::SingleActionWidget(KScoringManager *m,TQWidget *p, const cha } } - connect(types,TQT_SIGNAL(activated(int)),stack,TQT_SLOT(raiseWidget(int))); + connect(types,TQ_SIGNAL(activated(int)),stack,TQ_SLOT(raiseWidget(int))); // raise the dummy label types->setCurrentItem(0); @@ -413,7 +413,7 @@ RuleEditWidget::RuleEditWidget(KScoringManager *m,TQWidget *p, const char *n) groupL->addWidget( groupsLabel, 2, 0 ); TQPushButton *groupsBtn = new TQPushButton(i18n("A&dd Group"), groupB); - connect(groupsBtn,TQT_SIGNAL(clicked()),TQT_SLOT(slotAddGroup())); + connect(groupsBtn,TQ_SIGNAL(clicked()),TQ_SLOT(slotAddGroup())); groupL->addWidget( groupsBtn, 3, 0 ); groupsBox = new KComboBox( false, groupB, "groupsBox" ); @@ -428,15 +428,15 @@ RuleEditWidget::RuleEditWidget(KScoringManager *m,TQWidget *p, const char *n) expireEdit = new KIntSpinBox(1,99999,1,30,10, groupB, "expireWidget"); //Init suffix slotExpireEditChanged(30); - connect(expireEdit, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotExpireEditChanged(int))); + connect(expireEdit, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotExpireEditChanged(int))); groupL->addWidget( expireEdit, 5, 1 ); expireLabel = new TQLabel(expireEdit, i18n("&Rule is valid for:"), groupB, "expireLabel"); groupL->addWidget( expireLabel, 5, 0 ); expireLabel->setEnabled(false); expireEdit->setEnabled(false); - connect(expireCheck, TQT_SIGNAL(toggled(bool)), expireLabel, TQT_SLOT(setEnabled(bool))); - connect(expireCheck, TQT_SIGNAL(toggled(bool)), expireEdit, TQT_SLOT(setEnabled(bool))); + connect(expireCheck, TQ_SIGNAL(toggled(bool)), expireLabel, TQ_SLOT(setEnabled(bool))); + connect(expireCheck, TQ_SIGNAL(toggled(bool)), expireEdit, TQ_SLOT(setEnabled(bool))); //------------- Conditions --------------------- TQGroupBox *groupConds = new TQGroupBox(i18n("Conditions"), this); @@ -457,7 +457,7 @@ RuleEditWidget::RuleEditWidget(KScoringManager *m,TQWidget *p, const char *n) condEditor = new ConditionEditWidget(manager,groupConds); condL->addMultiCellWidget(condEditor, 2,2, 0,1); - connect(condEditor,TQT_SIGNAL(widgetRemoved()),this,TQT_SLOT(slotShrink())); + connect(condEditor,TQ_SIGNAL(widgetRemoved()),this,TQ_SLOT(slotShrink())); //------------- Actions --------------------- TQGroupBox *groupActions = new TQGroupBox(i18n("Actions"), this); @@ -466,7 +466,7 @@ RuleEditWidget::RuleEditWidget(KScoringManager *m,TQWidget *p, const char *n) actionL->addSpacing(fontMetrics().lineSpacing()-4); actionEditor = new ActionEditWidget(manager,groupActions); actionL->addWidget(actionEditor); - connect(actionEditor,TQT_SIGNAL(widgetRemoved()),this,TQT_SLOT(slotShrink())); + connect(actionEditor,TQ_SIGNAL(widgetRemoved()),this,TQ_SLOT(slotShrink())); topLayout->addStretch(1); @@ -600,13 +600,13 @@ RuleListWidget::RuleListWidget(KScoringManager *m, bool standalone, TQWidget *p, TQVBoxLayout *topL = new TQVBoxLayout(this,standalone? 0:5,KDialog::spacingHint()); ruleList = new TDEListBox(this); if (standalone) { - connect(ruleList,TQT_SIGNAL(doubleClicked(TQListBoxItem*)), - this,TQT_SLOT(slotEditRule(TQListBoxItem*))); - connect(ruleList,TQT_SIGNAL(returnPressed(TQListBoxItem*)), - this,TQT_SLOT(slotEditRule(TQListBoxItem*))); + connect(ruleList,TQ_SIGNAL(doubleClicked(TQListBoxItem*)), + this,TQ_SLOT(slotEditRule(TQListBoxItem*))); + connect(ruleList,TQ_SIGNAL(returnPressed(TQListBoxItem*)), + this,TQ_SLOT(slotEditRule(TQListBoxItem*))); } - connect(ruleList, TQT_SIGNAL(currentChanged(TQListBoxItem*)), - this, TQT_SLOT(slotRuleSelected(TQListBoxItem*))); + connect(ruleList, TQ_SIGNAL(currentChanged(TQListBoxItem*)), + this, TQ_SLOT(slotRuleSelected(TQListBoxItem*))); topL->addWidget(ruleList); TQHBoxLayout *btnL = new TQHBoxLayout( topL, KDialog::spacingHint() ); @@ -614,12 +614,12 @@ RuleListWidget::RuleListWidget(KScoringManager *m, bool standalone, TQWidget *p, mRuleUp->setPixmap( BarIcon( "go-up", TDEIcon::SizeSmall ) ); TQToolTip::add( mRuleUp, i18n("Move rule up") ); btnL->addWidget( mRuleUp ); - connect( mRuleUp, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRuleUp() ) ); + connect( mRuleUp, TQ_SIGNAL( clicked() ), TQ_SLOT( slotRuleUp() ) ); mRuleDown = new TQPushButton( this ); mRuleDown->setPixmap( BarIcon( "go-down", TDEIcon::SizeSmall ) ); TQToolTip::add( mRuleDown, i18n("Move rule down") ); btnL->addWidget( mRuleDown ); - connect( mRuleDown, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRuleDown() ) ); + connect( mRuleDown, TQ_SIGNAL( clicked() ), TQ_SLOT( slotRuleDown() ) ); btnL = new TQHBoxLayout( topL, KDialog::spacingHint() ); editRule=0L; @@ -627,25 +627,25 @@ RuleListWidget::RuleListWidget(KScoringManager *m, bool standalone, TQWidget *p, newRule->setPixmap( BarIcon( "document-new", TDEIcon::SizeSmall ) ); TQToolTip::add(newRule,i18n("New rule")), btnL->addWidget(newRule); - connect(newRule, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewRule())); + connect(newRule, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNewRule())); // if we're standalone, we need an additional edit button if (standalone) { editRule = new TQPushButton(this); editRule->setIconSet( BarIconSet("edit", TDEIcon::SizeSmall) ); TQToolTip::add(editRule,i18n("Edit rule")); btnL->addWidget(editRule); - connect(editRule,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotEditRule())); + connect(editRule,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotEditRule())); } delRule = new TQPushButton(this); delRule->setIconSet( BarIconSet( "edit-delete", TDEIcon::SizeSmall ) ); TQToolTip::add(delRule,i18n("Remove rule")); btnL->addWidget(delRule); - connect(delRule, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDelRule())); + connect(delRule, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDelRule())); copyRule = new TQPushButton(this); copyRule->setIconSet(BarIconSet("edit-copy", TDEIcon::SizeSmall)); TQToolTip::add(copyRule,i18n("Copy rule")); btnL->addWidget(copyRule); - connect(copyRule, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCopyRule())); + connect(copyRule, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCopyRule())); // the group filter TQBoxLayout *filterL = new TQVBoxLayout(topL,KDialog::spacingHint()); @@ -654,17 +654,17 @@ RuleListWidget::RuleListWidget(KScoringManager *m, bool standalone, TQWidget *p, filterBox->insertItem(i18n("<all groups>")); filterBox->insertStringList(l); filterBox->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); - connect(filterBox,TQT_SIGNAL(activated(const TQString&)), - this,TQT_SLOT(slotGroupFilter(const TQString&))); + connect(filterBox,TQ_SIGNAL(activated(const TQString&)), + this,TQ_SLOT(slotGroupFilter(const TQString&))); slotGroupFilter(i18n("<all groups>")); TQLabel *lab = new TQLabel(filterBox,i18n("Sho&w only rules for group:"),this); filterL->addWidget(lab); filterL->addWidget(filterBox); - connect(manager,TQT_SIGNAL(changedRules()), - this,TQT_SLOT(updateRuleList())); - connect(manager,TQT_SIGNAL(changedRuleName(const TQString&,const TQString&)), - this,TQT_SLOT(slotRuleNameChanged(const TQString&,const TQString&))); + connect(manager,TQ_SIGNAL(changedRules()), + this,TQ_SLOT(updateRuleList())); + connect(manager,TQ_SIGNAL(changedRuleName(const TQString&,const TQString&)), + this,TQ_SLOT(slotRuleNameChanged(const TQString&,const TQString&))); updateRuleList(); updateButton(); @@ -872,12 +872,12 @@ KScoringEditor::KScoringEditor(KScoringManager* m, hbl->addWidget(ruleLister); ruleEditor = new RuleEditWidget(manager,w); hbl->addWidget(ruleEditor); - connect(ruleLister,TQT_SIGNAL(ruleSelected(const TQString&)), - ruleEditor, TQT_SLOT(slotEditRule(const TQString&))); - connect(ruleLister, TQT_SIGNAL(leavingRule()), - ruleEditor, TQT_SLOT(updateRule())); - connect(ruleEditor, TQT_SIGNAL(shrink()), TQT_SLOT(slotShrink())); - connect(this,TQT_SIGNAL(finished()),TQT_SLOT(slotFinished())); + connect(ruleLister,TQ_SIGNAL(ruleSelected(const TQString&)), + ruleEditor, TQ_SLOT(slotEditRule(const TQString&))); + connect(ruleLister, TQ_SIGNAL(leavingRule()), + ruleEditor, TQ_SLOT(updateRule())); + connect(ruleEditor, TQ_SIGNAL(shrink()), TQ_SLOT(slotShrink())); + connect(this,TQ_SIGNAL(finished()),TQ_SLOT(slotFinished())); ruleLister->slotRuleSelected(0); resize(550, sizeHint().height()); } @@ -909,7 +909,7 @@ void KScoringEditor::setRule(KScoringRule* r) void KScoringEditor::slotShrink() { - TQTimer::singleShot(5, this, TQT_SLOT(slotDoShrink())); + TQTimer::singleShot(5, this, TQ_SLOT(slotDoShrink())); } void KScoringEditor::slotDoShrink() @@ -964,7 +964,7 @@ KScoringEditorWidgetDialog::KScoringEditorWidgetDialog(KScoringManager *m, const TQFrame *f = makeMainWidget(); TQBoxLayout *topL = new TQVBoxLayout(f); ruleEditor = new RuleEditWidget(manager,f); - connect(ruleEditor, TQT_SIGNAL(shrink()), TQT_SLOT(slotShrink())); + connect(ruleEditor, TQ_SIGNAL(shrink()), TQ_SLOT(slotShrink())); topL->addWidget(ruleEditor); ruleEditor->slotEditRule(ruleName); resize(0,0); @@ -987,7 +987,7 @@ void KScoringEditorWidgetDialog::slotOk() void KScoringEditorWidgetDialog::slotShrink() { - TQTimer::singleShot(5, this, TQT_SLOT(slotDoShrink())); + TQTimer::singleShot(5, this, TQ_SLOT(slotDoShrink())); } void KScoringEditorWidgetDialog::slotDoShrink() @@ -1008,8 +1008,8 @@ KScoringEditorWidget::KScoringEditorWidget(KScoringManager *m,TQWidget *p, const TQBoxLayout *topL = new TQVBoxLayout(this); ruleLister = new RuleListWidget(manager,true,this); topL->addWidget(ruleLister); - connect(ruleLister,TQT_SIGNAL(ruleEdited(const TQString&)), - this,TQT_SLOT(slotRuleEdited(const TQString &))); + connect(ruleLister,TQ_SIGNAL(ruleEdited(const TQString&)), + this,TQ_SLOT(slotRuleEdited(const TQString &))); } KScoringEditorWidget::~KScoringEditorWidget() diff --git a/libtdepim/ksubscription.cpp b/libtdepim/ksubscription.cpp index d72776bc..7bb7179d 100644 --- a/libtdepim/ksubscription.cpp +++ b/libtdepim/ksubscription.cpp @@ -227,7 +227,7 @@ KSubscription::KSubscription( TQWidget *parent, const TQString &caption, TDEApplication::reverseLayout() ? "clear_left":"locationbar_erase", TDEIcon::Small, 0 ) ); filterEdit = new KLineEdit(page); TQLabel *l = new TQLabel(filterEdit,i18n("S&earch:"), page); - connect( clearButton, TQT_SIGNAL( clicked() ), filterEdit, TQT_SLOT( clear() ) ); + connect( clearButton, TQ_SIGNAL( clicked() ), filterEdit, TQ_SLOT( clear() ) ); // checkboxes noTreeCB = new TQCheckBox(i18n("Disable &tree view"), page); @@ -323,29 +323,29 @@ KSubscription::KSubscription( TQWidget *parent, const TQString &caption, filterEdit->setFocus(); // items clicked - connect(groupView, TQT_SIGNAL(clicked(TQListViewItem *)), - this, TQT_SLOT(slotChangeButtonState(TQListViewItem*))); - connect(subView, TQT_SIGNAL(clicked(TQListViewItem *)), - this, TQT_SLOT(slotChangeButtonState(TQListViewItem*))); - connect(unsubView, TQT_SIGNAL(clicked(TQListViewItem *)), - this, TQT_SLOT(slotChangeButtonState(TQListViewItem*))); + connect(groupView, TQ_SIGNAL(clicked(TQListViewItem *)), + this, TQ_SLOT(slotChangeButtonState(TQListViewItem*))); + connect(subView, TQ_SIGNAL(clicked(TQListViewItem *)), + this, TQ_SLOT(slotChangeButtonState(TQListViewItem*))); + connect(unsubView, TQ_SIGNAL(clicked(TQListViewItem *)), + this, TQ_SLOT(slotChangeButtonState(TQListViewItem*))); // connect buttons - connect(arrowBtn1, TQT_SIGNAL(clicked()), TQT_SLOT(slotButton1())); - connect(arrowBtn2, TQT_SIGNAL(clicked()), TQT_SLOT(slotButton2())); - connect(this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(slotLoadFolders())); + connect(arrowBtn1, TQ_SIGNAL(clicked()), TQ_SLOT(slotButton1())); + connect(arrowBtn2, TQ_SIGNAL(clicked()), TQ_SLOT(slotButton2())); + connect(this, TQ_SIGNAL(user1Clicked()), TQ_SLOT(slotLoadFolders())); // connect checkboxes - connect(subCB, TQT_SIGNAL(clicked()), TQT_SLOT(slotCBToggled())); - connect(newCB, TQT_SIGNAL(clicked()), TQT_SLOT(slotCBToggled())); - connect(noTreeCB, TQT_SIGNAL(clicked()), TQT_SLOT(slotCBToggled())); + connect(subCB, TQ_SIGNAL(clicked()), TQ_SLOT(slotCBToggled())); + connect(newCB, TQ_SIGNAL(clicked()), TQ_SLOT(slotCBToggled())); + connect(noTreeCB, TQ_SIGNAL(clicked()), TQ_SLOT(slotCBToggled())); // connect textfield - connect(filterEdit, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(slotFilterTextChanged(const TQString&))); + connect(filterEdit, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(slotFilterTextChanged(const TQString&))); // update status - connect(this, TQT_SIGNAL(listChanged()), TQT_SLOT(slotUpdateStatusLabel())); + connect(this, TQ_SIGNAL(listChanged()), TQ_SLOT(slotUpdateStatusLabel())); } //----------------------------------------------------------------------------- diff --git a/libtdepim/ktimeedit.cpp b/libtdepim/ktimeedit.cpp index 37783130..4dd66280 100644 --- a/libtdepim/ktimeedit.cpp +++ b/libtdepim/ktimeedit.cpp @@ -128,9 +128,9 @@ KTimeEdit::KTimeEdit( TQWidget *parent, TQTime qt, const char *name ) updateText(); setFocusPolicy(TQWidget::StrongFocus); - connect(this, TQT_SIGNAL(activated(int)), this, TQT_SLOT(active(int))); - connect(this, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(hilit(int))); - connect(this, TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(changedText())); + connect(this, TQ_SIGNAL(activated(int)), this, TQ_SLOT(active(int))); + connect(this, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(hilit(int))); + connect(this, TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(changedText())); } KTimeEdit::~KTimeEdit() diff --git a/libtdepim/kwidgetlister.cpp b/libtdepim/kwidgetlister.cpp index d279c8bc..0ad66de7 100644 --- a/libtdepim/kwidgetlister.cpp +++ b/libtdepim/kwidgetlister.cpp @@ -71,12 +71,12 @@ KWidgetLister::KWidgetLister( int minWidgets, int maxWidgets, TQWidget *parent, mButtonBox->setStretchFactor( mBtnClear, 0 ); //---------- connect everything - connect( mBtnMore, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotMore()) ); - connect( mBtnFewer, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotFewer()) ); - connect( mBtnClear, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotClear()) ); + connect( mBtnMore, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotMore()) ); + connect( mBtnFewer, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotFewer()) ); + connect( mBtnClear, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotClear()) ); enableControls(); } diff --git a/libtdepim/ldapclient.cpp b/libtdepim/ldapclient.cpp index 8e478388..55d8362b 100644 --- a/libtdepim/ldapclient.cpp +++ b/libtdepim/ldapclient.cpp @@ -137,12 +137,12 @@ void LdapClient::startQuery( const TQString& filter ) startParseLDIF(); mActive = true; mJob = TDEIO::get( url, false, false ); - connect( mJob, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), - this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); - connect( mJob, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), - this, TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) ); - connect( mJob, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( slotDone() ) ); + connect( mJob, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + this, TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); + connect( mJob, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), + this, TQ_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) ); + connect( mJob, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( slotDone() ) ); } void LdapClient::cancelQuery() @@ -345,8 +345,8 @@ LdapSearch::LdapSearch() } readConfig(); - connect(KDirWatch::self(), TQT_SIGNAL(dirty (const TQString&)),this, - TQT_SLOT(slotFileChanged(const TQString&))); + connect(KDirWatch::self(), TQ_SIGNAL(dirty (const TQString&)),this, + TQ_SLOT(slotFileChanged(const TQString&))); } void LdapSearch::readWeighForClient( LdapClient *client, TDEConfig *config, int clientNumber ) @@ -394,17 +394,17 @@ void LdapSearch::readConfig() attrs << "cn" << "mail" << "givenname" << "sn" << "objectClass"; ldapClient->setAttrs( attrs ); - connect( ldapClient, TQT_SIGNAL( result( const KPIM::LdapObject& ) ), - this, TQT_SLOT( slotLDAPResult( const KPIM::LdapObject& ) ) ); - connect( ldapClient, TQT_SIGNAL( done() ), - this, TQT_SLOT( slotLDAPDone() ) ); - connect( ldapClient, TQT_SIGNAL( error( const TQString& ) ), - this, TQT_SLOT( slotLDAPError( const TQString& ) ) ); + connect( ldapClient, TQ_SIGNAL( result( const KPIM::LdapObject& ) ), + this, TQ_SLOT( slotLDAPResult( const KPIM::LdapObject& ) ) ); + connect( ldapClient, TQ_SIGNAL( done() ), + this, TQ_SLOT( slotLDAPDone() ) ); + connect( ldapClient, TQ_SIGNAL( error( const TQString& ) ), + this, TQ_SLOT( slotLDAPError( const TQString& ) ) ); mClients.append( ldapClient ); } - connect( &mDataTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotDataTimer() ) ); + connect( &mDataTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotDataTimer() ) ); } mConfigFile = locateLocal( "config", "kabldaprc" ); KDirWatch::self()->addFile( mConfigFile ); diff --git a/libtdepim/ldapsearchdialog.cpp b/libtdepim/ldapsearchdialog.cpp index d6b541f5..26cc3d24 100644 --- a/libtdepim/ldapsearchdialog.cpp +++ b/libtdepim/ldapsearchdialog.cpp @@ -195,10 +195,10 @@ LDAPSearchDialog::LDAPSearchDialog( TQWidget* parent, const char* name ) mNumHosts = 0; mIsOK = false; - connect( mRecursiveCheckbox, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotSetScope( bool ) ) ); - connect( mSearchButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotStartSearch() ) ); + connect( mRecursiveCheckbox, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotSetScope( bool ) ) ); + connect( mSearchButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotStartSearch() ) ); setTabOrder(mSearchEdit, mFilterCombo); setTabOrder(mFilterCombo, mSearchButton); @@ -268,12 +268,12 @@ void LDAPSearchDialog::restoreSettings() ldapClient->setAttrs( attrs ); - connect( ldapClient, TQT_SIGNAL( result( const KPIM::LdapObject& ) ), - this, TQT_SLOT( slotAddResult( const KPIM::LdapObject& ) ) ); - connect( ldapClient, TQT_SIGNAL( done() ), - this, TQT_SLOT( slotSearchDone() ) ); - connect( ldapClient, TQT_SIGNAL( error( const TQString& ) ), - this, TQT_SLOT( slotError( const TQString& ) ) ); + connect( ldapClient, TQ_SIGNAL( result( const KPIM::LdapObject& ) ), + this, TQ_SLOT( slotAddResult( const KPIM::LdapObject& ) ) ); + connect( ldapClient, TQ_SIGNAL( done() ), + this, TQ_SLOT( slotSearchDone() ) ); + connect( ldapClient, TQ_SIGNAL( error( const TQString& ) ), + this, TQ_SLOT( slotError( const TQString& ) ) ); mLdapClientList.append( ldapClient ); } @@ -378,10 +378,10 @@ void LDAPSearchDialog::slotStartSearch() TQApplication::setOverrideCursor( TQt::waitCursor ); mSearchButton->setText( i18n( "Stop" ) ); - disconnect( mSearchButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotStartSearch() ) ); - connect( mSearchButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotStopSearch() ) ); + disconnect( mSearchButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotStartSearch() ) ); + connect( mSearchButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotStopSearch() ) ); bool startsWith = (mSearchType->currentItem() == 1); @@ -410,10 +410,10 @@ void LDAPSearchDialog::slotSearchDone() return; } - disconnect( mSearchButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotStopSearch() ) ); - connect( mSearchButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotStartSearch() ) ); + disconnect( mSearchButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotStopSearch() ) ); + connect( mSearchButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotStartSearch() ) ); mSearchButton->setText( i18n( "Search" ) ); TQApplication::restoreOverrideCursor(); diff --git a/libtdepim/progressdialog.cpp b/libtdepim/progressdialog.cpp index d3a37003..e780c297 100644 --- a/libtdepim/progressdialog.cpp +++ b/libtdepim/progressdialog.cpp @@ -75,7 +75,7 @@ TransactionItem* TransactionItemView::addTransactionItem( ProgressItem* item, bo { TransactionItem *ti = new TransactionItem( mBigBox, item, first ); ti->hide(); - TQTimer::singleShot( 1000, ti, TQT_SLOT( show() ) ); + TQTimer::singleShot( 1000, ti, TQ_SLOT( show() ) ); return ti; } @@ -169,8 +169,8 @@ TransactionItem::TransactionItem( TQWidget* parent, if ( item->canBeCanceled() ) { mCancelButton = new TQPushButton( SmallIcon( "cancel" ), TQString(), h ); TQToolTip::add( mCancelButton, i18n("Cancel this operation.") ); - connect ( mCancelButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotItemCanceled() )); + connect ( mCancelButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotItemCanceled() )); } h = new TQHBox( this ); @@ -262,7 +262,7 @@ ProgressDialog::ProgressDialog( TQWidget* alignWidget, TQWidget* parent, const c pbClose->setFixedSize( 16, 16 ); pbClose->setIconSet( TDEGlobal::iconLoader()->loadIconSet( "window-close", TDEIcon::Small, 14 ) ); TQToolTip::add( pbClose, i18n( "Hide detailed progress window" ) ); - connect(pbClose, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClose())); + connect(pbClose, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClose())); TQWidget* spacer = new TQWidget( rightBox ); // don't let the close button take up all the height rightBox->setStretchFactor( spacer, 100 ); */ @@ -272,22 +272,22 @@ ProgressDialog::ProgressDialog( TQWidget* alignWidget, TQWidget* parent, const c * appearing and vanishing items. */ ProgressManager *pm = ProgressManager::instance(); - connect ( pm, TQT_SIGNAL( progressItemAdded( KPIM::ProgressItem* ) ), - this, TQT_SLOT( slotTransactionAdded( KPIM::ProgressItem* ) ) ); - connect ( pm, TQT_SIGNAL( progressItemCompleted( KPIM::ProgressItem* ) ), - this, TQT_SLOT( slotTransactionCompleted( KPIM::ProgressItem* ) ) ); - connect ( pm, TQT_SIGNAL( progressItemProgress( KPIM::ProgressItem*, unsigned int ) ), - this, TQT_SLOT( slotTransactionProgress( KPIM::ProgressItem*, unsigned int ) ) ); - connect ( pm, TQT_SIGNAL( progressItemStatus( KPIM::ProgressItem*, const TQString& ) ), - this, TQT_SLOT( slotTransactionStatus( KPIM::ProgressItem*, const TQString& ) ) ); - connect ( pm, TQT_SIGNAL( progressItemLabel( KPIM::ProgressItem*, const TQString& ) ), - this, TQT_SLOT( slotTransactionLabel( KPIM::ProgressItem*, const TQString& ) ) ); - connect ( pm, TQT_SIGNAL( progressItemUsesCrypto(KPIM::ProgressItem*, bool) ), - this, TQT_SLOT( slotTransactionUsesCrypto( KPIM::ProgressItem*, bool ) ) ); - connect ( pm, TQT_SIGNAL( progressItemUsesBusyIndicator(KPIM::ProgressItem*, bool) ), - this, TQT_SLOT( slotTransactionUsesBusyIndicator( KPIM::ProgressItem*, bool ) ) ); - connect ( pm, TQT_SIGNAL( showProgressDialog() ), - this, TQT_SLOT( slotShow() ) ); + connect ( pm, TQ_SIGNAL( progressItemAdded( KPIM::ProgressItem* ) ), + this, TQ_SLOT( slotTransactionAdded( KPIM::ProgressItem* ) ) ); + connect ( pm, TQ_SIGNAL( progressItemCompleted( KPIM::ProgressItem* ) ), + this, TQ_SLOT( slotTransactionCompleted( KPIM::ProgressItem* ) ) ); + connect ( pm, TQ_SIGNAL( progressItemProgress( KPIM::ProgressItem*, unsigned int ) ), + this, TQ_SLOT( slotTransactionProgress( KPIM::ProgressItem*, unsigned int ) ) ); + connect ( pm, TQ_SIGNAL( progressItemStatus( KPIM::ProgressItem*, const TQString& ) ), + this, TQ_SLOT( slotTransactionStatus( KPIM::ProgressItem*, const TQString& ) ) ); + connect ( pm, TQ_SIGNAL( progressItemLabel( KPIM::ProgressItem*, const TQString& ) ), + this, TQ_SLOT( slotTransactionLabel( KPIM::ProgressItem*, const TQString& ) ) ); + connect ( pm, TQ_SIGNAL( progressItemUsesCrypto(KPIM::ProgressItem*, bool) ), + this, TQ_SLOT( slotTransactionUsesCrypto( KPIM::ProgressItem*, bool ) ) ); + connect ( pm, TQ_SIGNAL( progressItemUsesBusyIndicator(KPIM::ProgressItem*, bool) ), + this, TQ_SLOT( slotTransactionUsesBusyIndicator( KPIM::ProgressItem*, bool ) ) ); + connect ( pm, TQ_SIGNAL( showProgressDialog() ), + this, TQ_SLOT( slotShow() ) ); } void ProgressDialog::closeEvent( TQCloseEvent* e ) @@ -319,7 +319,7 @@ void ProgressDialog::slotTransactionAdded( ProgressItem *item ) if ( ti ) mTransactionsToListviewItems.replace( item, ti ); if ( first && mWasLastShown ) - TQTimer::singleShot( 1000, this, TQT_SLOT( slotShow() ) ); + TQTimer::singleShot( 1000, this, TQ_SLOT( slotShow() ) ); } } @@ -330,14 +330,14 @@ void ProgressDialog::slotTransactionCompleted( ProgressItem *item ) TransactionItem *ti = mTransactionsToListviewItems[ item ]; mTransactionsToListviewItems.remove( item ); ti->setItemComplete(); - TQTimer::singleShot( 3000, ti, TQT_SLOT( deleteLater() ) ); + TQTimer::singleShot( 3000, ti, TQ_SLOT( deleteLater() ) ); // see the slot for comments as to why that works - connect ( ti, TQT_SIGNAL( destroyed() ), - mScrollView, TQT_SLOT( slotLayoutFirstItem() ) ); + connect ( ti, TQ_SIGNAL( destroyed() ), + mScrollView, TQ_SLOT( slotLayoutFirstItem() ) ); } // This was the last item, hide. if ( mTransactionsToListviewItems.empty() ) - TQTimer::singleShot( 3000, this, TQT_SLOT( slotHide() ) ); + TQTimer::singleShot( 3000, this, TQ_SLOT( slotHide() ) ); } void ProgressDialog::slotTransactionCanceled( ProgressItem* ) diff --git a/libtdepim/progressmanager.cpp b/libtdepim/progressmanager.cpp index 37216e94..68e8ac28 100644 --- a/libtdepim/progressmanager.cpp +++ b/libtdepim/progressmanager.cpp @@ -162,22 +162,22 @@ ProgressItem* ProgressManager::createProgressItemImpl( } } // connect all signals - connect ( t, TQT_SIGNAL( progressItemCompleted(KPIM::ProgressItem*) ), - this, TQT_SLOT( slotTransactionCompleted(KPIM::ProgressItem*) ) ); - connect ( t, TQT_SIGNAL( progressItemProgress(KPIM::ProgressItem*, unsigned int) ), - this, TQT_SIGNAL( progressItemProgress(KPIM::ProgressItem*, unsigned int) ) ); - connect ( t, TQT_SIGNAL( progressItemAdded(KPIM::ProgressItem*) ), - this, TQT_SIGNAL( progressItemAdded(KPIM::ProgressItem*) ) ); - connect ( t, TQT_SIGNAL( progressItemCanceled(KPIM::ProgressItem*) ), - this, TQT_SIGNAL( progressItemCanceled(KPIM::ProgressItem*) ) ); - connect ( t, TQT_SIGNAL( progressItemStatus(KPIM::ProgressItem*, const TQString&) ), - this, TQT_SIGNAL( progressItemStatus(KPIM::ProgressItem*, const TQString&) ) ); - connect ( t, TQT_SIGNAL( progressItemLabel(KPIM::ProgressItem*, const TQString&) ), - this, TQT_SIGNAL( progressItemLabel(KPIM::ProgressItem*, const TQString&) ) ); - connect ( t, TQT_SIGNAL( progressItemUsesCrypto(KPIM::ProgressItem*, bool) ), - this, TQT_SIGNAL( progressItemUsesCrypto(KPIM::ProgressItem*, bool) ) ); - connect ( t, TQT_SIGNAL( progressItemUsesBusyIndicator(KPIM::ProgressItem*, bool) ), - this, TQT_SIGNAL( progressItemUsesBusyIndicator(KPIM::ProgressItem*, bool) ) ); + connect ( t, TQ_SIGNAL( progressItemCompleted(KPIM::ProgressItem*) ), + this, TQ_SLOT( slotTransactionCompleted(KPIM::ProgressItem*) ) ); + connect ( t, TQ_SIGNAL( progressItemProgress(KPIM::ProgressItem*, unsigned int) ), + this, TQ_SIGNAL( progressItemProgress(KPIM::ProgressItem*, unsigned int) ) ); + connect ( t, TQ_SIGNAL( progressItemAdded(KPIM::ProgressItem*) ), + this, TQ_SIGNAL( progressItemAdded(KPIM::ProgressItem*) ) ); + connect ( t, TQ_SIGNAL( progressItemCanceled(KPIM::ProgressItem*) ), + this, TQ_SIGNAL( progressItemCanceled(KPIM::ProgressItem*) ) ); + connect ( t, TQ_SIGNAL( progressItemStatus(KPIM::ProgressItem*, const TQString&) ), + this, TQ_SIGNAL( progressItemStatus(KPIM::ProgressItem*, const TQString&) ) ); + connect ( t, TQ_SIGNAL( progressItemLabel(KPIM::ProgressItem*, const TQString&) ), + this, TQ_SIGNAL( progressItemLabel(KPIM::ProgressItem*, const TQString&) ) ); + connect ( t, TQ_SIGNAL( progressItemUsesCrypto(KPIM::ProgressItem*, bool) ), + this, TQ_SIGNAL( progressItemUsesCrypto(KPIM::ProgressItem*, bool) ) ); + connect ( t, TQ_SIGNAL( progressItemUsesBusyIndicator(KPIM::ProgressItem*, bool) ), + this, TQ_SIGNAL( progressItemUsesBusyIndicator(KPIM::ProgressItem*, bool) ) ); emit progressItemAdded( t ); } else { diff --git a/libtdepim/sendsmsdialog.cpp b/libtdepim/sendsmsdialog.cpp index 2b658112..2f451d3a 100644 --- a/libtdepim/sendsmsdialog.cpp +++ b/libtdepim/sendsmsdialog.cpp @@ -48,10 +48,10 @@ SendSMSDialog::SendSMSDialog( const TQString &recipientName, TQWidget *parent, c setButtonText( Ok, i18n( "Send" ) ); - connect( mText, TQT_SIGNAL( textChanged() ), - this, TQT_SLOT( updateMessageLength() ) ); - connect( mText, TQT_SIGNAL( textChanged() ), - this, TQT_SLOT( updateButtons() ) ); + connect( mText, TQ_SIGNAL( textChanged() ), + this, TQ_SLOT( updateMessageLength() ) ); + connect( mText, TQ_SIGNAL( textChanged() ), + this, TQ_SLOT( updateButtons() ) ); updateButtons(); diff --git a/libtdepim/statusbarprogresswidget.cpp b/libtdepim/statusbarprogresswidget.cpp index e196bcf8..d0cd9d7d 100644 --- a/libtdepim/statusbarprogresswidget.cpp +++ b/libtdepim/statusbarprogresswidget.cpp @@ -98,22 +98,22 @@ StatusbarProgressWidget::StatusbarProgressWidget( ProgressDialog* progressDialog mode = None; setMode(); - connect( m_pButton, TQT_SIGNAL( clicked() ), - progressDialog, TQT_SLOT( slotToggleVisibility() ) ); + connect( m_pButton, TQ_SIGNAL( clicked() ), + progressDialog, TQ_SLOT( slotToggleVisibility() ) ); - connect ( ProgressManager::instance(), TQT_SIGNAL( progressItemAdded( KPIM::ProgressItem * ) ), - this, TQT_SLOT( slotProgressItemAdded( KPIM::ProgressItem * ) ) ); - connect ( ProgressManager::instance(), TQT_SIGNAL( progressItemCompleted( KPIM::ProgressItem * ) ), - this, TQT_SLOT( slotProgressItemCompleted( KPIM::ProgressItem * ) ) ); - connect ( ProgressManager::instance(), TQT_SIGNAL(progressItemUsesBusyIndicator(KPIM::ProgressItem*,bool)), - this, TQT_SLOT( updateBusyMode() ) ); + connect ( ProgressManager::instance(), TQ_SIGNAL( progressItemAdded( KPIM::ProgressItem * ) ), + this, TQ_SLOT( slotProgressItemAdded( KPIM::ProgressItem * ) ) ); + connect ( ProgressManager::instance(), TQ_SIGNAL( progressItemCompleted( KPIM::ProgressItem * ) ), + this, TQ_SLOT( slotProgressItemCompleted( KPIM::ProgressItem * ) ) ); + connect ( ProgressManager::instance(), TQ_SIGNAL(progressItemUsesBusyIndicator(KPIM::ProgressItem*,bool)), + this, TQ_SLOT( updateBusyMode() ) ); - connect ( progressDialog, TQT_SIGNAL( visibilityChanged( bool )), - this, TQT_SLOT( slotProgressDialogVisible( bool ) ) ); + connect ( progressDialog, TQ_SIGNAL( visibilityChanged( bool )), + this, TQ_SLOT( slotProgressDialogVisible( bool ) ) ); mDelayTimer = new TQTimer( this ); - connect ( mDelayTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotShowItemDelayed() ) ); + connect ( mDelayTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotShowItemDelayed() ) ); } // There are three cases: no progressitem, one progressitem (connect to it directly), @@ -132,8 +132,8 @@ void StatusbarProgressWidget::updateBusyMode() else { // N items if ( !mBusyTimer ) { mBusyTimer = new TQTimer( this ); - connect( mBusyTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotBusyIndicator() ) ); + connect( mBusyTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotBusyIndicator() ) ); mDelayTimer->start( 1000, true ); } } @@ -153,7 +153,7 @@ void StatusbarProgressWidget::slotProgressItemCompleted( ProgressItem *item ) connectSingleItem(); // if going back to 1 item if ( ProgressManager::instance()->isEmpty() ) { // No item // Done. In 5s the progress-widget will close, then we can clean up the statusbar - TQTimer::singleShot( 5000, this, TQT_SLOT( slotClean() ) ); + TQTimer::singleShot( 5000, this, TQ_SLOT( slotClean() ) ); } else if ( mCurrentItem ) { // Exactly one item delete mBusyTimer; mBusyTimer = 0; @@ -164,14 +164,14 @@ void StatusbarProgressWidget::slotProgressItemCompleted( ProgressItem *item ) void StatusbarProgressWidget::connectSingleItem() { if ( mCurrentItem ) { - disconnect ( mCurrentItem, TQT_SIGNAL( progressItemProgress( KPIM::ProgressItem *, unsigned int ) ), - this, TQT_SLOT( slotProgressItemProgress( KPIM::ProgressItem *, unsigned int ) ) ); + disconnect ( mCurrentItem, TQ_SIGNAL( progressItemProgress( KPIM::ProgressItem *, unsigned int ) ), + this, TQ_SLOT( slotProgressItemProgress( KPIM::ProgressItem *, unsigned int ) ) ); mCurrentItem = 0; } mCurrentItem = ProgressManager::instance()->singleItem(); if ( mCurrentItem ) { - connect ( mCurrentItem, TQT_SIGNAL( progressItemProgress( KPIM::ProgressItem *, unsigned int ) ), - this, TQT_SLOT( slotProgressItemProgress( KPIM::ProgressItem *, unsigned int ) ) ); + connect ( mCurrentItem, TQ_SIGNAL( progressItemProgress( KPIM::ProgressItem *, unsigned int ) ), + this, TQ_SLOT( slotProgressItemProgress( KPIM::ProgressItem *, unsigned int ) ) ); } } diff --git a/libtdepim/tdeabcresourcecached.cpp b/libtdepim/tdeabcresourcecached.cpp index 42a06e45..63eb2f75 100644 --- a/libtdepim/tdeabcresourcecached.cpp +++ b/libtdepim/tdeabcresourcecached.cpp @@ -36,8 +36,8 @@ ResourceCached::ResourceCached( const TDEConfig *config ) mSavePolicy( SaveDelayed ), mSaveInterval( 10 ), mKABCSaveTimer( 0, "mKABCSaveTimer" ) { - connect( &mKABCReloadTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotKABCReload() ) ); - connect( &mKABCSaveTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotKABCSave() ) ); + connect( &mKABCReloadTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotKABCReload() ) ); + connect( &mKABCSaveTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotKABCSave() ) ); if (config) this->readConfig(const_cast<TDEConfig *>(config)); diff --git a/libtdepim/tdeconfigwizard.cpp b/libtdepim/tdeconfigwizard.cpp index 8c2620d1..7b982aea 100644 --- a/libtdepim/tdeconfigwizard.cpp +++ b/libtdepim/tdeconfigwizard.cpp @@ -56,10 +56,10 @@ TDEConfigWizard::~TDEConfigWizard() void TDEConfigWizard::init() { - connect( this, TQT_SIGNAL( aboutToShowPage( TQWidget * ) ), - TQT_SLOT( slotAboutToShowPage( TQWidget * ) ) ); + connect( this, TQ_SIGNAL( aboutToShowPage( TQWidget * ) ), + TQ_SLOT( slotAboutToShowPage( TQWidget * ) ) ); - TQTimer::singleShot( 0, this, TQT_SLOT( readConfig() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( readConfig() ) ); } void TDEConfigWizard::setPropagator( TDEConfigPropagator *p ) diff --git a/libtdepim/tests/testdateedit.cpp b/libtdepim/tests/testdateedit.cpp index a87e950c..39c8447d 100644 --- a/libtdepim/tests/testdateedit.cpp +++ b/libtdepim/tests/testdateedit.cpp @@ -39,8 +39,8 @@ DateEdit::DateEdit( TQWidget *parent, const char *name ) KDateEdit *edit = new KDateEdit( this ); layout->addWidget( edit ); - connect( edit, TQT_SIGNAL( dateChanged( const TQDate& ) ), - this, TQT_SLOT( dateChanged( const TQDate& ) ) ); + connect( edit, TQ_SIGNAL( dateChanged( const TQDate& ) ), + this, TQ_SLOT( dateChanged( const TQDate& ) ) ); } void DateEdit::dateChanged( const TQDate &date ) diff --git a/libtdepim/weaverextensions.cpp b/libtdepim/weaverextensions.cpp index ad5b144c..01d68ff7 100644 --- a/libtdepim/weaverextensions.cpp +++ b/libtdepim/weaverextensions.cpp @@ -25,14 +25,14 @@ namespace ThreadWeaver { void WeaverExtension::attach (Weaver *w) { - connect (w, TQT_SIGNAL (threadCreated (Thread *) ), - TQT_SLOT (threadCreated (Thread *) ) ); - connect (w, TQT_SIGNAL (threadDestroyed (Thread *) ), - TQT_SLOT (threadDestroyed (Thread *) ) ); - connect (w, TQT_SIGNAL (threadBusy (Thread *) ), - TQT_SLOT (threadBusy (Thread *) ) ); - connect (w, TQT_SIGNAL (threadSuspended (Thread *) ), - TQT_SLOT (threadSuspended (Thread *) ) ); + connect (w, TQ_SIGNAL (threadCreated (Thread *) ), + TQ_SLOT (threadCreated (Thread *) ) ); + connect (w, TQ_SIGNAL (threadDestroyed (Thread *) ), + TQ_SLOT (threadDestroyed (Thread *) ) ); + connect (w, TQ_SIGNAL (threadBusy (Thread *) ), + TQ_SLOT (threadBusy (Thread *) ) ); + connect (w, TQ_SIGNAL (threadSuspended (Thread *) ), + TQ_SLOT (threadSuspended (Thread *) ) ); } WeaverExtension::~WeaverExtension() diff --git a/plugins/kmail/bodypartformatter/attendeeselector.cpp b/plugins/kmail/bodypartformatter/attendeeselector.cpp index 08bf9c00..c0c89307 100644 --- a/plugins/kmail/bodypartformatter/attendeeselector.cpp +++ b/plugins/kmail/bodypartformatter/attendeeselector.cpp @@ -38,15 +38,15 @@ AttendeeSelector::AttendeeSelector(TQWidget * parent) layout->setMargin( 0 ); ui->addButton->setGuiItem( KStdGuiItem::add() ); - connect( ui->addButton, TQT_SIGNAL(clicked()), TQT_SLOT(addClicked()) ); + connect( ui->addButton, TQ_SIGNAL(clicked()), TQ_SLOT(addClicked()) ); ui->removeButton->setGuiItem( KStdGuiItem::remove() ); - connect( ui->removeButton, TQT_SIGNAL(clicked()), TQT_SLOT(removeClicked()) ); + connect( ui->removeButton, TQ_SIGNAL(clicked()), TQ_SLOT(removeClicked()) ); ui->attendeeEdit->setClickMessage( i18n("Click to add a new attendee") ); - connect( ui->attendeeEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(textChanged(const TQString&)) ); - connect( ui->attendeeEdit, TQT_SIGNAL(returnPressed(const TQString&)), TQT_SLOT(addClicked()) ); + connect( ui->attendeeEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(textChanged(const TQString&)) ); + connect( ui->attendeeEdit, TQ_SIGNAL(returnPressed(const TQString&)), TQ_SLOT(addClicked()) ); - connect( ui->attendeeList, TQT_SIGNAL(selectionChanged()), TQT_SLOT(selectionChanged()) ); + connect( ui->attendeeList, TQ_SIGNAL(selectionChanged()), TQ_SLOT(selectionChanged()) ); } TQStringList AttendeeSelector::attendees() const diff --git a/tdeabc/frontend/main.cpp b/tdeabc/frontend/main.cpp index 0e941e01..706d94e7 100644 --- a/tdeabc/frontend/main.cpp +++ b/tdeabc/frontend/main.cpp @@ -15,6 +15,6 @@ int main( int argc, char ** argv ) MainWindow *w = new MainWindow; w->show(); - app.connect( &app, TQT_SIGNAL( lastWindowClosed() ), &app, TQT_SLOT( quit() ) ); + app.connect( &app, TQ_SIGNAL( lastWindowClosed() ), &app, TQ_SLOT( quit() ) ); return app.exec(); } diff --git a/tdeabc/frontend/mainWindow.ui.h b/tdeabc/frontend/mainWindow.ui.h index 8e678b93..5a32e6cc 100644 --- a/tdeabc/frontend/mainWindow.ui.h +++ b/tdeabc/frontend/mainWindow.ui.h @@ -39,12 +39,12 @@ void MainWindow::init() mEmailListView->header()->hide(); mCategoryListView->header()->hide(); - connect( mAddressBook, TQT_SIGNAL( addressBookChanged( AddressBook * ) ), - TQT_SLOT( addressBookChanged() ) ); - connect( mAddressBook, TQT_SIGNAL( addressBookLocked( AddressBook * ) ), - TQT_SLOT( addressBookLocked() ) ); - connect( mAddressBook, TQT_SIGNAL( addressBookUnlocked( AddressBook * ) ), - TQT_SLOT( addressBookUnlocked() ) ); + connect( mAddressBook, TQ_SIGNAL( addressBookChanged( AddressBook * ) ), + TQ_SLOT( addressBookChanged() ) ); + connect( mAddressBook, TQ_SIGNAL( addressBookLocked( AddressBook * ) ), + TQ_SLOT( addressBookLocked() ) ); + connect( mAddressBook, TQ_SIGNAL( addressBookUnlocked( AddressBook * ) ), + TQ_SLOT( addressBookUnlocked() ) ); } void MainWindow::destroy() diff --git a/tdeabc/tdeabc2mutt/tdeabc2mutt.cpp b/tdeabc/tdeabc2mutt/tdeabc2mutt.cpp index d36582ba..ea688aac 100644 --- a/tdeabc/tdeabc2mutt/tdeabc2mutt.cpp +++ b/tdeabc/tdeabc2mutt/tdeabc2mutt.cpp @@ -42,8 +42,8 @@ void KABC2Mutt::run() mAddressBook = TDEABC::StdAddressBook::self( true ); TDEABC::StdAddressBook::setAutomaticSave( false ); - connect( mAddressBook, TQT_SIGNAL( addressBookChanged( AddressBook* ) ), - this, TQT_SLOT( loadingFinished() ) ); + connect( mAddressBook, TQ_SIGNAL( addressBookChanged( AddressBook* ) ), + this, TQ_SLOT( loadingFinished() ) ); } void KABC2Mutt::loadingFinished() diff --git a/tdeioslave/opengroupware/opengroupware.cpp b/tdeioslave/opengroupware/opengroupware.cpp index 882b4c6b..b202373e 100644 --- a/tdeioslave/opengroupware/opengroupware.cpp +++ b/tdeioslave/opengroupware/opengroupware.cpp @@ -194,8 +194,8 @@ void OpenGroupware::getCalendar( const KURL &_url ) // FIXME do progress handling mListEventsJob = TDEIO::davPropFind( url, props, "0", false ); - connect( mListEventsJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotGetCalendarListingResult( TDEIO::Job * ) ) ); + connect( mListEventsJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotGetCalendarListingResult( TDEIO::Job * ) ) ); } void OpenGroupware::getAddressbook( const KURL &url ) diff --git a/tderesources/birthdays/resourcetdeabc.cpp b/tderesources/birthdays/resourcetdeabc.cpp index f5271ac7..2e937a7d 100644 --- a/tderesources/birthdays/resourcetdeabc.cpp +++ b/tderesources/birthdays/resourcetdeabc.cpp @@ -125,7 +125,7 @@ bool ResourceTDEABC::doOpen() kdDebug(5800) << "ResourceTDEABC::doOpen()" << endl; mAddressbook = TDEABC::StdAddressBook::self( true ); - connect( mAddressbook, TQT_SIGNAL(addressBookChanged(AddressBook*)), TQT_SLOT( reload() ) ); + connect( mAddressbook, TQ_SIGNAL(addressBookChanged(AddressBook*)), TQ_SLOT( reload() ) ); return true; } diff --git a/tderesources/birthdays/resourcetdeabcconfig.cpp b/tderesources/birthdays/resourcetdeabcconfig.cpp index 0f9b3279..4b3b0a1d 100644 --- a/tderesources/birthdays/resourcetdeabcconfig.cpp +++ b/tderesources/birthdays/resourcetdeabcconfig.cpp @@ -61,13 +61,13 @@ ResourceTDEABCConfig::ResourceTDEABCConfig( TQWidget* parent, const char* name mCategoryView->setEnabled( false ); topLayout->addMultiCellWidget( mCategoryView, 4, 4, 0, 1 ); - connect( mUseCategories, TQT_SIGNAL( toggled( bool ) ), - mCategoryView, TQT_SLOT( setEnabled( bool ) ) ); + connect( mUseCategories, TQ_SIGNAL( toggled( bool ) ), + mCategoryView, TQ_SLOT( setEnabled( bool ) ) ); mAlarmTimeEdit->setDisabled(true); mALabel->setDisabled(true); - connect(mAlarm, TQT_SIGNAL(clicked()), TQT_SLOT(alarmClicked())); + connect(mAlarm, TQ_SIGNAL(clicked()), TQ_SLOT(alarmClicked())); setReadOnly( true ); diff --git a/tderesources/blogging/bloggingcalendaradaptor.cpp b/tderesources/blogging/bloggingcalendaradaptor.cpp index 2ed925a8..9c899e5c 100644 --- a/tderesources/blogging/bloggingcalendaradaptor.cpp +++ b/tderesources/blogging/bloggingcalendaradaptor.cpp @@ -102,17 +102,17 @@ void BloggingCalendarAdaptor::setAPI( KBlog::APIBlog *api ) delete mAPI; mAPI = api; mAuthenticated = false; - connect( api, TQT_SIGNAL( userInfoRetrieved( const TQString &, const TQString &, + connect( api, TQ_SIGNAL( userInfoRetrieved( const TQString &, const TQString &, const TQString & ) ), - TQT_SLOT( slotUserInfoRetrieved( const TQString &, const TQString &, + TQ_SLOT( slotUserInfoRetrieved( const TQString &, const TQString &, const TQString & ) ) ); - connect( api, TQT_SIGNAL( folderInfoRetrieved( const TQString &, const TQString & ) ), - TQT_SLOT( slotFolderInfoRetrieved( const TQString&, const TQString & ) ) ); - connect( api, TQT_SIGNAL( itemOnServer( const KURL & ) ), - TQT_SIGNAL( itemOnServer( const KURL & ) ) ); - connect( api, TQT_SIGNAL( itemDownloaded( KCal::Incidence *, const TQString &, + connect( api, TQ_SIGNAL( folderInfoRetrieved( const TQString &, const TQString & ) ), + TQ_SLOT( slotFolderInfoRetrieved( const TQString&, const TQString & ) ) ); + connect( api, TQ_SIGNAL( itemOnServer( const KURL & ) ), + TQ_SIGNAL( itemOnServer( const KURL & ) ) ); + connect( api, TQ_SIGNAL( itemDownloaded( KCal::Incidence *, const TQString &, const KURL &, const TQString &, const TQString & ) ), - TQT_SLOT( calendarItemDownloaded( KCal::Incidence *, const TQString &, + TQ_SLOT( calendarItemDownloaded( KCal::Incidence *, const TQString &, const KURL &, const TQString &, const TQString & ) ) ); } diff --git a/tderesources/caldav/config.cpp b/tderesources/caldav/config.cpp index b83660f8..4a9888ea 100644 --- a/tderesources/caldav/config.cpp +++ b/tderesources/caldav/config.cpp @@ -167,12 +167,12 @@ void ResourceCalDavConfig::setupUI() { mainLayout->addWidget(mRememberPassword, 8, 1); mTasksUrl->setEnabled(mUseSTasks->isChecked()); - connect( mUseSTasks, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( slotSTasksToggled( bool ) ) ); + connect( mUseSTasks, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( slotSTasksToggled( bool ) ) ); mJournalsUrl->setEnabled(mUseSJournals->isChecked()); - connect( mUseSJournals, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( slotSJournalsToggled( bool ) ) ); + connect( mUseSJournals, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( slotSJournalsToggled( bool ) ) ); // configs TQHBoxLayout* horizontal = new TQHBoxLayout(this); diff --git a/tderesources/caldav/configwidgets.cpp b/tderesources/caldav/configwidgets.cpp index 7e003dcd..9f4f1e11 100644 --- a/tderesources/caldav/configwidgets.cpp +++ b/tderesources/caldav/configwidgets.cpp @@ -103,8 +103,8 @@ CalDavReloadConfig::CalDavReloadConfig( TQWidget *parent ) d->mGroup->insert( automaticReloadOnStartup, 1 ); d->mGroup->insert( noAutomaticReload, 0 ); - connect( intervalRadio, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( slotIntervalToggled( bool ) ) ); + connect( intervalRadio, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( slotIntervalToggled( bool ) ) ); TQHBox *intervalBox = new TQHBox( groupBox ); //new TQLabel( i18nc( "@label:spinbox", "Interval in minutes:" ), intervalBox ); @@ -179,8 +179,8 @@ CalDavSaveConfig::CalDavSaveConfig( TQWidget *parent ) d->mGroup->insert( onExit, 1 ); d->mGroup->insert( intervalRadio, 2 ); - connect( intervalRadio, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( slotIntervalToggled( bool ) ) ); + connect( intervalRadio, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( slotIntervalToggled( bool ) ) ); TQHBox *intervalBox = new TQHBox( groupBox ); //new TQLabel( i18nc( "@label:spinbox", "Interval in minutes:" ), intervalBox ); diff --git a/tderesources/caldav/resource.cpp b/tderesources/caldav/resource.cpp index 8fae5c98..2c63da22 100644 --- a/tderesources/caldav/resource.cpp +++ b/tderesources/caldav/resource.cpp @@ -197,7 +197,7 @@ bool ResourceCalDav::doSave() { clearChanges(); if (mWriteRetryTimer != NULL) { if (mWriteRetryTimer->isActive() == false) { - disconnect( mWriteRetryTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(doSave()) ); + disconnect( mWriteRetryTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(doSave()) ); delete mWriteRetryTimer; mWriteRetryTimer = NULL; } @@ -249,8 +249,8 @@ void ResourceCalDav::init() { // creating jobs // TQt4 handles this quite differently, as shown below, // whereas TQt3 needs events (see ::event()) -// connect(mLoader, TQT_SIGNAL(finished()), this, TQT_SLOT(loadFinished())); -// connect(mWriter, TQT_SIGNAL(finished()), this, TQT_SLOT(writingFinished())); +// connect(mLoader, TQ_SIGNAL(finished()), this, TQ_SLOT(loadFinished())); +// connect(mWriter, TQ_SIGNAL(finished()), this, TQ_SLOT(writingFinished())); setType("ResourceCalDav"); } @@ -850,7 +850,7 @@ bool ResourceCalDav::startWriting(const TQString& url, const TQString& tasksUrl, if ((mLoader->running() == true) || (mLoadingQueue.isEmpty() == false) || (mWriter->running() == true) || (mWritingQueue.isEmpty() == false)) { if (mWriteRetryTimer == NULL) { mWriteRetryTimer = new TQTimer(this); - connect( mWriteRetryTimer, TQT_SIGNAL(timeout()), TQT_SLOT(doSave()) ); + connect( mWriteRetryTimer, TQ_SIGNAL(timeout()), TQ_SLOT(doSave()) ); } mWriteRetryTimer->start(1000, TRUE); return false; @@ -995,7 +995,7 @@ void ResourceCalDav::writingFinished() { } // Give the remote system a few seconds to process the data before we allow any read operations - TQTimer::singleShot( 3000, this, TQT_SLOT(releaseReadLockout()) ); + TQTimer::singleShot( 3000, this, TQ_SLOT(releaseReadLockout()) ); // Writing queue and mWritingQueueReady flag are not shared resources, i.e. only one thread has an access to them. // That's why no mutexes are required. diff --git a/tderesources/carddav/configwidgets.cpp b/tderesources/carddav/configwidgets.cpp index 3d747513..60fc5ed2 100644 --- a/tderesources/carddav/configwidgets.cpp +++ b/tderesources/carddav/configwidgets.cpp @@ -102,8 +102,8 @@ CardDavReloadConfig::CardDavReloadConfig( TQWidget *parent ) d->mGroup->insert( automaticReloadOnStartup, 1 ); d->mGroup->insert( noAutomaticReload, 0 ); - connect( intervalRadio, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( slotIntervalToggled( bool ) ) ); + connect( intervalRadio, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( slotIntervalToggled( bool ) ) ); TQHBox *intervalBox = new TQHBox( groupBox ); //new TQLabel( i18nc( "@label:spinbox", "Interval in minutes:" ), intervalBox ); @@ -178,8 +178,8 @@ CardDavSaveConfig::CardDavSaveConfig( TQWidget *parent ) d->mGroup->insert( onExit, 1 ); d->mGroup->insert( intervalRadio, 2 ); - connect( intervalRadio, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( slotIntervalToggled( bool ) ) ); + connect( intervalRadio, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( slotIntervalToggled( bool ) ) ); TQHBox *intervalBox = new TQHBox( groupBox ); //new TQLabel( i18nc( "@label:spinbox", "Interval in minutes:" ), intervalBox ); diff --git a/tderesources/carddav/resource.cpp b/tderesources/carddav/resource.cpp index 69eb98e4..ddd6928e 100644 --- a/tderesources/carddav/resource.cpp +++ b/tderesources/carddav/resource.cpp @@ -197,7 +197,7 @@ bool ResourceCardDav::doSave() { clearChanges(); if (mWriteRetryTimer != NULL) { if (mWriteRetryTimer->isActive() == false) { - disconnect( mWriteRetryTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(doSave()) ); + disconnect( mWriteRetryTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(doSave()) ); delete mWriteRetryTimer; mWriteRetryTimer = NULL; } @@ -256,8 +256,8 @@ void ResourceCardDav::init() { // creating jobs // TQt4 handles this quite differently, as shown below, // whereas TQt3 needs events (see ::event()) -// connect(mLoader, TQT_SIGNAL(finished()), this, TQT_SLOT(loadFinished())); -// connect(mWriter, TQT_SIGNAL(finished()), this, TQT_SLOT(writingFinished())); +// connect(mLoader, TQ_SIGNAL(finished()), this, TQ_SLOT(loadFinished())); +// connect(mWriter, TQ_SIGNAL(finished()), this, TQ_SLOT(writingFinished())); setType("ResourceCardDav"); } @@ -609,7 +609,7 @@ bool ResourceCardDav::startWriting(const TQString& url) { if ((mLoader->running() == true) || (mLoadingQueue.isEmpty() == false) || (mWriter->running() == true) || (mWritingQueue.isEmpty() == false)) { if (mWriteRetryTimer == NULL) { mWriteRetryTimer = new TQTimer(this); - connect( mWriteRetryTimer, TQT_SIGNAL(timeout()), TQT_SLOT(doSave()) ); + connect( mWriteRetryTimer, TQ_SIGNAL(timeout()), TQ_SLOT(doSave()) ); } mWriteRetryTimer->start(1000, TRUE); return false; diff --git a/tderesources/egroupware/kcal_resourcexmlrpc.cpp b/tderesources/egroupware/kcal_resourcexmlrpc.cpp index 676770ed..9ccc24b5 100644 --- a/tderesources/egroupware/kcal_resourcexmlrpc.cpp +++ b/tderesources/egroupware/kcal_resourcexmlrpc.cpp @@ -197,8 +197,8 @@ bool ResourceXMLRPC::doOpen() args.insert( "password", mPrefs->password() ); mServer->call( "system.login", TQVariant( args ), - this, TQT_SLOT( loginFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( loginFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); mSynchronizer->start(); @@ -214,8 +214,8 @@ void ResourceXMLRPC::doClose() args.insert( "kp3", mKp3 ); mServer->call( "system.logout", TQVariant( args ), - this, TQT_SLOT( logoutFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( logoutFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); mSynchronizer->start(); } @@ -243,8 +243,8 @@ bool ResourceXMLRPC::doLoad() args.insert( "end", TQDateTime( TQDate::currentDate().addDays( 2000 ) ) ); mServer->call( SearchEventsCommand, args, - this, TQT_SLOT( listEventsFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( listEventsFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); args.clear(); columns.insert( "type", "task" ); @@ -253,16 +253,16 @@ bool ResourceXMLRPC::doLoad() args.insert( "order", "id_parent" ); mServer->call( SearchTodosCommand, args, - this, TQT_SLOT( listTodosFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( listTodosFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); mServer->call( LoadEventCategoriesCommand, TQVariant( TQStringVariantMap() ), - this, TQT_SLOT( loadEventCategoriesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( loadEventCategoriesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); mServer->call( LoadTodoCategoriesCommand, TQVariant( false ), - this, TQT_SLOT( loadTodoCategoriesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( loadTodoCategoriesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); return true; } @@ -286,8 +286,8 @@ bool ResourceXMLRPC::doSave() args.insert( "id", idMapper().remoteId( (*evIt)->uid() ).toInt() ); mServer->call( AddEventCommand, TQVariant( args ), - this, TQT_SLOT( updateEventFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( updateEventFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); counter++; } } @@ -302,8 +302,8 @@ bool ResourceXMLRPC::doSave() args.insert( "id", idMapper().remoteId( (*todoIt)->uid() ).toInt() ); mServer->call( AddTodoCommand, TQVariant( args ), - this, TQT_SLOT( updateTodoFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( updateTodoFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); counter++; } } @@ -340,8 +340,8 @@ bool ResourceXMLRPC::addEvent( Event* ev ) writeEvent( ev, args ); args.insert( "id", idMapper().remoteId( ev->uid() ).toInt() ); mServer->call( AddEventCommand, TQVariant( args ), - this, TQT_SLOT( updateEventFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( updateEventFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); mCalendar.deleteIncidence( oldEvent ); mCalendar.addIncidence( ev ); @@ -350,8 +350,8 @@ bool ResourceXMLRPC::addEvent( Event* ev ) } else { // new event writeEvent( ev, args ); mServer->call( AddEventCommand, TQVariant( args ), - this, TQT_SLOT( addEventFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ), + this, TQ_SLOT( addEventFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ), TQVariant( ev->uid() ) ); mCalendar.addEvent( ev ); @@ -369,9 +369,9 @@ bool ResourceXMLRPC::deleteEvent( Event* ev ) return false; mServer->call( DeleteEventCommand, idMapper().remoteId( ev->uid() ).toInt(), - this, TQT_SLOT( deleteEventFinished( const TQValueList<TQVariant>&, + this, TQ_SLOT( deleteEventFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ), TQVariant( ev->uid() ) ); return true; } @@ -420,8 +420,8 @@ bool ResourceXMLRPC::addTodo( Todo *todo ) writeTodo( todo, args ); args.insert( "id", idMapper().remoteId( todo->uid() ).toInt() ); mServer->call( AddTodoCommand, TQVariant( args ), - this, TQT_SLOT( updateTodoFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( updateTodoFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); mCalendar.deleteIncidence( oldTodo ); mCalendar.addIncidence( todo ); @@ -430,8 +430,8 @@ bool ResourceXMLRPC::addTodo( Todo *todo ) } else { // new todo writeTodo( todo, args ); mServer->call( AddTodoCommand, TQVariant( args ), - this, TQT_SLOT( addTodoFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ), + this, TQ_SLOT( addTodoFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ), TQVariant( todo->uid() ) ); mCalendar.addTodo( todo ); @@ -449,9 +449,9 @@ bool ResourceXMLRPC::deleteTodo( Todo *todo ) return false; mServer->call( DeleteTodoCommand, idMapper().remoteId( todo->uid() ).toInt(), - this, TQT_SLOT( deleteTodoFinished( const TQValueList<TQVariant>&, + this, TQ_SLOT( deleteTodoFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ), TQVariant( todo->uid() ) ); return true; } diff --git a/tderesources/egroupware/knotes_resourcexmlrpc.cpp b/tderesources/egroupware/knotes_resourcexmlrpc.cpp index 9a477076..05306c87 100644 --- a/tderesources/egroupware/knotes_resourcexmlrpc.cpp +++ b/tderesources/egroupware/knotes_resourcexmlrpc.cpp @@ -123,8 +123,8 @@ bool ResourceXMLRPC::load() args.insert( "password", mPrefs->password() ); mServer->call( "system.login", TQVariant( args ), - this, TQT_SLOT( loginFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( loginFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); mSynchronizer->start(); @@ -135,8 +135,8 @@ bool ResourceXMLRPC::load() args.insert( "order", "id_parent" ); mServer->call( SearchNotesCommand, args, - this, TQT_SLOT( listNotesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( listNotesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); mSynchronizer->start(); @@ -163,15 +163,15 @@ bool ResourceXMLRPC::addNote( KCal::Journal *journal ) writeNote( journal, args ); args.insert( "id", mUidMap[ journal->uid() ].toInt() ); mServer->call( AddNoteCommand, TQVariant( args ), - this, TQT_SLOT( updateNoteFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( updateNoteFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); mCalendar.addJournal( journal ); added = true; } } else { mServer->call( AddNoteCommand, TQVariant( args ), - this, TQT_SLOT( addNoteFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ), + this, TQ_SLOT( addNoteFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ), TQVariant( journal->uid() ) ); mCalendar.addJournal( journal ); @@ -189,8 +189,8 @@ bool ResourceXMLRPC::deleteNote( KCal::Journal *journal ) int id = mUidMap[ journal->uid() ].toInt(); mServer->call( DeleteNoteCommand, id, - this, TQT_SLOT( deleteNoteFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ), + this, TQ_SLOT( deleteNoteFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ), TQVariant( journal->uid() ) ); mSynchronizer->start(); diff --git a/tderesources/egroupware/synchronizer.h b/tderesources/egroupware/synchronizer.h index ed9fd135..9e14fd93 100644 --- a/tderesources/egroupware/synchronizer.h +++ b/tderesources/egroupware/synchronizer.h @@ -37,8 +37,8 @@ ... job = TDEIO::file_copy( url, file, -1, true ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotResult( TDEIO::Job * ) ) ); mSynchronizer.start(); // will block here until the slot was called ... diff --git a/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp b/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp index dd791cd8..4e95f792 100644 --- a/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp +++ b/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp @@ -159,8 +159,8 @@ bool ResourceXMLRPC::doOpen() args.insert( "password", mPrefs->password() ); mServer->call( "system.login", TQVariant( args ), - this, TQT_SLOT( loginFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( loginFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); mSynchronizer->start(); @@ -174,8 +174,8 @@ void ResourceXMLRPC::doClose() args.insert( "kp3", mKp3 ); mServer->call( "system.logout", TQVariant( args ), - this, TQT_SLOT( logoutFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( logoutFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); mSynchronizer->start(); } @@ -205,16 +205,16 @@ bool ResourceXMLRPC::asyncLoad() args.insert( "include_users", "calendar" ); mServer->call( SearchContactsCommand, args, - this, TQT_SLOT( listContactsFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( listContactsFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); mServer->call( LoadCategoriesCommand, TQVariant( false ), - this, TQT_SLOT( loadCategoriesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( loadCategoriesFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); mServer->call( LoadCustomFieldsCommand, TQVariant( TQValueList<TQVariant>() ), - this, TQT_SLOT( loadCustomFieldsFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); + this, TQ_SLOT( loadCustomFieldsFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( fault( int, const TQString&, const TQVariant& ) ) ); return true; } @@ -253,8 +253,8 @@ void ResourceXMLRPC::addContact( const Addressee& addr ) writeContact( addr, args ); mServer->call( AddContactCommand, args, - this, TQT_SLOT( addContactFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( addContactFault( int, const TQString&, const TQVariant& ) ), + this, TQ_SLOT( addContactFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( addContactFault( int, const TQString&, const TQVariant& ) ), TQVariant( addr.uid() ) ); } @@ -270,8 +270,8 @@ void ResourceXMLRPC::updateContact( const Addressee& addr ) args.insert( "id", idMapper().remoteId( addr.uid() ) ); mServer->call( AddContactCommand, args, - this, TQT_SLOT( updateContactFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( updateContactFault( int, const TQString&, const TQVariant& ) ), + this, TQ_SLOT( updateContactFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( updateContactFault( int, const TQString&, const TQVariant& ) ), TQVariant( addr.uid() ) ); } @@ -284,8 +284,8 @@ void ResourceXMLRPC::deleteContact( const Addressee& addr ) } mServer->call( DeleteContactCommand, idMapper().remoteId( addr.uid() ), - this, TQT_SLOT( deleteContactFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), - this, TQT_SLOT( deleteContactFault( int, const TQString&, const TQVariant& ) ), + this, TQ_SLOT( deleteContactFinished( const TQValueList<TQVariant>&, const TQVariant& ) ), + this, TQ_SLOT( deleteContactFault( int, const TQString&, const TQVariant& ) ), TQVariant( addr.uid() ) ); } diff --git a/tderesources/egroupware/xmlrpciface.cpp b/tderesources/egroupware/xmlrpciface.cpp index 3f4b9aa4..29d5563e 100644 --- a/tderesources/egroupware/xmlrpciface.cpp +++ b/tderesources/egroupware/xmlrpciface.cpp @@ -78,10 +78,10 @@ void Query::call( const TQString &server, const TQString &method, job->addMetaData( "content-type", "Content-Type: text/xml; charset=utf-8" ); job->addMetaData( "ConnectTimeout", "50" ); - connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - this, TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + this, TQ_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); m_pendingJobs.append( job ); } @@ -360,9 +360,9 @@ void Server::call( const TQString &method, const TQValueList<TQVariant> &args, kdWarning() << "Cannot execute call to " << method << ": empty server URL" << endl; Query *query = Query::create( id, this ); - connect( query, TQT_SIGNAL( message( const TQValueList<TQVariant> &, const TQVariant& ) ), msgObj, messageSlot ); - connect( query, TQT_SIGNAL( fault( int, const TQString&, const TQVariant& ) ), faultObj, faultSlot ); - connect( query, TQT_SIGNAL( finished( Query* ) ), this, TQT_SLOT( queryFinished( Query* ) ) ); + connect( query, TQ_SIGNAL( message( const TQValueList<TQVariant> &, const TQVariant& ) ), msgObj, messageSlot ); + connect( query, TQ_SIGNAL( fault( int, const TQString&, const TQVariant& ) ), faultObj, faultSlot ); + connect( query, TQ_SIGNAL( finished( Query* ) ), this, TQ_SLOT( queryFinished( Query* ) ) ); mPendingQueries.append( query ); query->call( m_url.url(), method, args, m_userAgent ); diff --git a/tderesources/exchange/resourceexchange.cpp b/tderesources/exchange/resourceexchange.cpp index ae65f9cd..a2cbbed0 100644 --- a/tderesources/exchange/resourceexchange.cpp +++ b/tderesources/exchange/resourceexchange.cpp @@ -123,18 +123,18 @@ bool ResourceExchange::doOpen() kdDebug() << "ResourceExchange::doOpen()" << endl; mClient = new ExchangeClient( mAccount, mTimeZoneId ); - connect( mClient, TQT_SIGNAL( downloadFinished( int, const TQString & ) ), - TQT_SLOT( slotDownloadFinished( int, const TQString & ) ) ); - connect( mClient, TQT_SIGNAL( event( KCal::Event *, const KURL & ) ), - TQT_SLOT( downloadedEvent( KCal::Event *, const KURL & ) ) ); + connect( mClient, TQ_SIGNAL( downloadFinished( int, const TQString & ) ), + TQ_SLOT( slotDownloadFinished( int, const TQString & ) ) ); + connect( mClient, TQ_SIGNAL( event( KCal::Event *, const KURL & ) ), + TQ_SLOT( downloadedEvent( KCal::Event *, const KURL & ) ) ); #if 0 kdDebug() << "Creating monitor" << endl; TQHostAddress ip; ip.setAddress( mAccount->host() ); mMonitor = new ExchangeMonitor( mAccount, ExchangeMonitor::CallBack, ip ); - connect( mMonitor, TQT_SIGNAL(notify( const TQValueList<long>& , const TQValueList<KURL>& )), this, TQT_SLOT(slotMonitorNotify( const TQValueList<long>& , const TQValueList<KURL>& )) ); - connect( mMonitor, TQT_SIGNAL(error(int , const TQString&)), this, TQT_SLOT(slotMonitorError(int , const TQString&)) ); + connect( mMonitor, TQ_SIGNAL(notify( const TQValueList<long>& , const TQValueList<KURL>& )), this, TQ_SLOT(slotMonitorNotify( const TQValueList<long>& , const TQValueList<KURL>& )) ); + connect( mMonitor, TQ_SIGNAL(error(int , const TQString&)), this, TQ_SLOT(slotMonitorError(int , const TQString&)) ); mMonitor->addWatch( mAccount->calendarURL(), ExchangeMonitor::UpdateNewMember, 1 ); #endif diff --git a/tderesources/exchange/resourceexchangeconfig.cpp b/tderesources/exchange/resourceexchangeconfig.cpp index 3b3bf14f..57ad9d0f 100644 --- a/tderesources/exchange/resourceexchangeconfig.cpp +++ b/tderesources/exchange/resourceexchangeconfig.cpp @@ -62,7 +62,7 @@ ResourceExchangeConfig::ResourceExchangeConfig( TQWidget* parent, const char* n mAutoMailbox = new TQCheckBox( i18n( "Determine mailbox &automatically" ), this ); mainLayout->addMultiCellWidget( mAutoMailbox, 5, 5, 0, 1 ); - connect( mAutoMailbox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleAuto(bool)) ); + connect( mAutoMailbox, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggleAuto(bool)) ); mMailboxEdit = new KLineEdit( this ); mainLayout->addWidget( new TQLabel( i18n( "Mailbox URL:" ), this ), 6, 0 ); @@ -70,11 +70,11 @@ ResourceExchangeConfig::ResourceExchangeConfig( TQWidget* parent, const char* n mTryFindMailbox = new TQPushButton( i18n( "&Find" ), this ); mainLayout->addWidget( mTryFindMailbox, 6, 2 ); - connect( mTryFindMailbox, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFindClicked()) ); + connect( mTryFindMailbox, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFindClicked()) ); label = new TQLabel( i18n( "Cache timeout:" ), this ); mCacheEdit = new KIntNumInput( this ); - connect(mCacheEdit, TQT_SIGNAL(valueChanged( int )), TQT_SLOT(slotCacheEditChanged( int ))); + connect(mCacheEdit, TQ_SIGNAL(valueChanged( int )), TQ_SLOT(slotCacheEditChanged( int ))); mCacheEdit->setMinValue( 0 ); mainLayout->addWidget( label, 7, 0 ); mainLayout->addWidget( mCacheEdit, 7, 1 ); diff --git a/tderesources/groupware/kcal_resourcegroupware.cpp b/tderesources/groupware/kcal_resourcegroupware.cpp index 6200773b..f3897d79 100644 --- a/tderesources/groupware/kcal_resourcegroupware.cpp +++ b/tderesources/groupware/kcal_resourcegroupware.cpp @@ -159,16 +159,16 @@ bool ResourceGroupware::doLoad() mJobData = TQString(); mDownloadJob = KPIM::GroupwareJob::getCalendar( url ); - connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotJobResult( TDEIO::Job * ) ) ); - connect( mDownloadJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( mDownloadJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotJobResult( TDEIO::Job * ) ) ); + connect( mDownloadJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQ_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) ); mProgress = KPIM::ProgressManager::instance()->createProgressItem( KPIM::ProgressManager::getUniqueID(), i18n("Downloading calendar") ); connect( mProgress, - TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), - TQT_SLOT( cancelLoad() ) ); + TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), + TQ_SLOT( cancelLoad() ) ); return true; } diff --git a/tderesources/groupware/tdeabc_resourcegroupware.cpp b/tderesources/groupware/tdeabc_resourcegroupware.cpp index e8f0c0a2..b6b25911 100644 --- a/tderesources/groupware/tdeabc_resourcegroupware.cpp +++ b/tderesources/groupware/tdeabc_resourcegroupware.cpp @@ -244,18 +244,18 @@ bool ResourceGroupware::asyncLoad() mJobData = TQString(); mDownloadJob = KPIM::GroupwareJob::getAddressBook( url ); - connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotJobResult( TDEIO::Job * ) ) ); - connect( mDownloadJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) ); - connect( mDownloadJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), - TQT_SLOT( slotJobPercent( TDEIO::Job *, unsigned long ) ) ); + connect( mDownloadJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotJobResult( TDEIO::Job * ) ) ); + connect( mDownloadJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQ_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( mDownloadJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), + TQ_SLOT( slotJobPercent( TDEIO::Job *, unsigned long ) ) ); mProgress = KPIM::ProgressManager::instance()->createProgressItem( KPIM::ProgressManager::getUniqueID(), i18n("Downloading addressbook") ); connect( mProgress, - TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), - TQT_SLOT( cancelLoad() ) ); + TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), + TQ_SLOT( cancelLoad() ) ); return true; } diff --git a/tderesources/groupware/tdeabc_resourcegroupwareconfig.cpp b/tderesources/groupware/tdeabc_resourcegroupwareconfig.cpp index e171c7e7..74e86600 100644 --- a/tderesources/groupware/tdeabc_resourcegroupwareconfig.cpp +++ b/tderesources/groupware/tdeabc_resourcegroupwareconfig.cpp @@ -106,7 +106,7 @@ ResourceGroupwareConfig::ResourceGroupwareConfig( TQWidget* parent, const char* mainLayout->addWidget( label, 6, 0 ); mainLayout->addWidget( mAddressBookBox, 6, 1 ); - connect( updateButton, TQT_SIGNAL( clicked() ), TQT_SLOT( updateAddressBookList() ) ); + connect( updateButton, TQ_SIGNAL( clicked() ), TQ_SLOT( updateAddressBookList() ) ); } void ResourceGroupwareConfig::loadSettings( KRES::Resource *res ) diff --git a/tderesources/groupwise/groupwisesettingswidget.cpp b/tderesources/groupwise/groupwisesettingswidget.cpp index 48de8143..cbff52ac 100644 --- a/tderesources/groupwise/groupwisesettingswidget.cpp +++ b/tderesources/groupwise/groupwisesettingswidget.cpp @@ -27,8 +27,8 @@ GroupWiseSettingsWidget::GroupWiseSettingsWidget( TQWidget * parent ) : GroupWiseSettingsWidgetBase( parent ) { - connect( m_settingsList, TQT_SIGNAL( itemRenamed( TQListViewItem *, int ) ), - this, TQT_SLOT( slotItemRenamed( TQListViewItem *, int ) ) ); + connect( m_settingsList, TQ_SIGNAL( itemRenamed( TQListViewItem *, int ) ), + this, TQ_SLOT( slotItemRenamed( TQListViewItem *, int ) ) ); } void GroupWiseSettingsWidget::slotItemRenamed( TQListViewItem * item, int ) diff --git a/tderesources/groupwise/kcal_resourcegroupwise.cpp b/tderesources/groupwise/kcal_resourcegroupwise.cpp index a8a0727e..6c3db3a8 100644 --- a/tderesources/groupwise/kcal_resourcegroupwise.cpp +++ b/tderesources/groupwise/kcal_resourcegroupwise.cpp @@ -158,16 +158,16 @@ bool ResourceGroupwise::doLoad() mJobData = TQString(); mDownloadJob = TDEIO::get( url, false, false ); - connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotJobResult( TDEIO::Job * ) ) ); - connect( mDownloadJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( mDownloadJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotJobResult( TDEIO::Job * ) ) ); + connect( mDownloadJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQ_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) ); mProgress = KPIM::ProgressManager::instance()->createProgressItem( KPIM::ProgressManager::getUniqueID(), i18n("Downloading calendar") ); connect( mProgress, - TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), - TQT_SLOT( cancelLoad() ) ); + TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), + TQ_SLOT( cancelLoad() ) ); return true; } diff --git a/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp b/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp index 9371ef59..bd081f5e 100644 --- a/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp +++ b/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp @@ -73,7 +73,7 @@ ResourceGroupwiseConfig::ResourceGroupwiseConfig( TQWidget* parent, const char* mainLayout->addMultiCellWidget( mSaveConfig, 6, 6, 0, 1 ); settingsButton->hide(); - // connect( settingsButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotViewUserSettings() ) ); + // connect( settingsButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotViewUserSettings() ) ); } diff --git a/tderesources/groupwise/soap/groupwiseserver.cpp b/tderesources/groupwise/soap/groupwiseserver.cpp index 07342ec4..3ba461b9 100644 --- a/tderesources/groupwise/soap/groupwiseserver.cpp +++ b/tderesources/groupwise/soap/groupwiseserver.cpp @@ -114,7 +114,7 @@ int GroupwiseServer::gSoapOpen( struct soap *soap, const char *, // kdDebug() << "Creating KSSLSocket()" << endl; m_sock = new KSSLSocket(); m_sock->setTimeout( KProtocolManager::connectTimeout() ); - connect( m_sock, TQT_SIGNAL( sslFailure() ), TQT_SLOT( slotSslError() ) ); + connect( m_sock, TQ_SIGNAL( sslFailure() ), TQ_SLOT( slotSslError() ) ); } else { m_sock = new KExtendedSocket(); } diff --git a/tderesources/groupwise/soap/ksslsocket.cpp b/tderesources/groupwise/soap/ksslsocket.cpp index 2f085cf2..b753249d 100644 --- a/tderesources/groupwise/soap/ksslsocket.cpp +++ b/tderesources/groupwise/soap/ksslsocket.cpp @@ -57,9 +57,9 @@ KSSLSocket::KSSLSocket() : KExtendedSocket() setBlockingMode(false); //Connect internal slots - TQObject::connect( this, TQT_SIGNAL(connectionSuccess()), this, TQT_SLOT(slotConnected()) ); - TQObject::connect( this, TQT_SIGNAL(closed(int)), this, TQT_SLOT(slotDisconnected()) ); - TQObject::connect( this, TQT_SIGNAL(connectionFailed(int)), this, TQT_SLOT(slotDisconnected())); + TQObject::connect( this, TQ_SIGNAL(connectionSuccess()), this, TQ_SLOT(slotConnected()) ); + TQObject::connect( this, TQ_SIGNAL(closed(int)), this, TQ_SLOT(slotDisconnected()) ); + TQObject::connect( this, TQ_SIGNAL(connectionFailed(int)), this, TQ_SLOT(slotDisconnected())); } KSSLSocket::~KSSLSocket() diff --git a/tderesources/groupwise/tdeabc_resourcegroupwise.cpp b/tderesources/groupwise/tdeabc_resourcegroupwise.cpp index 7c3ed791..04ecc769 100644 --- a/tderesources/groupwise/tdeabc_resourcegroupwise.cpp +++ b/tderesources/groupwise/tdeabc_resourcegroupwise.cpp @@ -288,8 +288,8 @@ bool ResourceGroupwise::asyncLoad() { mProgress = KPIM::ProgressManager::instance()->createProgressItem( KPIM::ProgressManager::getUniqueID(), i18n( "Loading GroupWise resource %1" ).arg( resourceName() ), TQString(), true /*CanBeCancelled*/, mPrefs->url().startsWith("https" ) ); - connect( mProgress, TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), - TQT_SLOT( cancelLoad() ) ); + connect( mProgress, TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), + TQ_SLOT( cancelLoad() ) ); } if ( addressBooks().isEmpty() ) { @@ -349,15 +349,15 @@ void ResourceGroupwise::fetchAddressBooks( const BookType bookType ) mJob = TDEIO::get( url, false, false ); // TODO: make the GW jobs call finished if the URL // contains no address book IDs kdDebug() << " Job address: " << mJob << endl; - connect( mJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotReadJobData( TDEIO::Job *, const TQByteArray & ) ) ); - connect( mJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), - TQT_SLOT( slotJobPercent( TDEIO::Job *, unsigned long ) ) ); + connect( mJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQ_SLOT( slotReadJobData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( mJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), + TQ_SLOT( slotJobPercent( TDEIO::Job *, unsigned long ) ) ); if ( bookType == System ) { - connect( mJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( fetchSABResult( TDEIO::Job * ) ) ); + connect( mJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( fetchSABResult( TDEIO::Job * ) ) ); mSABProgress = KPIM::ProgressManager::instance()->createProgressItem( mProgress, KPIM::ProgressManager::getUniqueID(), i18n( "Fetching System Address Book" ), TQString(), @@ -366,8 +366,8 @@ void ResourceGroupwise::fetchAddressBooks( const BookType bookType ) } else { - connect( mJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( fetchUABResult( TDEIO::Job * ) ) ); + connect( mJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( fetchUABResult( TDEIO::Job * ) ) ); mUABProgress = KPIM::ProgressManager::instance()->createProgressItem( mProgress, KPIM::ProgressManager::getUniqueID(), i18n( "Fetching User Address Books" ), TQString(), @@ -446,12 +446,12 @@ void ResourceGroupwise::updateSystemAddressBook() mJob = TDEIO::get( url, false, false ); mJob->setInteractive( false ); - connect( mJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( updateSABResult( TDEIO::Job * ) ) ); - connect( mJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotUpdateJobData( TDEIO::Job *, const TQByteArray & ) ) ); - connect( mJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), - TQT_SLOT( slotJobPercent( TDEIO::Job *, unsigned long ) ) ); + connect( mJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( updateSABResult( TDEIO::Job * ) ) ); + connect( mJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQ_SLOT( slotUpdateJobData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( mJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), + TQ_SLOT( slotJobPercent( TDEIO::Job *, unsigned long ) ) ); return; } diff --git a/tderesources/groupwise/tdeabc_resourcegroupwise.h b/tderesources/groupwise/tdeabc_resourcegroupwise.h index 29b3ed81..ccf74403 100644 --- a/tderesources/groupwise/tdeabc_resourcegroupwise.h +++ b/tderesources/groupwise/tdeabc_resourcegroupwise.h @@ -143,7 +143,7 @@ class KDE_EXPORT ResourceGroupwise : public ResourceCached /** DATA PROCESSING SLOTS **/ void slotReadJobData( TDEIO::Job *, const TQByteArray & ); void slotUpdateJobData( TDEIO::Job *, const TQByteArray & ); - /** HELPER TQT_SLOT **/ + /** HELPER TQ_SLOT **/ void slotJobPercent( TDEIO::Job *job, unsigned long percent ); void cancelLoad(); diff --git a/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.cpp b/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.cpp index 49016cdd..69dd7a6f 100644 --- a/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.cpp +++ b/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.cpp @@ -102,7 +102,7 @@ ResourceGroupwiseConfig::ResourceGroupwiseConfig( TQWidget* parent, const char* mainLayout->addWidget( label, 6, 0 ); mainLayout->addWidget( mAddressBookBox, 6, 1 ); - connect( updateButton, TQT_SIGNAL( clicked() ), TQT_SLOT( updateAddressBookList() ) ); + connect( updateButton, TQ_SIGNAL( clicked() ), TQ_SLOT( updateAddressBookList() ) ); } void ResourceGroupwiseConfig::loadSettings( KRES::Resource *res ) diff --git a/tderesources/groupwise/tdeioslave/groupwise.cpp b/tderesources/groupwise/tdeioslave/groupwise.cpp index c51fa4e4..1c68d654 100644 --- a/tderesources/groupwise/tdeioslave/groupwise.cpp +++ b/tderesources/groupwise/tdeioslave/groupwise.cpp @@ -295,14 +295,14 @@ void Groupwise::getAddressbook( const KURL &url ) GroupwiseServer server( u, user, pass, 0 ); - connect( &server, TQT_SIGNAL( readAddressBookTotalSize( int ) ), - TQT_SLOT( slotReadAddressBookTotalSize( int ) ) ); - connect( &server, TQT_SIGNAL( readAddressBookProcessedSize( int ) ), - TQT_SLOT( slotReadAddressBookProcessedSize( int ) ) ); - connect( &server, TQT_SIGNAL( errorMessage( const TQString &, bool ) ), - TQT_SLOT( slotServerErrorMessage( const TQString &, bool ) ) ); - connect( &server, TQT_SIGNAL( gotAddressees( const TDEABC::Addressee::List ) ), - TQT_SLOT( slotReadReceiveAddressees( const TDEABC::Addressee::List ) ) ); + connect( &server, TQ_SIGNAL( readAddressBookTotalSize( int ) ), + TQ_SLOT( slotReadAddressBookTotalSize( int ) ) ); + connect( &server, TQ_SIGNAL( readAddressBookProcessedSize( int ) ), + TQ_SLOT( slotReadAddressBookProcessedSize( int ) ) ); + connect( &server, TQ_SIGNAL( errorMessage( const TQString &, bool ) ), + TQ_SLOT( slotServerErrorMessage( const TQString &, bool ) ) ); + connect( &server, TQ_SIGNAL( gotAddressees( const TDEABC::Addressee::List ) ), + TQ_SLOT( slotReadReceiveAddressees( const TDEABC::Addressee::List ) ) ); kdDebug() << "Login" << endl; if ( !server.login() ) { @@ -369,10 +369,10 @@ void Groupwise::updateAddressbook( const KURL &url ) debugMessage( "update IDs: " + ids.join( "," ) ); GroupwiseServer server( u, user, pass, 0 ); - connect( &server, TQT_SIGNAL( errorMessage( const TQString &, bool ) ), - TQT_SLOT( slotServerErrorMessage( const TQString &, bool ) ) ); - connect( &server, TQT_SIGNAL( gotAddressees( const TDEABC::Addressee::List ) ), - TQT_SLOT( slotReadReceiveAddressees( const TDEABC::Addressee::List ) ) ); + connect( &server, TQ_SIGNAL( errorMessage( const TQString &, bool ) ), + TQ_SLOT( slotServerErrorMessage( const TQString &, bool ) ) ); + connect( &server, TQ_SIGNAL( gotAddressees( const TDEABC::Addressee::List ) ), + TQ_SLOT( slotReadReceiveAddressees( const TDEABC::Addressee::List ) ) ); kdDebug() << " Login" << endl; if ( !server.login() ) { diff --git a/tderesources/kolab/kcal/resourcekolab.cpp b/tderesources/kolab/kcal/resourcekolab.cpp index e68321a8..24f6efe0 100644 --- a/tderesources/kolab/kcal/resourcekolab.cpp +++ b/tderesources/kolab/kcal/resourcekolab.cpp @@ -77,8 +77,8 @@ ResourceKolab::ResourceKolab( const TDEConfig *config ) setResourceName( i18n( "Kolab Server" ) ); } setType( "imap" ); - connect( &mResourceChangedTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotEmitResourceChanged() ) ); + connect( &mResourceChangedTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotEmitResourceChanged() ) ); } ResourceKolab::~ResourceKolab() @@ -402,7 +402,7 @@ void ResourceKolab::resolveConflict( KCal::Incidence* inc, const TQString& subre KIncidenceChooser* ch = new KIncidenceChooser(); ch->setIncidence( local ,inc ); if ( KIncidenceChooser::chooseMode == KIncidenceChooser::ask ) { - connect ( this, TQT_SIGNAL( useGlobalMode() ), ch, TQT_SLOT ( useGlobalMode() ) ); + connect ( this, TQ_SIGNAL( useGlobalMode() ), ch, TQ_SLOT ( useGlobalMode() ) ); if ( ch->exec() ) { if ( KIncidenceChooser::chooseMode != KIncidenceChooser::ask ) { emit useGlobalMode() ; @@ -1185,7 +1185,7 @@ void ResourceKolab::setSubresourceActive( const TQString &subresource, bool v ) } mResourceChangedTimer.changeInterval( 100 ); } - TQTimer::singleShot( 0, this, TQT_SLOT(writeConfig()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(writeConfig()) ); } bool ResourceKolab::subresourceWritable( const TQString& subresource ) const diff --git a/tderesources/kolab/shared/kmailconnection.cpp b/tderesources/kolab/shared/kmailconnection.cpp index 8011c15d..ac4904a8 100644 --- a/tderesources/kolab/shared/kmailconnection.cpp +++ b/tderesources/kolab/shared/kmailconnection.cpp @@ -56,8 +56,8 @@ KMailConnection::KMailConnection( ResourceKolabBase* resource, mDCOPClient->registerAs( objId, true ); kapp->dcopClient()->setNotifications( true ); - connect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString& ) ), - this, TQT_SLOT( unregisteredFromDCOP( const TQCString& ) ) ); + connect( kapp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& ) ), + this, TQ_SLOT( unregisteredFromDCOP( const TQCString& ) ) ); } KMailConnection::~KMailConnection() diff --git a/tderesources/lib/folderconfig.cpp b/tderesources/lib/folderconfig.cpp index bbae1346..facdf13b 100644 --- a/tderesources/lib/folderconfig.cpp +++ b/tderesources/lib/folderconfig.cpp @@ -52,7 +52,7 @@ FolderConfig::FolderConfig( TQWidget *parent ) topLayout->addWidget( topBox ); TQPushButton *button = new TQPushButton( i18n("Update Folder List"), topBox ); - connect( button, TQT_SIGNAL( clicked() ), TQT_SIGNAL( updateFoldersClicked() ) ); + connect( button, TQ_SIGNAL( clicked() ), TQ_SIGNAL( updateFoldersClicked() ) ); mFolderList = new FolderListView( topBox ); @@ -81,7 +81,7 @@ void FolderConfig::setFolderLister( FolderLister *f ) if ( suptypes.contains( FolderLister::Unknown ) ) types << FolderListView::Unknown; mFolderList->setEnabledTypes( types ); - connect( mFolderLister, TQT_SIGNAL( foldersRead() ), TQT_SLOT( updateFolderList() ) ); + connect( mFolderLister, TQ_SIGNAL( foldersRead() ), TQ_SLOT( updateFolderList() ) ); } void FolderConfig::retrieveFolderList( const KURL &url ) diff --git a/tderesources/lib/folderlister.cpp b/tderesources/lib/folderlister.cpp index c12d3ae6..ec40e8cc 100644 --- a/tderesources/lib/folderlister.cpp +++ b/tderesources/lib/folderlister.cpp @@ -216,12 +216,12 @@ void FolderLister::setAdaptor( KPIM::GroupwareDataAdaptor *adaptor ) disconnect( mAdaptor, 0, this, 0 ); } mAdaptor = adaptor; - connect( mAdaptor, TQT_SIGNAL( folderInfoRetrieved( const KURL &, + connect( mAdaptor, TQ_SIGNAL( folderInfoRetrieved( const KURL &, const TQString &, KPIM::FolderLister::ContentType ) ), - this, TQT_SLOT( processFolderResult( const KURL &, const TQString &, + this, TQ_SLOT( processFolderResult( const KURL &, const TQString &, KPIM::FolderLister::ContentType ) ) ); - connect( mAdaptor, TQT_SIGNAL( folderSubitemRetrieved( const KURL &, bool ) ), - this, TQT_SLOT( folderSubitemRetrieved( const KURL &, bool ) ) ); + connect( mAdaptor, TQ_SIGNAL( folderSubitemRetrieved( const KURL &, bool ) ), + this, TQ_SLOT( folderSubitemRetrieved( const KURL &, bool ) ) ); } void FolderLister::folderSubitemRetrieved( const KURL &url, bool isFolder ) @@ -272,8 +272,8 @@ void FolderLister::doRetrieveFolder( const KURL &u ) kdDebug(7000) << "FolderLister::retrieveFolders: adjustedURL=" << url.prettyURL() << endl; - connect( listjob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotListJobResult( TDEIO::Job * ) ) ); + connect( listjob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotListJobResult( TDEIO::Job * ) ) ); } else { // TODO: Indicate a problem to the user! kdWarning() << "Unable to create the folder list job for the url " diff --git a/tderesources/lib/folderlistview.cpp b/tderesources/lib/folderlistview.cpp index d43d77ce..f2427c48 100644 --- a/tderesources/lib/folderlistview.cpp +++ b/tderesources/lib/folderlistview.cpp @@ -43,10 +43,10 @@ FolderListView::FolderListView( TQWidget *parent, const TQValueList<Property> &t { setEnabledTypes( types ); - connect( this, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(slotMousePressed(int, TQListViewItem*, const TQPoint&, int)) ); - connect( this, TQT_SIGNAL(spacePressed(TQListViewItem*)), - this, TQT_SLOT(showPopupMenu(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(slotMousePressed(int, TQListViewItem*, const TQPoint&, int)) ); + connect( this, TQ_SIGNAL(spacePressed(TQListViewItem*)), + this, TQ_SLOT(showPopupMenu(TQListViewItem*)) ); } void FolderListView::setEnabledTypes( const TQValueList<Property> &types ) @@ -99,32 +99,32 @@ void FolderListView::showPopupMenu( FolderListItem *i, const TQPoint &globalPos int id; m.insertTitle( folder.name, 9999 ); - id = m.insertItem( i18n("&Enabled"), this, TQT_SLOT(slotPopupHandler(int)), 0, FolderName ); + id = m.insertItem( i18n("&Enabled"), this, TQ_SLOT(slotPopupHandler(int)), 0, FolderName ); m.setItemChecked( id, i->isOn() ); m.insertSeparator(); if ( ( folder.type & KPIM::FolderLister::Event ) && (mTypes.contains( Event ) ) ) { - id = m.insertItem( i18n("Default for New &Events"), this, TQT_SLOT(slotPopupHandler(int)), 0, Event ); + id = m.insertItem( i18n("Default for New &Events"), this, TQ_SLOT(slotPopupHandler(int)), 0, Event ); m.setItemChecked( id, i->isDefault( Event ) ); } if ( ( folder.type & KPIM::FolderLister::Todo ) && (mTypes.contains( Todo ) ) ) { - id = m.insertItem( i18n("Default for New &Todos"), this, TQT_SLOT(slotPopupHandler(int)), 0, Todo ); + id = m.insertItem( i18n("Default for New &Todos"), this, TQ_SLOT(slotPopupHandler(int)), 0, Todo ); m.setItemChecked( id, i->isDefault( Todo ) ); } if ( ( folder.type & KPIM::FolderLister::Journal ) && (mTypes.contains( Journal ) ) ) { - id = m.insertItem( i18n("Default for New &Journals"), this, TQT_SLOT(slotPopupHandler(int)), 0, Journal ); + id = m.insertItem( i18n("Default for New &Journals"), this, TQ_SLOT(slotPopupHandler(int)), 0, Journal ); m.setItemChecked( id, i->isDefault( Journal ) ); } if ( ( folder.type & KPIM::FolderLister::Contact ) && (mTypes.contains( Contact ) ) ) { - id = m.insertItem( i18n("Default for New &Contacts"), this, TQT_SLOT(slotPopupHandler(int)), 0, Contact ); + id = m.insertItem( i18n("Default for New &Contacts"), this, TQ_SLOT(slotPopupHandler(int)), 0, Contact ); m.setItemChecked( id, i->isDefault( Contact ) ); } if ( ( folder.type == KPIM::FolderLister::All ) && (mTypes.contains( All ) ) ) { - id = m.insertItem( i18n("Default for All New &Items"), this, TQT_SLOT(slotPopupHandler(int)), 0, All ); + id = m.insertItem( i18n("Default for All New &Items"), this, TQ_SLOT(slotPopupHandler(int)), 0, All ); m.setItemChecked( id, i->isDefault( All ) ); } if ( ( folder.type == KPIM::FolderLister::Unknown ) && (mTypes.contains( Unknown ) ) ) { - id = m.insertItem( i18n("Default for &Unknown New Items"), this, TQT_SLOT(slotPopupHandler(int)), 0, Unknown ); + id = m.insertItem( i18n("Default for &Unknown New Items"), this, TQ_SLOT(slotPopupHandler(int)), 0, Unknown ); m.setItemChecked( id, i->isDefault( Unknown ) ); } diff --git a/tderesources/lib/folderselectdialog.cpp b/tderesources/lib/folderselectdialog.cpp index ab599153..7ffd3e38 100644 --- a/tderesources/lib/folderselectdialog.cpp +++ b/tderesources/lib/folderselectdialog.cpp @@ -53,10 +53,10 @@ FolderSelectDialog::FolderSelectDialog( const TQString& caption, const TQString& mListBox->ensureCurrentVisible(); layout->addWidget( mListBox, 10 ); - connect( mListBox, TQT_SIGNAL( doubleClicked( TQListBoxItem * ) ), - TQT_SLOT( slotOk() ) ); - connect( mListBox, TQT_SIGNAL( returnPressed( TQListBoxItem * ) ), - TQT_SLOT( slotOk() ) ); + connect( mListBox, TQ_SIGNAL( doubleClicked( TQListBoxItem * ) ), + TQ_SLOT( slotOk() ) ); + connect( mListBox, TQ_SIGNAL( returnPressed( TQListBoxItem * ) ), + TQ_SLOT( slotOk() ) ); mListBox->setFocus(); diff --git a/tderesources/lib/groupwaredownloadjob.cpp b/tderesources/lib/groupwaredownloadjob.cpp index 52a01fd4..1381b929 100644 --- a/tderesources/lib/groupwaredownloadjob.cpp +++ b/tderesources/lib/groupwaredownloadjob.cpp @@ -59,21 +59,21 @@ void GroupwareDownloadJob::run() mItemsForDownload.clear(); mCurrentlyOnServer.clear(); - connect( adaptor(), TQT_SIGNAL( itemToDownload( const KURL &, KPIM::FolderLister::ContentType ) ), - TQT_SLOT( slotItemToDownload( const KURL &, KPIM::FolderLister::ContentType ) ) ); - connect( adaptor(), TQT_SIGNAL( itemOnServer( const KURL & ) ), - TQT_SLOT( slotItemOnServer( const KURL & ) ) ); - connect( adaptor(), TQT_SIGNAL( itemDownloaded( const TQString &, const KURL &, const TQString & ) ), - TQT_SLOT( slotItemDownloaded( const TQString &, const KURL &, const TQString & ) ) ); - connect( adaptor(), TQT_SIGNAL( itemDownloadError( const KURL &, const TQString & ) ), - TQT_SLOT( slotItemDownloadError( const KURL &, const TQString & ) ) ); + connect( adaptor(), TQ_SIGNAL( itemToDownload( const KURL &, KPIM::FolderLister::ContentType ) ), + TQ_SLOT( slotItemToDownload( const KURL &, KPIM::FolderLister::ContentType ) ) ); + connect( adaptor(), TQ_SIGNAL( itemOnServer( const KURL & ) ), + TQ_SLOT( slotItemOnServer( const KURL & ) ) ); + connect( adaptor(), TQ_SIGNAL( itemDownloaded( const TQString &, const KURL &, const TQString & ) ), + TQ_SLOT( slotItemDownloaded( const TQString &, const KURL &, const TQString & ) ) ); + connect( adaptor(), TQ_SIGNAL( itemDownloadError( const KURL &, const TQString & ) ), + TQ_SLOT( slotItemDownloadError( const KURL &, const TQString & ) ) ); mProgress = KPIM::ProgressManager::instance()->createProgressItem( KPIM::ProgressManager::getUniqueID(), adaptor()->downloadProgressMessage() ); connect( mProgress, - TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), - TQT_SLOT( cancelLoad() ) ); + TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), + TQ_SLOT( cancelLoad() ) ); listItems(); } @@ -105,10 +105,10 @@ void GroupwareDownloadJob::listItems() mListItemsData = TQString(); mListEventsJob = adaptor()->createListItemsJob( url ); - connect( mListEventsJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotListItemsResult( TDEIO::Job * ) ) ); - connect( mListEventsJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotListItemsData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( mListEventsJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotListItemsResult( TDEIO::Job * ) ) ); + connect( mListEventsJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQ_SLOT( slotListItemsData( TDEIO::Job *, const TQByteArray & ) ) ); } } @@ -187,10 +187,10 @@ void GroupwareDownloadJob::downloadItem() mDownloadJob = adaptor()->createDownloadJob( href, ctype ); } - connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotDownloadItemResult( TDEIO::Job * ) ) ); - connect( mDownloadJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotDownloadItemData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( mDownloadJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotDownloadItemResult( TDEIO::Job * ) ) ); + connect( mDownloadJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQ_SLOT( slotDownloadItemData( TDEIO::Job *, const TQByteArray & ) ) ); } } diff --git a/tderesources/lib/groupwareresourcejob.cpp b/tderesources/lib/groupwareresourcejob.cpp index b7e4b57b..09972b85 100644 --- a/tderesources/lib/groupwareresourcejob.cpp +++ b/tderesources/lib/groupwareresourcejob.cpp @@ -30,7 +30,7 @@ using namespace KPIM; GroupwareJob::GroupwareJob( GroupwareDataAdaptor *adaptor ) : mAdaptor( adaptor ) { - TQTimer::singleShot( 0, this, TQT_SLOT( run() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( run() ) ); } bool GroupwareJob::error() const diff --git a/tderesources/lib/groupwareuploadjob.cpp b/tderesources/lib/groupwareuploadjob.cpp index 51307d83..4c0f1ba2 100644 --- a/tderesources/lib/groupwareuploadjob.cpp +++ b/tderesources/lib/groupwareuploadjob.cpp @@ -52,22 +52,22 @@ void GroupwareUploadJob::run() KPIM::ProgressManager::getUniqueID(), adaptor()->uploadProgressMessage() ); connect( mUploadProgress, - TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), - TQT_SLOT( cancelSave() ) ); + TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), + TQ_SLOT( cancelSave() ) ); - connect( adaptor(), TQT_SIGNAL( itemDeletionError( const KURL &, const TQString & ) ), - TQT_SLOT( slotItemDeleteError( const KURL &, const TQString & ) ) ); - connect( adaptor(), TQT_SIGNAL( itemUploadError( const KURL &, const TQString & ) ), - TQT_SLOT( slotItemUploadError( const KURL &, const TQString & ) ) ); - connect( adaptor(), TQT_SIGNAL( itemUploadNewError( const TQString &, const TQString & ) ), - TQT_SLOT( slotItemUploadNewError( const TQString &, const TQString & ) ) ); + connect( adaptor(), TQ_SIGNAL( itemDeletionError( const KURL &, const TQString & ) ), + TQ_SLOT( slotItemDeleteError( const KURL &, const TQString & ) ) ); + connect( adaptor(), TQ_SIGNAL( itemUploadError( const KURL &, const TQString & ) ), + TQ_SLOT( slotItemUploadError( const KURL &, const TQString & ) ) ); + connect( adaptor(), TQ_SIGNAL( itemUploadNewError( const TQString &, const TQString & ) ), + TQ_SLOT( slotItemUploadNewError( const TQString &, const TQString & ) ) ); - connect( adaptor(), TQT_SIGNAL( itemDeleted( const TQString &, const KURL & ) ), - TQT_SLOT( slotItemDeleted( const TQString &, const KURL & ) ) ); - connect( adaptor(), TQT_SIGNAL( itemUploaded( const TQString &, const KURL & ) ), - TQT_SLOT( slotItemUploaded( const TQString &, const KURL & ) ) ); - connect( adaptor(), TQT_SIGNAL( itemUploadedNew( const TQString &, const KURL& ) ), - TQT_SLOT( slotItemUploadedNew( const TQString &, const KURL & ) ) ); + connect( adaptor(), TQ_SIGNAL( itemDeleted( const TQString &, const KURL & ) ), + TQ_SLOT( slotItemDeleted( const TQString &, const KURL & ) ) ); + connect( adaptor(), TQ_SIGNAL( itemUploaded( const TQString &, const KURL & ) ), + TQ_SLOT( slotItemUploaded( const TQString &, const KURL & ) ) ); + connect( adaptor(), TQ_SIGNAL( itemUploadedNew( const TQString &, const KURL& ) ), + TQ_SLOT( slotItemUploadedNew( const TQString &, const KURL & ) ) ); mUploadProgress->setTotalItems( mAddedItems.size() + mChangedItems.size() + @@ -81,7 +81,7 @@ void GroupwareUploadJob::deleteItem() { kdDebug(5800)<<"GroupwareUploadJob::deleteItem()"<<endl; if ( mDeletedItems.isEmpty() ) { - TQTimer::singleShot( 0, this, TQT_SLOT( uploadItem() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( uploadItem() ) ); } else { kdDebug(7000) << " Deleting " << mDeletedItems.size() << " items from the server " << endl; @@ -102,10 +102,10 @@ kdDebug() << "Not using batch delete " << endl; if ( mDeletionJob ) { mDeletionJobData = TQString(); - connect( mDeletionJob, TQT_SIGNAL( result( TDEIO::Job* ) ), - TQT_SLOT( slotDeletionJobResult( TDEIO::Job* ) ) ); -// connect( mDeletionJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), -// TQT_SLOT( slotDeletionJobData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( mDeletionJob, TQ_SIGNAL( result( TDEIO::Job* ) ), + TQ_SLOT( slotDeletionJobResult( TDEIO::Job* ) ) ); +// connect( mDeletionJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), +// TQ_SLOT( slotDeletionJobData( TDEIO::Job *, const TQByteArray & ) ) ); } else { deleteItem(); } @@ -129,7 +129,7 @@ void GroupwareUploadJob::slotDeletionJobResult( TDEIO::Job *job ) adaptor()->interpretRemoveJob( job, mDeletionJobData ); } mDeletionJob = 0; - TQTimer::singleShot( 0, this, TQT_SLOT( deleteItem() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( deleteItem() ) ); } @@ -138,7 +138,7 @@ void GroupwareUploadJob::uploadItem() { kdDebug(5800)<<"GroupwareUploadJob::uploadItem()"<<endl; if ( mChangedItems.isEmpty() ) { - TQTimer::singleShot( 0, this, TQT_SLOT( uploadNewItem() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( uploadNewItem() ) ); } else { kdDebug(5800)<<"We still have "<<mChangedItems.count()<<" changed items to upload"<<endl; @@ -159,10 +159,10 @@ kdDebug() << "Not using batch upload " << endl; if ( mUploadJob ) { mUploadJobData = TQString(); - connect( mUploadJob, TQT_SIGNAL( result( TDEIO::Job* ) ), - TQT_SLOT( slotUploadJobResult( TDEIO::Job* ) ) ); - connect( mUploadJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotUploadJobData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( mUploadJob, TQ_SIGNAL( result( TDEIO::Job* ) ), + TQ_SLOT( slotUploadJobResult( TDEIO::Job* ) ) ); + connect( mUploadJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQ_SLOT( slotUploadJobData( TDEIO::Job *, const TQByteArray & ) ) ); } else { uploadItem(); } @@ -185,7 +185,7 @@ void GroupwareUploadJob::slotUploadJobResult( TDEIO::Job *job ) adaptor()->interpretUploadJob( job, mUploadJobData ); } mUploadJob = 0; - TQTimer::singleShot( 0, this, TQT_SLOT( uploadItem() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( uploadItem() ) ); } @@ -217,10 +217,10 @@ kdDebug() << "Not using batch create to " << url.url() << " for item of type " < if ( mUploadJob ) { mUploadNewJobData = TQString(); - connect( mUploadJob, TQT_SIGNAL( result( TDEIO::Job* ) ), - TQT_SLOT( slotUploadNewJobResult( TDEIO::Job* ) ) ); - connect( mUploadJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotUploadNewJobData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( mUploadJob, TQ_SIGNAL( result( TDEIO::Job* ) ), + TQ_SLOT( slotUploadNewJobResult( TDEIO::Job* ) ) ); + connect( mUploadJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQ_SLOT( slotUploadNewJobData( TDEIO::Job *, const TQByteArray & ) ) ); } else { uploadNewItem(); } @@ -246,7 +246,7 @@ void GroupwareUploadJob::slotUploadNewJobResult( TDEIO::Job *job ) adaptor()->interpretUploadNewJob( job, mUploadNewJobData ); } mUploadJob = 0; - TQTimer::singleShot( 0, this, TQT_SLOT( uploadNewItem() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( uploadNewItem() ) ); } diff --git a/tderesources/lib/kcal_resourcegroupwarebase.cpp b/tderesources/lib/kcal_resourcegroupwarebase.cpp index 11eedfe5..1710a11e 100644 --- a/tderesources/lib/kcal_resourcegroupwarebase.cpp +++ b/tderesources/lib/kcal_resourcegroupwarebase.cpp @@ -195,8 +195,8 @@ bool ResourceGroupwareBase::doOpen() return false; } else { mLoginFinished = false; - connect( loginJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotLoginJobResult( TDEIO::Job* ) ) ); + connect( loginJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotLoginJobResult( TDEIO::Job* ) ) ); enter_loop(); return mLoginFinished; } @@ -239,8 +239,8 @@ void ResourceGroupwareBase::doClose() if ( adaptor() && adaptor()->flags() & KPIM::GroupwareDataAdaptor::GWResNeedsLogoff ) { TDEIO::Job *logoffJob = adaptor()->createLogoffJob( prefs()->url(), prefs()->user(), prefs()->password() ); - connect( logoffJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotLogoffJobResult( TDEIO::Job* ) ) ); + connect( logoffJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotLogoffJobResult( TDEIO::Job* ) ) ); // TODO: Do we really need to block while waiting for the job to return? enter_loop(); } @@ -276,8 +276,8 @@ bool ResourceGroupwareBase::doLoad() emit resourceChanged( this ); mDownloadJob = createDownloadJob( adaptor() ); - connect( mDownloadJob, TQT_SIGNAL( result( KPIM::GroupwareJob * ) ), - TQT_SLOT( slotDownloadJobResult( KPIM::GroupwareJob * ) ) ); + connect( mDownloadJob, TQ_SIGNAL( result( KPIM::GroupwareJob * ) ), + TQ_SLOT( slotDownloadJobResult( KPIM::GroupwareJob * ) ) ); return true; } @@ -322,8 +322,8 @@ bool ResourceGroupwareBase::doSave() if ( !confirmSave() ) return false; mUploadJob = createUploadJob( adaptor() ); - connect( mUploadJob, TQT_SIGNAL( result( KPIM::GroupwareJob * ) ), - TQT_SLOT( slotUploadJobResult( KPIM::GroupwareJob * ) ) ); + connect( mUploadJob, TQ_SIGNAL( result( KPIM::GroupwareJob * ) ), + TQ_SLOT( slotUploadJobResult( KPIM::GroupwareJob * ) ) ); Incidence::List inc; Incidence::List::Iterator it; @@ -376,8 +376,8 @@ void ResourceGroupwareBase::slotUploadJobResult( KPIM::GroupwareJob *job ) if ( !mDownloadJob ) { mDownloadJob = createDownloadJob( adaptor() ); - connect( mDownloadJob, TQT_SIGNAL( result( KPIM::GroupwareJob * ) ), - TQT_SLOT( slotDownloadJobResult( KPIM::GroupwareJob * ) ) ); + connect( mDownloadJob, TQ_SIGNAL( result( KPIM::GroupwareJob * ) ), + TQ_SLOT( slotDownloadJobResult( KPIM::GroupwareJob * ) ) ); } else { kdWarning() << k_funcinfo << "Download still in progress. " "Can't happen. (TM)" << endl; diff --git a/tderesources/lib/kcal_resourcegroupwarebaseconfig.cpp b/tderesources/lib/kcal_resourcegroupwarebaseconfig.cpp index 1ca2570a..4f576ed7 100644 --- a/tderesources/lib/kcal_resourcegroupwarebaseconfig.cpp +++ b/tderesources/lib/kcal_resourcegroupwarebaseconfig.cpp @@ -68,15 +68,15 @@ ResourceGroupwareBaseConfig::ResourceGroupwareBaseConfig( TQWidget* parent, mPasswordEdit->setEchoMode( KLineEdit::Password ); mFolderConfig = new KPIM::FolderConfig( this ); - connect( mFolderConfig, TQT_SIGNAL( updateFoldersClicked() ), - TQT_SLOT( updateFolders() ) ); + connect( mFolderConfig, TQ_SIGNAL( updateFoldersClicked() ), + TQ_SLOT( updateFolders() ) ); mainLayout->addMultiCellWidget( mFolderConfig, 4, 4, 0, 1 ); TQHBox *hBox = new TQHBox( this ); mCacheSettingsButton = new KPushButton( i18n("Configure Cache Settings..."), hBox ); mainLayout->addMultiCellWidget( hBox, 5, 5, 0, 1 ); - connect( mCacheSettingsButton, TQT_SIGNAL( clicked() ), - TQT_SLOT( showCacheSettings() ) ); + connect( mCacheSettingsButton, TQ_SIGNAL( clicked() ), + TQ_SLOT( showCacheSettings() ) ); mCacheDialog = new CacheSettingsDialog( this ); } diff --git a/tderesources/lib/tdeabc_resourcegroupwarebase.cpp b/tderesources/lib/tdeabc_resourcegroupwarebase.cpp index f4a46990..cf73e03a 100644 --- a/tderesources/lib/tdeabc_resourcegroupwarebase.cpp +++ b/tderesources/lib/tdeabc_resourcegroupwarebase.cpp @@ -177,8 +177,8 @@ bool ResourceGroupwareBase::asyncLoad() loadCache(); mDownloadJob = createDownloadJob( mAdaptor ); - connect( mDownloadJob, TQT_SIGNAL( result( KPIM::GroupwareJob * ) ), - TQT_SLOT( slotDownloadJobResult( KPIM::GroupwareJob * ) ) ); + connect( mDownloadJob, TQ_SIGNAL( result( KPIM::GroupwareJob * ) ), + TQ_SLOT( slotDownloadJobResult( KPIM::GroupwareJob * ) ) ); return true; } @@ -212,8 +212,8 @@ bool ResourceGroupwareBase::asyncSave( Ticket* ) } mUploadJob = createUploadJob( mAdaptor ); - connect( mUploadJob, TQT_SIGNAL( result( KPIM::GroupwareJob * ) ), - TQT_SLOT( slotUploadJobResult( KPIM::GroupwareJob * ) ) ); + connect( mUploadJob, TQ_SIGNAL( result( KPIM::GroupwareJob * ) ), + TQ_SLOT( slotUploadJobResult( KPIM::GroupwareJob * ) ) ); TDEABC::Addressee::List addr; TDEABC::Addressee::List::Iterator it; diff --git a/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.cpp b/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.cpp index 69dfb3d8..a80ce9e0 100644 --- a/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.cpp +++ b/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.cpp @@ -67,8 +67,8 @@ ResourceGroupwareBaseConfig::ResourceGroupwareBaseConfig( TQWidget* parent, con mainLayout->addMultiCellWidget( hline, 3, 3, 0, 1 ); mFolderConfig = new KPIM::FolderConfig( this ); - connect( mFolderConfig, TQT_SIGNAL( updateFoldersClicked() ), - TQT_SLOT( updateFolders() ) ); + connect( mFolderConfig, TQ_SIGNAL( updateFoldersClicked() ), + TQ_SLOT( updateFolders() ) ); mainLayout->addMultiCellWidget( mFolderConfig, 4, 4, 0, 1 ); } diff --git a/tderesources/newexchange/exchangecalendaradaptor.cpp b/tderesources/newexchange/exchangecalendaradaptor.cpp index 5b51de5e..3b7aa36d 100644 --- a/tderesources/newexchange/exchangecalendaradaptor.cpp +++ b/tderesources/newexchange/exchangecalendaradaptor.cpp @@ -109,7 +109,7 @@ void ExchangeDelete::findUidSingleMaster( TQString const& uid ) TDEIO::DavJob* job = TDEIO::davSearch( mAccount->calendarURL(), "DAV:", "sql", query, false ); job->setWindow( mWindow ); - connect(job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotFindUidResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result( TDEIO::Job * )), this, TQ_SLOT(slotFindUidResult(TDEIO::Job *))); } */ diff --git a/tderesources/newexchange/exchangeconvertercalendar.cpp b/tderesources/newexchange/exchangeconvertercalendar.cpp index e67acdeb..58c31535 100644 --- a/tderesources/newexchange/exchangeconvertercalendar.cpp +++ b/tderesources/newexchange/exchangeconvertercalendar.cpp @@ -314,8 +314,8 @@ void ExchangeDownload::handleRecurrence( TQString uid ) query, false ); TDEIO::Scheduler::scheduleJob( job ); job->setWindow( mWindow ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotMasterResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotMasterResult( TDEIO::Job * ) ) ); } */ diff --git a/tderesources/remote/resourceremote.cpp b/tderesources/remote/resourceremote.cpp index 0a58aefb..9ee4aef5 100644 --- a/tderesources/remote/resourceremote.cpp +++ b/tderesources/remote/resourceremote.cpp @@ -197,11 +197,11 @@ bool ResourceRemote::doLoad() mDownloadJob = TDEIO::file_copy( mDownloadUrl, KURL( cacheFile() ), -1, true, false, !mUseProgressManager ); - connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotLoadJobResult( TDEIO::Job * ) ) ); + connect( mDownloadJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotLoadJobResult( TDEIO::Job * ) ) ); if ( mUseProgressManager ) { - connect( mDownloadJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), - TQT_SLOT( slotPercent( TDEIO::Job *, unsigned long ) ) ); + connect( mDownloadJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), + TQ_SLOT( slotPercent( TDEIO::Job *, unsigned long ) ) ); mProgress = KPIM::ProgressManager::createProgressItem( KPIM::ProgressManager::getUniqueID(), i18n("Downloading Calendar") ); @@ -283,8 +283,8 @@ bool ResourceRemote::doSave() saveCache(); mUploadJob = TDEIO::file_copy( KURL( cacheFile() ), mUploadUrl, -1, true ); - connect( mUploadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotSaveJobResult( TDEIO::Job * ) ) ); + connect( mUploadJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotSaveJobResult( TDEIO::Job * ) ) ); return true; } diff --git a/tderesources/scalix/kcal/resourcescalix.cpp b/tderesources/scalix/kcal/resourcescalix.cpp index ff9158d1..6b796e5d 100644 --- a/tderesources/scalix/kcal/resourcescalix.cpp +++ b/tderesources/scalix/kcal/resourcescalix.cpp @@ -66,8 +66,8 @@ ResourceScalix::ResourceScalix( const TDEConfig *config ) mCalendar( TQString::fromLatin1("UTC") ), mOpen( false ) { setType( "scalix" ); - connect( &mResourceChangedTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotEmitResourceChanged() ) ); + connect( &mResourceChangedTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotEmitResourceChanged() ) ); } ResourceScalix::~ResourceScalix() @@ -310,7 +310,7 @@ void ResourceScalix::resolveConflict( KCal::Incidence* inc, const TQString& subr KIncidenceChooser* ch = new KIncidenceChooser(); ch->setIncidence( local ,inc ); if ( KIncidenceChooser::chooseMode == KIncidenceChooser::ask ) { - connect ( this, TQT_SIGNAL( useGlobalMode() ), ch, TQT_SLOT ( useGlobalMode() ) ); + connect ( this, TQ_SIGNAL( useGlobalMode() ), ch, TQ_SLOT ( useGlobalMode() ) ); if ( ch->exec() ) if ( KIncidenceChooser::chooseMode != KIncidenceChooser::ask ) emit useGlobalMode() ; diff --git a/tderesources/scalix/scalixadmin/delegatedialog.cpp b/tderesources/scalix/scalixadmin/delegatedialog.cpp index 8674ce70..af843285 100644 --- a/tderesources/scalix/scalixadmin/delegatedialog.cpp +++ b/tderesources/scalix/scalixadmin/delegatedialog.cpp @@ -63,7 +63,7 @@ DelegateDialog::DelegateDialog( TQWidget *parent ) row++; } - connect( emailSelector, TQT_SIGNAL( clicked() ), TQT_SLOT( selectEmail() ) ); + connect( emailSelector, TQ_SIGNAL( clicked() ), TQ_SLOT( selectEmail() ) ); setMainWidget( page ); } diff --git a/tderesources/scalix/scalixadmin/delegatepage.cpp b/tderesources/scalix/scalixadmin/delegatepage.cpp index b4368f7d..b43dac85 100644 --- a/tderesources/scalix/scalixadmin/delegatepage.cpp +++ b/tderesources/scalix/scalixadmin/delegatepage.cpp @@ -53,10 +53,10 @@ DelegatePage::DelegatePage( TQWidget *parent ) mRemoveButton->setEnabled( false ); layout->addWidget( mRemoveButton, 1, 2 ); - connect( mView, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( selectionChanged() ) ); - connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addDelegate() ) ); - connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editDelegate() ) ); - connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeDelegate() ) ); + connect( mView, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( selectionChanged() ) ); + connect( mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( addDelegate() ) ); + connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editDelegate() ) ); + connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeDelegate() ) ); loadAllDelegates(); } @@ -69,7 +69,7 @@ void DelegatePage::loadAllDelegates() { Scalix::GetDelegatesJob *job = Scalix::getDelegates( Settings::self()->globalSlave(), Settings::self()->accountUrl() ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( allDelegates( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( allDelegates( TDEIO::Job* ) ) ); } void DelegatePage::addDelegate() @@ -88,7 +88,7 @@ void DelegatePage::addDelegate() Scalix::SetDelegateJob *job = Scalix::setDelegate( Settings::self()->globalSlave(), Settings::self()->accountUrl(), delegate.email(), delegate.rights() ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( delegateAdded( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( delegateAdded( TDEIO::Job* ) ) ); } void DelegatePage::editDelegate() @@ -113,7 +113,7 @@ void DelegatePage::editDelegate() Scalix::SetDelegateJob *job = Scalix::setDelegate( Settings::self()->globalSlave(), Settings::self()->accountUrl(), delegate.email(), delegate.rights() ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( delegateAdded( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( delegateAdded( TDEIO::Job* ) ) ); } void DelegatePage::removeDelegate() @@ -124,7 +124,7 @@ void DelegatePage::removeDelegate() Scalix::DeleteDelegateJob *job = Scalix::deleteDelegate( Settings::self()->globalSlave(), Settings::self()->accountUrl(), delegate.email() ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( delegateRemoved( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( delegateRemoved( TDEIO::Job* ) ) ); } void DelegatePage::allDelegates( TDEIO::Job *job ) diff --git a/tderesources/scalix/scalixadmin/delegateview.cpp b/tderesources/scalix/scalixadmin/delegateview.cpp index 79b8cf33..e999baff 100644 --- a/tderesources/scalix/scalixadmin/delegateview.cpp +++ b/tderesources/scalix/scalixadmin/delegateview.cpp @@ -48,7 +48,7 @@ DelegateView::DelegateView( DelegateManager *manager, TQWidget *parent ) setFullWidth( true ); setAllColumnsShowFocus( true ); - connect( mManager, TQT_SIGNAL( changed() ), TQT_SLOT( delegateChanged() ) ); + connect( mManager, TQ_SIGNAL( changed() ), TQ_SLOT( delegateChanged() ) ); delegateChanged(); } diff --git a/tderesources/scalix/scalixadmin/jobs.cpp b/tderesources/scalix/scalixadmin/jobs.cpp index e07b17ca..d965438d 100644 --- a/tderesources/scalix/scalixadmin/jobs.cpp +++ b/tderesources/scalix/scalixadmin/jobs.cpp @@ -207,8 +207,8 @@ DeleteDelegateJob::DeleteDelegateJob( const KURL& url, const TQByteArray &packed GetDelegatesJob::GetDelegatesJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo ) : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo ) { - connect( this, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), - this, TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) ); + connect( this, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), + this, TQ_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) ); } Delegate::List GetDelegatesJob::delegates() const @@ -259,8 +259,8 @@ DeleteOtherUserJob::DeleteOtherUserJob( const KURL& url, const TQByteArray &pack GetOtherUsersJob::GetOtherUsersJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo ) : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo ) { - connect( this, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), - this, TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) ); + connect( this, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), + this, TQ_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) ); } TQStringList GetOtherUsersJob::otherUsers() const @@ -281,8 +281,8 @@ SetOutOfOfficeJob::SetOutOfOfficeJob( const KURL& url, const TQByteArray &packed GetOutOfOfficeJob::GetOutOfOfficeJob( const KURL& url, const TQByteArray &packedArgs, bool showProgressInfo ) : TDEIO::SimpleJob( url, TDEIO::CMD_SPECIAL, packedArgs, showProgressInfo ) { - connect( this, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), - this, TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) ); + connect( this, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), + this, TQ_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) ); } bool GetOutOfOfficeJob::enabled() const diff --git a/tderesources/scalix/scalixadmin/ldapview.cpp b/tderesources/scalix/scalixadmin/ldapview.cpp index 3e6eea04..a58dec2e 100644 --- a/tderesources/scalix/scalixadmin/ldapview.cpp +++ b/tderesources/scalix/scalixadmin/ldapview.cpp @@ -56,10 +56,10 @@ LdapView::LdapView( TQWidget *parent ) attrs << "surname" << "mail"; mClient->setAttrs( attrs ); - connect( mClient, TQT_SIGNAL( result( const TDEABC::LdapObject& ) ), - this, TQT_SLOT( entryAdded( const TDEABC::LdapObject& ) ) ); - connect( mClient, TQT_SIGNAL( error( const TQString& ) ), - this, TQT_SLOT( error( const TQString& ) ) ); + connect( mClient, TQ_SIGNAL( result( const TDEABC::LdapObject& ) ), + this, TQ_SLOT( entryAdded( const TDEABC::LdapObject& ) ) ); + connect( mClient, TQ_SIGNAL( error( const TQString& ) ), + this, TQ_SLOT( error( const TQString& ) ) ); } LdapView::~LdapView() diff --git a/tderesources/scalix/scalixadmin/otheruserpage.cpp b/tderesources/scalix/scalixadmin/otheruserpage.cpp index 3cc220ea..f7594acf 100644 --- a/tderesources/scalix/scalixadmin/otheruserpage.cpp +++ b/tderesources/scalix/scalixadmin/otheruserpage.cpp @@ -52,9 +52,9 @@ OtherUserPage::OtherUserPage( TQWidget *parent ) mDeleteButton->setEnabled( false ); layout->addWidget( mDeleteButton, 1, 1 ); - connect( mView, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( selectionChanged() ) ); - connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addUser() ) ); - connect( mDeleteButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeUser() ) ); + connect( mView, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( selectionChanged() ) ); + connect( mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( addUser() ) ); + connect( mDeleteButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeUser() ) ); loadAllUsers(); } @@ -67,7 +67,7 @@ void OtherUserPage::loadAllUsers() { Scalix::GetOtherUsersJob *job = Scalix::getOtherUsers( Settings::self()->globalSlave(), Settings::self()->accountUrl() ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( allUsers( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( allUsers( TDEIO::Job* ) ) ); } void OtherUserPage::addUser() @@ -82,7 +82,7 @@ void OtherUserPage::addUser() Scalix::AddOtherUserJob *job = Scalix::addOtherUser( Settings::self()->globalSlave(), Settings::self()->accountUrl(), email ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( userAdded( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( userAdded( TDEIO::Job* ) ) ); } void OtherUserPage::removeUser() @@ -93,7 +93,7 @@ void OtherUserPage::removeUser() Scalix::DeleteOtherUserJob *job = Scalix::deleteOtherUser( Settings::self()->globalSlave(), Settings::self()->accountUrl(), email ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( userRemoved( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( userRemoved( TDEIO::Job* ) ) ); } void OtherUserPage::allUsers( TDEIO::Job *job ) diff --git a/tderesources/scalix/scalixadmin/otheruserview.cpp b/tderesources/scalix/scalixadmin/otheruserview.cpp index e8aa13bc..be09dc74 100644 --- a/tderesources/scalix/scalixadmin/otheruserview.cpp +++ b/tderesources/scalix/scalixadmin/otheruserview.cpp @@ -45,7 +45,7 @@ OtherUserView::OtherUserView( OtherUserManager *manager, TQWidget *parent ) addColumn( i18n( "Registered Accounts" ) ); setFullWidth( true ); - connect( mManager, TQT_SIGNAL( changed() ), TQT_SLOT( userChanged() ) ); + connect( mManager, TQ_SIGNAL( changed() ), TQ_SLOT( userChanged() ) ); userChanged(); } diff --git a/tderesources/scalix/scalixadmin/outofofficepage.cpp b/tderesources/scalix/scalixadmin/outofofficepage.cpp index 557772d8..343f4f4c 100644 --- a/tderesources/scalix/scalixadmin/outofofficepage.cpp +++ b/tderesources/scalix/scalixadmin/outofofficepage.cpp @@ -55,10 +55,10 @@ OutOfOfficePage::OutOfOfficePage( TQWidget *parent ) statusChanged(); - connect( mEnabled, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( statusChanged() ) ); - connect( mEnabled, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( changed() ) ); - connect( mSaveButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( store() ) ); - connect( mMessage, TQT_SIGNAL( textChanged() ), this, TQT_SLOT( changed() ) ); + connect( mEnabled, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( statusChanged() ) ); + connect( mEnabled, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( changed() ) ); + connect( mSaveButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( store() ) ); + connect( mMessage, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( changed() ) ); load(); } @@ -71,7 +71,7 @@ void OutOfOfficePage::load() { Scalix::GetOutOfOfficeJob *job = Scalix::getOutOfOffice( Settings::self()->globalSlave(), Settings::self()->accountUrl() ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( loaded( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( loaded( TDEIO::Job* ) ) ); } void OutOfOfficePage::loaded( TDEIO::Job* job ) @@ -98,7 +98,7 @@ void OutOfOfficePage::store() mEnabled->isChecked(), mMessage->text() ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( stored( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( stored( TDEIO::Job* ) ) ); mSaveButton->setEnabled( false ); } diff --git a/tderesources/scalix/scalixadmin/passwordpage.cpp b/tderesources/scalix/scalixadmin/passwordpage.cpp index 38262725..f67e4251 100644 --- a/tderesources/scalix/scalixadmin/passwordpage.cpp +++ b/tderesources/scalix/scalixadmin/passwordpage.cpp @@ -62,9 +62,9 @@ PasswordPage::PasswordPage( TQWidget *parent ) layout->setRowSpacing( 3, 1 ); - connect( mPassword, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( textChanged() ) ); - connect( mPasswordRetype, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( textChanged() ) ); - connect( mButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( buttonClicked() ) ); + connect( mPassword, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( textChanged() ) ); + connect( mPasswordRetype, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( textChanged() ) ); + connect( mButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( buttonClicked() ) ); } void PasswordPage::buttonClicked() @@ -77,7 +77,7 @@ void PasswordPage::buttonClicked() mJob = Scalix::setPassword( Settings::self()->globalSlave(), Settings::self()->accountUrl(), Settings::self()->accountPassword(), mPassword->text() ); - connect( mJob, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( finished( TDEIO::Job* ) ) ); + connect( mJob, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( finished( TDEIO::Job* ) ) ); updateState( true ); } else { diff --git a/tderesources/scalix/shared/kmailconnection.cpp b/tderesources/scalix/shared/kmailconnection.cpp index 147b9822..6f239cc2 100644 --- a/tderesources/scalix/shared/kmailconnection.cpp +++ b/tderesources/scalix/shared/kmailconnection.cpp @@ -55,8 +55,8 @@ KMailConnection::KMailConnection( ResourceScalixBase* resource, mDCOPClient->registerAs( objId, true ); kapp->dcopClient()->setNotifications( true ); - connect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString& ) ), - this, TQT_SLOT( unregisteredFromDCOP( const TQCString& ) ) ); + connect( kapp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& ) ), + this, TQ_SLOT( unregisteredFromDCOP( const TQCString& ) ) ); } KMailConnection::~KMailConnection() diff --git a/tderesources/scalix/tdeioslave/scalix.cpp b/tderesources/scalix/tdeioslave/scalix.cpp index 0af6c466..8dbb8651 100644 --- a/tderesources/scalix/tdeioslave/scalix.cpp +++ b/tderesources/scalix/tdeioslave/scalix.cpp @@ -116,10 +116,10 @@ void Scalix::retrieveFreeBusy( const KURL &url ) mFreeBusyData = TQString(); TDEIO::SimpleJob *job = TDEIO::special( imapUrl, packedArgs, false ); - connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), - this, TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( slotRetrieveResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), + this, TQ_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( slotRetrieveResult( TDEIO::Job* ) ) ); tqApp->eventLoop()->enterLoop(); } @@ -182,8 +182,8 @@ void Scalix::publishFreeBusy( const KURL &url ) .arg( url.host() ); TDEIO::SimpleJob *job = TDEIO::special( imapUrl, packedArgs, false ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( slotPublishResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( slotPublishResult( TDEIO::Job* ) ) ); tqApp->eventLoop()->enterLoop(); } diff --git a/tderesources/slox/kcalresourceslox.cpp b/tderesources/slox/kcalresourceslox.cpp index 4c2ab12c..e93b8944 100644 --- a/tderesources/slox/kcalresourceslox.cpp +++ b/tderesources/slox/kcalresourceslox.cpp @@ -226,16 +226,16 @@ void KCalResourceSlox::requestEvents() kdDebug() << "REQUEST CALENDAR: \n" << doc.toString( 2 ) << endl; mLoadEventsJob = TDEIO::davPropFind( url, doc, "0", false ); - connect( mLoadEventsJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotLoadEventsResult( TDEIO::Job * ) ) ); - connect( mLoadEventsJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), - TQT_SLOT( slotEventsProgress( TDEIO::Job *, unsigned long ) ) ); + connect( mLoadEventsJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotLoadEventsResult( TDEIO::Job * ) ) ); + connect( mLoadEventsJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), + TQ_SLOT( slotEventsProgress( TDEIO::Job *, unsigned long ) ) ); mLoadEventsProgress = KPIM::ProgressManager::instance()->createProgressItem( KPIM::ProgressManager::getUniqueID(), i18n("Downloading events") ); connect( mLoadEventsProgress, - TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), - TQT_SLOT( cancelLoadEvents() ) ); + TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), + TQ_SLOT( cancelLoadEvents() ) ); mPrefs->setLastEventSync( TQDateTime::currentDateTime() ); } @@ -271,16 +271,16 @@ void KCalResourceSlox::requestTodos() kdDebug() << "REQUEST TASKS: \n" << doc.toString( 2 ) << endl; mLoadTodosJob = TDEIO::davPropFind( url, doc, "0", false ); - connect( mLoadTodosJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotLoadTodosResult( TDEIO::Job * ) ) ); - connect( mLoadTodosJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), - TQT_SLOT( slotTodosProgress( TDEIO::Job *, unsigned long ) ) ); + connect( mLoadTodosJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotLoadTodosResult( TDEIO::Job * ) ) ); + connect( mLoadTodosJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), + TQ_SLOT( slotTodosProgress( TDEIO::Job *, unsigned long ) ) ); mLoadTodosProgress = KPIM::ProgressManager::instance()->createProgressItem( KPIM::ProgressManager::getUniqueID(), i18n("Downloading to-dos") ); connect( mLoadTodosProgress, - TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), - TQT_SLOT( cancelLoadTodos() ) ); + TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), + TQ_SLOT( cancelLoadTodos() ) ); mPrefs->setLastTodoSync( TQDateTime::currentDateTime() ); } @@ -380,16 +380,16 @@ void KCalResourceSlox::uploadIncidences() kdDebug() << "UPLOAD: \n" << doc.toString( 2 ) << endl; mUploadJob = TDEIO::davPropPatch( url, doc, false ); - connect( mUploadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotUploadResult( TDEIO::Job * ) ) ); - connect( mUploadJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), - TQT_SLOT( slotUploadProgress( TDEIO::Job *, unsigned long ) ) ); + connect( mUploadJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotUploadResult( TDEIO::Job * ) ) ); + connect( mUploadJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), + TQ_SLOT( slotUploadProgress( TDEIO::Job *, unsigned long ) ) ); mUploadProgress = KPIM::ProgressManager::instance()->createProgressItem( KPIM::ProgressManager::getUniqueID(), i18n("Uploading incidence") ); connect( mUploadProgress, - TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), - TQT_SLOT( cancelUpload() ) ); + TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), + TQ_SLOT( cancelUpload() ) ); } void KCalResourceSlox::createIncidenceAttributes( TQDomDocument &doc, diff --git a/tderesources/slox/kcalresourcesloxconfig.cpp b/tderesources/slox/kcalresourcesloxconfig.cpp index 83246a03..8652263f 100644 --- a/tderesources/slox/kcalresourcesloxconfig.cpp +++ b/tderesources/slox/kcalresourcesloxconfig.cpp @@ -72,11 +72,11 @@ KCalResourceSloxConfig::KCalResourceSloxConfig( TQWidget* parent, const char* n mCalButton = new KPushButton( i18n("Calendar Folder..."), this ); mainLayout->addWidget( mCalButton, 5, 0 ); - connect( mCalButton, TQT_SIGNAL( clicked() ), TQT_SLOT( selectCalendarFolder() ) ); + connect( mCalButton, TQ_SIGNAL( clicked() ), TQ_SLOT( selectCalendarFolder() ) ); mTaskButton = new KPushButton( i18n("Task Folder..."), this ); mainLayout->addWidget( mTaskButton, 5, 1 ); - connect( mTaskButton, TQT_SIGNAL( clicked() ), TQT_SLOT( selectTaskFolder() ) ); + connect( mTaskButton, TQ_SIGNAL( clicked() ), TQ_SLOT( selectTaskFolder() ) ); mReloadConfig = new KCal::ResourceCachedReloadConfig( this ); mainLayout->addMultiCellWidget( mReloadConfig, 6, 6, 0, 1 ); diff --git a/tderesources/slox/sloxaccounts.cpp b/tderesources/slox/sloxaccounts.cpp index 3afa7019..e5ba2651 100644 --- a/tderesources/slox/sloxaccounts.cpp +++ b/tderesources/slox/sloxaccounts.cpp @@ -139,8 +139,8 @@ void SloxAccounts::requestAccounts() mDownloadJob = TDEIO::davPropFind( url, doc, "0", false ); } - connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( mDownloadJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotResult( TDEIO::Job * ) ) ); } void SloxAccounts::slotResult( TDEIO::Job *job ) diff --git a/tderesources/slox/sloxfolderdialog.cpp b/tderesources/slox/sloxfolderdialog.cpp index 716c2d40..c1f1086e 100644 --- a/tderesources/slox/sloxfolderdialog.cpp +++ b/tderesources/slox/sloxfolderdialog.cpp @@ -37,7 +37,7 @@ SloxFolderDialog::SloxFolderDialog( SloxFolderManager *manager, FolderType type, mListView->addColumn( i18n("Folder ID"), 0 ); setMainWidget( mListView ); updateFolderView(); - connect( manager, TQT_SIGNAL( foldersUpdated() ), TQT_SLOT( updateFolderView() ) ); + connect( manager, TQ_SIGNAL( foldersUpdated() ), TQ_SLOT( updateFolderView() ) ); } SloxFolderDialog::~SloxFolderDialog() diff --git a/tderesources/slox/sloxfoldermanager.cpp b/tderesources/slox/sloxfoldermanager.cpp index d7284d3a..b862a388 100644 --- a/tderesources/slox/sloxfoldermanager.cpp +++ b/tderesources/slox/sloxfoldermanager.cpp @@ -79,8 +79,8 @@ void SloxFolderManager::requestFolders() mDownloadJob = TDEIO::davPropFind( url, doc, "0", false ); - connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( mDownloadJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotResult( TDEIO::Job * ) ) ); } void SloxFolderManager::slotResult( TDEIO::Job *job ) diff --git a/tderesources/slox/tdeabcresourceslox.cpp b/tderesources/slox/tdeabcresourceslox.cpp index 5b0b6515..d77347d3 100644 --- a/tderesources/slox/tdeabcresourceslox.cpp +++ b/tderesources/slox/tdeabcresourceslox.cpp @@ -208,16 +208,16 @@ bool ResourceSlox::asyncLoad() kdDebug() << "REQUEST CONTACTS: \n" << doc.toString( 2 ) << endl; mDownloadJob = TDEIO::davPropFind( url, doc, "0", false ); - connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotResult( TDEIO::Job * ) ) ); - connect( mDownloadJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), - TQT_SLOT( slotProgress( TDEIO::Job *, unsigned long ) ) ); + connect( mDownloadJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( mDownloadJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), + TQ_SLOT( slotProgress( TDEIO::Job *, unsigned long ) ) ); mDownloadProgress = KPIM::ProgressManager::instance()->createProgressItem( KPIM::ProgressManager::getUniqueID(), i18n("Downloading contacts") ); connect( mDownloadProgress, - TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), - TQT_SLOT( cancelDownload() ) ); + TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), + TQ_SLOT( cancelDownload() ) ); mPrefs->setLastSync( TQDateTime::currentDateTime() ); @@ -521,16 +521,16 @@ void ResourceSlox::uploadContacts() url.setPass( mPrefs->password() ); mUploadJob = TDEIO::davPropPatch( url, doc, false ); - connect( mUploadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotUploadResult( TDEIO::Job * ) ) ); - connect( mUploadJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), - TQT_SLOT( slotProgress( TDEIO::Job *, unsigned long ) ) ); + connect( mUploadJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotUploadResult( TDEIO::Job * ) ) ); + connect( mUploadJob, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), + TQ_SLOT( slotProgress( TDEIO::Job *, unsigned long ) ) ); mUploadProgress = KPIM::ProgressManager::instance()->createProgressItem( KPIM::ProgressManager::getUniqueID(), i18n("Uploading contacts") ); connect( mUploadProgress, - TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), - TQT_SLOT( cancelUpload() ) ); + TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), + TQ_SLOT( cancelUpload() ) ); } void ResourceSlox::createAddresseeFields( TQDomDocument &doc, TQDomElement &prop, diff --git a/tderesources/slox/tdeabcresourcesloxconfig.cpp b/tderesources/slox/tdeabcresourcesloxconfig.cpp index 8ad6701c..36f76238 100644 --- a/tderesources/slox/tdeabcresourcesloxconfig.cpp +++ b/tderesources/slox/tdeabcresourcesloxconfig.cpp @@ -69,7 +69,7 @@ ResourceSloxConfig::ResourceSloxConfig( TQWidget* parent, const char* name ) mFolderButton = new KPushButton( i18n("Select Folder..."), this ); mainLayout->addMultiCellWidget( mFolderButton, 4, 4, 0, 1 ); - connect( mFolderButton, TQT_SIGNAL( clicked() ), TQT_SLOT( selectAddressFolder() ) ); + connect( mFolderButton, TQ_SIGNAL( clicked() ), TQ_SLOT( selectAddressFolder() ) ); } diff --git a/tderesources/slox/testsloxaccounts.cpp b/tderesources/slox/testsloxaccounts.cpp index 22c44e66..ea7b3da1 100644 --- a/tderesources/slox/testsloxaccounts.cpp +++ b/tderesources/slox/testsloxaccounts.cpp @@ -55,7 +55,7 @@ int main(int argc,char **argv) app.setMainWidget( &button ); button.show(); - TQObject::connect( &button, TQT_SIGNAL( clicked() ), &app, TQT_SLOT( quit() ) ); + TQObject::connect( &button, TQ_SIGNAL( clicked() ), &app, TQ_SLOT( quit() ) ); app.exec(); } diff --git a/tderesources/tvanytime/kcal_resourcetvanytime.cpp b/tderesources/tvanytime/kcal_resourcetvanytime.cpp index 12161d90..44b3e324 100644 --- a/tderesources/tvanytime/kcal_resourcetvanytime.cpp +++ b/tderesources/tvanytime/kcal_resourcetvanytime.cpp @@ -93,8 +93,8 @@ void ResourceTVAnytime::init() //setReadOnly( true ); - connect( &mResourceChangedTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotEmitResourceChanged() ) ); + connect( &mResourceChangedTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotEmitResourceChanged() ) ); } TVAnytimePrefsBase *ResourceTVAnytime::prefs() @@ -179,15 +179,15 @@ bool ResourceTVAnytime::doLoad() // TODO: find out if the file to download is fresh. if not, just work with the cache. mDownloadJob = TDEIO::file_copy( url, destination, -1, true ); - connect( mDownloadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotJobResult( TDEIO::Job * ) ) ); + connect( mDownloadJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotJobResult( TDEIO::Job * ) ) ); mProgress = KPIM::ProgressManager::instance()->createProgressItem( KPIM::ProgressManager::getUniqueID(), i18n("Downloading program schedule") ); connect( mProgress, - TQT_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), - TQT_SLOT( cancelLoad() ) ); + TQ_SIGNAL( progressItemCanceled( KPIM::ProgressItem * ) ), + TQ_SLOT( cancelLoad() ) ); return true; } diff --git a/wizards/groupwarewizard.cpp b/wizards/groupwarewizard.cpp index 1f520ce5..3df995ce 100644 --- a/wizards/groupwarewizard.cpp +++ b/wizards/groupwarewizard.cpp @@ -39,8 +39,8 @@ GroupwareWizard::GroupwareWizard( TQWidget *parent, const char *name ) layout->addWidget( mOverViewPage ); - connect( mOverViewPage, TQT_SIGNAL( cancel() ), - tqApp, TQT_SLOT( quit() ) ); + connect( mOverViewPage, TQ_SIGNAL( cancel() ), + tqApp, TQ_SLOT( quit() ) ); resize( 400, 200 ); } diff --git a/wizards/groupwisewizard.cpp b/wizards/groupwisewizard.cpp index 6081bb00..f6b019ef 100644 --- a/wizards/groupwisewizard.cpp +++ b/wizards/groupwisewizard.cpp @@ -320,8 +320,8 @@ GroupwiseWizard::GroupwiseWizard() : TDEConfigWizard( new GroupwisePropagator ) topLayout->addWidget( mEmailBox, 0, 0 ); mEmailWidget = new TQWidget( mEmailBox ); - connect( mEmailBox, TQT_SIGNAL( toggled( bool ) ), mEmailWidget, - TQT_SLOT( setEnabled( bool ) ) ); + connect( mEmailBox, TQ_SIGNAL( toggled( bool ) ), mEmailWidget, + TQ_SLOT( setEnabled( bool ) ) ); TQGridLayout *accountLayout= new TQGridLayout( mEmailWidget ); accountLayout->setSpacing( spacingHint() ); @@ -340,8 +340,8 @@ GroupwiseWizard::GroupwiseWizard() : TDEConfigWizard( new GroupwisePropagator ) accountLayout->setRowStretch( 2, 1 ); - connect( this, TQT_SIGNAL( aboutToShowPage( TQWidget * ) ), - TQT_SLOT( slotAboutToShowPage( TQWidget * ) ) ); + connect( this, TQ_SIGNAL( aboutToShowPage( TQWidget * ) ), + TQ_SLOT( slotAboutToShowPage( TQWidget * ) ) ); setupRulesPage(); diff --git a/wizards/overviewpage.cpp b/wizards/overviewpage.cpp index e9f6596a..9e4aba5d 100644 --- a/wizards/overviewpage.cpp +++ b/wizards/overviewpage.cpp @@ -66,7 +66,7 @@ OverViewPage::OverViewPage( TQWidget *parent, const char *name ) #ifdef WITH_EGROUPWARE button = new TQPushButton( i18n("eGroupware"), this ); layout->addMultiCellWidget( button, 3, 3, 0, 3 ); - connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( showWizardEGroupware() ) ); + connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( showWizardEGroupware() ) ); #endif // FIXME: Maybe hyperlinks would be better than buttons. @@ -74,20 +74,20 @@ OverViewPage::OverViewPage( TQWidget *parent, const char *name ) #ifdef WITH_KOLAB button = new TQPushButton( i18n("Kolab"), this ); layout->addMultiCellWidget( button, 4, 4, 0, 3 ); - connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( showWizardKolab() ) ); + connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( showWizardKolab() ) ); #endif #ifdef WITH_SLOX button = new TQPushButton( i18n("SUSE Linux Openexchange (SLOX)"), this ); layout->addMultiCellWidget( button, 5, 5, 0, 3 ); - connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( showWizardSlox() ) ); + connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( showWizardSlox() ) ); #endif #ifdef WITH_NEWEXCHANGE button = new TQPushButton( i18n("Microsoft Exchange"), this ); button->hide(); // not quite ready yet layout->addMultiCellWidget( button, 6, 6, 0, 3 ); - connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( showWizardExchange() ) ); + connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( showWizardExchange() ) ); #endif TQFrame *frame = new TQFrame( this ); @@ -97,7 +97,7 @@ OverViewPage::OverViewPage( TQWidget *parent, const char *name ) TQPushButton *cancelButton = new KPushButton( KStdGuiItem::close(), this ); layout->addWidget( cancelButton, 8, 3 ); - connect( cancelButton, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( cancel() ) ); + connect( cancelButton, TQ_SIGNAL( clicked() ), this, TQ_SIGNAL( cancel() ) ); layout->setRowStretch( 7, 1 ); |