TDE
/
tdepim
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdepim
0
0
Fork 0
Code Issues Releases Wiki Activity

Replace various '#define' strings - part 6

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/105/head
Michele Calgaro 11 months ago
parent 6ab7f162f4
commit 762dc98fa6
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
123 changed files with 1020 additions and 1020 deletions
Show Stats Download Patch File Download Diff File

98
akregator/src/actionmanagerimpl.cpp
Unescape View File

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

4
akregator/src/akregator_view.cpp
Unescape View File

@ -319,7 +319,7 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons
TQWhatsThis::add(m_articleViewer->widget(), i18n("Browsing area.")); TQWhatsThis::add(m_articleViewer->widget(), i18n("Browsing area."));
mainTabLayout->addWidget( m_articleSplitter ); mainTabLayout->addWidget( m_articleSplitter );
m_mainFrame=new Frame(TQT_TQOBJECT(this), m_part, m_mainTab, i18n("Articles"), false); m_mainFrame=new Frame(this, m_part, m_mainTab, i18n("Articles"), false);
connectFrame(m_mainFrame); connectFrame(m_mainFrame);
m_tabs->addFrame(m_mainFrame); m_tabs->addFrame(m_mainFrame);
@ -440,7 +440,7 @@ void View::slotOpenNewTab(const KURL& url, bool background)
connect( page, TQT_SIGNAL(urlClicked(const KURL &, Viewer*, bool, bool)), connect( page, TQT_SIGNAL(urlClicked(const KURL &, Viewer*, bool, bool)),
this, TQT_SLOT(slotUrlClickedInViewer(const KURL &, Viewer*, bool, bool)) ); this, TQT_SLOT(slotUrlClickedInViewer(const KURL &, Viewer*, bool, bool)) );
Frame* frame = new Frame(TQT_TQOBJECT(this), page, page->widget(), i18n("Untitled")); Frame* frame = new Frame(this, page, page->widget(), i18n("Untitled"));
frame->setAutoDeletePart(true); // delete page viewer when removing the tab 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, TQT_SIGNAL(setWindowCaption (const TQString &)), frame, TQT_SLOT(setTitle (const TQString &)));

10
akregator/src/mainwindow.cpp
Unescape View File

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

2
akregator/src/trayicon.cpp
Unescape View File

@ -200,7 +200,7 @@ void TrayIcon::setUnread(int unread, bool force)
void TrayIcon::viewButtonClicked() void TrayIcon::viewButtonClicked()
{ {
TQWidget *p=TQT_TQWIDGET(parent()); TQWidget *p=static_cast<TQWidget*>(parent());
KWin::forceActiveWindow(p->winId()); KWin::forceActiveWindow(p->winId());
} }

2
certmanager/certificateinfowidgetimpl.cpp
Unescape View File

@ -253,7 +253,7 @@ void CertificateInfoWidgetImpl::startCertificateChainListing() {
} }
void CertificateInfoWidgetImpl::startCertificateDump() { void CertificateInfoWidgetImpl::startCertificateDump() {
TDEProcess* proc = new TDEProcess( TQT_TQOBJECT(this) ); TDEProcess* proc = new TDEProcess( this );
(*proc) << "gpgsm"; // must be in the PATH (*proc) << "gpgsm"; // must be in the PATH
(*proc) << "--dump-keys"; (*proc) << "--dump-keys";
(*proc) << mChain.front().primaryFingerprint(); (*proc) << mChain.front().primaryFingerprint();

66
certmanager/certmanager.cpp
Unescape View File

@ -252,23 +252,23 @@ static inline void connectEnableOperationSignal( TQObject * s, TQObject * d ) {
void CertManager::createActions() { void CertManager::createActions() {
TDEAction * action = 0; TDEAction * action = 0;
(void)KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection() ); (void)KStdAction::quit( this, TQT_SLOT(close()), actionCollection() );
action = KStdAction::redisplay( TQT_TQOBJECT(this), TQT_SLOT(slotRedisplay()), actionCollection() ); action = KStdAction::redisplay( this, TQT_SLOT(slotRedisplay()), actionCollection() );
// work around the fact that the stdaction has no shortcut // work around the fact that the stdaction has no shortcut
TDEShortcut reloadShortcut = TDEStdAccel::shortcut(TDEStdAccel::Reload); TDEShortcut reloadShortcut = TDEStdAccel::shortcut(TDEStdAccel::Reload);
reloadShortcut.append(KKey(CTRL + Key_R)); reloadShortcut.append(KKey(CTRL + Key_R));
action->setShortcut( reloadShortcut ); action->setShortcut( reloadShortcut );
connectEnableOperationSignal( TQT_TQOBJECT(this), action ); connectEnableOperationSignal( this, action );
action = new TDEAction( i18n("Stop Operation"), "process-stop", Key_Escape, action = new TDEAction( i18n("Stop Operation"), "process-stop", Key_Escape,
TQT_TQOBJECT(this), TQT_SIGNAL(stopOperations()), this, TQT_SIGNAL(stopOperations()),
actionCollection(), "view_stop_operations" ); actionCollection(), "view_stop_operations" );
action->setEnabled( false ); action->setEnabled( false );
(void) new TDEAction( i18n("New Key Pair..."), "document-new", 0, (void) new TDEAction( i18n("New Key Pair..."), "document-new", 0,
TQT_TQOBJECT(this), TQT_SLOT(newCertificate()), this, TQT_SLOT(newCertificate()),
actionCollection(), "file_new_certificate" ); actionCollection(), "file_new_certificate" );
connect( new TDEToggleAction( i18n("Hierarchical Key List"), 0, connect( new TDEToggleAction( i18n("Hierarchical Key List"), 0,
@ -276,100 +276,100 @@ void CertManager::createActions() {
TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggleHierarchicalView(bool)) ); TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggleHierarchicalView(bool)) );
action = new TDEAction( i18n("Expand All"), 0, CTRL+Key_Period, action = new TDEAction( i18n("Expand All"), 0, CTRL+Key_Period,
TQT_TQOBJECT(this), TQT_SLOT(slotExpandAll()), this, TQT_SLOT(slotExpandAll()),
actionCollection(), "view_expandall" ); actionCollection(), "view_expandall" );
action = new TDEAction( i18n("Collapse All"), 0, CTRL+Key_Comma, action = new TDEAction( i18n("Collapse All"), 0, CTRL+Key_Comma,
TQT_TQOBJECT(this), TQT_SLOT(slotCollapseAll()), this, TQT_SLOT(slotCollapseAll()),
actionCollection(), "view_collapseall" ); actionCollection(), "view_collapseall" );
(void) new TDEAction( i18n("Refresh CRLs"), 0, 0, (void) new TDEAction( i18n("Refresh CRLs"), 0, 0,
TQT_TQOBJECT(this), TQT_SLOT(slotRefreshKeys()), this, TQT_SLOT(slotRefreshKeys()),
actionCollection(), "certificates_refresh_clr" ); actionCollection(), "certificates_refresh_clr" );
#ifdef NOT_IMPLEMENTED_ANYWAY #ifdef NOT_IMPLEMENTED_ANYWAY
mRevokeCertificateAction = new TDEAction( i18n("Revoke"), 0, mRevokeCertificateAction = new TDEAction( i18n("Revoke"), 0,
TQT_TQOBJECT(this), TQT_SLOT(revokeCertificate()), this, TQT_SLOT(revokeCertificate()),
actionCollection(), "edit_revoke_certificate" ); actionCollection(), "edit_revoke_certificate" );
connectEnableOperationSignal( this, mRevokeCertificateAction ); connectEnableOperationSignal( this, mRevokeCertificateAction );
mExtendCertificateAction = new TDEAction( i18n("Extend"), 0, mExtendCertificateAction = new TDEAction( i18n("Extend"), 0,
TQT_TQOBJECT(this), TQT_SLOT(extendCertificate()), this, TQT_SLOT(extendCertificate()),
actionCollection(), "edit_extend_certificate" ); actionCollection(), "edit_extend_certificate" );
connectEnableOperationSignal( this, mExtendCertificateAction ); connectEnableOperationSignal( this, mExtendCertificateAction );
#endif #endif
mDeleteCertificateAction = new TDEAction( i18n("Delete"), "edit-delete", Key_Delete, mDeleteCertificateAction = new TDEAction( i18n("Delete"), "edit-delete", Key_Delete,
TQT_TQOBJECT(this), TQT_SLOT(slotDeleteCertificate()), this, TQT_SLOT(slotDeleteCertificate()),
actionCollection(), "edit_delete_certificate" ); actionCollection(), "edit_delete_certificate" );
connectEnableOperationSignal( TQT_TQOBJECT(this), mDeleteCertificateAction ); connectEnableOperationSignal( this, mDeleteCertificateAction );
mValidateCertificateAction = new TDEAction( i18n("Validate"), "reload", SHIFT + Key_F5, mValidateCertificateAction = new TDEAction( i18n("Validate"), "reload", SHIFT + Key_F5,
TQT_TQOBJECT(this), TQT_SLOT(slotValidate()), this, TQT_SLOT(slotValidate()),
actionCollection(), "certificates_validate" ); actionCollection(), "certificates_validate" );
connectEnableOperationSignal( TQT_TQOBJECT(this), mValidateCertificateAction ); connectEnableOperationSignal( this, mValidateCertificateAction );
mImportCertFromFileAction = new TDEAction( i18n("Import Certificates..."), 0, mImportCertFromFileAction = new TDEAction( i18n("Import Certificates..."), 0,
TQT_TQOBJECT(this), TQT_SLOT(slotImportCertFromFile()), this, TQT_SLOT(slotImportCertFromFile()),
actionCollection(), "file_import_certificates" ); actionCollection(), "file_import_certificates" );
connectEnableOperationSignal( TQT_TQOBJECT(this), mImportCertFromFileAction ); connectEnableOperationSignal( this, mImportCertFromFileAction );
mImportCRLFromFileAction = new TDEAction( i18n("Import CRLs..."), 0, mImportCRLFromFileAction = new TDEAction( i18n("Import CRLs..."), 0,
TQT_TQOBJECT(this), TQT_SLOT(importCRLFromFile()), this, TQT_SLOT(importCRLFromFile()),
actionCollection(), "file_import_crls" ); actionCollection(), "file_import_crls" );
connectEnableOperationSignal( TQT_TQOBJECT(this), mImportCRLFromFileAction ); connectEnableOperationSignal( this, mImportCRLFromFileAction );
mExportCertificateAction = new TDEAction( i18n("Export Certificates..."), "export", 0, mExportCertificateAction = new TDEAction( i18n("Export Certificates..."), "export", 0,
TQT_TQOBJECT(this), TQT_SLOT(slotExportCertificate()), this, TQT_SLOT(slotExportCertificate()),
actionCollection(), "file_export_certificate" ); actionCollection(), "file_export_certificate" );
mExportSecretKeyAction = new TDEAction( i18n("Export Secret Key..."), "export", 0, mExportSecretKeyAction = new TDEAction( i18n("Export Secret Key..."), "export", 0,
TQT_TQOBJECT(this), TQT_SLOT(slotExportSecretKey()), this, TQT_SLOT(slotExportSecretKey()),
actionCollection(), "file_export_secret_keys" ); actionCollection(), "file_export_secret_keys" );
connectEnableOperationSignal( TQT_TQOBJECT(this), mExportSecretKeyAction ); connectEnableOperationSignal( this, mExportSecretKeyAction );
mViewCertDetailsAction = new TDEAction( i18n("Certificate Details..."), 0, 0, mViewCertDetailsAction = new TDEAction( i18n("Certificate Details..."), 0, 0,
TQT_TQOBJECT(this), TQT_SLOT(slotViewDetails()), actionCollection(), this, TQT_SLOT(slotViewDetails()), actionCollection(),
"view_certificate_details" ); "view_certificate_details" );
mDownloadCertificateAction = new TDEAction( i18n( "Download"), 0, 0, mDownloadCertificateAction = new TDEAction( i18n( "Download"), 0, 0,
TQT_TQOBJECT(this), TQT_SLOT(slotDownloadCertificate()), actionCollection(), this, TQT_SLOT(slotDownloadCertificate()), actionCollection(),
"download_certificate" ); "download_certificate" );
const TQString dirmngr = TDEStandardDirs::findExe( "gpgsm" ); const TQString dirmngr = TDEStandardDirs::findExe( "gpgsm" );
mDirMngrFound = !dirmngr.isEmpty(); mDirMngrFound = !dirmngr.isEmpty();
action = new TDEAction( i18n("Dump CRL Cache..."), 0, action = new TDEAction( i18n("Dump CRL Cache..."), 0,
TQT_TQOBJECT(this), TQT_SLOT(slotViewCRLs()), this, TQT_SLOT(slotViewCRLs()),
actionCollection(), "crl_dump_crl_cache" ); actionCollection(), "crl_dump_crl_cache" );
action->setEnabled( mDirMngrFound ); // we also need dirmngr for this action->setEnabled( mDirMngrFound ); // we also need dirmngr for this
action = new TDEAction( i18n("Clear CRL Cache..."), 0, action = new TDEAction( i18n("Clear CRL Cache..."), 0,
TQT_TQOBJECT(this), TQT_SLOT(slotClearCRLs()), this, TQT_SLOT(slotClearCRLs()),
actionCollection(), "crl_clear_crl_cache" ); actionCollection(), "crl_clear_crl_cache" );
action->setEnabled( mDirMngrFound ); // we also need dirmngr for this action->setEnabled( mDirMngrFound ); // we also need dirmngr for this
action = new TDEAction( i18n("GnuPG Log Viewer..."), "pgp-keys", 0, TQT_TQOBJECT(this), action = new TDEAction( i18n("GnuPG Log Viewer..."), "pgp-keys", 0, this,
TQT_SLOT(slotStartWatchGnuPG()), actionCollection(), "tools_start_kwatchgnupg"); TQT_SLOT(slotStartWatchGnuPG()), actionCollection(), "tools_start_kwatchgnupg");
// disable action if no kwatchgnupg binary is around // disable action if no kwatchgnupg binary is around
if (TDEStandardDirs::findExe("kwatchgnupg").isEmpty()) action->setEnabled(false); if (TDEStandardDirs::findExe("kwatchgnupg").isEmpty()) action->setEnabled(false);
(void)new LabelAction( i18n("Search:"), actionCollection(), "label_action" ); (void)new LabelAction( i18n("Search:"), actionCollection(), "label_action" );
mLineEditAction = new LineEditAction( TQString(), actionCollection(), TQT_TQOBJECT(this), mLineEditAction = new LineEditAction( TQString(), actionCollection(), this,
TQT_SLOT(slotSearch()), TQT_SLOT(slotSearch()),
"query_lineedit_action"); "query_lineedit_action");
TQStringList lst; TQStringList lst;
lst << i18n("In Local Certificates") << i18n("In External Certificates"); lst << i18n("In Local Certificates") << i18n("In External Certificates");
mComboAction = new ComboAction( lst, actionCollection(), TQT_TQOBJECT(this), TQT_SLOT( slotToggleRemote(int) ), mComboAction = new ComboAction( lst, actionCollection(), this, TQT_SLOT( slotToggleRemote(int) ),
"location_combo_action", mNextFindRemote? 1 : 0 ); "location_combo_action", mNextFindRemote? 1 : 0 );
mFindAction = new TDEAction( i18n("Find"), "edit-find", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSearch()), mFindAction = new TDEAction( i18n("Find"), "edit-find", 0, this, TQT_SLOT(slotSearch()),
actionCollection(), "find" ); actionCollection(), "find" );
KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT(slotEditKeybindings()), actionCollection() ); KStdAction::keyBindings( this, TQT_SLOT(slotEditKeybindings()), actionCollection() );
KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT(slotShowConfigurationDialog()), actionCollection() ); KStdAction::preferences( this, TQT_SLOT(slotShowConfigurationDialog()), actionCollection() );
new TDEAction( i18n( "Configure &GpgME Backend" ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigureGpgME()), new TDEAction( i18n( "Configure &GpgME Backend" ), 0, 0, this, TQT_SLOT(slotConfigureGpgME()),
actionCollection(), "configure_gpgme" ); actionCollection(), "configure_gpgme" );
createStandardStatusBarAction(); createStandardStatusBarAction();
@ -1031,7 +1031,7 @@ void CertManager::slotDeleteCertificate() {
return; return;
if ( !mHierarchyAnalyser ) { if ( !mHierarchyAnalyser ) {
mHierarchyAnalyser = new HierarchyAnalyser( TQT_TQOBJECT(this), "mHierarchyAnalyser" ); mHierarchyAnalyser = new HierarchyAnalyser( this, "mHierarchyAnalyser" );
Kleo::KeyListJob * job = Kleo::CryptoBackendFactory::instance()->smime()->keyListJob(); Kleo::KeyListJob * job = Kleo::CryptoBackendFactory::instance()->smime()->keyListJob();
assert( job ); assert( job );
connect( job, TQT_SIGNAL(nextKey(const GpgME::Key&)), connect( job, TQT_SIGNAL(nextKey(const GpgME::Key&)),

14
certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
Unescape View File

@ -96,14 +96,14 @@ void KWatchGnuPGMainWindow::slotClear()
void KWatchGnuPGMainWindow::createActions() void KWatchGnuPGMainWindow::createActions()
{ {
(void)new TDEAction( i18n("C&lear History"), "history_clear", CTRL+Key_L, (void)new TDEAction( i18n("C&lear History"), "history_clear", CTRL+Key_L,
TQT_TQOBJECT(this), TQT_SLOT( slotClear() ), this, TQT_SLOT( slotClear() ),
actionCollection(), "clear_log" ); actionCollection(), "clear_log" );
(void)KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs()), actionCollection() ); (void)KStdAction::saveAs( this, TQT_SLOT(slotSaveAs()), actionCollection() );
(void)KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection() ); (void)KStdAction::close( this, TQT_SLOT(close()), actionCollection() );
(void)KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection() ); (void)KStdAction::quit( this, TQT_SLOT(slotQuit()), actionCollection() );
(void)KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actionCollection() ); (void)KStdAction::preferences( this, TQT_SLOT(slotConfigure()), actionCollection() );
(void)KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(configureShortcuts()), actionCollection()); (void)KStdAction::keyBindings(this, TQT_SLOT(configureShortcuts()), actionCollection());
(void)KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureToolbars()), actionCollection()); (void)KStdAction::configureToolbars(this, TQT_SLOT(slotConfigureToolbars()), actionCollection());
#if 0 #if 0
(void)new TDEAction( i18n("Configure KWatchGnuPG..."), TQString::fromLatin1("configure"), (void)new TDEAction( i18n("Configure KWatchGnuPG..."), TQString::fromLatin1("configure"),

2
certmanager/lib/ui/adddirectoryservicedialogimpl.cpp
Unescape View File

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

2
kaddressbook/addresseditwidget.cpp
Unescape View File

@ -281,7 +281,7 @@ AddressEditDialog::AddressEditDialog( const TDEABC::Address::List &list,
label->setBuddy( mStreetTextEdit ); label->setBuddy( mStreetTextEdit );
topLayout->addWidget( mStreetTextEdit, 1, 1 ); topLayout->addWidget( mStreetTextEdit, 1, 1 );
TabPressEater *eater = new TabPressEater( TQT_TQOBJECT(this) ); TabPressEater *eater = new TabPressEater( this );
mStreetTextEdit->installEventFilter( eater ); mStreetTextEdit->installEventFilter( eater );
label = new TQLabel( i18n( "<postOfficeBoxLabel>:", "%1:" ).arg( TDEABC::Address::postOfficeBoxLabel() ), page ); label = new TQLabel( i18n( "<postOfficeBoxLabel>:", "%1:" ).arg( TDEABC::Address::postOfficeBoxLabel() ), page );

2
kaddressbook/customfieldswidget.cpp
Unescape View File

@ -54,7 +54,7 @@ AddFieldDialog::AddFieldDialog( TQWidget *parent, const char *name )
layout->addWidget( label, 0, 0 ); layout->addWidget( label, 0, 0 );
mTitle = new KLineEdit( page ); mTitle = new KLineEdit( page );
mTitle->setValidator( new TQRegExpValidator( TQRegExp( "([a-zA-Z]|\\d|-)+" ), TQT_TQOBJECT(mTitle) ) ); mTitle->setValidator( new TQRegExpValidator( TQRegExp( "([a-zA-Z]|\\d|-)+" ), mTitle ) );
label->setBuddy( mTitle ); label->setBuddy( mTitle );
layout->addWidget( mTitle, 0, 1 ); layout->addWidget( mTitle, 0, 1 );

4
kaddressbook/distributionlisteditor.cpp
Unescape View File

@ -159,7 +159,7 @@ KPIM::DistributionListEditor::EditorWidget::EditorWidget( TDEABC::AddressBook* b
d->addressBook = book; d->addressBook = book;
Q_ASSERT( d->addressBook ); Q_ASSERT( d->addressBook );
d->lastLineId = 0; d->lastLineId = 0;
d->mapper = new TQSignalMapper( TQT_TQOBJECT(this) ); d->mapper = new TQSignalMapper( this );
connect( d->mapper, TQT_SIGNAL( mapped( int ) ), connect( d->mapper, TQT_SIGNAL( mapped( int ) ),
this, TQT_SLOT( lineTextChanged( int ) ) ); this, TQT_SLOT( lineTextChanged( int ) ) );
setCaption( i18n( "Edit Distribution List" ) ); setCaption( i18n( "Edit Distribution List" ) );
@ -250,7 +250,7 @@ KPIM::DistributionListEditor::Line* KPIM::DistributionListEditor::EditorWidgetPr
addressees.append( line ); addressees.append( line );
TQObject::connect( line, TQT_SIGNAL( textChanged() ), TQObject::connect( line, TQT_SIGNAL( textChanged() ),
mapper, TQT_SLOT( map() ) ); mapper, TQT_SLOT( map() ) );
mapper->setMapping( TQT_TQOBJECT(line), ++lastLineId ); mapper->setMapping( line, ++lastLineId );
line->setShown( true ); line->setShown( true );
return line; return line;
} }

6
kaddressbook/filtereditdialog.cpp
Unescape View File

@ -266,10 +266,10 @@ void FilterDialog::initGUI()
TQT_SLOT( edit() ) ); TQT_SLOT( edit() ) );
KButtonBox *buttonBox = new KButtonBox( page, TQt::Vertical ); KButtonBox *buttonBox = new KButtonBox( page, TQt::Vertical );
buttonBox->addButton( i18n( "&Add..." ), TQT_TQOBJECT(this), TQT_SLOT( add() ) ); buttonBox->addButton( i18n( "&Add..." ), this, TQT_SLOT( add() ) );
mEditButton = buttonBox->addButton( i18n( "&Edit..." ), TQT_TQOBJECT(this), TQT_SLOT( edit() ) ); mEditButton = buttonBox->addButton( i18n( "&Edit..." ), this, TQT_SLOT( edit() ) );
mEditButton->setEnabled( false ); mEditButton->setEnabled( false );
mRemoveButton = buttonBox->addButton( i18n( "&Remove" ), TQT_TQOBJECT(this), TQT_SLOT( remove() ) ); mRemoveButton = buttonBox->addButton( i18n( "&Remove" ), this, TQT_SLOT( remove() ) );
mRemoveButton->setEnabled( false ); mRemoveButton->setEnabled( false );
buttonBox->layout(); buttonBox->layout();

6
kaddressbook/kabcore.cpp
Unescape View File

@ -94,7 +94,7 @@
KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *parent, KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *parent,
const TQString &file, const char *name ) const TQString &file, const char *name )
: KAB::Core( client, TQT_TQOBJECT(parent), name ), mStatusBar( 0 ), mViewManager( 0 ), : KAB::Core( client, parent, name ), mStatusBar( 0 ), mViewManager( 0 ),
mExtensionManager( 0 ), mJumpButtonBar( 0 ), mCategorySelectDialog( 0 ), mExtensionManager( 0 ), mJumpButtonBar( 0 ), mCategorySelectDialog( 0 ),
mCategoryEditDialog( 0 ), mLdapSearchDialog( 0 ), mReadWrite( readWrite ), mCategoryEditDialog( 0 ), mLdapSearchDialog( 0 ), mReadWrite( readWrite ),
mModified( false ) mModified( false )
@ -140,7 +140,7 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *parent,
mAddressBook->addCustomField( i18n( "Blog" ), TDEABC::Field::Personal, mAddressBook->addCustomField( i18n( "Blog" ), TDEABC::Field::Personal,
"BlogFeed", "KADDRESSBOOK" ); "BlogFeed", "KADDRESSBOOK" );
mSearchManager = new KAB::SearchManager( mAddressBook, TQT_TQOBJECT(parent) ); mSearchManager = new KAB::SearchManager( mAddressBook, parent );
connect( mSearchManager, TQT_SIGNAL( contactsUpdated() ), connect( mSearchManager, TQT_SIGNAL( contactsUpdated() ),
this, TQT_SLOT( slotContactsUpdated() ) ); this, TQT_SLOT( slotContactsUpdated() ) );
@ -1292,7 +1292,7 @@ void KABCore::initGUI()
topLayout->setStretchFactor( mDetailsSplitter, 1 ); topLayout->setStretchFactor( mDetailsSplitter, 1 );
mXXPortManager = new XXPortManager( this, TQT_TQOBJECT(mWidget) ); mXXPortManager = new XXPortManager( this, mWidget );
initActions(); initActions();
} }

6
kaddressbook/kaddressbookmain.cpp
Unescape View File

@ -150,13 +150,13 @@ bool KAddressBookMain::queryClose()
void KAddressBookMain::initActions() void KAddressBookMain::initActions()
{ {
KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() ); KStdAction::quit( this, TQT_SLOT( close() ), actionCollection() );
TDEAction *action; TDEAction *action;
action = KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( configureKeyBindings() ), actionCollection() ); action = KStdAction::keyBindings( this, TQT_SLOT( configureKeyBindings() ), actionCollection() );
action->setWhatsThis( i18n( "You will be presented with a dialog, where you can configure the application wide shortcuts." ) ); action->setWhatsThis( i18n( "You will be presented with a dialog, where you can configure the application wide shortcuts." ) );
KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT( configureToolbars() ), actionCollection() ); KStdAction::configureToolbars( this, TQT_SLOT( configureToolbars() ), actionCollection() );
} }
void KAddressBookMain::configureKeyBindings() void KAddressBookMain::configureKeyBindings()

6
kaddressbook/kcmconfigs/addresseewidget.cpp
Unescape View File

@ -56,10 +56,10 @@ NamePartWidget::NamePartWidget( const TQString &title, const TQString &label,
groupLayout->addWidget( mBox, 0, 0 ); groupLayout->addWidget( mBox, 0, 0 );
KButtonBox *bbox = new KButtonBox( group, TQt::Vertical ); KButtonBox *bbox = new KButtonBox( group, TQt::Vertical );
mAddButton = bbox->addButton( i18n( "Add..." ), TQT_TQOBJECT(this), TQT_SLOT( add() ) ); mAddButton = bbox->addButton( i18n( "Add..." ), this, TQT_SLOT( add() ) );
mEditButton = bbox->addButton( i18n( "Edit..." ), TQT_TQOBJECT(this), TQT_SLOT( edit() ) ); mEditButton = bbox->addButton( i18n( "Edit..." ), this, TQT_SLOT( edit() ) );
mEditButton->setEnabled( false ); mEditButton->setEnabled( false );
mRemoveButton = bbox->addButton( i18n( "Remove" ), TQT_TQOBJECT(this), TQT_SLOT( remove() ) ); mRemoveButton = bbox->addButton( i18n( "Remove" ), this, TQT_SLOT( remove() ) );
mRemoveButton->setEnabled( false ); mRemoveButton->setEnabled( false );
bbox->layout(); bbox->layout();
groupLayout->addWidget( bbox, 0, 1 ); groupLayout->addWidget( bbox, 0, 1 );

6
kaddressbook/kcmconfigs/ldapoptionswidget.cpp
Unescape View File

@ -288,10 +288,10 @@ void LDAPOptionsWidget::initGUI()
layout->addWidget( groupBox ); layout->addWidget( groupBox );
KButtonBox *buttons = new KButtonBox( this ); KButtonBox *buttons = new KButtonBox( this );
buttons->addButton( i18n( "&Add Host..." ), TQT_TQOBJECT(this), TQT_SLOT( slotAddHost() ) ); buttons->addButton( i18n( "&Add Host..." ), this, TQT_SLOT( slotAddHost() ) );
mEditButton = buttons->addButton( i18n( "&Edit Host..." ), TQT_TQOBJECT(this), TQT_SLOT( slotEditHost() ) ); mEditButton = buttons->addButton( i18n( "&Edit Host..." ), this, TQT_SLOT( slotEditHost() ) );
mEditButton->setEnabled( false ); mEditButton->setEnabled( false );
mRemoveButton = buttons->addButton( i18n( "&Remove Host" ), TQT_TQOBJECT(this), TQT_SLOT( slotRemoveHost() ) ); mRemoveButton = buttons->addButton( i18n( "&Remove Host" ), this, TQT_SLOT( slotRemoveHost() ) );
mRemoveButton->setEnabled( false ); mRemoveButton->setEnabled( false );
buttons->layout(); buttons->layout();

6
kaddressbook/ldapsearchdialog.cpp
Unescape View File

@ -203,8 +203,8 @@ LDAPSearchDialog::LDAPSearchDialog( TDEABC::AddressBook *ab, KABCore *core,
topLayout->addWidget( mResultListView ); topLayout->addWidget( mResultListView );
KButtonBox *buttons = new KButtonBox( page, TQt::Horizontal ); KButtonBox *buttons = new KButtonBox( page, TQt::Horizontal );
buttons->addButton( i18n( "Select All" ), TQT_TQOBJECT(this), TQT_SLOT( slotSelectAll() ) ); buttons->addButton( i18n( "Select All" ), this, TQT_SLOT( slotSelectAll() ) );
buttons->addButton( i18n( "Unselect All" ), TQT_TQOBJECT(this), TQT_SLOT( slotUnselectAll() ) ); buttons->addButton( i18n( "Unselect All" ), this, TQT_SLOT( slotUnselectAll() ) );
topLayout->addWidget( buttons ); topLayout->addWidget( buttons );
@ -264,7 +264,7 @@ void LDAPSearchDialog::restoreSettings()
} else { } else {
mIsOK = true; mIsOK = true;
for ( int j = 0; j < mNumHosts; ++j ) { for ( int j = 0; j < mNumHosts; ++j ) {
KPIM::LdapClient* ldapClient = new KPIM::LdapClient( 0, TQT_TQOBJECT(this), "ldapclient" ); KPIM::LdapClient* ldapClient = new KPIM::LdapClient( 0, this, "ldapclient" );
KPIM::LdapServer ldapServer; KPIM::LdapServer ldapServer;
KPIM::LdapSearch::readConfig( ldapServer, config, j, true ); KPIM::LdapSearch::readConfig( ldapServer, config, j, true );
ldapClient->setServer( ldapServer ); ldapClient->setServer( ldapServer );

4
kaddressbook/phoneeditwidget.cpp
Unescape View File

@ -183,7 +183,7 @@ PhoneEditWidget::PhoneEditWidget( TQWidget *parent, const char *name )
mRemoveButton->setMaximumSize( mRemoveButton->sizeHint() ); mRemoveButton->setMaximumSize( mRemoveButton->sizeHint() );
layout->addWidget( mRemoveButton, 1, 1 ); layout->addWidget( mRemoveButton, 1, 1 );
mMapper = new TQSignalMapper( TQT_TQOBJECT(this) ); mMapper = new TQSignalMapper( this );
connect( mMapper, TQT_SIGNAL( mapped( int ) ), TQT_SLOT( changed( int ) ) ); connect( mMapper, TQT_SIGNAL( mapped( int ) ), TQT_SLOT( changed( int ) ) );
connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( add() ) ); connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( add() ) );
@ -271,7 +271,7 @@ void PhoneEditWidget::recreateNumberWidgets()
PhoneNumberWidget *wdg = new PhoneNumberWidget( this ); PhoneNumberWidget *wdg = new PhoneNumberWidget( this );
wdg->setNumber( *it ); wdg->setNumber( *it );
mMapper->setMapping( TQT_TQOBJECT(wdg), counter ); mMapper->setMapping( wdg, counter );
connect( wdg, TQT_SIGNAL( modified() ), mMapper, TQT_SLOT( map() ) ); connect( wdg, TQT_SIGNAL( modified() ), mMapper, TQT_SLOT( map() ) );
mWidgetLayout->addWidget( wdg ); mWidgetLayout->addWidget( wdg );

10
kaddressbook/viewmanager.cpp
Unescape View File

@ -573,27 +573,27 @@ void ViewManager::initActions()
TDEAction *action; TDEAction *action;
action = new TDEAction( i18n( "Modify View..." ), "configure", 0, TQT_TQOBJECT(this), action = new TDEAction( i18n( "Modify View..." ), "configure", 0, this,
TQT_SLOT( editView() ), mCore->actionCollection(), TQT_SLOT( editView() ), mCore->actionCollection(),
"view_modify" ); "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->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, TQT_TQOBJECT(this), action = new TDEAction( i18n( "Add View..." ), "window-new", 0, this,
TQT_SLOT( addView() ), mCore->actionCollection(), TQT_SLOT( addView() ), mCore->actionCollection(),
"view_add" ); "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." ) ); 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, mActionDeleteView = new TDEAction( i18n( "Delete View" ), "view_remove", 0,
TQT_TQOBJECT(this), TQT_SLOT( deleteView() ), this, TQT_SLOT( deleteView() ),
mCore->actionCollection(), "view_delete" ); mCore->actionCollection(), "view_delete" );
mActionDeleteView->setWhatsThis( i18n( "By pressing this button you can delete the actual view, which you have added before." ) ); 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, TQT_TQOBJECT(this), action = new TDEAction( i18n( "Refresh View" ), "reload", 0, this,
TQT_SLOT( refreshView() ), mCore->actionCollection(), TQT_SLOT( refreshView() ), mCore->actionCollection(),
"view_refresh" ); "view_refresh" );
action->setWhatsThis( i18n( "The view will be refreshed by pressing this button." ) ); action->setWhatsThis( i18n( "The view will be refreshed by pressing this button." ) );
action = new TDEAction( i18n( "Edit &Filters..." ), "filter", 0, TQT_TQOBJECT(this), action = new TDEAction( i18n( "Edit &Filters..." ), "filter", 0, this,
TQT_SLOT( configureFilters() ), mCore->actionCollection(), TQT_SLOT( configureFilters() ), mCore->actionCollection(),
"options_edit_filters" ); "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." ) ); action->setWhatsThis( i18n( "Edit the contact filters<p>You will be presented with a dialog, where you can add, remove and edit filters." ) );

2
kalarm/alarmtimewidget.cpp
Unescape View File

@ -182,7 +182,7 @@ void AlarmTimeWidget::init(int mode)
setButton(id(mAtTimeRadio)); setButton(id(mAtTimeRadio));
// Timeout every minute to update alarm time fields. // Timeout every minute to update alarm time fields.
MinuteTimer::connect(TQT_TQOBJECT(this), TQT_SLOT(slotTimer())); MinuteTimer::connect(this, TQT_SLOT(slotTimer()));
} }
/****************************************************************************** /******************************************************************************

4
kalarm/birthdaydlg.cpp
Unescape View File

@ -421,7 +421,7 @@ BListView::BListView(TQWidget* parent, const char* name)
: TDEListView(parent, name) : TDEListView(parent, name)
{ {
TDEAccel* accel = new TDEAccel(this); TDEAccel* accel = new TDEAccel(this);
accel->insert(TDEStdAccel::SelectAll, TQT_TQOBJECT(this), TQT_SLOT(slotSelectAll())); accel->insert(TDEStdAccel::SelectAll, this, TQT_SLOT(slotSelectAll()));
accel->insert(TDEStdAccel::Deselect, TQT_TQOBJECT(this), TQT_SLOT(slotDeselect())); accel->insert(TDEStdAccel::Deselect, this, TQT_SLOT(slotDeselect()));
accel->readSettings(); accel->readSettings();
} }

4
kalarm/functions.cpp
Unescape View File

@ -747,7 +747,7 @@ bool readConfigWindowSize(const char* window, TQSize& result)
{ {
TDEConfig* config = TDEGlobal::config(); TDEConfig* config = TDEGlobal::config();
config->setGroup(TQString::fromLatin1(window)); config->setGroup(TQString::fromLatin1(window));
TQWidget* desktop = TQT_TQWIDGET(TDEApplication::desktop()); TQWidget* desktop = TDEApplication::desktop();
TQSize s = TQSize(config->readNumEntry(TQString::fromLatin1("Width %1").arg(desktop->width()), 0), TQSize s = TQSize(config->readNumEntry(TQString::fromLatin1("Width %1").arg(desktop->width()), 0),
config->readNumEntry(TQString::fromLatin1("Height %1").arg(desktop->height()), 0)); config->readNumEntry(TQString::fromLatin1("Height %1").arg(desktop->height()), 0));
if (s.isEmpty()) if (s.isEmpty())
@ -764,7 +764,7 @@ void writeConfigWindowSize(const char* window, const TQSize& size)
{ {
TDEConfig* config = TDEGlobal::config(); TDEConfig* config = TDEGlobal::config();
config->setGroup(TQString::fromLatin1(window)); config->setGroup(TQString::fromLatin1(window));
TQWidget* desktop = TQT_TQWIDGET(TDEApplication::desktop()); TQWidget* desktop = TDEApplication::desktop();
config->writeEntry(TQString::fromLatin1("Width %1").arg(desktop->width()), size.width()); config->writeEntry(TQString::fromLatin1("Width %1").arg(desktop->width()), size.width());
config->writeEntry(TQString::fromLatin1("Height %1").arg(desktop->height()), size.height()); config->writeEntry(TQString::fromLatin1("Height %1").arg(desktop->height()), size.height());
config->sync(); config->sync();

2
kalarm/kalarmapp.cpp
Unescape View File

@ -109,7 +109,7 @@ KAlarmApp::KAlarmApp()
mSpeechEnabled(false) mSpeechEnabled(false)
{ {
Preferences::initialise(); Preferences::initialise();
Preferences::connect(TQT_SIGNAL(preferencesChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotPreferencesChanged())); Preferences::connect(TQT_SIGNAL(preferencesChanged()), this, TQT_SLOT(slotPreferencesChanged()));
KCal::CalFormat::setApplication(aboutData()->programName(), AlarmCalendar::icalProductId()); KCal::CalFormat::setApplication(aboutData()->programName(), AlarmCalendar::icalProductId());
KARecurrence::setDefaultFeb29Type(Preferences::defaultFeb29Type()); KARecurrence::setDefaultFeb29Type(Preferences::defaultFeb29Type());

2
kalarm/lib/colourcombo.cpp
Unescape View File

@ -41,7 +41,7 @@ ColourCombo::ColourCombo(TQWidget* parent, const char* name, const TQColor& defa
addColours(); addColours();
connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int))); connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int)));
connect(this, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotHighlighted(int))); connect(this, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotHighlighted(int)));
Preferences::connect(TQT_SIGNAL(preferencesChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotPreferencesChanged())); Preferences::connect(TQT_SIGNAL(preferencesChanged()), this, TQT_SLOT(slotPreferencesChanged()));
} }
void ColourCombo::setColour(const TQColor& colour) void ColourCombo::setColour(const TQColor& colour)

2
kalarm/lib/label.cpp
Unescape View File

@ -55,7 +55,7 @@ void Label::setBuddy(TQWidget* bud)
if (w) if (w)
{ {
while (w->focusProxy()) while (w->focusProxy())
w = TQT_TQWIDGET(w->focusProxy()); w = w->focusProxy();
if (!w->inherits("TQRadioButton")) if (!w->inherits("TQRadioButton"))
w = 0; w = 0;
} }

2
kalarm/lib/timespinbox.cpp
Unescape View File

@ -31,7 +31,7 @@ class TimeSpinBox::TimeValidator : public TQValidator
{ {
public: public:
TimeValidator(int minMin, int maxMin, TQWidget* parent, const char* name = 0) TimeValidator(int minMin, int maxMin, TQWidget* parent, const char* name = 0)
: TQValidator(TQT_TQOBJECT(parent), name), : TQValidator(parent, name),
minMinute(minMin), maxMinute(maxMin), m12Hour(false), mPm(false) { } minMinute(minMin), maxMinute(maxMin), m12Hour(false), mPm(false) { }
virtual State validate(TQString&, int&) const; virtual State validate(TQString&, int&) const;
int minMinute, maxMinute; int minMinute, maxMinute;

70
kalarm/mainwindow.cpp
Unescape View File

@ -182,7 +182,7 @@ MainWindow::~MainWindow()
else else
theApp()->trayWindow()->removeWindow(this); theApp()->trayWindow()->removeWindow(this);
} }
MinuteTimer::disconnect(TQT_TQOBJECT(this)); MinuteTimer::disconnect(this);
mMinuteTimerActive = false; // to ensure that setUpdateTimer() works correctly mMinuteTimerActive = false; // to ensure that setUpdateTimer() works correctly
setUpdateTimer(); setUpdateTimer();
MainWindow* main = mainMainWindow(); MainWindow* main = mainMainWindow();
@ -326,55 +326,55 @@ void MainWindow::columnsReordered()
void MainWindow::initActions() void MainWindow::initActions()
{ {
TDEActionCollection* actions = actionCollection(); TDEActionCollection* actions = actionCollection();
mActionTemplates = new TDEAction(i18n("&Templates..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTemplates()), actions, "templates"); mActionTemplates = new TDEAction(i18n("&Templates..."), 0, this, TQT_SLOT(slotTemplates()), actions, "templates");
mActionNew = KAlarm::createNewAlarmAction(i18n("&New..."), TQT_TQOBJECT(this), TQT_SLOT(slotNew()), actions, "new"); mActionNew = KAlarm::createNewAlarmAction(i18n("&New..."), this, TQT_SLOT(slotNew()), actions, "new");
mActionNewFromTemplate = KAlarm::createNewFromTemplateAction(i18n("New &From Template"), TQT_TQOBJECT(this), TQT_SLOT(slotNewFromTemplate(const KAEvent&)), actions, "newFromTempl"); mActionNewFromTemplate = KAlarm::createNewFromTemplateAction(i18n("New &From Template"), this, TQT_SLOT(slotNewFromTemplate(const KAEvent&)), actions, "newFromTempl");
mActionCreateTemplate = new TDEAction(i18n("Create Tem&plate..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewTemplate()), actions, "createTemplate"); 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, TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), actions, "copy"); 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, TQT_TQOBJECT(this), TQT_SLOT(slotModify()), actions, "modify"); 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, TQT_TQOBJECT(this), TQT_SLOT(slotDelete()), actions, "delete"); 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, TQT_TQOBJECT(this), TQT_SLOT(slotReactivate()), actions, "undelete"); 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, TQT_TQOBJECT(this), TQT_SLOT(slotEnable()), actions, "disable"); 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, TQT_TQOBJECT(this), TQT_SLOT(slotView()), actions, "view"); 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, TQT_TQOBJECT(this), TQT_SLOT(slotShowTime()), actions, "showAlarmTimes"); mActionShowTime = new TDEToggleAction(i18n_a_ShowAlarmTimes(), TQt::CTRL+TQt::Key_M, this, TQT_SLOT(slotShowTime()), actions, "showAlarmTimes");
mActionShowTime->setCheckedState(i18n("Hide &Alarm Times")); mActionShowTime->setCheckedState(i18n("Hide &Alarm Times"));
mActionShowTimeTo = new TDEToggleAction(i18n_o_ShowTimeToAlarms(), TQt::CTRL+TQt::Key_I, TQT_TQOBJECT(this), TQT_SLOT(slotShowTimeTo()), actions, "showTimeToAlarms"); mActionShowTimeTo = new TDEToggleAction(i18n_o_ShowTimeToAlarms(), TQt::CTRL+TQt::Key_I, this, TQT_SLOT(slotShowTimeTo()), actions, "showTimeToAlarms");
mActionShowTimeTo->setCheckedState(i18n("Hide Time t&o Alarms")); mActionShowTimeTo->setCheckedState(i18n("Hide Time t&o Alarms"));
mActionShowExpired = new TDEToggleAction(i18n_e_ShowExpiredAlarms(), "history", TQt::CTRL+TQt::Key_P, TQT_TQOBJECT(this), TQT_SLOT(slotShowExpired()), actions, "showExpiredAlarms"); mActionShowExpired = new TDEToggleAction(i18n_e_ShowExpiredAlarms(), "history", TQt::CTRL+TQt::Key_P, this, TQT_SLOT(slotShowExpired()), actions, "showExpiredAlarms");
mActionShowExpired->setCheckedState(i18n_e_HideExpiredAlarms()); mActionShowExpired->setCheckedState(i18n_e_HideExpiredAlarms());
mActionToggleTrayIcon = new TDEToggleAction(i18n("Show in System &Tray"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleTrayIcon()), actions, "showInSystemTray"); mActionToggleTrayIcon = new TDEToggleAction(i18n("Show in System &Tray"), 0, this, TQT_SLOT(slotToggleTrayIcon()), actions, "showInSystemTray");
mActionToggleTrayIcon->setCheckedState(i18n("Hide From System &Tray")); mActionToggleTrayIcon->setCheckedState(i18n("Hide From System &Tray"));
new TDEAction(i18n("Import &Alarms..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotImportAlarms()), actions, "importAlarms"); new TDEAction(i18n("Import &Alarms..."), 0, this, TQT_SLOT(slotImportAlarms()), actions, "importAlarms");
new TDEAction(i18n("Import &Birthdays..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotBirthdays()), actions, "importBirthdays"); new TDEAction(i18n("Import &Birthdays..."), 0, this, TQT_SLOT(slotBirthdays()), actions, "importBirthdays");
new TDEAction(i18n("&Refresh Alarms"), "reload", 0, TQT_TQOBJECT(this), TQT_SLOT(slotResetDaemon()), actions, "refreshAlarms"); new TDEAction(i18n("&Refresh Alarms"), "reload", 0, this, TQT_SLOT(slotResetDaemon()), actions, "refreshAlarms");
Daemon::createAlarmEnableAction(actions, "alarmEnable"); Daemon::createAlarmEnableAction(actions, "alarmEnable");
if (undoText.isNull()) if (undoText.isNull())
{ {
// Get standard texts, etc., for Undo and Redo actions // Get standard texts, etc., for Undo and Redo actions
TDEAction* act = KStdAction::undo(TQT_TQOBJECT(this), 0, actions); TDEAction* act = KStdAction::undo(this, 0, actions);
undoIcon = act->icon(); undoIcon = act->icon();
undoShortcut = act->shortcut(); undoShortcut = act->shortcut();
undoText = act->text(); undoText = act->text();
undoTextStripped = KAlarm::stripAccel(undoText); undoTextStripped = KAlarm::stripAccel(undoText);
delete act; delete act;
act = KStdAction::redo(TQT_TQOBJECT(this), 0, actions); act = KStdAction::redo(this, 0, actions);
redoIcon = act->icon(); redoIcon = act->icon();
redoShortcut = act->shortcut(); redoShortcut = act->shortcut();
redoText = act->text(); redoText = act->text();
redoTextStripped = KAlarm::stripAccel(redoText); redoTextStripped = KAlarm::stripAccel(redoText);
delete act; delete act;
} }
mActionUndo = new TDEToolBarPopupAction(undoText, undoIcon, undoShortcut, TQT_TQOBJECT(this), TQT_SLOT(slotUndo()), actions, "edit_undo"); mActionUndo = new TDEToolBarPopupAction(undoText, undoIcon, undoShortcut, this, TQT_SLOT(slotUndo()), actions, "edit_undo");
mActionRedo = new TDEToolBarPopupAction(redoText, redoIcon, redoShortcut, TQT_TQOBJECT(this), TQT_SLOT(slotRedo()), actions, "edit_redo"); mActionRedo = new TDEToolBarPopupAction(redoText, redoIcon, redoShortcut, this, TQT_SLOT(slotRedo()), actions, "edit_redo");
KStdAction::find(TQT_TQOBJECT(mListView), TQT_SLOT(slotFind()), actions); KStdAction::find(mListView, TQT_SLOT(slotFind()), actions);
mActionFindNext = KStdAction::findNext(TQT_TQOBJECT(mListView), TQT_SLOT(slotFindNext()), actions); mActionFindNext = KStdAction::findNext(mListView, TQT_SLOT(slotFindNext()), actions);
mActionFindPrev = KStdAction::findPrev(TQT_TQOBJECT(mListView), TQT_SLOT(slotFindPrev()), actions); mActionFindPrev = KStdAction::findPrev(mListView, TQT_SLOT(slotFindPrev()), actions);
KStdAction::selectAll(TQT_TQOBJECT(mListView), TQT_SLOT(slotSelectAll()), actions); KStdAction::selectAll(mListView, TQT_SLOT(slotSelectAll()), actions);
KStdAction::deselect(TQT_TQOBJECT(mListView), TQT_SLOT(slotDeselect()), actions); KStdAction::deselect(mListView, TQT_SLOT(slotDeselect()), actions);
KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actions); KStdAction::quit(this, TQT_SLOT(slotQuit()), actions);
KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureKeys()), actions); KStdAction::keyBindings(this, TQT_SLOT(slotConfigureKeys()), actions);
KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureToolbar()), actions); KStdAction::configureToolbars(this, TQT_SLOT(slotConfigureToolbar()), actions);
KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotPreferences()), actions); KStdAction::preferences(this, TQT_SLOT(slotPreferences()), actions);
setStandardToolBarMenuEnabled(true); setStandardToolBarMenuEnabled(true);
createGUI(UI_FILE); createGUI(UI_FILE);
@ -388,7 +388,7 @@ void MainWindow::initActions()
connect(mActionRedo->popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(slotRedoItem(int))); 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(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))); connect(mListView, TQT_SIGNAL(findActive(bool)), TQT_SLOT(slotFindActive(bool)));
Preferences::connect(TQT_SIGNAL(preferencesChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotPrefsChanged())); Preferences::connect(TQT_SIGNAL(preferencesChanged()), this, TQT_SLOT(slotPrefsChanged()));
connect(theApp(), TQT_SIGNAL(trayIconToggled()), TQT_SLOT(updateTrayIconAction())); connect(theApp(), TQT_SIGNAL(trayIconToggled()), TQT_SLOT(updateTrayIconAction()));
// Set menu item states // Set menu item states
@ -485,13 +485,13 @@ void MainWindow::setUpdateTimer()
{ {
// Timeout every minute. // Timeout every minute.
needTimer->mMinuteTimerActive = true; needTimer->mMinuteTimerActive = true;
MinuteTimer::connect(TQT_TQOBJECT(needTimer), TQT_SLOT(slotUpdateTimeTo())); MinuteTimer::connect(needTimer, TQT_SLOT(slotUpdateTimeTo()));
kdDebug(5950) << "MainWindow::setUpdateTimer(): started timer" << endl; kdDebug(5950) << "MainWindow::setUpdateTimer(): started timer" << endl;
} }
else if (!needTimer && timerWindow) else if (!needTimer && timerWindow)
{ {
timerWindow->mMinuteTimerActive = false; timerWindow->mMinuteTimerActive = false;
MinuteTimer::disconnect(TQT_TQOBJECT(timerWindow)); MinuteTimer::disconnect(timerWindow);
kdDebug(5950) << "MainWindow::setUpdateTimer(): stopped timer" << endl; kdDebug(5950) << "MainWindow::setUpdateTimer(): stopped timer" << endl;
} }
} }
@ -1088,7 +1088,7 @@ void MainWindow::slotConfigureToolbar()
{ {
saveMainWindowSettings(TDEGlobal::config(), WINDOW_NAME); saveMainWindowSettings(TDEGlobal::config(), WINDOW_NAME);
KEditToolbar dlg(factory()); KEditToolbar dlg(factory());
connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_TQOBJECT(this), TQT_SLOT(slotNewToolbarConfig())); connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(slotNewToolbarConfig()));
dlg.exec(); dlg.exec();
} }

12
kalarm/messagewin.cpp
Unescape View File

@ -429,12 +429,12 @@ void MessageWin::initView()
if (mDateTime.isDateOnly() || TQDate::currentDate().daysTo(mDateTime.date()) > 0) if (mDateTime.isDateOnly() || TQDate::currentDate().daysTo(mDateTime.date()) > 0)
{ {
setRemainingTextDay(); setRemainingTextDay();
MidnightTimer::connect(TQT_TQOBJECT(this), TQT_SLOT(setRemainingTextDay())); // update every day MidnightTimer::connect(this, TQT_SLOT(setRemainingTextDay())); // update every day
} }
else else
{ {
setRemainingTextMinute(); setRemainingTextMinute();
MinuteTimer::connect(TQT_TQOBJECT(this), TQT_SLOT(setRemainingTextMinute())); // update every minute MinuteTimer::connect(this, TQT_SLOT(setRemainingTextMinute())); // update every minute
} }
topLayout->addWidget(mRemainingText, 0, TQt::AlignHCenter); topLayout->addWidget(mRemainingText, 0, TQt::AlignHCenter);
topLayout->addSpacing(KDialog::spacingHint()); topLayout->addSpacing(KDialog::spacingHint());
@ -619,9 +619,9 @@ void MessageWin::setRemainingTextDay()
if (days <= 0 && !mDateTime.isDateOnly()) if (days <= 0 && !mDateTime.isDateOnly())
{ {
// The alarm is due today, so start refreshing every minute // The alarm is due today, so start refreshing every minute
MidnightTimer::disconnect(TQT_TQOBJECT(this), TQT_SLOT(setRemainingTextDay())); MidnightTimer::disconnect(this, TQT_SLOT(setRemainingTextDay()));
setRemainingTextMinute(); setRemainingTextMinute();
MinuteTimer::connect(TQT_TQOBJECT(this), TQT_SLOT(setRemainingTextMinute())); // update every minute MinuteTimer::connect(this, TQT_SLOT(setRemainingTextMinute())); // update every minute
} }
else else
{ {
@ -1497,7 +1497,7 @@ void MessageWin::setDeferralLimit(const KAEvent& event)
if (mDeferButton) if (mDeferButton)
{ {
mDeferLimit = event.deferralLimit().dateTime(); mDeferLimit = event.deferralLimit().dateTime();
MidnightTimer::connect(TQT_TQOBJECT(this), TQT_SLOT(checkDeferralLimit())); // check every day MidnightTimer::connect(this, TQT_SLOT(checkDeferralLimit())); // check every day
mDisableDeferral = false; mDisableDeferral = false;
checkDeferralLimit(); checkDeferralLimit();
} }
@ -1519,7 +1519,7 @@ void MessageWin::checkDeferralLimit()
int n = TQDate::currentDate().daysTo(mDeferLimit.date()); int n = TQDate::currentDate().daysTo(mDeferLimit.date());
if (n > 0) if (n > 0)
return; return;
MidnightTimer::disconnect(TQT_TQOBJECT(this), TQT_SLOT(checkDeferralLimit())); MidnightTimer::disconnect(this, TQT_SLOT(checkDeferralLimit()));
if (n == 0) if (n == 0)
{ {
// The deferral limit will be reached today // The deferral limit will be reached today

4
kalarm/templatedlg.cpp
Unescape View File

@ -80,8 +80,8 @@ TemplateDlg::TemplateDlg(TQWidget* parent, const char* name)
layout->addWidget(mDeleteButton); layout->addWidget(mDeleteButton);
TDEAccel* accel = new TDEAccel(this); TDEAccel* accel = new TDEAccel(this);
accel->insert(TDEStdAccel::SelectAll, TQT_TQOBJECT(mTemplateList), TQT_SLOT(slotSelectAll())); accel->insert(TDEStdAccel::SelectAll, mTemplateList, TQT_SLOT(slotSelectAll()));
accel->insert(TDEStdAccel::Deselect, TQT_TQOBJECT(mTemplateList), TQT_SLOT(slotDeselect())); accel->insert(TDEStdAccel::Deselect, mTemplateList, TQT_SLOT(slotDeselect()));
accel->readSettings(); accel->readSettings();
mTemplateList->refresh(); mTemplateList->refresh();

8
kalarm/traywindow.cpp
Unescape View File

@ -88,15 +88,15 @@ TrayWindow::TrayWindow(MainWindow* parent, const char* name)
AlarmEnableAction* a = Daemon::createAlarmEnableAction(actcol, "tAlarmEnable"); AlarmEnableAction* a = Daemon::createAlarmEnableAction(actcol, "tAlarmEnable");
a->plug(contextMenu()); a->plug(contextMenu());
connect(a, TQT_SIGNAL(switched(bool)), TQT_SLOT(setEnabledStatus(bool))); connect(a, TQT_SIGNAL(switched(bool)), TQT_SLOT(setEnabledStatus(bool)));
KAlarm::createNewAlarmAction(i18n("&New Alarm..."), TQT_TQOBJECT(this), TQT_SLOT(slotNewAlarm()), actcol, "tNew")->plug(contextMenu()); KAlarm::createNewAlarmAction(i18n("&New Alarm..."), this, TQT_SLOT(slotNewAlarm()), actcol, "tNew")->plug(contextMenu());
KAlarm::createNewFromTemplateAction(i18n("New Alarm From &Template"), TQT_TQOBJECT(this), TQT_SLOT(slotNewFromTemplate(const KAEvent&)), actcol, "tNewFromTempl")->plug(contextMenu()); KAlarm::createNewFromTemplateAction(i18n("New Alarm From &Template"), this, TQT_SLOT(slotNewFromTemplate(const KAEvent&)), actcol, "tNewFromTempl")->plug(contextMenu());
KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotPreferences()), actcol)->plug(contextMenu()); KStdAction::preferences(this, TQT_SLOT(slotPreferences()), actcol)->plug(contextMenu());
// Replace the default handler for the Quit context menu item // Replace the default handler for the Quit context menu item
const char* quitName = KStdAction::name(KStdAction::Quit); const char* quitName = KStdAction::name(KStdAction::Quit);
actcol->remove(actcol->action(quitName)); actcol->remove(actcol->action(quitName));
actcol->tdeaccel()->remove(quitName); actcol->tdeaccel()->remove(quitName);
KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actcol); KStdAction::quit(this, TQT_SLOT(slotQuit()), actcol);
// Set icon to correspond with the alarms enabled menu status // Set icon to correspond with the alarms enabled menu status
Daemon::checkStatus(); Daemon::checkStatus();

2
kalarm/undo.cpp
Unescape View File

@ -207,7 +207,7 @@ Undo::List Undo::mRedoList;
Undo* Undo::instance() Undo* Undo::instance()
{ {
if (!mInstance) if (!mInstance)
mInstance = new Undo(TQT_TQOBJECT(kapp)); mInstance = new Undo(kapp);
return mInstance; return mInstance;
} }

22
kandy/src/kandy.cpp
Unescape View File

@ -123,25 +123,25 @@ void Kandy::save(const TQString & filename)
void Kandy::setupActions() void Kandy::setupActions()
{ {
KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection()); KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection());
KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(fileSave()), actionCollection()); KStdAction::save(this, TQT_SLOT(fileSave()), actionCollection());
KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(fileSaveAs()), actionCollection()); KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection());
// KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(filePrint()), actionCollection()); // KStdAction::print(this, TQT_SLOT(filePrint()), actionCollection());
KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); KStdAction::quit(this, TQT_SLOT(close()), actionCollection());
createStandardStatusBarAction(); createStandardStatusBarAction();
setStandardToolBarMenuEnabled(true); setStandardToolBarMenuEnabled(true);
KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection()); KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection());
KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection()); KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection());
KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(optionsPreferences()), actionCollection()); KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection());
new TDEAction(i18n("Mobile GUI"),0,TQT_TQOBJECT(this),TQT_SLOT(showMobileGui()), new TDEAction(i18n("Mobile GUI"),0,this,TQT_SLOT(showMobileGui()),
actionCollection(),"show_mobilegui"); actionCollection(),"show_mobilegui");
mConnectAction = new TDEAction(i18n("Connect"),0,TQT_TQOBJECT(this),TQT_SLOT(modemConnect()), mConnectAction = new TDEAction(i18n("Connect"),0,this,TQT_SLOT(modemConnect()),
actionCollection(),"modem_connect"); actionCollection(),"modem_connect");
mDisconnectAction = new TDEAction(i18n("Disconnect"),0,TQT_TQOBJECT(this), mDisconnectAction = new TDEAction(i18n("Disconnect"),0,this,
TQT_SLOT(modemDisconnect()),actionCollection(), TQT_SLOT(modemDisconnect()),actionCollection(),
"modem_disconnect"); "modem_disconnect");

10
kandy/src/mobilemain.cpp
Unescape View File

@ -71,17 +71,17 @@ MobileMain::~MobileMain()
void MobileMain::setupActions() void MobileMain::setupActions()
{ {
KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); KStdAction::quit(this, TQT_SLOT(close()), actionCollection());
new TDEAction(i18n("Terminal"),0,TQT_TQOBJECT(this),TQT_SLOT(showTerminal()), new TDEAction(i18n("Terminal"),0,this,TQT_SLOT(showTerminal()),
actionCollection(),"show_terminal"); actionCollection(),"show_terminal");
createStandardStatusBarAction(); createStandardStatusBarAction();
setStandardToolBarMenuEnabled(true); setStandardToolBarMenuEnabled(true);
KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection()); KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection());
KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection()); KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection());
KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(optionsPreferences()), actionCollection()); KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection());
createGUI("kandymobileui.rc"); createGUI("kandymobileui.rc");
} }

42
karm/karm_part.cpp
Unescape View File

@ -25,7 +25,7 @@ karmPart::karmPart( TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name ) TQObject *parent, const char *name )
: DCOPObject ( "KarmDCOPIface" ), KParts::ReadWritePart(parent, name), : DCOPObject ( "KarmDCOPIface" ), KParts::ReadWritePart(parent, name),
_accel ( new TDEAccel( parentWidget ) ), _accel ( new TDEAccel( parentWidget ) ),
_watcher ( new TDEAccelMenuWatch( _accel, TQT_TQOBJECT(parentWidget) ) ) _watcher ( new TDEAccelMenuWatch( _accel, parentWidget ) )
{ {
// we need an instance // we need an instance
setInstance( karmPartFactory::instance() ); setInstance( karmPartFactory::instance() );
@ -117,109 +117,109 @@ void karmPart::makeMenus()
(void) KStdAction::print( this, TQT_SLOT( print() ), actionCollection()); (void) KStdAction::print( this, TQT_SLOT( print() ), actionCollection());
actionKeyBindings = KStdAction::keyBindings( this, TQT_SLOT( keyBindings() ), actionKeyBindings = KStdAction::keyBindings( this, TQT_SLOT( keyBindings() ),
actionCollection() ); actionCollection() );
actionPreferences = KStdAction::preferences(TQT_TQOBJECT(_preferences), actionPreferences = KStdAction::preferences(_preferences,
TQT_SLOT(showDialog()), TQT_SLOT(showDialog()),
actionCollection() ); actionCollection() );
(void) KStdAction::save( this, TQT_SLOT( save() ), actionCollection() ); (void) KStdAction::save( this, TQT_SLOT( save() ), actionCollection() );
TDEAction* actionStartNewSession = new TDEAction( i18n("Start &New Session"), TDEAction* actionStartNewSession = new TDEAction( i18n("Start &New Session"),
0, 0,
TQT_TQOBJECT(this), this,
TQT_SLOT( startNewSession() ), TQT_SLOT( startNewSession() ),
actionCollection(), actionCollection(),
"start_new_session"); "start_new_session");
TDEAction* actionResetAll = new TDEAction( i18n("&Reset All Times"), TDEAction* actionResetAll = new TDEAction( i18n("&Reset All Times"),
0, 0,
TQT_TQOBJECT(this), this,
TQT_SLOT( resetAllTimes() ), TQT_SLOT( resetAllTimes() ),
actionCollection(), actionCollection(),
"reset_all_times"); "reset_all_times");
actionStart = new TDEAction( i18n("&Start"), actionStart = new TDEAction( i18n("&Start"),
TQString::fromLatin1("1rightarrow"), Key_S, TQString::fromLatin1("1rightarrow"), Key_S,
TQT_TQOBJECT(_taskView), _taskView,
TQT_SLOT( startCurrentTimer() ), actionCollection(), TQT_SLOT( startCurrentTimer() ), actionCollection(),
"start"); "start");
actionStop = new TDEAction( i18n("S&top"), actionStop = new TDEAction( i18n("S&top"),
TQString::fromLatin1("process-stop"), 0, TQString::fromLatin1("process-stop"), 0,
TQT_TQOBJECT(_taskView), _taskView,
TQT_SLOT( stopCurrentTimer() ), actionCollection(), TQT_SLOT( stopCurrentTimer() ), actionCollection(),
"stop"); "stop");
actionStopAll = new TDEAction( i18n("Stop &All Timers"), actionStopAll = new TDEAction( i18n("Stop &All Timers"),
Key_Escape, Key_Escape,
TQT_TQOBJECT(_taskView), _taskView,
TQT_SLOT( stopAllTimers() ), actionCollection(), TQT_SLOT( stopAllTimers() ), actionCollection(),
"stopAll"); "stopAll");
actionStopAll->setEnabled(false); actionStopAll->setEnabled(false);
actionNew = new TDEAction( i18n("&New..."), actionNew = new TDEAction( i18n("&New..."),
TQString::fromLatin1("document-new"), CTRL+Key_N, TQString::fromLatin1("document-new"), CTRL+Key_N,
TQT_TQOBJECT(_taskView), _taskView,
TQT_SLOT( newTask() ), actionCollection(), TQT_SLOT( newTask() ), actionCollection(),
"new_task"); "new_task");
actionNewSub = new TDEAction( i18n("New &Subtask..."), actionNewSub = new TDEAction( i18n("New &Subtask..."),
TQString::fromLatin1("application-vnd.tde.tdemultiple"), CTRL+ALT+Key_N, TQString::fromLatin1("application-vnd.tde.tdemultiple"), CTRL+ALT+Key_N,
TQT_TQOBJECT(_taskView), _taskView,
TQT_SLOT( newSubTask() ), actionCollection(), TQT_SLOT( newSubTask() ), actionCollection(),
"new_sub_task"); "new_sub_task");
actionDelete = new TDEAction( i18n("&Delete"), actionDelete = new TDEAction( i18n("&Delete"),
TQString::fromLatin1("edit-delete"), Key_Delete, TQString::fromLatin1("edit-delete"), Key_Delete,
TQT_TQOBJECT(_taskView), _taskView,
TQT_SLOT( deleteTask() ), actionCollection(), TQT_SLOT( deleteTask() ), actionCollection(),
"delete_task"); "delete_task");
actionEdit = new TDEAction( i18n("&Edit..."), actionEdit = new TDEAction( i18n("&Edit..."),
TQString::fromLatin1("edit"), CTRL + Key_E, TQString::fromLatin1("edit"), CTRL + Key_E,
TQT_TQOBJECT(_taskView), _taskView,
TQT_SLOT( editTask() ), actionCollection(), TQT_SLOT( editTask() ), actionCollection(),
"edit_task"); "edit_task");
// actionAddComment = new TDEAction( i18n("&Add Comment..."), // actionAddComment = new TDEAction( i18n("&Add Comment..."),
// TQString::fromLatin1("text-x-generic"), // TQString::fromLatin1("text-x-generic"),
// CTRL+ALT+Key_E, // CTRL+ALT+Key_E,
// TQT_TQOBJECT(_taskView), // _taskView,
// TQT_SLOT( addCommentToTask() ), // TQT_SLOT( addCommentToTask() ),
// actionCollection(), // actionCollection(),
// "add_comment_to_task"); // "add_comment_to_task");
actionMarkAsComplete = new TDEAction( i18n("&Mark as Complete"), actionMarkAsComplete = new TDEAction( i18n("&Mark as Complete"),
TQString::fromLatin1("text-x-generic"), TQString::fromLatin1("text-x-generic"),
CTRL+Key_M, CTRL+Key_M,
TQT_TQOBJECT(_taskView), _taskView,
TQT_SLOT( markTaskAsComplete() ), TQT_SLOT( markTaskAsComplete() ),
actionCollection(), actionCollection(),
"mark_as_complete"); "mark_as_complete");
actionMarkAsIncomplete = new TDEAction( i18n("&Mark as Incomplete"), actionMarkAsIncomplete = new TDEAction( i18n("&Mark as Incomplete"),
TQString::fromLatin1("text-x-generic"), TQString::fromLatin1("text-x-generic"),
CTRL+Key_M, CTRL+Key_M,
TQT_TQOBJECT(_taskView), _taskView,
TQT_SLOT( markTaskAsIncomplete() ), TQT_SLOT( markTaskAsIncomplete() ),
actionCollection(), actionCollection(),
"mark_as_incomplete"); "mark_as_incomplete");
actionClipTotals = new TDEAction( i18n("&Copy Totals to Clipboard"), actionClipTotals = new TDEAction( i18n("&Copy Totals to Clipboard"),
TQString::fromLatin1("klipper"), TQString::fromLatin1("klipper"),
CTRL+Key_C, CTRL+Key_C,
TQT_TQOBJECT(_taskView), _taskView,
TQT_SLOT( clipTotals() ), TQT_SLOT( clipTotals() ),
actionCollection(), actionCollection(),
"clip_totals"); "clip_totals");
actionClipHistory = new TDEAction( i18n("Copy &History to Clipboard"), actionClipHistory = new TDEAction( i18n("Copy &History to Clipboard"),
TQString::fromLatin1("klipper"), TQString::fromLatin1("klipper"),
CTRL+ALT+Key_C, CTRL+ALT+Key_C,
TQT_TQOBJECT(_taskView), _taskView,
TQT_SLOT( clipHistory() ), TQT_SLOT( clipHistory() ),
actionCollection(), actionCollection(),
"clip_history"); "clip_history");
new TDEAction( i18n("Import &Legacy Flat File..."), 0, new TDEAction( i18n("Import &Legacy Flat File..."), 0,
TQT_TQOBJECT(_taskView), TQT_SLOT(loadFromFlatFile()), actionCollection(), _taskView, TQT_SLOT(loadFromFlatFile()), actionCollection(),
"import_flatfile"); "import_flatfile");
new TDEAction( i18n("&Export to CSV File..."), 0, new TDEAction( i18n("&Export to CSV File..."), 0,
TQT_TQOBJECT(_taskView), TQT_SLOT(exportcsvFile()), actionCollection(), _taskView, TQT_SLOT(exportcsvFile()), actionCollection(),
"export_csvfile"); "export_csvfile");
new TDEAction( i18n("Export &History to CSV File..."), 0, new TDEAction( i18n("Export &History to CSV File..."), 0,
TQT_TQOBJECT(this), TQT_SLOT(exportcsvHistory()), actionCollection(), this, TQT_SLOT(exportcsvHistory()), actionCollection(),
"export_csvhistory"); "export_csvhistory");
new TDEAction( i18n("Import Tasks From &Planner..."), 0, new TDEAction( i18n("Import Tasks From &Planner..."), 0,
TQT_TQOBJECT(_taskView), TQT_SLOT(importPlanner()), actionCollection(), _taskView, TQT_SLOT(importPlanner()), actionCollection(),
"import_planner"); "import_planner");
new TDEAction( i18n("Configure KArm..."), 0, new TDEAction( i18n("Configure KArm..."), 0,
TQT_TQOBJECT(_preferences), TQT_SLOT(showDialog()), actionCollection(), _preferences, TQT_SLOT(showDialog()), actionCollection(),
"configure_karm"); "configure_karm");
/* /*

2
karm/ktimewidget.cpp
Unescape View File

@ -17,7 +17,7 @@ class TimeValidator : public TQValidator
{ {
public: public:
TimeValidator( ValidatorType tp, TQWidget *parent=0, const char *name=0) TimeValidator( ValidatorType tp, TQWidget *parent=0, const char *name=0)
: TQValidator(TQT_TQOBJECT(parent), name) : TQValidator(parent, name)
{ {
_tp = tp; _tp = tp;
} }

50
karm/mainwindow.cpp
Unescape View File

@ -38,7 +38,7 @@ MainWindow::MainWindow( const TQString &icsfile )
: DCOPObject ( "KarmDCOPIface" ), : DCOPObject ( "KarmDCOPIface" ),
KParts::MainWindow(0,TQt::WStyle_ContextHelp), KParts::MainWindow(0,TQt::WStyle_ContextHelp),
_accel ( new TDEAccel( this ) ), _accel ( new TDEAccel( this ) ),
_watcher ( new TDEAccelMenuWatch( _accel, TQT_TQOBJECT(this) ) ), _watcher ( new TDEAccelMenuWatch( _accel, this ) ),
_totalSum ( 0 ), _totalSum ( 0 ),
_sessionSum( 0 ) _sessionSum( 0 )
{ {
@ -251,88 +251,88 @@ void MainWindow::makeMenus()
*actionNew, *actionNew,
*actionNewSub; *actionNewSub;
(void) KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( quit() ), actionCollection()); (void) KStdAction::quit( this, TQT_SLOT( quit() ), actionCollection());
(void) KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT( print() ), actionCollection()); (void) KStdAction::print( this, TQT_SLOT( print() ), actionCollection());
actionKeyBindings = KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( keyBindings() ), actionKeyBindings = KStdAction::keyBindings( this, TQT_SLOT( keyBindings() ),
actionCollection() ); actionCollection() );
actionPreferences = KStdAction::preferences(TQT_TQOBJECT(_preferences), actionPreferences = KStdAction::preferences(_preferences,
TQT_SLOT(showDialog()), TQT_SLOT(showDialog()),
actionCollection() ); actionCollection() );
(void) KStdAction::save( TQT_TQOBJECT(this), TQT_SLOT( save() ), actionCollection() ); (void) KStdAction::save( this, TQT_SLOT( save() ), actionCollection() );
TDEAction* actionStartNewSession = new TDEAction( i18n("Start &New Session"), TDEAction* actionStartNewSession = new TDEAction( i18n("Start &New Session"),
0, 0,
TQT_TQOBJECT(this), this,
TQT_SLOT( startNewSession() ), TQT_SLOT( startNewSession() ),
actionCollection(), actionCollection(),
"start_new_session"); "start_new_session");
TDEAction* actionResetAll = new TDEAction( i18n("&Reset All Times"), TDEAction* actionResetAll = new TDEAction( i18n("&Reset All Times"),
0, 0,
TQT_TQOBJECT(this), this,
TQT_SLOT( resetAllTimes() ), TQT_SLOT( resetAllTimes() ),
actionCollection(), actionCollection(),
"reset_all_times"); "reset_all_times");
actionStart = new TDEAction( i18n("&Start"), actionStart = new TDEAction( i18n("&Start"),
TQString::fromLatin1("1rightarrow"), Key_S, TQString::fromLatin1("1rightarrow"), Key_S,
TQT_TQOBJECT(_taskView), _taskView,
TQT_SLOT( startCurrentTimer() ), actionCollection(), TQT_SLOT( startCurrentTimer() ), actionCollection(),
"start"); "start");
actionStop = new TDEAction( i18n("S&top"), actionStop = new TDEAction( i18n("S&top"),
TQString::fromLatin1("process-stop"), Key_S, TQString::fromLatin1("process-stop"), Key_S,
TQT_TQOBJECT(_taskView), _taskView,
TQT_SLOT( stopCurrentTimer() ), actionCollection(), TQT_SLOT( stopCurrentTimer() ), actionCollection(),
"stop"); "stop");
actionStopAll = new TDEAction( i18n("Stop &All Timers"), actionStopAll = new TDEAction( i18n("Stop &All Timers"),
Key_Escape, Key_Escape,
TQT_TQOBJECT(_taskView), _taskView,
TQT_SLOT( stopAllTimers() ), actionCollection(), TQT_SLOT( stopAllTimers() ), actionCollection(),
"stopAll"); "stopAll");
actionStopAll->setEnabled(false); actionStopAll->setEnabled(false);
actionNew = new TDEAction( i18n("&New..."), actionNew = new TDEAction( i18n("&New..."),
TQString::fromLatin1("document-new"), CTRL+Key_N, TQString::fromLatin1("document-new"), CTRL+Key_N,
TQT_TQOBJECT(_taskView), _taskView,
TQT_SLOT( newTask() ), actionCollection(), TQT_SLOT( newTask() ), actionCollection(),
"new_task"); "new_task");
actionNewSub = new TDEAction( i18n("New &Subtask..."), actionNewSub = new TDEAction( i18n("New &Subtask..."),
TQString::fromLatin1("application-vnd.tde.tdemultiple"), CTRL+ALT+Key_N, TQString::fromLatin1("application-vnd.tde.tdemultiple"), CTRL+ALT+Key_N,
TQT_TQOBJECT(_taskView), _taskView,
TQT_SLOT( newSubTask() ), actionCollection(), TQT_SLOT( newSubTask() ), actionCollection(),
"new_sub_task"); "new_sub_task");
actionDelete = new TDEAction( i18n("&Delete"), actionDelete = new TDEAction( i18n("&Delete"),
TQString::fromLatin1("edit-delete"), Key_Delete, TQString::fromLatin1("edit-delete"), Key_Delete,
TQT_TQOBJECT(_taskView), _taskView,
TQT_SLOT( deleteTask() ), actionCollection(), TQT_SLOT( deleteTask() ), actionCollection(),
"delete_task"); "delete_task");
actionEdit = new TDEAction( i18n("&Edit..."), actionEdit = new TDEAction( i18n("&Edit..."),
TQString::fromLatin1("edit"), CTRL + Key_E, TQString::fromLatin1("edit"), CTRL + Key_E,
TQT_TQOBJECT(_taskView), _taskView,
TQT_SLOT( editTask() ), actionCollection(), TQT_SLOT( editTask() ), actionCollection(),
"edit_task"); "edit_task");
// actionAddComment = new TDEAction( i18n("&Add Comment..."), // actionAddComment = new TDEAction( i18n("&Add Comment..."),
// TQString::fromLatin1("text-x-generic"), // TQString::fromLatin1("text-x-generic"),
// CTRL+ALT+Key_E, // CTRL+ALT+Key_E,
// TQT_TQOBJECT(_taskView), // _taskView,
// TQT_SLOT( addCommentToTask() ), // TQT_SLOT( addCommentToTask() ),
// actionCollection(), // actionCollection(),
// "add_comment_to_task"); // "add_comment_to_task");
actionMarkAsComplete = new TDEAction( i18n("&Mark as Complete"), actionMarkAsComplete = new TDEAction( i18n("&Mark as Complete"),
TQString::fromLatin1("text-x-generic"), TQString::fromLatin1("text-x-generic"),
CTRL+Key_M, CTRL+Key_M,
TQT_TQOBJECT(_taskView), _taskView,
TQT_SLOT( markTaskAsComplete() ), TQT_SLOT( markTaskAsComplete() ),
actionCollection(), actionCollection(),
"mark_as_complete"); "mark_as_complete");
actionMarkAsIncomplete = new TDEAction( i18n("&Mark as Incomplete"), actionMarkAsIncomplete = new TDEAction( i18n("&Mark as Incomplete"),
TQString::fromLatin1("text-x-generic"), TQString::fromLatin1("text-x-generic"),
CTRL+Key_M, CTRL+Key_M,
TQT_TQOBJECT(_taskView), _taskView,
TQT_SLOT( markTaskAsIncomplete() ), TQT_SLOT( markTaskAsIncomplete() ),
actionCollection(), actionCollection(),
"mark_as_incomplete"); "mark_as_incomplete");
actionClipTotals = new TDEAction( i18n("&Copy Totals to Clipboard"), actionClipTotals = new TDEAction( i18n("&Copy Totals to Clipboard"),
TQString::fromLatin1("klipper"), TQString::fromLatin1("klipper"),
CTRL+Key_C, CTRL+Key_C,
TQT_TQOBJECT(_taskView), _taskView,
TQT_SLOT( clipTotals() ), TQT_SLOT( clipTotals() ),
actionCollection(), actionCollection(),
"clip_totals"); "clip_totals");
@ -340,29 +340,29 @@ void MainWindow::makeMenus()
actionClipTotals = new TDEAction( i18n("&Copy Session Time to Clipboard"), actionClipTotals = new TDEAction( i18n("&Copy Session Time to Clipboard"),
TQString::fromLatin1("klipper"), TQString::fromLatin1("klipper"),
0, 0,
TQT_TQOBJECT(_taskView), _taskView,
TQT_SLOT( clipSession() ), TQT_SLOT( clipSession() ),
actionCollection(), actionCollection(),
"clip_session"); "clip_session");
actionClipHistory = new TDEAction( i18n("Copy &History to Clipboard"), actionClipHistory = new TDEAction( i18n("Copy &History to Clipboard"),
TQString::fromLatin1("klipper"), TQString::fromLatin1("klipper"),
CTRL+ALT+Key_C, CTRL+ALT+Key_C,
TQT_TQOBJECT(_taskView), _taskView,
TQT_SLOT( clipHistory() ), TQT_SLOT( clipHistory() ),
actionCollection(), actionCollection(),
"clip_history"); "clip_history");
new TDEAction( i18n("Import &Legacy Flat File..."), 0, new TDEAction( i18n("Import &Legacy Flat File..."), 0,
TQT_TQOBJECT(_taskView), TQT_SLOT(loadFromFlatFile()), actionCollection(), _taskView, TQT_SLOT(loadFromFlatFile()), actionCollection(),
"import_flatfile"); "import_flatfile");
new TDEAction( i18n("&Export to CSV File..."), 0, new TDEAction( i18n("&Export to CSV File..."), 0,
TQT_TQOBJECT(_taskView), TQT_SLOT(exportcsvFile()), actionCollection(), _taskView, TQT_SLOT(exportcsvFile()), actionCollection(),
"export_csvfile"); "export_csvfile");
new TDEAction( i18n("Export &History to CSV File..."), 0, new TDEAction( i18n("Export &History to CSV File..."), 0,
TQT_TQOBJECT(this), TQT_SLOT(exportcsvHistory()), actionCollection(), this, TQT_SLOT(exportcsvHistory()), actionCollection(),
"export_csvhistory"); "export_csvhistory");
new TDEAction( i18n("Import Tasks From &Planner..."), 0, new TDEAction( i18n("Import Tasks From &Planner..."), 0,
TQT_TQOBJECT(_taskView), TQT_SLOT(importPlanner()), actionCollection(), _taskView, TQT_SLOT(importPlanner()), actionCollection(),
"import_planner"); "import_planner");
/* /*

2
kdgantt/KDGanttViewSubwidgets.cpp
Unescape View File

@ -59,7 +59,7 @@
#include <kdebug.h> #include <kdebug.h>
KDTimeTableWidget:: KDTimeTableWidget( TQWidget* parent,KDGanttView* myGantt) KDTimeTableWidget:: KDTimeTableWidget( TQWidget* parent,KDGanttView* myGantt)
: TQCanvas (TQT_TQOBJECT(parent)) : TQCanvas (parent)
{ {
myGanttView = myGantt; myGanttView = myGantt;
taskLinksVisible = true; taskLinksVisible = true;

16
kgantt/kgantt/xQGanttBarViewPort.cpp
Unescape View File

@ -117,7 +117,7 @@ xQGanttBarViewPort::toolbar(TQMainWindow* mw)
_toolbar->insertButton("ganttSelect.png", 0, _toolbar->insertButton("ganttSelect.png", 0,
TQT_SIGNAL(clicked()), TQT_SIGNAL(clicked()),
TQT_TQOBJECT(this), TQT_SLOT(setSelect()), this, TQT_SLOT(setSelect()),
true, i18n("Select") ); true, i18n("Select") );
TDEPopupMenu *selectMenu = new TDEPopupMenu(_toolbar); TDEPopupMenu *selectMenu = new TDEPopupMenu(_toolbar);
@ -128,7 +128,7 @@ xQGanttBarViewPort::toolbar(TQMainWindow* mw)
*/ */
TQPixmap pix = _iconloader->loadIcon("ganttSelecttask.png", TDEIcon::Toolbar , 16 ); TQPixmap pix = _iconloader->loadIcon("ganttSelecttask.png", TDEIcon::Toolbar , 16 );
if(pix.isNull()) printf("ganttSelecttask.png not found !\n"); if(pix.isNull()) printf("ganttSelecttask.png not found !\n");
selectMenu->insertItem(pix, i18n("Select All"), TQT_TQOBJECT(this), TQT_SLOT(selectAll()) ); selectMenu->insertItem(pix, i18n("Select All"), this, TQT_SLOT(selectAll()) );
/* /*
@ -136,7 +136,7 @@ xQGanttBarViewPort::toolbar(TQMainWindow* mw)
*/ */
pix = _iconloader->loadIcon("ganttUnselecttask", TDEIcon::Toolbar , 16 ); pix = _iconloader->loadIcon("ganttUnselecttask", TDEIcon::Toolbar , 16 );
if(pix.isNull()) printf("ganttUnselecttask.png not found !\n"); if(pix.isNull()) printf("ganttUnselecttask.png not found !\n");
selectMenu->insertItem(pix, i18n("Unselect All"), TQT_TQOBJECT(this), TQT_SLOT(unselectAll()) ); selectMenu->insertItem(pix, i18n("Unselect All"), this, TQT_SLOT(unselectAll()) );
TDEToolBarButton* b = _toolbar->getButton(0); TDEToolBarButton* b = _toolbar->getButton(0);
@ -145,30 +145,30 @@ xQGanttBarViewPort::toolbar(TQMainWindow* mw)
_toolbar->insertButton("viewmag.png", 1, _toolbar->insertButton("viewmag.png", 1,
TQT_SIGNAL(clicked()), TQT_SIGNAL(clicked()),
TQT_TQOBJECT(this), TQT_SLOT(setZoom()), this, TQT_SLOT(setZoom()),
true, i18n("Zoom") ); true, i18n("Zoom") );
TDEPopupMenu* zoomMenu = new TDEPopupMenu(_toolbar); TDEPopupMenu* zoomMenu = new TDEPopupMenu(_toolbar);
pix = _iconloader->loadIcon("viewmag.png", TDEIcon::Toolbar , 16 ); pix = _iconloader->loadIcon("viewmag.png", TDEIcon::Toolbar , 16 );
if(pix.isNull()) printf("viewmag.png not found !\n"); if(pix.isNull()) printf("viewmag.png not found !\n");
zoomMenu->insertItem(pix, i18n("Zoom All"), TQT_TQOBJECT(this), TQT_SLOT(zoomAll()) ); zoomMenu->insertItem(pix, i18n("Zoom All"), this, TQT_SLOT(zoomAll()) );
zoomMenu->insertSeparator(); zoomMenu->insertSeparator();
pix = _iconloader->loadIcon("viewmag+.png", TDEIcon::Toolbar , 16 ); pix = _iconloader->loadIcon("viewmag+.png", TDEIcon::Toolbar , 16 );
if(pix.isNull()) printf("viewmag+.png not found !\n"); if(pix.isNull()) printf("viewmag+.png not found !\n");
zoomMenu->insertItem(pix, i18n("Zoom In +"), TQT_TQOBJECT(this), TQT_SLOT(zoomIn()) ); zoomMenu->insertItem(pix, i18n("Zoom In +"), this, TQT_SLOT(zoomIn()) );
pix = _iconloader->loadIcon("viewmag-.png", TDEIcon::Toolbar , 16 ); pix = _iconloader->loadIcon("viewmag-.png", TDEIcon::Toolbar , 16 );
if(pix.isNull()) printf("viewmag-.png not found !\n"); if(pix.isNull()) printf("viewmag-.png not found !\n");
zoomMenu->insertItem(pix, i18n("Zoom Out -"), TQT_TQOBJECT(this), TQT_SLOT(zoomOut()) ); zoomMenu->insertItem(pix, i18n("Zoom Out -"), this, TQT_SLOT(zoomOut()) );
b = _toolbar->getButton(1); b = _toolbar->getButton(1);
b->setDelayedPopup(zoomMenu); b->setDelayedPopup(zoomMenu);
_toolbar->insertButton("move.png", 2, _toolbar->insertButton("move.png", 2,
TQT_SIGNAL(clicked()), TQT_SIGNAL(clicked()),
TQT_TQOBJECT(this), TQT_SLOT(setMove()), this, TQT_SLOT(setMove()),
true, i18n("Move") ); true, i18n("Move") );
return _toolbar; return _toolbar;

4
kmail/accountdialog.cpp
Unescape View File

@ -618,7 +618,7 @@ void AccountDialog::makePopAccountPage()
label = new TQLabel( i18n("&Port:"), page1 ); label = new TQLabel( i18n("&Port:"), page1 );
grid->addWidget( label, 4, 0 ); grid->addWidget( label, 4, 0 );
mPop.portEdit = new KLineEdit( page1 ); mPop.portEdit = new KLineEdit( page1 );
mPop.portEdit->setValidator( new TQIntValidator(TQT_TQOBJECT(this)) ); mPop.portEdit->setValidator( new TQIntValidator(this) );
label->setBuddy( mPop.portEdit ); label->setBuddy( mPop.portEdit );
grid->addWidget( mPop.portEdit, 4, 1 ); grid->addWidget( mPop.portEdit, 4, 1 );
@ -891,7 +891,7 @@ void AccountDialog::makeImapAccountPage( bool connected )
label = new TQLabel( i18n("&Port:"), page1 ); label = new TQLabel( i18n("&Port:"), page1 );
grid->addWidget( label, row, 0 ); grid->addWidget( label, row, 0 );
mImap.portEdit = new KLineEdit( page1 ); mImap.portEdit = new KLineEdit( page1 );
mImap.portEdit->setValidator( new TQIntValidator(TQT_TQOBJECT(this)) ); mImap.portEdit->setValidator( new TQIntValidator(this) );
label->setBuddy( mImap.portEdit ); label->setBuddy( mImap.portEdit );
grid->addWidget( mImap.portEdit, row, 1 ); grid->addWidget( mImap.portEdit, row, 1 );

2
kmail/configuredialog.cpp
Unescape View File

@ -3376,7 +3376,7 @@ ComposerPageHeadersTab::ComposerPageHeadersTab( TQWidget * parent, const char *
mMessageIdSuffixEdit = new KLineEdit( this ); mMessageIdSuffixEdit = new KLineEdit( this );
// only ASCII letters, digits, plus, minus and dots are allowed // only ASCII letters, digits, plus, minus and dots are allowed
mMessageIdSuffixValidator = mMessageIdSuffixValidator =
new TQRegExpValidator( TQRegExp( "[a-zA-Z0-9+-]+(?:\\.[a-zA-Z0-9+-]+)*" ), TQT_TQOBJECT(this) ); new TQRegExpValidator( TQRegExp( "[a-zA-Z0-9+-]+(?:\\.[a-zA-Z0-9+-]+)*" ), this );
mMessageIdSuffixEdit->setValidator( mMessageIdSuffixValidator ); mMessageIdSuffixEdit->setValidator( mMessageIdSuffixValidator );
label = new TQLabel( mMessageIdSuffixEdit, label = new TQLabel( mMessageIdSuffixEdit,
i18n("Custom message-&id suffix:"), this ); i18n("Custom message-&id suffix:"), this );

2
kmail/foldertreebase.cpp
Unescape View File

@ -235,7 +235,7 @@ void FolderTreeBase::handleMailListDrop(TQDropEvent * event, KMFolder *destinati
else else
action = dndMode(); action = dndMode();
if ( action == DRAG_COPY || action == DRAG_MOVE ) { if ( action == DRAG_COPY || action == DRAG_MOVE ) {
new MessageCopyHelper( serNums, destination, action == DRAG_MOVE, TQT_TQOBJECT(this) ); new MessageCopyHelper( serNums, destination, action == DRAG_MOVE, this );
} }
} }
} }

2
kmail/headerlistquicksearch.cpp
Unescape View File

@ -57,7 +57,7 @@ HeaderListQuickSearch::HeaderListQuickSearch( TQWidget *parent,
TQApplication::reverseLayout() TQApplication::reverseLayout()
? "clear_left" ? "clear_left"
: "locationbar_erase", : "locationbar_erase",
0, TQT_TQOBJECT(this), 0, this,
TQT_SLOT( reset() ), TQT_SLOT( reset() ),
actionCollection, actionCollection,
"reset_quicksearch" ); "reset_quicksearch" );

8
kmail/imapaccountbase.cpp
Unescape View File

@ -958,7 +958,7 @@ namespace KMail {
if ( errorCode == TDEIO::ERR_SERVER_TIMEOUT || errorCode == TDEIO::ERR_CONNECTION_BROKEN ) { if ( errorCode == TDEIO::ERR_SERVER_TIMEOUT || errorCode == TDEIO::ERR_CONNECTION_BROKEN ) {
msg = i18n("The connection to the server %1 was unexpectedly closed or timed out. It will be re-established automatically if possible."). msg = i18n("The connection to the server %1 was unexpectedly closed or timed out. It will be re-established automatically if possible.").
arg( name() ); arg( name() );
KMessageBox::information( TQT_TQWIDGET(kapp->activeWindow()), msg, caption, "kmailConnectionBrokenErrorDialog" ); KMessageBox::information( kapp->activeWindow(), msg, caption, "kmailConnectionBrokenErrorDialog" );
// Show it in the status bar, in case the user has ticked "don't show again" // Show it in the status bar, in case the user has ticked "don't show again"
if ( errorCode == TDEIO::ERR_CONNECTION_BROKEN ) if ( errorCode == TDEIO::ERR_CONNECTION_BROKEN )
KPIM::BroadcastStatus::instance()->setStatusMsg( KPIM::BroadcastStatus::instance()->setStatusMsg(
@ -968,9 +968,9 @@ namespace KMail {
i18n( "The connection to account %1 timed out." ).arg( name() ) ); i18n( "The connection to account %1 timed out." ).arg( name() ) );
} else { } else {
if ( !errors.isEmpty() ) if ( !errors.isEmpty() )
KMessageBox::detailedError( TQT_TQWIDGET(kapp->activeWindow()), msg, errors.join("\n").prepend("<qt>"), caption ); KMessageBox::detailedError( kapp->activeWindow(), msg, errors.join("\n").prepend("<qt>"), caption );
else else
KMessageBox::error( TQT_TQWIDGET(kapp->activeWindow()), msg, caption ); KMessageBox::error( kapp->activeWindow(), msg, caption );
} }
} else { // i.e. we have a chance to continue, ask the user about it } else { // i.e. we have a chance to continue, ask the user about it
if ( errors.count() >= 3 ) { // there is no detailedWarningContinueCancel... (#86517) if ( errors.count() >= 3 ) { // there is no detailedWarningContinueCancel... (#86517)
@ -978,7 +978,7 @@ namespace KMail {
msg = TQString( "<qt>") + context + error + '\n' + errors[2]; msg = TQString( "<qt>") + context + error + '\n' + errors[2];
caption = errors[0]; caption = errors[0];
} }
int ret = KMessageBox::warningContinueCancel( TQT_TQWIDGET(kapp->activeWindow()), msg, caption ); int ret = KMessageBox::warningContinueCancel( kapp->activeWindow(), msg, caption );
if ( ret == KMessageBox::Cancel ) { if ( ret == KMessageBox::Cancel ) {
jobsKilled = true; jobsKilled = true;
killAllJobs( false ); killAllJobs( false );

178
kmail/kmcomposewin.cpp
Unescape View File

@ -455,7 +455,7 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id )
connect(kmkernel->dimapFolderMgr(),TQT_SIGNAL(folderRemoved(KMFolder*)), connect(kmkernel->dimapFolderMgr(),TQT_SIGNAL(folderRemoved(KMFolder*)),
TQT_SLOT(slotFolderRemoved(KMFolder*))); TQT_SLOT(slotFolderRemoved(KMFolder*)));
connect( kmkernel, TQT_SIGNAL( configChanged() ), connect( kmkernel, TQT_SIGNAL( configChanged() ),
TQT_TQOBJECT(this), TQT_SLOT( slotConfigChanged() ) ); this, TQT_SLOT( slotConfigChanged() ) );
connect (mEditor, TQT_SIGNAL (spellcheck_done(int)), connect (mEditor, TQT_SIGNAL (spellcheck_done(int)),
this, TQT_SLOT (slotSpellcheckDone (int))); this, TQT_SLOT (slotSpellcheckDone (int)));
@ -816,7 +816,7 @@ void KMComposeWin::autoSaveMessage()
mAutoSaveTimer->stop(); mAutoSaveTimer->stop();
connect( this, TQT_SIGNAL( applyChangesDone( bool ) ), connect( this, TQT_SIGNAL( applyChangesDone( bool ) ),
TQT_TQOBJECT(this), TQT_SLOT( slotContinueAutoSave() ) ); this, TQT_SLOT( slotContinueAutoSave() ) );
// This method is called when KMail crashed, so don't try signing/encryption // 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 // and don't disable controls because it is also called from a timer and
// then the disabling is distracting. // then the disabling is distracting.
@ -828,7 +828,7 @@ void KMComposeWin::autoSaveMessage()
void KMComposeWin::slotContinueAutoSave() void KMComposeWin::slotContinueAutoSave()
{ {
disconnect( this, TQT_SIGNAL( applyChangesDone( bool ) ), disconnect( this, TQT_SIGNAL( applyChangesDone( bool ) ),
TQT_TQOBJECT(this), TQT_SLOT( slotContinueAutoSave() ) ); this, TQT_SLOT( slotContinueAutoSave() ) );
// Ok, it's done now - continue dead letter saving // Ok, it's done now - continue dead letter saving
if ( mComposedMessages.isEmpty() ) { if ( mComposedMessages.isEmpty() ) {
@ -1233,13 +1233,13 @@ void KMComposeWin::setupActions(void)
{ {
//default = send now, alternative = queue //default = send now, alternative = queue
( void ) new TDEAction( i18n("&Send Mail"), "mail-send", CTRL+Key_Return, ( void ) new TDEAction( i18n("&Send Mail"), "mail-send", CTRL+Key_Return,
TQT_TQOBJECT(this), TQT_SLOT(slotSendNow()), actionCollection(),"send_default"); this, TQT_SLOT(slotSendNow()), actionCollection(),"send_default");
// FIXME: change to mail_send_via icon when this exits. // FIXME: change to mail_send_via icon when this exits.
actActionNowMenu = new TDEActionMenu (i18n("&Send Mail Via"), "mail-send", actActionNowMenu = new TDEActionMenu (i18n("&Send Mail Via"), "mail-send",
actionCollection(), "send_default_via" ); actionCollection(), "send_default_via" );
(void) new TDEAction (i18n("Send &Later"), "queue", 0, TQT_TQOBJECT(this), (void) new TDEAction (i18n("Send &Later"), "queue", 0, this,
TQT_SLOT(slotSendLater()), actionCollection(),"send_alternative"); TQT_SLOT(slotSendLater()), actionCollection(),"send_alternative");
actActionLaterMenu = new TDEActionMenu (i18n("Send &Later Via"), "queue", actActionLaterMenu = new TDEActionMenu (i18n("Send &Later Via"), "queue",
actionCollection(), "send_alternative_via" ); actionCollection(), "send_alternative_via" );
@ -1250,12 +1250,12 @@ void KMComposeWin::setupActions(void)
//default = queue, alternative = send now //default = queue, alternative = send now
(void) new TDEAction (i18n("Send &Later"), "queue", (void) new TDEAction (i18n("Send &Later"), "queue",
CTRL+Key_Return, CTRL+Key_Return,
TQT_TQOBJECT(this), TQT_SLOT(slotSendLater()), actionCollection(),"send_default"); this, TQT_SLOT(slotSendLater()), actionCollection(),"send_default");
actActionLaterMenu = new TDEActionMenu (i18n("Send &Later Via"), "queue", actActionLaterMenu = new TDEActionMenu (i18n("Send &Later Via"), "queue",
actionCollection(), "send_default_via" ); actionCollection(), "send_default_via" );
( void ) new TDEAction( i18n("&Send Mail"), "mail-send", 0, ( void ) new TDEAction( i18n("&Send Mail"), "mail-send", 0,
TQT_TQOBJECT(this), TQT_SLOT(slotSendNow()), actionCollection(),"send_alternative"); this, TQT_SLOT(slotSendNow()), actionCollection(),"send_alternative");
// FIXME: change to mail_send_via icon when this exits. // FIXME: change to mail_send_via icon when this exits.
actActionNowMenu = new TDEActionMenu (i18n("&Send Mail Via"), "mail-send", actActionNowMenu = new TDEActionMenu (i18n("&Send Mail Via"), "mail-send",
@ -1290,78 +1290,78 @@ void KMComposeWin::setupActions(void)
(void) new TDEAction (i18n("Save as &Draft"), "document-save", 0, (void) new TDEAction (i18n("Save as &Draft"), "document-save", 0,
TQT_TQOBJECT(this), TQT_SLOT(slotSaveDraft()), this, TQT_SLOT(slotSaveDraft()),
actionCollection(), "save_in_drafts"); actionCollection(), "save_in_drafts");
(void) new TDEAction (i18n("Save as &Template"), "document-save", 0, (void) new TDEAction (i18n("Save as &Template"), "document-save", 0,
TQT_TQOBJECT(this), TQT_SLOT(slotSaveTemplate()), this, TQT_SLOT(slotSaveTemplate()),
actionCollection(), "save_in_templates"); actionCollection(), "save_in_templates");
(void) new TDEAction (i18n("&Insert File..."), "document-open", 0, (void) new TDEAction (i18n("&Insert File..."), "document-open", 0,
TQT_TQOBJECT(this), TQT_SLOT(slotInsertFile()), this, TQT_SLOT(slotInsertFile()),
actionCollection(), "insert_file"); actionCollection(), "insert_file");
mRecentAction = new TDERecentFilesAction (i18n("&Insert File Recent"), mRecentAction = new TDERecentFilesAction (i18n("&Insert File Recent"),
"document-open", 0, "document-open", 0,
TQT_TQOBJECT(this), TQT_SLOT(slotInsertRecentFile(const KURL&)), this, TQT_SLOT(slotInsertRecentFile(const KURL&)),
actionCollection(), "insert_file_recent"); actionCollection(), "insert_file_recent");
mRecentAction->loadEntries( KMKernel::config() ); mRecentAction->loadEntries( KMKernel::config() );
(void) new TDEAction (i18n("&Address Book"), "contents",0, (void) new TDEAction (i18n("&Address Book"), "contents",0,
TQT_TQOBJECT(this), TQT_SLOT(slotAddrBook()), this, TQT_SLOT(slotAddrBook()),
actionCollection(), "addressbook"); actionCollection(), "addressbook");
(void) new TDEAction (i18n("&New Composer"), "mail-message-new", (void) new TDEAction (i18n("&New Composer"), "mail-message-new",
TDEStdAccel::shortcut(TDEStdAccel::New), TDEStdAccel::shortcut(TDEStdAccel::New),
TQT_TQOBJECT(this), TQT_SLOT(slotNewComposer()), this, TQT_SLOT(slotNewComposer()),
actionCollection(), "new_composer"); actionCollection(), "new_composer");
(void) new TDEAction (i18n("New Main &Window"), "window-new", 0, (void) new TDEAction (i18n("New Main &Window"), "window-new", 0,
TQT_TQOBJECT(this), TQT_SLOT(slotNewMailReader()), this, TQT_SLOT(slotNewMailReader()),
actionCollection(), "open_mailreader"); actionCollection(), "open_mailreader");
if ( !mClassicalRecipients ) { if ( !mClassicalRecipients ) {
new TDEAction( i18n("Select &Recipients..."), CTRL + Key_L, TQT_TQOBJECT(mRecipientsEditor), new TDEAction( i18n("Select &Recipients..."), CTRL + Key_L, mRecipientsEditor,
TQT_SLOT( selectRecipients() ), actionCollection(), "select_recipients" ); TQT_SLOT( selectRecipients() ), actionCollection(), "select_recipients" );
new TDEAction( i18n("Save &Distribution List..."), 0, TQT_TQOBJECT(mRecipientsEditor), new TDEAction( i18n("Save &Distribution List..."), 0, mRecipientsEditor,
TQT_SLOT( saveDistributionList() ), actionCollection(), TQT_SLOT( saveDistributionList() ), actionCollection(),
"save_distribution_list" ); "save_distribution_list" );
} }
//KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(), actionCollection(), "save_message"); //KStdAction::save(this, TQT_SLOT(), actionCollection(), "save_message");
KStdAction::print (TQT_TQOBJECT(this), TQT_SLOT(slotPrint()), actionCollection()); KStdAction::print (this, TQT_SLOT(slotPrint()), actionCollection());
KStdAction::close (TQT_TQOBJECT(this), TQT_SLOT(slotClose()), actionCollection()); KStdAction::close (this, TQT_SLOT(slotClose()), actionCollection());
KStdAction::undo (TQT_TQOBJECT(this), TQT_SLOT(slotUndo()), actionCollection()); KStdAction::undo (this, TQT_SLOT(slotUndo()), actionCollection());
KStdAction::redo (TQT_TQOBJECT(this), TQT_SLOT(slotRedo()), actionCollection()); KStdAction::redo (this, TQT_SLOT(slotRedo()), actionCollection());
KStdAction::cut (TQT_TQOBJECT(this), TQT_SLOT(slotCut()), actionCollection()); KStdAction::cut (this, TQT_SLOT(slotCut()), actionCollection());
KStdAction::copy (TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), actionCollection()); KStdAction::copy (this, TQT_SLOT(slotCopy()), actionCollection());
KStdAction::pasteText (TQT_TQOBJECT(this), TQT_SLOT(slotPasteClipboard()), actionCollection()); KStdAction::pasteText (this, TQT_SLOT(slotPasteClipboard()), actionCollection());
KStdAction::selectAll (TQT_TQOBJECT(this), TQT_SLOT(slotMarkAll()), actionCollection()); KStdAction::selectAll (this, TQT_SLOT(slotMarkAll()), actionCollection());
KStdAction::find (TQT_TQOBJECT(this), TQT_SLOT(slotFind()), actionCollection()); KStdAction::find (this, TQT_SLOT(slotFind()), actionCollection());
KStdAction::findNext(TQT_TQOBJECT(this), TQT_SLOT(slotSearchAgain()), actionCollection()); KStdAction::findNext(this, TQT_SLOT(slotSearchAgain()), actionCollection());
KStdAction::replace (TQT_TQOBJECT(this), TQT_SLOT(slotReplace()), actionCollection()); KStdAction::replace (this, TQT_SLOT(slotReplace()), actionCollection());
KStdAction::spelling (TQT_TQOBJECT(this), TQT_SLOT(slotSpellcheck()), actionCollection(), "tools-check-spelling"); KStdAction::spelling (this, TQT_SLOT(slotSpellcheck()), actionCollection(), "tools-check-spelling");
mPasteQuotation = new TDEAction (i18n("Pa&ste as Quotation"),0,TQT_TQOBJECT(this),TQT_SLOT( slotPasteClipboardAsQuotation()), mPasteQuotation = new TDEAction (i18n("Pa&ste as Quotation"),0,this,TQT_SLOT( slotPasteClipboardAsQuotation()),
actionCollection(), "paste_quoted"); actionCollection(), "paste_quoted");
(void) new TDEAction (i18n("Paste as Attac&hment"),0,TQT_TQOBJECT(this),TQT_SLOT( slotPasteClipboardAsAttachment()), (void) new TDEAction (i18n("Paste as Attac&hment"),0,this,TQT_SLOT( slotPasteClipboardAsAttachment()),
actionCollection(), "paste_att"); actionCollection(), "paste_att");
TDEAction * addq = new TDEAction(i18n("Add &Quote Characters"), 0, TQT_TQOBJECT(this), TDEAction * addq = new TDEAction(i18n("Add &Quote Characters"), 0, this,
TQT_SLOT(slotAddQuotes()), actionCollection(), "tools_quote"); TQT_SLOT(slotAddQuotes()), actionCollection(), "tools_quote");
connect( mEditor, TQT_SIGNAL(selectionAvailable(bool)), connect( mEditor, TQT_SIGNAL(selectionAvailable(bool)),
addq, TQT_SLOT(setEnabled(bool)) ); addq, TQT_SLOT(setEnabled(bool)) );
TDEAction * remq = new TDEAction(i18n("Re&move Quote Characters"), 0, TQT_TQOBJECT(this), TDEAction * remq = new TDEAction(i18n("Re&move Quote Characters"), 0, this,
TQT_SLOT(slotRemoveQuotes()), actionCollection(), "tools_unquote"); TQT_SLOT(slotRemoveQuotes()), actionCollection(), "tools_unquote");
connect( mEditor, TQT_SIGNAL(selectionAvailable(bool)), connect( mEditor, TQT_SIGNAL(selectionAvailable(bool)),
remq, TQT_SLOT(setEnabled(bool)) ); remq, TQT_SLOT(setEnabled(bool)) );
(void) new TDEAction (i18n("Cl&ean Spaces"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCleanSpace()), (void) new TDEAction (i18n("Cl&ean Spaces"), 0, this, TQT_SLOT(slotCleanSpace()),
actionCollection(), "clean_spaces"); actionCollection(), "clean_spaces");
mFixedFontAction = new TDEToggleAction( i18n("Use Fi&xed Font"), 0, TQT_TQOBJECT(this), mFixedFontAction = new TDEToggleAction( i18n("Use Fi&xed Font"), 0, this,
TQT_SLOT(slotUpdateFont()), actionCollection(), "toggle_fixedfont" ); TQT_SLOT(slotUpdateFont()), actionCollection(), "toggle_fixedfont" );
mFixedFontAction->setChecked( GlobalSettings::self()->useFixedFont() ); mFixedFontAction->setChecked( GlobalSettings::self()->useFixedFont() );
@ -1375,7 +1375,7 @@ void KMComposeWin::setupActions(void)
mRequestMDNAction->setChecked(GlobalSettings::self()->requestMDN()); mRequestMDNAction->setChecked(GlobalSettings::self()->requestMDN());
//----- Message-Encoding Submenu //----- Message-Encoding Submenu
mEncodingAction = new TDESelectAction( i18n( "Se&t Encoding" ), "charset", mEncodingAction = new TDESelectAction( i18n( "Se&t Encoding" ), "charset",
0, TQT_TQOBJECT(this), TQT_SLOT(slotSetCharset() ), 0, this, TQT_SLOT(slotSetCharset() ),
actionCollection(), "charsets" ); actionCollection(), "charsets" );
mWordWrapAction = new TDEToggleAction (i18n("&Wordwrap"), 0, mWordWrapAction = new TDEToggleAction (i18n("&Wordwrap"), 0,
actionCollection(), "wordwrap"); actionCollection(), "wordwrap");
@ -1395,7 +1395,7 @@ void KMComposeWin::setupActions(void)
mAutoSpellCheckingAction->setChecked( !GlobalSettings::self()->useExternalEditor() && spellChecking ); mAutoSpellCheckingAction->setChecked( !GlobalSettings::self()->useExternalEditor() && spellChecking );
slotAutoSpellCheckingToggled( !GlobalSettings::self()->useExternalEditor() && spellChecking ); slotAutoSpellCheckingToggled( !GlobalSettings::self()->useExternalEditor() && spellChecking );
connect( mAutoSpellCheckingAction, TQT_SIGNAL( toggled( bool ) ), connect( mAutoSpellCheckingAction, TQT_SIGNAL( toggled( bool ) ),
TQT_TQOBJECT(this), TQT_SLOT( slotAutoSpellCheckingToggled( bool ) ) ); this, TQT_SLOT( slotAutoSpellCheckingToggled( bool ) ) );
TQStringList encodings = KMMsgBase::supportedEncodings(true); TQStringList encodings = KMMsgBase::supportedEncodings(true);
encodings.prepend( i18n("Auto-Detect")); encodings.prepend( i18n("Auto-Detect"));
@ -1403,84 +1403,84 @@ void KMComposeWin::setupActions(void)
mEncodingAction->setCurrentItem( -1 ); mEncodingAction->setCurrentItem( -1 );
//these are checkable!!! //these are checkable!!!
markupAction = new TDEToggleAction (i18n("Formatting (HTML)"), 0, TQT_TQOBJECT(this), markupAction = new TDEToggleAction (i18n("Formatting (HTML)"), 0, this,
TQT_SLOT(slotToggleMarkup()), TQT_SLOT(slotToggleMarkup()),
actionCollection(), "html"); actionCollection(), "html");
mAllFieldsAction = new TDEToggleAction (i18n("&All Fields"), 0, TQT_TQOBJECT(this), mAllFieldsAction = new TDEToggleAction (i18n("&All Fields"), 0, this,
TQT_SLOT(slotView()), TQT_SLOT(slotView()),
actionCollection(), "show_all_fields"); actionCollection(), "show_all_fields");
mIdentityAction = new TDEToggleAction (i18n("&Identity"), 0, TQT_TQOBJECT(this), mIdentityAction = new TDEToggleAction (i18n("&Identity"), 0, this,
TQT_SLOT(slotView()), TQT_SLOT(slotView()),
actionCollection(), "show_identity"); actionCollection(), "show_identity");
mDictionaryAction = new TDEToggleAction (i18n("&Dictionary"), 0, TQT_TQOBJECT(this), mDictionaryAction = new TDEToggleAction (i18n("&Dictionary"), 0, this,
TQT_SLOT(slotView()), TQT_SLOT(slotView()),
actionCollection(), "show_dictionary"); actionCollection(), "show_dictionary");
mFccAction = new TDEToggleAction (i18n("&Sent-Mail Folder"), 0, TQT_TQOBJECT(this), mFccAction = new TDEToggleAction (i18n("&Sent-Mail Folder"), 0, this,
TQT_SLOT(slotView()), TQT_SLOT(slotView()),
actionCollection(), "show_fcc"); actionCollection(), "show_fcc");
mTransportAction = new TDEToggleAction (i18n("&Mail Transport"), 0, TQT_TQOBJECT(this), mTransportAction = new TDEToggleAction (i18n("&Mail Transport"), 0, this,
TQT_SLOT(slotView()), TQT_SLOT(slotView()),
actionCollection(), "show_transport"); actionCollection(), "show_transport");
mFromAction = new TDEToggleAction (i18n("&From"), 0, TQT_TQOBJECT(this), mFromAction = new TDEToggleAction (i18n("&From"), 0, this,
TQT_SLOT(slotView()), TQT_SLOT(slotView()),
actionCollection(), "show_from"); actionCollection(), "show_from");
mReplyToAction = new TDEToggleAction (i18n("&Reply To"), 0, TQT_TQOBJECT(this), mReplyToAction = new TDEToggleAction (i18n("&Reply To"), 0, this,
TQT_SLOT(slotView()), TQT_SLOT(slotView()),
actionCollection(), "show_reply_to"); actionCollection(), "show_reply_to");
if ( mClassicalRecipients ) { if ( mClassicalRecipients ) {
mToAction = new TDEToggleAction (i18n("&To"), 0, TQT_TQOBJECT(this), mToAction = new TDEToggleAction (i18n("&To"), 0, this,
TQT_SLOT(slotView()), TQT_SLOT(slotView()),
actionCollection(), "show_to"); actionCollection(), "show_to");
mCcAction = new TDEToggleAction (i18n("&CC"), 0, TQT_TQOBJECT(this), mCcAction = new TDEToggleAction (i18n("&CC"), 0, this,
TQT_SLOT(slotView()), TQT_SLOT(slotView()),
actionCollection(), "show_cc"); actionCollection(), "show_cc");
mBccAction = new TDEToggleAction (i18n("&BCC"), 0, TQT_TQOBJECT(this), mBccAction = new TDEToggleAction (i18n("&BCC"), 0, this,
TQT_SLOT(slotView()), TQT_SLOT(slotView()),
actionCollection(), "show_bcc"); actionCollection(), "show_bcc");
} }
mSubjectAction = new TDEToggleAction (i18n("S&ubject"), 0, TQT_TQOBJECT(this), mSubjectAction = new TDEToggleAction (i18n("S&ubject"), 0, this,
TQT_SLOT(slotView()), TQT_SLOT(slotView()),
actionCollection(), "show_subject"); actionCollection(), "show_subject");
//end of checkable //end of checkable
mAppendSignatureAction = new TDEAction (i18n("Append S&ignature"), 0, TQT_TQOBJECT(this), mAppendSignatureAction = new TDEAction (i18n("Append S&ignature"), 0, this,
TQT_SLOT(slotAppendSignature()), TQT_SLOT(slotAppendSignature()),
actionCollection(), "append_signature"); actionCollection(), "append_signature");
mPrependSignatureAction = new TDEAction (i18n("Prepend S&ignature"), 0, TQT_TQOBJECT(this), mPrependSignatureAction = new TDEAction (i18n("Prepend S&ignature"), 0, this,
TQT_SLOT(slotPrependSignature()), TQT_SLOT(slotPrependSignature()),
actionCollection(), "prepend_signature"); actionCollection(), "prepend_signature");
mInsertSignatureAction = new TDEAction (i18n("Insert Signature At C&ursor Position"), "edit", 0, TQT_TQOBJECT(this), mInsertSignatureAction = new TDEAction (i18n("Insert Signature At C&ursor Position"), "edit", 0, this,
TQT_SLOT(slotInsertSignatureAtCursor()), TQT_SLOT(slotInsertSignatureAtCursor()),
actionCollection(), "insert_signature_at_cursor_position"); actionCollection(), "insert_signature_at_cursor_position");
mAttachPK = new TDEAction (i18n("Attach &Public Key..."), 0, TQT_TQOBJECT(this), mAttachPK = new TDEAction (i18n("Attach &Public Key..."), 0, this,
TQT_SLOT(slotInsertPublicKey()), TQT_SLOT(slotInsertPublicKey()),
actionCollection(), "attach_public_key"); actionCollection(), "attach_public_key");
mAttachMPK = new TDEAction (i18n("Attach &My Public Key"), 0, TQT_TQOBJECT(this), mAttachMPK = new TDEAction (i18n("Attach &My Public Key"), 0, this,
TQT_SLOT(slotInsertMyPublicKey()), TQT_SLOT(slotInsertMyPublicKey()),
actionCollection(), "attach_my_public_key"); actionCollection(), "attach_my_public_key");
(void) new TDEAction (i18n("&Attach File..."), "attach", (void) new TDEAction (i18n("&Attach File..."), "attach",
0, TQT_TQOBJECT(this), TQT_SLOT(slotAttachFile()), 0, this, TQT_SLOT(slotAttachFile()),
actionCollection(), "attach"); actionCollection(), "attach");
mAttachRemoveAction = new TDEAction (i18n("&Remove Attachment"), 0, TQT_TQOBJECT(this), mAttachRemoveAction = new TDEAction (i18n("&Remove Attachment"), 0, this,
TQT_SLOT(slotAttachRemove()), TQT_SLOT(slotAttachRemove()),
actionCollection(), "remove"); actionCollection(), "remove");
mAttachSaveAction = new TDEAction (i18n("&Save Attachment As..."), "document-save",0, mAttachSaveAction = new TDEAction (i18n("&Save Attachment As..."), "document-save",0,
TQT_TQOBJECT(this), TQT_SLOT(slotAttachSave()), this, TQT_SLOT(slotAttachSave()),
actionCollection(), "attach_save"); actionCollection(), "attach_save");
mAttachPropertiesAction = new TDEAction (i18n("Attachment Pr&operties"), 0, TQT_TQOBJECT(this), mAttachPropertiesAction = new TDEAction (i18n("Attachment Pr&operties"), 0, this,
TQT_SLOT(slotAttachProperties()), TQT_SLOT(slotAttachProperties()),
actionCollection(), "attach_properties"); actionCollection(), "attach_properties");
setStandardToolBarMenuEnabled(true); setStandardToolBarMenuEnabled(true);
KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotEditKeys()), actionCollection()); KStdAction::keyBindings(this, TQT_SLOT(slotEditKeys()), actionCollection());
KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotEditToolbars()), actionCollection()); KStdAction::configureToolbars(this, TQT_SLOT(slotEditToolbars()), actionCollection());
KStdAction::preferences(kmkernel, TQT_SLOT(slotShowConfigurationDialog()), actionCollection()); KStdAction::preferences(kmkernel, TQT_SLOT(slotShowConfigurationDialog()), actionCollection());
(void) new TDEAction (i18n("&Spellchecker..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSpellcheckConfig()), (void) new TDEAction (i18n("&Spellchecker..."), 0, this, TQT_SLOT(slotSpellcheckConfig()),
actionCollection(), "setup_spellchecker"); actionCollection(), "setup_spellchecker");
if ( Kleo::CryptoBackendFactory::instance()->protocol( "Chiasmus" ) ) { if ( Kleo::CryptoBackendFactory::instance()->protocol( "Chiasmus" ) ) {
@ -1490,7 +1490,7 @@ void KMComposeWin::setupActions(void)
a->setCheckedState( KGuiItem( i18n( "Encrypt Message with Chiasmus..." ), "chiencrypted" ) ); a->setCheckedState( KGuiItem( i18n( "Encrypt Message with Chiasmus..." ), "chiencrypted" ) );
mEncryptChiasmusAction = a; mEncryptChiasmusAction = a;
connect( mEncryptChiasmusAction, TQT_SIGNAL(toggled(bool)), connect( mEncryptChiasmusAction, TQT_SIGNAL(toggled(bool)),
TQT_TQOBJECT(this), TQT_SLOT(slotEncryptChiasmusToggled(bool)) ); this, TQT_SLOT(slotEncryptChiasmusToggled(bool)) );
} else { } else {
mEncryptChiasmusAction = 0; mEncryptChiasmusAction = 0;
} }
@ -1546,7 +1546,7 @@ void KMComposeWin::setupActions(void)
l.push_back( Kleo::cryptoMessageFormatToLabel( cryptoMessageFormats[i] ) ); l.push_back( Kleo::cryptoMessageFormatToLabel( cryptoMessageFormats[i] ) );
mCryptoModuleAction = new TDESelectAction( i18n( "&Cryptographic Message Format" ), 0, mCryptoModuleAction = new TDESelectAction( i18n( "&Cryptographic Message Format" ), 0,
TQT_TQOBJECT(this), TQT_SLOT(slotSelectCryptoModule()), this, TQT_SLOT(slotSelectCryptoModule()),
actionCollection(), "options_select_crypto" ); actionCollection(), "options_select_crypto" );
mCryptoModuleAction->setItems( l ); mCryptoModuleAction->setItems( l );
mCryptoModuleAction->setCurrentItem( format2cb( ident.preferredCryptoMessageFormat() ) ); mCryptoModuleAction->setCurrentItem( format2cb( ident.preferredCryptoMessageFormat() ) );
@ -1580,36 +1580,36 @@ void KMComposeWin::setupActions(void)
TQT_SLOT( slotSizeAction( int ) ) ); TQT_SLOT( slotSizeAction( int ) ) );
alignLeftAction = new TDEToggleAction (i18n("Align Left"), "format-text-direction-ltr", 0, alignLeftAction = new TDEToggleAction (i18n("Align Left"), "format-text-direction-ltr", 0,
TQT_TQOBJECT(this), TQT_SLOT(slotAlignLeft()), actionCollection(), this, TQT_SLOT(slotAlignLeft()), actionCollection(),
"align_left"); "align_left");
alignLeftAction->setChecked( true ); alignLeftAction->setChecked( true );
alignRightAction = new TDEToggleAction (i18n("Align Right"), "format-text-direction-rtl", 0, alignRightAction = new TDEToggleAction (i18n("Align Right"), "format-text-direction-rtl", 0,
TQT_TQOBJECT(this), TQT_SLOT(slotAlignRight()), actionCollection(), this, TQT_SLOT(slotAlignRight()), actionCollection(),
"align_right"); "align_right");
alignCenterAction = new TDEToggleAction (i18n("Align Center"), "text_center", 0, alignCenterAction = new TDEToggleAction (i18n("Align Center"), "text_center", 0,
TQT_TQOBJECT(this), TQT_SLOT(slotAlignCenter()), actionCollection(), this, TQT_SLOT(slotAlignCenter()), actionCollection(),
"align_center"); "align_center");
textBoldAction = new TDEToggleAction( i18n("&Bold"), "format-text-bold", CTRL+Key_B, textBoldAction = new TDEToggleAction( i18n("&Bold"), "format-text-bold", CTRL+Key_B,
TQT_TQOBJECT(this), TQT_SLOT(slotTextBold()), this, TQT_SLOT(slotTextBold()),
actionCollection(), "format-text-bold"); actionCollection(), "format-text-bold");
textItalicAction = new TDEToggleAction( i18n("&Italic"), "format-text-italic", CTRL+Key_I, textItalicAction = new TDEToggleAction( i18n("&Italic"), "format-text-italic", CTRL+Key_I,
TQT_TQOBJECT(this), TQT_SLOT(slotTextItalic()), this, TQT_SLOT(slotTextItalic()),
actionCollection(), "format-text-italic"); actionCollection(), "format-text-italic");
textUnderAction = new TDEToggleAction( i18n("&Underline"), "format-text-underline", CTRL+Key_U, textUnderAction = new TDEToggleAction( i18n("&Underline"), "format-text-underline", CTRL+Key_U,
TQT_TQOBJECT(this), TQT_SLOT(slotTextUnder()), this, TQT_SLOT(slotTextUnder()),
actionCollection(), "format-text-underline"); actionCollection(), "format-text-underline");
actionFormatReset = new TDEAction( i18n( "Reset Font Settings" ), "eraser", 0, actionFormatReset = new TDEAction( i18n( "Reset Font Settings" ), "eraser", 0,
TQT_TQOBJECT(this), TQT_SLOT( slotFormatReset() ), this, TQT_SLOT( slotFormatReset() ),
actionCollection(), "format_reset"); actionCollection(), "format_reset");
actionFormatColor = new TDEAction( i18n( "Text Color..." ), "colorize", 0, actionFormatColor = new TDEAction( i18n( "Text Color..." ), "colorize", 0,
TQT_TQOBJECT(this), TQT_SLOT( slotTextColor() ), this, TQT_SLOT( slotTextColor() ),
actionCollection(), "format_color"); actionCollection(), "format_color");
// editorFocusChanged(false); // editorFocusChanged(false);
createGUI("kmcomposerui.rc"); createGUI("kmcomposerui.rc");
connect( toolBar("htmlToolBar"), TQT_SIGNAL( visibilityChanged(bool) ), connect( toolBar("htmlToolBar"), TQT_SIGNAL( visibilityChanged(bool) ),
TQT_TQOBJECT(this), TQT_SLOT( htmlToolBarVisibilityChanged(bool) ) ); this, TQT_SLOT( htmlToolBarVisibilityChanged(bool) ) );
// In Kontact, this entry would read "Configure Kontact", but bring // In Kontact, this entry would read "Configure Kontact", but bring
// up KMail's config dialog. That's sensible, though, so fix the label. // up KMail's config dialog. That's sensible, though, so fix the label.
@ -1682,9 +1682,9 @@ void KMComposeWin::setupEditor(void)
updateCursorPosition(); updateCursorPosition();
connect(mEditor,TQT_SIGNAL(CursorPositionChanged()),TQT_SLOT(updateCursorPosition())); connect(mEditor,TQT_SIGNAL(CursorPositionChanged()),TQT_SLOT(updateCursorPosition()));
connect( mEditor, TQT_SIGNAL( currentFontChanged( const TQFont & ) ), connect( mEditor, TQT_SIGNAL( currentFontChanged( const TQFont & ) ),
TQT_TQOBJECT(this), TQT_SLOT( fontChanged( const TQFont & ) ) ); this, TQT_SLOT( fontChanged( const TQFont & ) ) );
connect( mEditor, TQT_SIGNAL( currentAlignmentChanged( int ) ), connect( mEditor, TQT_SIGNAL( currentAlignmentChanged( int ) ),
TQT_TQOBJECT(this), TQT_SLOT( alignmentChanged( int ) ) ); this, TQT_SLOT( alignmentChanged( int ) ) );
} }
@ -1875,14 +1875,14 @@ void KMComposeWin::setMsg(KMMessage* newMsg, bool mayAutoSign,
// unless the identity is sticky // unless the identity is sticky
if ( !stickyIdentity ) { if ( !stickyIdentity ) {
disconnect(mIdentity,TQT_SIGNAL(identityChanged(uint)), disconnect(mIdentity,TQT_SIGNAL(identityChanged(uint)),
TQT_TQOBJECT(this), TQT_SLOT(slotIdentityChanged(uint))); this, TQT_SLOT(slotIdentityChanged(uint)));
} }
// load the mId into the gui, sticky or not, without emitting // load the mId into the gui, sticky or not, without emitting
mIdentity->setCurrentIdentity( mId ); mIdentity->setCurrentIdentity( mId );
const uint idToApply = mId; const uint idToApply = mId;
if ( !stickyIdentity ) { if ( !stickyIdentity ) {
connect(mIdentity,TQT_SIGNAL(identityChanged(uint)), connect(mIdentity,TQT_SIGNAL(identityChanged(uint)),
TQT_TQOBJECT(this), TQT_SLOT(slotIdentityChanged(uint))); this, TQT_SLOT(slotIdentityChanged(uint)));
} else { } else {
// load the message's state into the mId, without applying it to the gui // 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) // that's so we can detect that the id changed (because a sticky was set)
@ -2359,7 +2359,7 @@ void KMComposeWin::applyChanges( bool dontSignNorEncrypt, bool dontDisable )
// Make new job and execute it // Make new job and execute it
mComposer = new MessageComposer( this ); mComposer = new MessageComposer( this );
connect( mComposer, TQT_SIGNAL( done( bool ) ), connect( mComposer, TQT_SIGNAL( done( bool ) ),
TQT_TQOBJECT(this), TQT_SLOT( slotComposerDone( bool ) ) ); this, TQT_SLOT( slotComposerDone( bool ) ) );
// TODO: Add a cancel button for the following operations? // TODO: Add a cancel button for the following operations?
// Disable any input to the window, so that we have a snapshot of the // Disable any input to the window, so that we have a snapshot of the
@ -2436,9 +2436,9 @@ bool KMComposeWin::addAttach(const KURL aUrl)
mMapAtmLoadData.insert(job, ld); mMapAtmLoadData.insert(job, ld);
mAttachJobs[job] = aUrl; mAttachJobs[job] = aUrl;
connect(job, TQT_SIGNAL(result(TDEIO::Job *)), connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileResult(TDEIO::Job *))); this, TQT_SLOT(slotAttachFileResult(TDEIO::Job *)));
connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileData(TDEIO::Job *, const TQByteArray &))); this, TQT_SLOT(slotAttachFileData(TDEIO::Job *, const TQByteArray &)));
return true; return true;
} }
@ -2468,9 +2468,9 @@ void KMComposeWin::addAttach(const KMMessagePart* msgPart)
} }
connect( lvi, TQT_SIGNAL( compress( int ) ), connect( lvi, TQT_SIGNAL( compress( int ) ),
TQT_TQOBJECT(this), TQT_SLOT( compressAttach( int ) ) ); this, TQT_SLOT( compressAttach( int ) ) );
connect( lvi, TQT_SIGNAL( uncompress( int ) ), connect( lvi, TQT_SIGNAL( uncompress( int ) ),
TQT_TQOBJECT(this), TQT_SLOT( uncompressAttach( int ) ) ); this, TQT_SLOT( uncompressAttach( int ) ) );
slotUpdateAttachActions(); slotUpdateAttachActions();
} }
@ -3020,9 +3020,9 @@ void KMComposeWin::slotInsertRecentFile(const KURL& u)
} }
mMapAtmLoadData.insert(job, ld); mMapAtmLoadData.insert(job, ld);
connect(job, TQT_SIGNAL(result(TDEIO::Job *)), connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileResult(TDEIO::Job *))); this, TQT_SLOT(slotAttachFileResult(TDEIO::Job *)));
connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
TQT_TQOBJECT(this), TQT_SLOT(slotAttachFileData(TDEIO::Job *, const TQByteArray &))); this, TQT_SLOT(slotAttachFileData(TDEIO::Job *, const TQByteArray &)));
} }
@ -3575,7 +3575,7 @@ void KMComposeWin::editAttach(int index, bool openWith)
KMail::EditorWatcher *watcher = KMail::EditorWatcher *watcher =
new KMail::EditorWatcher( KURL( atmTempFile->name() ), contentTypeStr, openWith, new KMail::EditorWatcher( KURL( atmTempFile->name() ), contentTypeStr, openWith,
TQT_TQOBJECT(this), this ); this, this );
connect( watcher, TQT_SIGNAL(editDone(KMail::EditorWatcher*)), TQT_SLOT(slotEditDone(KMail::EditorWatcher*)) ); connect( watcher, TQT_SIGNAL(editDone(KMail::EditorWatcher*)), TQT_SLOT(slotEditDone(KMail::EditorWatcher*)) );
if ( watcher->start() ) { if ( watcher->start() ) {
mEditorMap.insert( watcher, msgPart ); mEditorMap.insert( watcher, msgPart );
@ -4083,14 +4083,14 @@ void KMComposeWin::slotPrint()
{ {
mMessageWasModified = isModified(); mMessageWasModified = isModified();
connect( this, TQT_SIGNAL( applyChangesDone( bool ) ), connect( this, TQT_SIGNAL( applyChangesDone( bool ) ),
TQT_TQOBJECT(this), TQT_SLOT( slotContinuePrint( bool ) ) ); this, TQT_SLOT( slotContinuePrint( bool ) ) );
applyChanges( true ); applyChanges( true );
} }
void KMComposeWin::slotContinuePrint( bool rc ) void KMComposeWin::slotContinuePrint( bool rc )
{ {
disconnect( this, TQT_SIGNAL( applyChangesDone( bool ) ), disconnect( this, TQT_SIGNAL( applyChangesDone( bool ) ),
TQT_TQOBJECT(this), TQT_SLOT( slotContinuePrint( bool ) ) ); this, TQT_SLOT( slotContinuePrint( bool ) ) );
if( rc ) { if( rc ) {
if ( mComposedMessages.isEmpty() ) { if ( mComposedMessages.isEmpty() ) {
@ -4334,7 +4334,7 @@ void KMComposeWin::slotContinueDoSend( bool sentOk )
kdDebug(5006) << "KMComposeWin::slotContinueDoSend( " << sentOk << " )" kdDebug(5006) << "KMComposeWin::slotContinueDoSend( " << sentOk << " )"
<< endl; << endl;
disconnect( this, TQT_SIGNAL( applyChangesDone( bool ) ), disconnect( this, TQT_SIGNAL( applyChangesDone( bool ) ),
TQT_TQOBJECT(this), TQT_SLOT( slotContinueDoSend( bool ) ) ); this, TQT_SLOT( slotContinueDoSend( bool ) ) );
if ( !sentOk ) { if ( !sentOk ) {
mDisableBreaking = false; mDisableBreaking = false;
@ -4989,7 +4989,7 @@ void KMComposeWin::slotSpellcheckConfig()
{ {
KDialogBase dlg(KDialogBase::Plain, i18n("Spellchecker"), KDialogBase dlg(KDialogBase::Plain, i18n("Spellchecker"),
KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok,
TQT_TQWIDGET(this), 0, true, true ); this, 0, true, true );
KWin twin; KWin twin;
TQTabDialog qtd (this, "tabdialog", true); TQTabDialog qtd (this, "tabdialog", true);
KSpellConfig mKSpellConfig (&qtd); KSpellConfig mKSpellConfig (&qtd);
@ -5079,7 +5079,7 @@ void KMComposeWin::updateAutoSave()
if ( !mAutoSaveTimer ) { if ( !mAutoSaveTimer ) {
mAutoSaveTimer = new TQTimer( this, "mAutoSaveTimer" ); mAutoSaveTimer = new TQTimer( this, "mAutoSaveTimer" );
connect( mAutoSaveTimer, TQT_SIGNAL( timeout() ), connect( mAutoSaveTimer, TQT_SIGNAL( timeout() ),
TQT_TQOBJECT(this), TQT_SLOT( autoSaveMessage() ) ); this, TQT_SLOT( autoSaveMessage() ) );
} }
mAutoSaveTimer->start( autoSaveInterval() ); mAutoSaveTimer->start( autoSaveInterval() );
} }

6
kmail/kmedit.cpp
Unescape View File

@ -240,7 +240,7 @@ KMEdit::KMEdit(TQWidget *parent, KMComposeWin* composer,
void KMEdit::createSpellers() void KMEdit::createSpellers()
{ {
delete mSpeller; delete mSpeller;
mSpeller = new KMSpell( TQT_TQOBJECT(this), TQT_SLOT( spellerReady( KSpell * ) ), mSpellConfig ); mSpeller = new KMSpell( this, TQT_SLOT( spellerReady( KSpell * ) ), mSpellConfig );
} }
void KMEdit::initializeAutoSpellChecking() void KMEdit::initializeAutoSpellChecking()
@ -457,7 +457,7 @@ bool KMEdit::eventFilter(TQObject*o, TQEvent* e)
i18n("Unable to start external editor.") ); i18n("Unable to start external editor.") );
killExternalEditor(); killExternalEditor();
} else { } else {
mExtEditorTempFileWatcher = new KDirWatch( TQT_TQOBJECT(this), "mExtEditorTempFileWatcher" ); mExtEditorTempFileWatcher = new KDirWatch( this, "mExtEditorTempFileWatcher" );
connect( mExtEditorTempFileWatcher, TQT_SIGNAL(dirty(const TQString&)), connect( mExtEditorTempFileWatcher, TQT_SIGNAL(dirty(const TQString&)),
TQT_SLOT(slotExternalEditorTempFileChanged(const TQString&)) ); TQT_SLOT(slotExternalEditorTempFileChanged(const TQString&)) );
mExtEditorTempFileWatcher->addFile( mExtEditorTempFile->name() ); mExtEditorTempFileWatcher->addFile( mExtEditorTempFile->name() );
@ -657,7 +657,7 @@ void KMEdit::spellcheck()
// Don't use mSpellConfig here. Reason is that the spell dialog, KSpellDlg, uses its own // 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. // spell config, and therefore the two wouldn't be in sync.
mKSpellForDialog = new KSpell( TQT_TQWIDGET(this), i18n("Spellcheck - KMail"), TQT_TQOBJECT(this), mKSpellForDialog = new KSpell( this, i18n("Spellcheck - KMail"), this,
TQT_SLOT(slotSpellcheck2(KSpell*))/*, mSpellConfig*/ ); TQT_SLOT(slotSpellcheck2(KSpell*))/*, mSpellConfig*/ );
// } // }

4
kmail/kmfoldertree.cpp
Unescape View File

@ -1115,13 +1115,13 @@ void KMFolderTree::slotContextMenuRequested( TQListViewItem *lvi,
// copy folder // copy folder
TQPopupMenu *copyMenu = new TQPopupMenu( folderMenu ); TQPopupMenu *copyMenu = new TQPopupMenu( folderMenu );
folderToPopupMenu( CopyFolder, TQT_TQOBJECT(this), &mMenuToFolder, copyMenu ); folderToPopupMenu( CopyFolder, this, &mMenuToFolder, copyMenu );
folderMenu->insertItem( i18n("&Copy Folder To"), copyMenu ); folderMenu->insertItem( i18n("&Copy Folder To"), copyMenu );
if ( fti->folder()->isMoveable() && fti->folder()->canDeleteMessages() ) if ( fti->folder()->isMoveable() && fti->folder()->canDeleteMessages() )
{ {
TQPopupMenu *moveMenu = new TQPopupMenu( folderMenu ); TQPopupMenu *moveMenu = new TQPopupMenu( folderMenu );
folderToPopupMenu( MoveFolder, TQT_TQOBJECT(this), &mMenuToFolder, moveMenu ); folderToPopupMenu( MoveFolder, this, &mMenuToFolder, moveMenu );
folderMenu->insertItem( i18n("&Move Folder To"), moveMenu ); folderMenu->insertItem( i18n("&Move Folder To"), moveMenu );
} }

6
kmail/kmheaders.cpp
Unescape View File

@ -2464,7 +2464,7 @@ void KMHeaders::slotRMB()
menu->insertSeparator(); menu->insertSeparator();
TQPopupMenu *msgCopyMenu = new TQPopupMenu(menu); TQPopupMenu *msgCopyMenu = new TQPopupMenu(menu);
mOwner->folderTree()->folderToPopupMenu( KMFolderTree::CopyMessage, TQT_TQOBJECT(this), mOwner->folderTree()->folderToPopupMenu( KMFolderTree::CopyMessage, this,
&mMenuToFolder, msgCopyMenu ); &mMenuToFolder, msgCopyMenu );
menu->insertItem(i18n("&Copy To"), msgCopyMenu); menu->insertItem(i18n("&Copy To"), msgCopyMenu);
@ -2473,7 +2473,7 @@ void KMHeaders::slotRMB()
menu->setItemEnabled( id, false ); menu->setItemEnabled( id, false );
} else { } else {
TQPopupMenu *msgMoveMenu = new TQPopupMenu(menu); TQPopupMenu *msgMoveMenu = new TQPopupMenu(menu);
mOwner->folderTree()->folderToPopupMenu( KMFolderTree::MoveMessage, TQT_TQOBJECT(this), mOwner->folderTree()->folderToPopupMenu( KMFolderTree::MoveMessage, this,
&mMenuToFolder, msgMoveMenu ); &mMenuToFolder, msgMoveMenu );
menu->insertItem(i18n("&Move To"), msgMoveMenu); menu->insertItem(i18n("&Move To"), msgMoveMenu);
} }
@ -3556,7 +3556,7 @@ void KMHeaders::cutMessages()
void KMHeaders::pasteMessages() void KMHeaders::pasteMessages()
{ {
new MessageCopyHelper( mCopiedMessages, folder(), mMoveMessages, TQT_TQOBJECT(this) ); new MessageCopyHelper( mCopiedMessages, folder(), mMoveMessages, this );
if ( mMoveMessages ) { if ( mMoveMessages ) {
mCopiedMessages.clear(); mCopiedMessages.clear();
updateActions(); updateActions();

258
kmail/kmmainwidget.cpp
Unescape View File

@ -203,7 +203,7 @@ KMMainWidget::KMMainWidget(TQWidget *parent, const char *name,
activatePanners(); activatePanners();
TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( slotShowStartupFolder() )); TQTimer::singleShot( 0, this, TQT_SLOT( slotShowStartupFolder() ));
connect( kmkernel->acctMgr(), TQT_SIGNAL( checkedMail( bool, bool, const TQMap<TQString, int> & ) ), connect( kmkernel->acctMgr(), TQT_SIGNAL( checkedMail( bool, bool, const TQMap<TQString, int> & ) ),
this, TQT_SLOT( slotMailChecked( bool, bool, const TQMap<TQString, int> & ) ) ); this, TQT_SLOT( slotMailChecked( bool, bool, const TQMap<TQString, int> & ) ) );
@ -251,7 +251,7 @@ KMMainWidget::KMMainWidget(TQWidget *parent, const char *name,
mVacationScriptIndicator->hide(); mVacationScriptIndicator->hide();
connect( mVacationScriptIndicator, TQT_SIGNAL(itemReleased(int)), TQT_SLOT(slotEditVacation()) ); connect( mVacationScriptIndicator, TQT_SIGNAL(itemReleased(int)), TQT_SLOT(slotEditVacation()) );
if ( GlobalSettings::checkOutOfOfficeOnStartup() ) if ( GlobalSettings::checkOutOfOfficeOnStartup() )
TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT(slotCheckVacation()) ); TQTimer::singleShot( 0, this, TQT_SLOT(slotCheckVacation()) );
} }
@ -468,7 +468,7 @@ void KMMainWidget::readConfig(void)
bool check = config->readBoolEntry("checkmail-startup", false); bool check = config->readBoolEntry("checkmail-startup", false);
if (check) if (check)
// do it after building the kmmainwin, so that the progressdialog is available // do it after building the kmmainwin, so that the progressdialog is available
TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( slotCheckMail() ) ); TQTimer::singleShot( 0, this, TQT_SLOT( slotCheckMail() ) );
} }
} }
@ -631,7 +631,7 @@ void KMMainWidget::createWidgets(void)
mHeaders, TQT_SLOT(selectNextMessage())); mHeaders, TQT_SLOT(selectNextMessage()));
if (mReaderWindowActive) { if (mReaderWindowActive) {
mMsgView = new KMReaderWin(messageParent, TQT_TQWIDGET(this), actionCollection(), 0 ); mMsgView = new KMReaderWin(messageParent, this, actionCollection(), 0 );
if ( mMsgActions ) { if ( mMsgActions ) {
mMsgActions->setMessageView( mMsgView ); mMsgActions->setMessageView( mMsgView );
} }
@ -660,17 +660,17 @@ void KMMainWidget::createWidgets(void)
TDEAction *action; TDEAction *action;
mMoveMsgToFolderAction = new TDEAction( i18n("Move Message to Folder"), Key_M, TQT_TQOBJECT(this), mMoveMsgToFolderAction = new TDEAction( i18n("Move Message to Folder"), Key_M, this,
TQT_SLOT(slotMoveMsg()), actionCollection(), TQT_SLOT(slotMoveMsg()), actionCollection(),
"move_message_to_folder" ); "move_message_to_folder" );
mMoveMsgToFolderAction->plugAccel( actionCollection()->tdeaccel() ); mMoveMsgToFolderAction->plugAccel( actionCollection()->tdeaccel() );
action = new TDEAction( i18n("Copy Message to Folder"), Key_C, TQT_TQOBJECT(this), action = new TDEAction( i18n("Copy Message to Folder"), Key_C, this,
TQT_SLOT(slotCopyMsg()), actionCollection(), TQT_SLOT(slotCopyMsg()), actionCollection(),
"copy_message_to_folder" ); "copy_message_to_folder" );
action->plugAccel( actionCollection()->tdeaccel() ); action->plugAccel( actionCollection()->tdeaccel() );
action = new TDEAction( i18n("Jump to Folder"), Key_J, TQT_TQOBJECT(this), action = new TDEAction( i18n("Jump to Folder"), Key_J, this,
TQT_SLOT(slotJumpToFolder()), actionCollection(), TQT_SLOT(slotJumpToFolder()), actionCollection(),
"jump_to_folder" ); "jump_to_folder" );
action->plugAccel( actionCollection()->tdeaccel() ); action->plugAccel( actionCollection()->tdeaccel() );
@ -713,7 +713,7 @@ void KMMainWidget::createWidgets(void)
//Commands not worthy of menu items, but that deserve configurable keybindings //Commands not worthy of menu items, but that deserve configurable keybindings
mRemoveDuplicatesAction = new TDEAction( mRemoveDuplicatesAction = new TDEAction(
i18n("Remove Duplicate Messages"), CTRL+Key_Asterisk, TQT_TQOBJECT(this), i18n("Remove Duplicate Messages"), CTRL+Key_Asterisk, this,
TQT_SLOT(removeDuplicates()), actionCollection(), "remove_duplicate_messages"); TQT_SLOT(removeDuplicates()), actionCollection(), "remove_duplicate_messages");
action->plugAccel( actionCollection()->tdeaccel() ); action->plugAccel( actionCollection()->tdeaccel() );
@ -723,32 +723,32 @@ void KMMainWidget::createWidgets(void)
action->plugAccel( actionCollection()->tdeaccel() ); action->plugAccel( actionCollection()->tdeaccel() );
action = new TDEAction( action = new TDEAction(
i18n("Focus on Next Folder"), CTRL+Key_Right, TQT_TQOBJECT(mFolderTree), i18n("Focus on Next Folder"), CTRL+Key_Right, mFolderTree,
TQT_SLOT(incCurrentFolder()), actionCollection(), "inc_current_folder"); TQT_SLOT(incCurrentFolder()), actionCollection(), "inc_current_folder");
action->plugAccel( actionCollection()->tdeaccel() ); action->plugAccel( actionCollection()->tdeaccel() );
action = new TDEAction( action = new TDEAction(
i18n("Focus on Previous Folder"), CTRL+Key_Left, TQT_TQOBJECT(mFolderTree), i18n("Focus on Previous Folder"), CTRL+Key_Left, mFolderTree,
TQT_SLOT(decCurrentFolder()), actionCollection(), "dec_current_folder"); TQT_SLOT(decCurrentFolder()), actionCollection(), "dec_current_folder");
action->plugAccel( actionCollection()->tdeaccel() ); action->plugAccel( actionCollection()->tdeaccel() );
action = new TDEAction( action = new TDEAction(
i18n("Select Folder with Focus"), CTRL+Key_Space, TQT_TQOBJECT(mFolderTree), i18n("Select Folder with Focus"), CTRL+Key_Space, mFolderTree,
TQT_SLOT(selectCurrentFolder()), actionCollection(), "select_current_folder"); TQT_SLOT(selectCurrentFolder()), actionCollection(), "select_current_folder");
action->plugAccel( actionCollection()->tdeaccel() ); action->plugAccel( actionCollection()->tdeaccel() );
action = new TDEAction( action = new TDEAction(
i18n("Focus on Next Message"), ALT+Key_Right, TQT_TQOBJECT(mHeaders), i18n("Focus on Next Message"), ALT+Key_Right, mHeaders,
TQT_SLOT(incCurrentMessage()), actionCollection(), "inc_current_message"); TQT_SLOT(incCurrentMessage()), actionCollection(), "inc_current_message");
action->plugAccel( actionCollection()->tdeaccel() ); action->plugAccel( actionCollection()->tdeaccel() );
action = new TDEAction( action = new TDEAction(
i18n("Focus on Previous Message"), ALT+Key_Left, TQT_TQOBJECT(mHeaders), i18n("Focus on Previous Message"), ALT+Key_Left, mHeaders,
TQT_SLOT(decCurrentMessage()), actionCollection(), "dec_current_message"); TQT_SLOT(decCurrentMessage()), actionCollection(), "dec_current_message");
action->plugAccel( actionCollection()->tdeaccel() ); action->plugAccel( actionCollection()->tdeaccel() );
action = new TDEAction( action = new TDEAction(
i18n("Select Message with Focus"), ALT+Key_Space, TQT_TQOBJECT(mHeaders), i18n("Select Message with Focus"), ALT+Key_Space, mHeaders,
TQT_SLOT( selectCurrentMessage() ), actionCollection(), "select_current_message"); TQT_SLOT( selectCurrentMessage() ), actionCollection(), "select_current_message");
action->plugAccel( actionCollection()->tdeaccel() ); action->plugAccel( actionCollection()->tdeaccel() );
@ -1716,7 +1716,7 @@ void KMMainWidget::slotCheckVacation()
if ( !kmkernel->askToGoOnline() ) if ( !kmkernel->askToGoOnline() )
return; return;
Vacation *vac = new Vacation( TQT_TQOBJECT(this), true /* check only */ ); Vacation *vac = new Vacation( this, true /* check only */ );
connect( vac, TQT_SIGNAL(scriptActive(bool)), TQT_SLOT(updateVactionScripStatus(bool)) ); connect( vac, TQT_SIGNAL(scriptActive(bool)), TQT_SLOT(updateVactionScripStatus(bool)) );
} }
@ -1729,7 +1729,7 @@ void KMMainWidget::slotEditVacation()
if ( mVacation ) if ( mVacation )
return; return;
mVacation = new Vacation( TQT_TQOBJECT(this) ); mVacation = new Vacation( this );
connect( mVacation, TQT_SIGNAL(scriptActive(bool)), TQT_SLOT(updateVactionScripStatus(bool)) ); connect( mVacation, TQT_SIGNAL(scriptActive(bool)), TQT_SLOT(updateVactionScripStatus(bool)) );
if ( mVacation->isUsable() ) { if ( mVacation->isUsable() ) {
connect( mVacation, TQT_SIGNAL(result(bool)), mVacation, TQT_SLOT(deleteLater()) ); connect( mVacation, TQT_SIGNAL(result(bool)), mVacation, TQT_SLOT(deleteLater()) );
@ -1847,7 +1847,7 @@ void KMMainWidget::setupForwardActions()
mForwardActionMenu->insert( mForwardAttachedAction, 1 ); mForwardActionMenu->insert( mForwardAttachedAction, 1 );
mForwardInlineAction->setShortcut( Key_F ); mForwardInlineAction->setShortcut( Key_F );
mForwardAttachedAction->setShortcut( SHIFT+Key_F ); mForwardAttachedAction->setShortcut( SHIFT+Key_F );
connect( mForwardActionMenu, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), connect( mForwardActionMenu, TQT_SIGNAL(activated()), this,
TQT_SLOT(slotForwardInlineMsg()) ); TQT_SLOT(slotForwardInlineMsg()) );
} else { } else {
@ -1855,7 +1855,7 @@ void KMMainWidget::setupForwardActions()
mForwardActionMenu->insert( mForwardInlineAction, 1 ); mForwardActionMenu->insert( mForwardInlineAction, 1 );
mForwardInlineAction->setShortcut( SHIFT+Key_F ); mForwardInlineAction->setShortcut( SHIFT+Key_F );
mForwardAttachedAction->setShortcut( Key_F ); mForwardAttachedAction->setShortcut( Key_F );
connect( mForwardActionMenu, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), connect( mForwardActionMenu, TQT_SIGNAL(activated()), this,
TQT_SLOT(slotForwardAttachedMsg()) ); TQT_SLOT(slotForwardAttachedMsg()) );
} }
} }
@ -2059,7 +2059,7 @@ void KMMainWidget::folderSelected( KMFolder* aFolder, bool forceJumpToUnread )
// Set a timer to show a splash screen if fetching folder contents // 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) // takes more than the amount of seconds configured in the kmailrc (default 1000 msec)
mShowBusySplashTimer = new TQTimer( this ); mShowBusySplashTimer = new TQTimer( this );
connect( mShowBusySplashTimer, TQT_SIGNAL( timeout() ), TQT_TQOBJECT(this), TQT_SLOT( slotShowBusySplash() ) ); connect( mShowBusySplashTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotShowBusySplash() ) );
mShowBusySplashTimer->start( GlobalSettings::self()->folderLoadingTimeout(), true ); mShowBusySplashTimer->start( GlobalSettings::self()->folderLoadingTimeout(), true );
return; return;
} else { } else {
@ -2509,26 +2509,26 @@ void KMMainWidget::updateCustomTemplateMenus()
new TDEActionMenu( i18n("Forward With Custom Template"), new TDEActionMenu( i18n("Forward With Custom Template"),
"mail_custom_forward", "mail_custom_forward",
actionCollection(), "custom_forward" ); actionCollection(), "custom_forward" );
TQSignalMapper *mCustomForwardMapper = new TQSignalMapper( TQT_TQOBJECT(this) ); TQSignalMapper *mCustomForwardMapper = new TQSignalMapper( this );
connect( mCustomForwardMapper, TQT_SIGNAL( mapped( int ) ), connect( mCustomForwardMapper, TQT_SIGNAL( mapped( int ) ),
TQT_TQOBJECT(this), TQT_SLOT( slotCustomForwardMsg( int ) ) ); this, TQT_SLOT( slotCustomForwardMsg( int ) ) );
mForwardActionMenu->insert( mCustomForwardActionMenu ); mForwardActionMenu->insert( mCustomForwardActionMenu );
mCustomReplyActionMenu = mCustomReplyActionMenu =
new TDEActionMenu( i18n("Reply With Custom Template"), "mail_custom_reply", new TDEActionMenu( i18n("Reply With Custom Template"), "mail_custom_reply",
actionCollection(), "custom_reply" ); actionCollection(), "custom_reply" );
TQSignalMapper *mCustomReplyMapper = new TQSignalMapper( TQT_TQOBJECT(this) ); TQSignalMapper *mCustomReplyMapper = new TQSignalMapper( this );
connect( mCustomReplyMapper, TQT_SIGNAL( mapped( int ) ), connect( mCustomReplyMapper, TQT_SIGNAL( mapped( int ) ),
TQT_TQOBJECT(this), TQT_SLOT( slotCustomReplyToMsg( int ) ) ); this, TQT_SLOT( slotCustomReplyToMsg( int ) ) );
mMsgActions->replyMenu()->insert( mCustomReplyActionMenu ); mMsgActions->replyMenu()->insert( mCustomReplyActionMenu );
mCustomReplyAllActionMenu = mCustomReplyAllActionMenu =
new TDEActionMenu( i18n("Reply to All With Custom Template"), new TDEActionMenu( i18n("Reply to All With Custom Template"),
"mail_custom_reply_all", "mail_custom_reply_all",
actionCollection(), "custom_reply_all" ); actionCollection(), "custom_reply_all" );
TQSignalMapper *mCustomReplyAllMapper = new TQSignalMapper( TQT_TQOBJECT(this) ); TQSignalMapper *mCustomReplyAllMapper = new TQSignalMapper( this );
connect( mCustomReplyAllMapper, TQT_SIGNAL( mapped( int ) ), connect( mCustomReplyAllMapper, TQT_SIGNAL( mapped( int ) ),
TQT_TQOBJECT(this), TQT_SLOT( slotCustomReplyAllToMsg( int ) ) ); this, TQT_SLOT( slotCustomReplyAllToMsg( int ) ) );
mMsgActions->replyMenu()->insert( mCustomReplyAllActionMenu ); mMsgActions->replyMenu()->insert( mCustomReplyAllActionMenu );
mCustomTemplates.clear(); mCustomTemplates.clear();
@ -2645,21 +2645,21 @@ void KMMainWidget::setupActions()
//----- File Menu //----- File Menu
mSaveAsAction = new TDEAction( i18n("Save &As..."), "document-save", mSaveAsAction = new TDEAction( i18n("Save &As..."), "document-save",
TDEStdAccel::shortcut(TDEStdAccel::Save), TDEStdAccel::shortcut(TDEStdAccel::Save),
TQT_TQOBJECT(this), TQT_SLOT(slotSaveMsg()), actionCollection(), "file_save_as" ); this, TQT_SLOT(slotSaveMsg()), actionCollection(), "file_save_as" );
mOpenAction = KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( slotOpenMsg() ), mOpenAction = KStdAction::open( this, TQT_SLOT( slotOpenMsg() ),
actionCollection() ); actionCollection() );
(void) new TDEAction( i18n("&Compact All Folders"), 0, (void) new TDEAction( i18n("&Compact All Folders"), 0,
TQT_TQOBJECT(this), TQT_SLOT(slotCompactAll()), this, TQT_SLOT(slotCompactAll()),
actionCollection(), "compact_all_folders" ); actionCollection(), "compact_all_folders" );
(void) new TDEAction( i18n("&Expire All Folders"), 0, (void) new TDEAction( i18n("&Expire All Folders"), 0,
TQT_TQOBJECT(this), TQT_SLOT(slotExpireAll()), this, TQT_SLOT(slotExpireAll()),
actionCollection(), "expire_all_folders" ); actionCollection(), "expire_all_folders" );
(void) new TDEAction( i18n("&Refresh Local IMAP Cache"), "refresh", (void) new TDEAction( i18n("&Refresh Local IMAP Cache"), "refresh",
TQT_TQOBJECT(this), TQT_SLOT(slotInvalidateIMAPFolders()), this, TQT_SLOT(slotInvalidateIMAPFolders()),
actionCollection(), "file_invalidate_imap_cache" ); actionCollection(), "file_invalidate_imap_cache" );
(void) new TDEAction( i18n("Empty All &Trash Folders"), 0, (void) new TDEAction( i18n("Empty All &Trash Folders"), 0,
@ -2667,7 +2667,7 @@ void KMMainWidget::setupActions()
actionCollection(), "empty_trash" ); actionCollection(), "empty_trash" );
(void) new TDEAction( i18n("Check &Mail"), "mail_get", CTRL+Key_L, (void) new TDEAction( i18n("Check &Mail"), "mail_get", CTRL+Key_L,
TQT_TQOBJECT(this), TQT_SLOT(slotCheckMail()), this, TQT_SLOT(slotCheckMail()),
actionCollection(), "check_mail" ); actionCollection(), "check_mail" );
mFavoritesCheckMailAction = new TDEAction( i18n("Check Mail in Favorite Folders"), mFavoritesCheckMailAction = new TDEAction( i18n("Check Mail in Favorite Folders"),
@ -2687,10 +2687,10 @@ void KMMainWidget::setupActions()
connect(mActMenu,TQT_SIGNAL(activated(int)),this,TQT_SLOT(slotCheckOneAccount(int))); connect(mActMenu,TQT_SIGNAL(activated(int)),this,TQT_SLOT(slotCheckOneAccount(int)));
connect(mActMenu,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(getAccountMenu())); connect(mActMenu,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(getAccountMenu()));
(void) new TDEAction( i18n("&Send Queued Messages"), "mail-send", 0, TQT_TQOBJECT(this), (void) new TDEAction( i18n("&Send Queued Messages"), "mail-send", 0, this,
TQT_SLOT(slotSendQueued()), actionCollection(), "send_queued"); TQT_SLOT(slotSendQueued()), actionCollection(), "send_queued");
(void) new TDEAction( i18n("Online Status (unknown)"), "online_status", 0, TQT_TQOBJECT(this), (void) new TDEAction( i18n("Online Status (unknown)"), "online_status", 0, this,
TQT_SLOT(slotOnlineStatus()), actionCollection(), "online_status"); TQT_SLOT(slotOnlineStatus()), actionCollection(), "online_status");
TDEActionMenu *sendActionMenu = new TDEActionMenu *sendActionMenu = new
@ -2699,165 +2699,165 @@ void KMMainWidget::setupActions()
sendActionMenu->setDelayed(true); sendActionMenu->setDelayed(true);
mSendMenu = sendActionMenu->popupMenu(); mSendMenu = sendActionMenu->popupMenu();
connect(mSendMenu,TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSendQueuedVia(int))); connect(mSendMenu,TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSendQueuedVia(int)));
connect(mSendMenu,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(getTransportMenu())); connect(mSendMenu,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(getTransportMenu()));
TDEAction *act; TDEAction *act;
//----- Tools menu //----- Tools menu
if (parent()->inherits("KMMainWin")) { if (parent()->inherits("KMMainWin")) {
act = new TDEAction( i18n("&Address Book..."), "contents", 0, TQT_TQOBJECT(this), act = new TDEAction( i18n("&Address Book..."), "contents", 0, this,
TQT_SLOT(slotAddrBook()), actionCollection(), "addressbook" ); TQT_SLOT(slotAddrBook()), actionCollection(), "addressbook" );
if (TDEStandardDirs::findExe("kaddressbook").isEmpty()) act->setEnabled(false); if (TDEStandardDirs::findExe("kaddressbook").isEmpty()) act->setEnabled(false);
} }
act = new TDEAction( i18n("Certificate Manager..."), "pgp-keys", 0, TQT_TQOBJECT(this), act = new TDEAction( i18n("Certificate Manager..."), "pgp-keys", 0, this,
TQT_SLOT(slotStartCertManager()), actionCollection(), "tools_start_certman"); TQT_SLOT(slotStartCertManager()), actionCollection(), "tools_start_certman");
// disable action if no certman binary is around // disable action if no certman binary is around
if (TDEStandardDirs::findExe("kleopatra").isEmpty()) act->setEnabled(false); if (TDEStandardDirs::findExe("kleopatra").isEmpty()) act->setEnabled(false);
act = new TDEAction( i18n("GnuPG Log Viewer..."), "pgp-keys", 0, TQT_TQOBJECT(this), act = new TDEAction( i18n("GnuPG Log Viewer..."), "pgp-keys", 0, this,
TQT_SLOT(slotStartWatchGnuPG()), actionCollection(), "tools_start_kwatchgnupg"); TQT_SLOT(slotStartWatchGnuPG()), actionCollection(), "tools_start_kwatchgnupg");
// disable action if no kwatchgnupg binary is around // disable action if no kwatchgnupg binary is around
if (TDEStandardDirs::findExe("kwatchgnupg").isEmpty()) act->setEnabled(false); if (TDEStandardDirs::findExe("kwatchgnupg").isEmpty()) act->setEnabled(false);
act = new TDEAction( i18n("&Import Messages..."), "document-open", 0, TQT_TQOBJECT(this), act = new TDEAction( i18n("&Import Messages..."), "document-open", 0, this,
TQT_SLOT(slotImport()), actionCollection(), "import" ); TQT_SLOT(slotImport()), actionCollection(), "import" );
if (TDEStandardDirs::findExe("kmailcvt").isEmpty()) act->setEnabled(false); if (TDEStandardDirs::findExe("kmailcvt").isEmpty()) act->setEnabled(false);
#if !defined(NDEBUG) #if !defined(NDEBUG)
(void) new TDEAction( i18n("&Debug Sieve..."), (void) new TDEAction( i18n("&Debug Sieve..."),
"idea", 0, TQT_TQOBJECT(this), TQT_SLOT(slotDebugSieve()), "idea", 0, this, TQT_SLOT(slotDebugSieve()),
actionCollection(), "tools_debug_sieve" ); actionCollection(), "tools_debug_sieve" );
#endif #endif
if ( GlobalSettings::allowOutOfOfficeSettings() ) { if ( GlobalSettings::allowOutOfOfficeSettings() ) {
(void) new TDEAction( i18n("Edit \"Out of Office\" Replies..."), (void) new TDEAction( i18n("Edit \"Out of Office\" Replies..."),
"configure", 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditVacation()), "configure", 0, this, TQT_SLOT(slotEditVacation()),
actionCollection(), "tools_edit_vacation" ); actionCollection(), "tools_edit_vacation" );
} }
(void) new TDEAction( i18n("Filter &Log Viewer..."), 0, TQT_TQOBJECT(this), (void) new TDEAction( i18n("Filter &Log Viewer..."), 0, this,
TQT_SLOT(slotFilterLogViewer()), actionCollection(), "filter_log_viewer" ); TQT_SLOT(slotFilterLogViewer()), actionCollection(), "filter_log_viewer" );
(void) new TDEAction( i18n("&Anti-Spam Wizard..."), 0, TQT_TQOBJECT(this), (void) new TDEAction( i18n("&Anti-Spam Wizard..."), 0, this,
TQT_SLOT(slotAntiSpamWizard()), actionCollection(), "antiSpamWizard" ); TQT_SLOT(slotAntiSpamWizard()), actionCollection(), "antiSpamWizard" );
(void) new TDEAction( i18n("&Anti-Virus Wizard..."), 0, TQT_TQOBJECT(this), (void) new TDEAction( i18n("&Anti-Virus Wizard..."), 0, this,
TQT_SLOT(slotAntiVirusWizard()), actionCollection(), "antiVirusWizard" ); TQT_SLOT(slotAntiVirusWizard()), actionCollection(), "antiVirusWizard" );
//----- Edit Menu //----- Edit Menu
mTrashAction = new TDEAction( KGuiItem( i18n("&Move to Trash"), "edittrash", mTrashAction = new TDEAction( KGuiItem( i18n("&Move to Trash"), "edittrash",
i18n("Move message to trashcan") ), i18n("Move message to trashcan") ),
Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotTrashMsg()), Key_Delete, this, TQT_SLOT(slotTrashMsg()),
actionCollection(), "move_to_trash" ); actionCollection(), "move_to_trash" );
/* The delete action is nowhere in the gui, by default, so we need to make /* The delete action is nowhere in the gui, by default, so we need to make
* sure it is plugged into the TDEAccel now, since that won't happen on * sure it is plugged into the TDEAccel now, since that won't happen on
* XMLGui construction or manual ->plug(). This is only a problem when run * XMLGui construction or manual ->plug(). This is only a problem when run
* as a part, though. */ * as a part, though. */
mDeleteAction = new TDEAction( i18n("&Delete"), "edit-delete", SHIFT+Key_Delete, TQT_TQOBJECT(this), mDeleteAction = new TDEAction( i18n("&Delete"), "edit-delete", SHIFT+Key_Delete, this,
TQT_SLOT(slotDeleteMsg()), actionCollection(), "delete" ); TQT_SLOT(slotDeleteMsg()), actionCollection(), "delete" );
mDeleteAction->plugAccel( actionCollection()->tdeaccel() ); mDeleteAction->plugAccel( actionCollection()->tdeaccel() );
mTrashThreadAction = new TDEAction( KGuiItem( i18n("M&ove Thread to Trash"), "edittrash", mTrashThreadAction = new TDEAction( KGuiItem( i18n("M&ove Thread to Trash"), "edittrash",
i18n("Move thread to trashcan") ), i18n("Move thread to trashcan") ),
CTRL+Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotTrashThread()), CTRL+Key_Delete, this, TQT_SLOT(slotTrashThread()),
actionCollection(), "move_thread_to_trash" ); actionCollection(), "move_thread_to_trash" );
mDeleteThreadAction = new TDEAction( i18n("Delete T&hread"), "edit-delete", CTRL+SHIFT+Key_Delete, TQT_TQOBJECT(this), mDeleteThreadAction = new TDEAction( i18n("Delete T&hread"), "edit-delete", CTRL+SHIFT+Key_Delete, this,
TQT_SLOT(slotDeleteThread()), actionCollection(), "delete_thread" ); TQT_SLOT(slotDeleteThread()), actionCollection(), "delete_thread" );
(void) new TDEAction( i18n("&Find Messages..."), "mail_find", Key_S, TQT_TQOBJECT(this), (void) new TDEAction( i18n("&Find Messages..."), "mail_find", Key_S, this,
TQT_SLOT(slotRequestFullSearchFromQuickSearch()), actionCollection(), "search_messages" ); TQT_SLOT(slotRequestFullSearchFromQuickSearch()), actionCollection(), "search_messages" );
mFindInMessageAction = new TDEAction( i18n("&Find in Message..."), "edit-find", TDEStdAccel::shortcut(TDEStdAccel::Find), TQT_TQOBJECT(this), mFindInMessageAction = new TDEAction( i18n("&Find in Message..."), "edit-find", TDEStdAccel::shortcut(TDEStdAccel::Find), this,
TQT_SLOT(slotFind()), actionCollection(), "find_in_messages" ); TQT_SLOT(slotFind()), actionCollection(), "find_in_messages" );
(void) new TDEAction( i18n("Select &All Messages"), TDEStdAccel::selectAll(), TQT_TQOBJECT(this), (void) new TDEAction( i18n("Select &All Messages"), TDEStdAccel::selectAll(), this,
TQT_SLOT(slotMarkAll()), actionCollection(), "mark_all_messages" ); TQT_SLOT(slotMarkAll()), actionCollection(), "mark_all_messages" );
//----- Folder Menu //----- Folder Menu
mNewFolderAction = new TDEAction( i18n("&New Folder..."), "folder-new", 0, TQT_TQOBJECT(mFolderTree), mNewFolderAction = new TDEAction( i18n("&New Folder..."), "folder-new", 0, mFolderTree,
TQT_SLOT(addChildFolder()), actionCollection(), "new_folder" ); TQT_SLOT(addChildFolder()), actionCollection(), "new_folder" );
mModifyFolderAction = new TDEAction( i18n("&Properties"), "configure", 0, TQT_TQOBJECT(this), mModifyFolderAction = new TDEAction( i18n("&Properties"), "configure", 0, this,
TQT_SLOT(slotModifyFolder()), actionCollection(), "modify" ); TQT_SLOT(slotModifyFolder()), actionCollection(), "modify" );
mFolderMailingListPropertiesAction = new TDEAction( i18n("&Mailing List Management..."), mFolderMailingListPropertiesAction = new TDEAction( i18n("&Mailing List Management..."),
/*"folder_mailinglist_properties",*/ 0, TQT_TQOBJECT(this), TQT_SLOT( slotFolderMailingListProperties() ), /*"folder_mailinglist_properties",*/ 0, this, TQT_SLOT( slotFolderMailingListProperties() ),
actionCollection(), "folder_mailinglist_properties" ); actionCollection(), "folder_mailinglist_properties" );
mFolderShortCutCommandAction = new TDEAction( i18n("&Assign Shortcut..."), "configure_shortcuts", mFolderShortCutCommandAction = new TDEAction( i18n("&Assign Shortcut..."), "configure_shortcuts",
0, TQT_TQOBJECT(this), TQT_SLOT( slotFolderShortcutCommand() ), actionCollection(), 0, this, TQT_SLOT( slotFolderShortcutCommand() ), actionCollection(),
"folder_shortcut_command" ); "folder_shortcut_command" );
mMarkAllAsReadAction = new TDEAction( i18n("Mark All Messages as &Read"), "goto", 0, TQT_TQOBJECT(this), mMarkAllAsReadAction = new TDEAction( i18n("Mark All Messages as &Read"), "goto", 0, this,
TQT_SLOT(slotMarkAllAsRead()), actionCollection(), "mark_all_as_read" ); TQT_SLOT(slotMarkAllAsRead()), actionCollection(), "mark_all_as_read" );
mExpireFolderAction = new TDEAction(i18n("&Expiration Settings"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotExpireFolder()), mExpireFolderAction = new TDEAction(i18n("&Expiration Settings"), 0, this, TQT_SLOT(slotExpireFolder()),
actionCollection(), "expire"); actionCollection(), "expire");
mCompactFolderAction = new TDEAction( i18n("&Compact Folder"), 0, TQT_TQOBJECT(this), mCompactFolderAction = new TDEAction( i18n("&Compact Folder"), 0, this,
TQT_SLOT(slotCompactFolder()), actionCollection(), "compact" ); TQT_SLOT(slotCompactFolder()), actionCollection(), "compact" );
mRefreshFolderAction = new TDEAction( i18n("Check Mail &in This Folder"), "reload", mRefreshFolderAction = new TDEAction( i18n("Check Mail &in This Folder"), "reload",
TDEStdAccel::shortcut( TDEStdAccel::Reload ), TQT_TQOBJECT(this), TDEStdAccel::shortcut( TDEStdAccel::Reload ), this,
TQT_SLOT(slotRefreshFolder()), TQT_SLOT(slotRefreshFolder()),
actionCollection(), "refresh_folder" ); actionCollection(), "refresh_folder" );
mTroubleshootFolderAction = 0; // set in initializeIMAPActions mTroubleshootFolderAction = 0; // set in initializeIMAPActions
mEmptyFolderAction = new TDEAction( "foo" /*set in updateFolderMenu*/, "edittrash", 0, TQT_TQOBJECT(this), mEmptyFolderAction = new TDEAction( "foo" /*set in updateFolderMenu*/, "edittrash", 0, this,
TQT_SLOT(slotEmptyFolder()), actionCollection(), "empty" ); TQT_SLOT(slotEmptyFolder()), actionCollection(), "empty" );
mRemoveFolderAction = new TDEAction( "foo" /*set in updateFolderMenu*/, "edit-delete", 0, TQT_TQOBJECT(this), mRemoveFolderAction = new TDEAction( "foo" /*set in updateFolderMenu*/, "edit-delete", 0, this,
TQT_SLOT(slotRemoveFolder()), actionCollection(), "delete_folder" ); TQT_SLOT(slotRemoveFolder()), actionCollection(), "delete_folder" );
mArchiveFolderAction = new TDEAction( i18n( "&Archive Folder..." ), "document-save", 0, TQT_TQOBJECT(this), mArchiveFolderAction = new TDEAction( i18n( "&Archive Folder..." ), "document-save", 0, this,
TQT_SLOT( slotArchiveFolder() ), actionCollection(), TQT_SLOT( slotArchiveFolder() ), actionCollection(),
"archive_folder" ); "archive_folder" );
mPreferHtmlAction = new TDEToggleAction( i18n("Prefer &HTML to Plain Text"), 0, TQT_TQOBJECT(this), mPreferHtmlAction = new TDEToggleAction( i18n("Prefer &HTML to Plain Text"), 0, this,
TQT_SLOT(slotOverrideHtml()), actionCollection(), "prefer_html" ); TQT_SLOT(slotOverrideHtml()), actionCollection(), "prefer_html" );
mPreferHtmlLoadExtAction = new TDEToggleAction( i18n("Load E&xternal References"), 0, TQT_TQOBJECT(this), mPreferHtmlLoadExtAction = new TDEToggleAction( i18n("Load E&xternal References"), 0, this,
TQT_SLOT(slotOverrideHtmlLoadExt()), actionCollection(), "prefer_html_external_refs" ); TQT_SLOT(slotOverrideHtmlLoadExt()), actionCollection(), "prefer_html_external_refs" );
mThreadMessagesAction = new TDEToggleAction( i18n("&Thread Messages"), 0, TQT_TQOBJECT(this), mThreadMessagesAction = new TDEToggleAction( i18n("&Thread Messages"), 0, this,
TQT_SLOT(slotOverrideThread()), actionCollection(), "thread_messages" ); TQT_SLOT(slotOverrideThread()), actionCollection(), "thread_messages" );
mThreadBySubjectAction = new TDEToggleAction( i18n("Thread Messages also by &Subject"), 0, TQT_TQOBJECT(this), mThreadBySubjectAction = new TDEToggleAction( i18n("Thread Messages also by &Subject"), 0, this,
TQT_SLOT(slotToggleSubjectThreading()), actionCollection(), "thread_messages_by_subject" ); TQT_SLOT(slotToggleSubjectThreading()), actionCollection(), "thread_messages_by_subject" );
new TDEAction( i18n("Copy Folder"), "edit-copy", SHIFT+CTRL+Key_C, TQT_TQOBJECT(folderTree()), new TDEAction( i18n("Copy Folder"), "edit-copy", SHIFT+CTRL+Key_C, folderTree(),
TQT_SLOT(copyFolder()), actionCollection(), "copy_folder" ); TQT_SLOT(copyFolder()), actionCollection(), "copy_folder" );
new TDEAction( i18n("Cut Folder"), "edit-cut", SHIFT+CTRL+Key_X, TQT_TQOBJECT(folderTree()), new TDEAction( i18n("Cut Folder"), "edit-cut", SHIFT+CTRL+Key_X, folderTree(),
TQT_SLOT(cutFolder()), actionCollection(), "cut_folder" ); TQT_SLOT(cutFolder()), actionCollection(), "cut_folder" );
new TDEAction( i18n("Paste Folder"), "edit-paste", SHIFT+CTRL+Key_V, TQT_TQOBJECT(folderTree()), new TDEAction( i18n("Paste Folder"), "edit-paste", SHIFT+CTRL+Key_V, folderTree(),
TQT_SLOT(pasteFolder()), actionCollection(), "paste_folder" ); TQT_SLOT(pasteFolder()), actionCollection(), "paste_folder" );
new TDEAction( i18n("Copy Messages"), "edit-copy", ALT+CTRL+Key_C, TQT_TQOBJECT(headers()), new TDEAction( i18n("Copy Messages"), "edit-copy", ALT+CTRL+Key_C, headers(),
TQT_SLOT(copyMessages()), actionCollection(), "copy_messages" ); TQT_SLOT(copyMessages()), actionCollection(), "copy_messages" );
new TDEAction( i18n("Cut Messages"), "edit-cut", ALT+CTRL+Key_X, TQT_TQOBJECT(headers()), new TDEAction( i18n("Cut Messages"), "edit-cut", ALT+CTRL+Key_X, headers(),
TQT_SLOT(cutMessages()), actionCollection(), "cut_messages" ); TQT_SLOT(cutMessages()), actionCollection(), "cut_messages" );
new TDEAction( i18n("Paste Messages"), "edit-paste", ALT+CTRL+Key_V, TQT_TQOBJECT(headers()), new TDEAction( i18n("Paste Messages"), "edit-paste", ALT+CTRL+Key_V, headers(),
TQT_SLOT(pasteMessages()), actionCollection(), "paste_messages" ); TQT_SLOT(pasteMessages()), actionCollection(), "paste_messages" );
//----- Message Menu //----- Message Menu
(void) new TDEAction( i18n("&New Message..."), "mail-message-new", TDEStdAccel::shortcut(TDEStdAccel::New), TQT_TQOBJECT(this), (void) new TDEAction( i18n("&New Message..."), "mail-message-new", TDEStdAccel::shortcut(TDEStdAccel::New), this,
TQT_SLOT(slotCompose()), actionCollection(), "new_message" ); TQT_SLOT(slotCompose()), actionCollection(), "new_message" );
mTemplateMenu = mTemplateMenu =
new TDEActionMenu( i18n("New Message From &Template"), "document-new", new TDEActionMenu( i18n("New Message From &Template"), "document-new",
actionCollection(), "new_from_template" ); actionCollection(), "new_from_template" );
mTemplateMenu->setDelayed( true ); mTemplateMenu->setDelayed( true );
connect( mTemplateMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_TQOBJECT(this), connect( mTemplateMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), this,
TQT_SLOT( slotShowNewFromTemplate() ) ); TQT_SLOT( slotShowNewFromTemplate() ) );
connect( mTemplateMenu->popupMenu(), TQT_SIGNAL( activated(int) ), TQT_TQOBJECT(this), connect( mTemplateMenu->popupMenu(), TQT_SIGNAL( activated(int) ), this,
TQT_SLOT( slotNewFromTemplate(int) ) ); TQT_SLOT( slotNewFromTemplate(int) ) );
TDEAction* newToML = new TDEAction( i18n("New Message t&o Mailing-List..."), "mail_post_to", TDEAction* newToML = new TDEAction( i18n("New Message t&o Mailing-List..."), "mail_post_to",
CTRL+SHIFT+Key_N, TQT_TQOBJECT(this), CTRL+SHIFT+Key_N, this,
TQT_SLOT(slotPostToML()), actionCollection(), "post_message" ); TQT_SLOT(slotPostToML()), actionCollection(), "post_message" );
newToML->plugAccel( actionCollection()->tdeaccel() ); newToML->plugAccel( actionCollection()->tdeaccel() );
@ -2866,25 +2866,25 @@ void KMMainWidget::setupActions()
"message_forward" ); "message_forward" );
mForwardInlineAction = new TDEAction( i18n("&Inline..."), mForwardInlineAction = new TDEAction( i18n("&Inline..."),
"mail-forward", 0, TQT_TQOBJECT(this), "mail-forward", 0, this,
TQT_SLOT(slotForwardInlineMsg()), TQT_SLOT(slotForwardInlineMsg()),
actionCollection(), actionCollection(),
"message_forward_inline" ); "message_forward_inline" );
mForwardAttachedAction = new TDEAction( i18n("Message->Forward->","As &Attachment..."), mForwardAttachedAction = new TDEAction( i18n("Message->Forward->","As &Attachment..."),
"mail-forward", 0, TQT_TQOBJECT(this), "mail-forward", 0, this,
TQT_SLOT(slotForwardAttachedMsg()), TQT_SLOT(slotForwardAttachedMsg()),
actionCollection(), actionCollection(),
"message_forward_as_attachment" ); "message_forward_as_attachment" );
mForwardDigestAction = new TDEAction( i18n("Message->Forward->","As Di&gest..."), mForwardDigestAction = new TDEAction( i18n("Message->Forward->","As Di&gest..."),
"mail-forward", 0, TQT_TQOBJECT(this), "mail-forward", 0, this,
TQT_SLOT(slotForwardDigestMsg()), TQT_SLOT(slotForwardDigestMsg()),
actionCollection(), actionCollection(),
"message_forward_as_digest" ); "message_forward_as_digest" );
mRedirectAction = new TDEAction( i18n("Message->Forward->","&Redirect..."), mRedirectAction = new TDEAction( i18n("Message->Forward->","&Redirect..."),
"mail-forward", Key_E, TQT_TQOBJECT(this), "mail-forward", Key_E, this,
TQT_SLOT(slotRedirectMsg()), TQT_SLOT(slotRedirectMsg()),
actionCollection(), actionCollection(),
"message_forward_redirect" ); "message_forward_redirect" );
@ -2895,38 +2895,38 @@ void KMMainWidget::setupActions()
mForwardActionMenu->insert( mForwardDigestAction ); mForwardActionMenu->insert( mForwardDigestAction );
mForwardActionMenu->insert( mRedirectAction ); mForwardActionMenu->insert( mRedirectAction );
mSendAgainAction = new TDEAction( i18n("Send A&gain..."), 0, TQT_TQOBJECT(this), mSendAgainAction = new TDEAction( i18n("Send A&gain..."), 0, this,
TQT_SLOT(slotResendMsg()), actionCollection(), "send_again" ); TQT_SLOT(slotResendMsg()), actionCollection(), "send_again" );
//----- Create filter actions //----- Create filter actions
mFilterMenu = new TDEActionMenu( i18n("&Create Filter"), "filter", actionCollection(), "create_filter" ); mFilterMenu = new TDEActionMenu( i18n("&Create Filter"), "filter", actionCollection(), "create_filter" );
connect( mFilterMenu, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), connect( mFilterMenu, TQT_SIGNAL(activated()), this,
TQT_SLOT(slotFilter()) ); TQT_SLOT(slotFilter()) );
mSubjectFilterAction = new TDEAction( i18n("Filter on &Subject..."), 0, TQT_TQOBJECT(this), mSubjectFilterAction = new TDEAction( i18n("Filter on &Subject..."), 0, this,
TQT_SLOT(slotSubjectFilter()), TQT_SLOT(slotSubjectFilter()),
actionCollection(), "subject_filter"); actionCollection(), "subject_filter");
mFilterMenu->insert( mSubjectFilterAction ); mFilterMenu->insert( mSubjectFilterAction );
mFromFilterAction = new TDEAction( i18n("Filter on &From..."), 0, TQT_TQOBJECT(this), mFromFilterAction = new TDEAction( i18n("Filter on &From..."), 0, this,
TQT_SLOT(slotFromFilter()), TQT_SLOT(slotFromFilter()),
actionCollection(), "from_filter"); actionCollection(), "from_filter");
mFilterMenu->insert( mFromFilterAction ); mFilterMenu->insert( mFromFilterAction );
mToFilterAction = new TDEAction( i18n("Filter on &To..."), 0, TQT_TQOBJECT(this), mToFilterAction = new TDEAction( i18n("Filter on &To..."), 0, this,
TQT_SLOT(slotToFilter()), TQT_SLOT(slotToFilter()),
actionCollection(), "to_filter"); actionCollection(), "to_filter");
mFilterMenu->insert( mToFilterAction ); mFilterMenu->insert( mToFilterAction );
mListFilterAction = new TDEAction( i18n("Filter on Mailing-&List..."), 0, TQT_TQOBJECT(this), mListFilterAction = new TDEAction( i18n("Filter on Mailing-&List..."), 0, this,
TQT_SLOT(slotMailingListFilter()), actionCollection(), TQT_SLOT(slotMailingListFilter()), actionCollection(),
"mlist_filter"); "mlist_filter");
mFilterMenu->insert( mListFilterAction ); mFilterMenu->insert( mListFilterAction );
mPrintAction = KStdAction::print (TQT_TQOBJECT(this), TQT_SLOT(slotPrintMsg()), actionCollection()); mPrintAction = KStdAction::print (this, TQT_SLOT(slotPrintMsg()), actionCollection());
mUseAction = new TDEAction( i18n("New Message From &Template"), "document-new", mUseAction = new TDEAction( i18n("New Message From &Template"), "document-new",
Key_N, TQT_TQOBJECT(this), TQT_SLOT( slotUseTemplate() ), Key_N, this, TQT_SLOT( slotUseTemplate() ),
actionCollection(), "use_template" ); actionCollection(), "use_template" );
mUseAction->plugAccel( actionCollection()->tdeaccel() ); mUseAction->plugAccel( actionCollection()->tdeaccel() );
@ -2936,52 +2936,52 @@ void KMMainWidget::setupActions()
mMarkThreadAsReadAction = new TDEAction(KGuiItem(i18n("Mark Thread as &Read"), "kmmsgread", mMarkThreadAsReadAction = new TDEAction(KGuiItem(i18n("Mark Thread as &Read"), "kmmsgread",
i18n("Mark all messages in the selected thread as read")), i18n("Mark all messages in the selected thread as read")),
0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusRead()), 0, this, TQT_SLOT(slotSetThreadStatusRead()),
actionCollection(), "thread_read"); actionCollection(), "thread_read");
mThreadStatusMenu->insert( mMarkThreadAsReadAction ); mThreadStatusMenu->insert( mMarkThreadAsReadAction );
mMarkThreadAsNewAction = new TDEAction(KGuiItem(i18n("Mark Thread as &New"), "kmmsgnew", mMarkThreadAsNewAction = new TDEAction(KGuiItem(i18n("Mark Thread as &New"), "kmmsgnew",
i18n("Mark all messages in the selected thread as new")), i18n("Mark all messages in the selected thread as new")),
0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusNew()), 0, this, TQT_SLOT(slotSetThreadStatusNew()),
actionCollection(), "thread_new"); actionCollection(), "thread_new");
mThreadStatusMenu->insert( mMarkThreadAsNewAction ); mThreadStatusMenu->insert( mMarkThreadAsNewAction );
mMarkThreadAsUnreadAction = new TDEAction(KGuiItem(i18n("Mark Thread as &Unread"), "kmmsgunseen", mMarkThreadAsUnreadAction = new TDEAction(KGuiItem(i18n("Mark Thread as &Unread"), "kmmsgunseen",
i18n("Mark all messages in the selected thread as unread")), i18n("Mark all messages in the selected thread as unread")),
0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusUnread()), 0, this, TQT_SLOT(slotSetThreadStatusUnread()),
actionCollection(), "thread_unread"); actionCollection(), "thread_unread");
mThreadStatusMenu->insert( mMarkThreadAsUnreadAction ); mThreadStatusMenu->insert( mMarkThreadAsUnreadAction );
mThreadStatusMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) ); mThreadStatusMenu->insert( new TDEActionSeparator( this ) );
//----- "Mark Thread" toggle actions //----- "Mark Thread" toggle actions
mToggleThreadFlagAction = new TDEToggleAction(i18n("Mark Thread as &Important"), "mail_flag", mToggleThreadFlagAction = new TDEToggleAction(i18n("Mark Thread as &Important"), "mail_flag",
0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusFlag()), 0, this, TQT_SLOT(slotSetThreadStatusFlag()),
actionCollection(), "thread_flag"); actionCollection(), "thread_flag");
mToggleThreadFlagAction->setCheckedState( i18n("Remove &Important Thread Mark") ); mToggleThreadFlagAction->setCheckedState( i18n("Remove &Important Thread Mark") );
mThreadStatusMenu->insert( mToggleThreadFlagAction ); mThreadStatusMenu->insert( mToggleThreadFlagAction );
mToggleThreadTodoAction = new TDEToggleAction(i18n("Mark Thread as &Action Item"), "mail_todo", mToggleThreadTodoAction = new TDEToggleAction(i18n("Mark Thread as &Action Item"), "mail_todo",
0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusTodo()), 0, this, TQT_SLOT(slotSetThreadStatusTodo()),
actionCollection(), "thread_todo"); actionCollection(), "thread_todo");
mToggleThreadTodoAction->setCheckedState( i18n("Remove &Action Item Thread Mark") ); mToggleThreadTodoAction->setCheckedState( i18n("Remove &Action Item Thread Mark") );
mThreadStatusMenu->insert( mToggleThreadTodoAction ); mThreadStatusMenu->insert( mToggleThreadTodoAction );
//------- "Watch and ignore thread" actions //------- "Watch and ignore thread" actions
mWatchThreadAction = new TDEToggleAction(i18n("&Watch Thread"), "kmmsgwatched", mWatchThreadAction = new TDEToggleAction(i18n("&Watch Thread"), "kmmsgwatched",
0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusWatched()), 0, this, TQT_SLOT(slotSetThreadStatusWatched()),
actionCollection(), "thread_watched"); actionCollection(), "thread_watched");
mIgnoreThreadAction = new TDEToggleAction(i18n("&Ignore Thread"), "mail_ignore", mIgnoreThreadAction = new TDEToggleAction(i18n("&Ignore Thread"), "mail_ignore",
0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusIgnored()), 0, this, TQT_SLOT(slotSetThreadStatusIgnored()),
actionCollection(), "thread_ignored"); actionCollection(), "thread_ignored");
mThreadStatusMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) ); mThreadStatusMenu->insert( new TDEActionSeparator( this ) );
mThreadStatusMenu->insert( mWatchThreadAction ); mThreadStatusMenu->insert( mWatchThreadAction );
mThreadStatusMenu->insert( mIgnoreThreadAction ); mThreadStatusMenu->insert( mIgnoreThreadAction );
mSaveAttachmentsAction = new TDEAction( i18n("Save A&ttachments..."), "attach", mSaveAttachmentsAction = new TDEAction( i18n("Save A&ttachments..."), "attach",
0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveAttachments()), 0, this, TQT_SLOT(slotSaveAttachments()),
actionCollection(), "file_save_attachments" ); actionCollection(), "file_save_attachments" );
mMoveActionMenu = new TDEActionMenu( i18n("&Move To" ), mMoveActionMenu = new TDEActionMenu( i18n("&Move To" ),
@ -2991,7 +2991,7 @@ void KMMainWidget::setupActions()
actionCollection(), "copy_to" ); actionCollection(), "copy_to" );
mApplyAllFiltersAction = new TDEAction( i18n("Appl&y All Filters"), "filter", mApplyAllFiltersAction = new TDEAction( i18n("Appl&y All Filters"), "filter",
CTRL+Key_J, TQT_TQOBJECT(this), CTRL+Key_J, this,
TQT_SLOT(slotApplyFilters()), TQT_SLOT(slotApplyFilters()),
actionCollection(), "apply_filters" ); actionCollection(), "apply_filters" );
@ -3006,25 +3006,25 @@ void KMMainWidget::setupActions()
actionCollection(), "view_unread" ); actionCollection(), "view_unread" );
unreadMenu->setToolTip( i18n("Choose how to display the count of unread messages") ); unreadMenu->setToolTip( i18n("Choose how to display the count of unread messages") );
mUnreadColumnToggle = new TDERadioAction( i18n("View->Unread Count", "View in &Separate Column"), 0, TQT_TQOBJECT(this), mUnreadColumnToggle = new TDERadioAction( i18n("View->Unread Count", "View in &Separate Column"), 0, this,
TQT_SLOT(slotToggleUnread()), TQT_SLOT(slotToggleUnread()),
actionCollection(), "view_unread_column" ); actionCollection(), "view_unread_column" );
mUnreadColumnToggle->setExclusiveGroup( "view_unread_group" ); mUnreadColumnToggle->setExclusiveGroup( "view_unread_group" );
unreadMenu->insert( mUnreadColumnToggle ); unreadMenu->insert( mUnreadColumnToggle );
mUnreadTextToggle = new TDERadioAction( i18n("View->Unread Count", "View After &Folder Name"), 0, TQT_TQOBJECT(this), mUnreadTextToggle = new TDERadioAction( i18n("View->Unread Count", "View After &Folder Name"), 0, this,
TQT_SLOT(slotToggleUnread()), TQT_SLOT(slotToggleUnread()),
actionCollection(), "view_unread_text" ); actionCollection(), "view_unread_text" );
mUnreadTextToggle->setExclusiveGroup( "view_unread_group" ); mUnreadTextToggle->setExclusiveGroup( "view_unread_group" );
unreadMenu->insert( mUnreadTextToggle ); unreadMenu->insert( mUnreadTextToggle );
// toggle for total column // toggle for total column
mTotalColumnToggle = new TDEToggleAction( i18n("View->", "&Total Column"), 0, TQT_TQOBJECT(this), mTotalColumnToggle = new TDEToggleAction( i18n("View->", "&Total Column"), 0, this,
TQT_SLOT(slotToggleTotalColumn()), TQT_SLOT(slotToggleTotalColumn()),
actionCollection(), "view_columns_total" ); actionCollection(), "view_columns_total" );
mTotalColumnToggle->setToolTip( i18n("Toggle display of column showing the " mTotalColumnToggle->setToolTip( i18n("Toggle display of column showing the "
"total number of messages in folders.") ); "total number of messages in folders.") );
mSizeColumnToggle = new TDEToggleAction( i18n("View->", "&Size Column"), 0, TQT_TQOBJECT(this), mSizeColumnToggle = new TDEToggleAction( i18n("View->", "&Size Column"), 0, this,
TQT_SLOT(slotToggleSizeColumn()), TQT_SLOT(slotToggleSizeColumn()),
actionCollection(), "view_columns_size" ); actionCollection(), "view_columns_size" );
mSizeColumnToggle->setToolTip( i18n("Toggle display of column showing the " mSizeColumnToggle->setToolTip( i18n("Toggle display of column showing the "
@ -3032,33 +3032,33 @@ void KMMainWidget::setupActions()
(void)new TDEAction( KGuiItem( i18n("View->","&Expand Thread"), TQString(), (void)new TDEAction( KGuiItem( i18n("View->","&Expand Thread"), TQString(),
i18n("Expand the current thread") ), i18n("Expand the current thread") ),
Key_Period, TQT_TQOBJECT(this), Key_Period, this,
TQT_SLOT(slotExpandThread()), TQT_SLOT(slotExpandThread()),
actionCollection(), "expand_thread" ); actionCollection(), "expand_thread" );
(void)new TDEAction( KGuiItem( i18n("View->","&Collapse Thread"), TQString(), (void)new TDEAction( KGuiItem( i18n("View->","&Collapse Thread"), TQString(),
i18n("Collapse the current thread") ), i18n("Collapse the current thread") ),
Key_Comma, TQT_TQOBJECT(this), Key_Comma, this,
TQT_SLOT(slotCollapseThread()), TQT_SLOT(slotCollapseThread()),
actionCollection(), "collapse_thread" ); actionCollection(), "collapse_thread" );
(void)new TDEAction( KGuiItem( i18n("View->","Ex&pand All Threads"), TQString(), (void)new TDEAction( KGuiItem( i18n("View->","Ex&pand All Threads"), TQString(),
i18n("Expand all threads in the current folder") ), i18n("Expand all threads in the current folder") ),
CTRL+Key_Period, TQT_TQOBJECT(this), CTRL+Key_Period, this,
TQT_SLOT(slotExpandAllThreads()), TQT_SLOT(slotExpandAllThreads()),
actionCollection(), "expand_all_threads" ); actionCollection(), "expand_all_threads" );
(void)new TDEAction( KGuiItem( i18n("View->","C&ollapse All Threads"), TQString(), (void)new TDEAction( KGuiItem( i18n("View->","C&ollapse All Threads"), TQString(),
i18n("Collapse all threads in the current folder") ), i18n("Collapse all threads in the current folder") ),
CTRL+Key_Comma, TQT_TQOBJECT(this), CTRL+Key_Comma, this,
TQT_SLOT(slotCollapseAllThreads()), TQT_SLOT(slotCollapseAllThreads()),
actionCollection(), "collapse_all_threads" ); actionCollection(), "collapse_all_threads" );
mViewSourceAction = new TDEAction( i18n("&View Source"), Key_V, TQT_TQOBJECT(this), mViewSourceAction = new TDEAction( i18n("&View Source"), Key_V, this,
TQT_SLOT(slotShowMsgSrc()), actionCollection(), TQT_SLOT(slotShowMsgSrc()), actionCollection(),
"view_source" ); "view_source" );
TDEAction* dukeOfMonmoth = new TDEAction( i18n("&Display Message"), Key_Return, TQT_TQOBJECT(this), TDEAction* dukeOfMonmoth = new TDEAction( i18n("&Display Message"), Key_Return, this,
TQT_SLOT( slotDisplayCurrentMessage() ), actionCollection(), TQT_SLOT( slotDisplayCurrentMessage() ), actionCollection(),
"display_message" ); "display_message" );
dukeOfMonmoth->plugAccel( actionCollection()->tdeaccel() ); dukeOfMonmoth->plugAccel( actionCollection()->tdeaccel() );
@ -3066,44 +3066,44 @@ void KMMainWidget::setupActions()
//----- Go Menu //----- Go Menu
new TDEAction( KGuiItem( i18n("&Next Message"), TQString(), new TDEAction( KGuiItem( i18n("&Next Message"), TQString(),
i18n("Go to the next message") ), i18n("Go to the next message") ),
"N;Right", TQT_TQOBJECT(this), TQT_SLOT(slotNextMessage()), "N;Right", this, TQT_SLOT(slotNextMessage()),
actionCollection(), "go_next_message" ); actionCollection(), "go_next_message" );
new TDEAction( KGuiItem( i18n("Next &Unread Message"), new TDEAction( KGuiItem( i18n("Next &Unread Message"),
TQApplication::reverseLayout() ? "go-previous" : "go-next", TQApplication::reverseLayout() ? "go-previous" : "go-next",
i18n("Go to the next unread message") ), i18n("Go to the next unread message") ),
Key_Plus, TQT_TQOBJECT(this), TQT_SLOT(slotNextUnreadMessage()), Key_Plus, this, TQT_SLOT(slotNextUnreadMessage()),
actionCollection(), "go_next_unread_message" ); actionCollection(), "go_next_unread_message" );
/* ### needs better support from folders: /* ### needs better support from folders:
new TDEAction( KGuiItem( i18n("Next &Important Message"), TQString(), new TDEAction( KGuiItem( i18n("Next &Important Message"), TQString(),
i18n("Go to the next important message") ), i18n("Go to the next important message") ),
0, TQT_TQOBJECT(this), TQT_SLOT(slotNextImportantMessage()), 0, this, TQT_SLOT(slotNextImportantMessage()),
actionCollection(), "go_next_important_message" ); actionCollection(), "go_next_important_message" );
*/ */
new TDEAction( KGuiItem( i18n("&Previous Message"), TQString(), new TDEAction( KGuiItem( i18n("&Previous Message"), TQString(),
i18n("Go to the previous message") ), i18n("Go to the previous message") ),
"P;Left", TQT_TQOBJECT(this), TQT_SLOT(slotPrevMessage()), "P;Left", this, TQT_SLOT(slotPrevMessage()),
actionCollection(), "go_prev_message" ); actionCollection(), "go_prev_message" );
new TDEAction( KGuiItem( i18n("Previous Unread &Message"), new TDEAction( KGuiItem( i18n("Previous Unread &Message"),
TQApplication::reverseLayout() ? "go-next" : "go-previous", TQApplication::reverseLayout() ? "go-next" : "go-previous",
i18n("Go to the previous unread message") ), i18n("Go to the previous unread message") ),
Key_Minus, TQT_TQOBJECT(this), TQT_SLOT(slotPrevUnreadMessage()), Key_Minus, this, TQT_SLOT(slotPrevUnreadMessage()),
actionCollection(), "go_prev_unread_message" ); actionCollection(), "go_prev_unread_message" );
/* needs better support from folders: /* needs better support from folders:
new TDEAction( KGuiItem( i18n("Previous I&mportant Message"), TQString(), new TDEAction( KGuiItem( i18n("Previous I&mportant Message"), TQString(),
i18n("Go to the previous important message") ), i18n("Go to the previous important message") ),
0, TQT_TQOBJECT(this), TQT_SLOT(slotPrevImportantMessage()), 0, this, TQT_SLOT(slotPrevImportantMessage()),
actionCollection(), "go_prev_important_message" ); actionCollection(), "go_prev_important_message" );
*/ */
TDEAction *action = TDEAction *action =
new TDEAction( KGuiItem( i18n("Next Unread &Folder"), TQString(), new TDEAction( KGuiItem( i18n("Next Unread &Folder"), TQString(),
i18n("Go to the next folder with unread messages") ), i18n("Go to the next folder with unread messages") ),
ALT+Key_Plus, TQT_TQOBJECT(this), TQT_SLOT(slotNextUnreadFolder()), ALT+Key_Plus, this, TQT_SLOT(slotNextUnreadFolder()),
actionCollection(), "go_next_unread_folder" ); actionCollection(), "go_next_unread_folder" );
TDEShortcut shortcut = action->shortcut(); TDEShortcut shortcut = action->shortcut();
shortcut.append( KKey( CTRL+Key_Plus ) ); shortcut.append( KKey( CTRL+Key_Plus ) );
@ -3112,7 +3112,7 @@ void KMMainWidget::setupActions()
action = action =
new TDEAction( KGuiItem( i18n("Previous Unread F&older"), TQString(), new TDEAction( KGuiItem( i18n("Previous Unread F&older"), TQString(),
i18n("Go to the previous folder with unread messages") ), i18n("Go to the previous folder with unread messages") ),
ALT+Key_Minus, TQT_TQOBJECT(this), TQT_SLOT(slotPrevUnreadFolder()), ALT+Key_Minus, this, TQT_SLOT(slotPrevUnreadFolder()),
actionCollection(), "go_prev_unread_folder" ); actionCollection(), "go_prev_unread_folder" );
shortcut = action->shortcut(); shortcut = action->shortcut();
shortcut.append( KKey( CTRL+Key_Minus ) ); shortcut.append( KKey( CTRL+Key_Minus ) );
@ -3123,33 +3123,33 @@ void KMMainWidget::setupActions()
i18n("Scroll down current message. " i18n("Scroll down current message. "
"If at end of current message, " "If at end of current message, "
"go to next unread message.") ), "go to next unread message.") ),
Key_Space, TQT_TQOBJECT(this), TQT_SLOT(slotReadOn()), Key_Space, this, TQT_SLOT(slotReadOn()),
actionCollection(), "go_next_unread_text" ); actionCollection(), "go_next_unread_text" );
//----- Settings Menu //----- Settings Menu
mToggleShowQuickSearchAction = new TDEToggleAction(i18n("Show Quick Search"), TQString(), mToggleShowQuickSearchAction = new TDEToggleAction(i18n("Show Quick Search"), TQString(),
0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleShowQuickSearch()), 0, this, TQT_SLOT(slotToggleShowQuickSearch()),
actionCollection(), "show_quick_search"); actionCollection(), "show_quick_search");
mToggleShowQuickSearchAction->setChecked( GlobalSettings::self()->quickSearchActive() ); mToggleShowQuickSearchAction->setChecked( GlobalSettings::self()->quickSearchActive() );
mToggleShowQuickSearchAction->setWhatsThis( mToggleShowQuickSearchAction->setWhatsThis(
i18n( GlobalSettings::self()->quickSearchActiveItem()->whatsThis().utf8() ) ); i18n( GlobalSettings::self()->quickSearchActiveItem()->whatsThis().utf8() ) );
(void) new TDEAction( i18n("Configure &Filters..."), 0, TQT_TQOBJECT(this), (void) new TDEAction( i18n("Configure &Filters..."), 0, this,
TQT_SLOT(slotFilter()), actionCollection(), "filter" ); TQT_SLOT(slotFilter()), actionCollection(), "filter" );
(void) new TDEAction( i18n("Configure &POP Filters..."), 0, TQT_TQOBJECT(this), (void) new TDEAction( i18n("Configure &POP Filters..."), 0, this,
TQT_SLOT(slotPopFilter()), actionCollection(), "popFilter" ); TQT_SLOT(slotPopFilter()), actionCollection(), "popFilter" );
(void) new TDEAction( i18n("Manage &Sieve Scripts..."), 0, TQT_TQOBJECT(this), (void) new TDEAction( i18n("Manage &Sieve Scripts..."), 0, this,
TQT_SLOT(slotManageSieveScripts()), actionCollection(), "sieveFilters" ); TQT_SLOT(slotManageSieveScripts()), actionCollection(), "sieveFilters" );
(void) new TDEAction( KGuiItem( i18n("KMail &Introduction"), 0, (void) new TDEAction( KGuiItem( i18n("KMail &Introduction"), 0,
i18n("Display KMail's Welcome Page") ), i18n("Display KMail's Welcome Page") ),
0, TQT_TQOBJECT(this), TQT_SLOT(slotIntro()), 0, this, TQT_SLOT(slotIntro()),
actionCollection(), "help_kmail_welcomepage" ); actionCollection(), "help_kmail_welcomepage" );
// ----- Standard Actions // ----- Standard Actions
// KStdAction::configureNotifications(this, TQT_SLOT(slotEditNotifications()), actionCollection()); // KStdAction::configureNotifications(this, TQT_SLOT(slotEditNotifications()), actionCollection());
(void) new TDEAction( i18n("Configure &Notifications..."), (void) new TDEAction( i18n("Configure &Notifications..."),
"knotify", 0, TQT_TQOBJECT(this), "knotify", 0, this,
TQT_SLOT(slotEditNotifications()), actionCollection(), TQT_SLOT(slotEditNotifications()), actionCollection(),
"kmail_configure_notifications" ); "kmail_configure_notifications" );
// KStdAction::preferences(this, TQT_SLOT(slotSettings()), actionCollection()); // KStdAction::preferences(this, TQT_SLOT(slotSettings()), actionCollection());
@ -3158,14 +3158,14 @@ void KMMainWidget::setupActions()
TQT_SLOT(slotShowConfigurationDialog()), actionCollection(), TQT_SLOT(slotShowConfigurationDialog()), actionCollection(),
"kmail_configure_kmail" ); "kmail_configure_kmail" );
KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(slotUndo()), actionCollection(), "kmail_undo"); KStdAction::undo(this, TQT_SLOT(slotUndo()), actionCollection(), "kmail_undo");
KStdAction::tipOfDay( TQT_TQOBJECT(this), TQT_SLOT( slotShowTip() ), actionCollection() ); KStdAction::tipOfDay( this, TQT_SLOT( slotShowTip() ), actionCollection() );
menutimer = new TQTimer( this, "menutimer" ); menutimer = new TQTimer( this, "menutimer" );
connect( menutimer, TQT_SIGNAL( timeout() ), TQT_SLOT( updateMessageActions() ) ); connect( menutimer, TQT_SIGNAL( timeout() ), TQT_SLOT( updateMessageActions() ) );
connect( kmkernel->undoStack(), connect( kmkernel->undoStack(),
TQT_SIGNAL( undoStackChanged() ), TQT_TQOBJECT(this), TQT_SLOT( slotUpdateUndo() )); TQT_SIGNAL( undoStackChanged() ), this, TQT_SLOT( slotUpdateUndo() ));
initializeIMAPActions( false ); // don't set state, config not read yet initializeIMAPActions( false ); // don't set state, config not read yet
updateMessageActions(); updateMessageActions();
@ -3288,9 +3288,9 @@ void KMMainWidget::copySelectedToFolder(int menuId )
void KMMainWidget::updateMessageMenu() void KMMainWidget::updateMessageMenu()
{ {
mMenuToFolder.clear(); mMenuToFolder.clear();
folderTree()->folderToPopupMenu( KMFolderTree::MoveMessage, TQT_TQOBJECT(this), folderTree()->folderToPopupMenu( KMFolderTree::MoveMessage, this,
&mMenuToFolder, mMoveActionMenu->popupMenu() ); &mMenuToFolder, mMoveActionMenu->popupMenu() );
folderTree()->folderToPopupMenu( KMFolderTree::CopyMessage, TQT_TQOBJECT(this), folderTree()->folderToPopupMenu( KMFolderTree::CopyMessage, this,
&mMenuToFolder, mCopyActionMenu->popupMenu() ); &mMenuToFolder, mCopyActionMenu->popupMenu() );
updateMessageActions(); updateMessageActions();
} }
@ -3770,7 +3770,7 @@ void KMMainWidget::initializeIMAPActions( bool setState /* false the first time,
if ( !mTroubleshootFolderAction ) { if ( !mTroubleshootFolderAction ) {
mTroubleshootFolderAction = new TDEAction( i18n("&Troubleshoot IMAP Cache..."), "wizard", 0, mTroubleshootFolderAction = new TDEAction( i18n("&Troubleshoot IMAP Cache..."), "wizard", 0,
TQT_TQOBJECT(this), TQT_SLOT(slotTroubleshootFolder()), actionCollection(), "troubleshoot_folder" ); this, TQT_SLOT(slotTroubleshootFolder()), actionCollection(), "troubleshoot_folder" );
if ( setState ) if ( setState )
updateFolderMenu(); // set initial state of the action updateFolderMenu(); // set initial state of the action
} else { } else {

10
kmail/kmmainwin.cpp
Unescape View File

@ -36,10 +36,10 @@ KMMainWin::KMMainWin(TQWidget *)
kapp->ref(); kapp->ref();
(void) new TDEAction( i18n("New &Window"), "window-new", 0, (void) new TDEAction( i18n("New &Window"), "window-new", 0,
TQT_TQOBJECT(this), TQT_SLOT(slotNewMailReader()), this, TQT_SLOT(slotNewMailReader()),
actionCollection(), "new_mail_client" ); actionCollection(), "new_mail_client" );
mKMMainWidget = new KMMainWidget( TQT_TQWIDGET(this), "KMMainWidget", this, actionCollection() ); mKMMainWidget = new KMMainWidget( this, "KMMainWidget", this, actionCollection() );
mKMMainWidget->resize( 450, 600 ); mKMMainWidget->resize( 450, 600 );
setCentralWidget(mKMMainWidget); setCentralWidget(mKMMainWidget);
setupStatusBar(); setupStatusBar();
@ -51,13 +51,13 @@ KMMainWin::KMMainWin(TQWidget *)
setStandardToolBarMenuEnabled(true); setStandardToolBarMenuEnabled(true);
KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotEditToolbars()), KStdAction::configureToolbars(this, TQT_SLOT(slotEditToolbars()),
actionCollection()); actionCollection());
KStdAction::keyBindings(TQT_TQOBJECT(mKMMainWidget), TQT_SLOT(slotEditKeys()), KStdAction::keyBindings(mKMMainWidget, TQT_SLOT(slotEditKeys()),
actionCollection()); actionCollection());
KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection()); KStdAction::quit( this, TQT_SLOT(slotQuit()), actionCollection());
createGUI( "kmmainwin.rc", false ); createGUI( "kmmainwin.rc", false );
// Don't use conserveMemory() because this renders dynamic plugging // Don't use conserveMemory() because this renders dynamic plugging
// of actions unusable! // of actions unusable!

2
kmail/kmmsgpartdlg.cpp
Unescape View File

@ -71,7 +71,7 @@ KMMsgPartDialog::KMMsgPartDialog( const TQString & caption,
// row 0: Type combobox: // row 0: Type combobox:
mMimeType = new KComboBox( true, plainPage() ); mMimeType = new KComboBox( true, plainPage() );
mMimeType->setInsertionPolicy( TQComboBox::NoInsertion ); mMimeType->setInsertionPolicy( TQComboBox::NoInsertion );
mMimeType->setValidator( new KMimeTypeValidator( TQT_TQOBJECT(mMimeType) ) ); mMimeType->setValidator( new KMimeTypeValidator( mMimeType ) );
mMimeType->insertStringList( TQStringList() mMimeType->insertStringList( TQStringList()
<< TQString::fromLatin1("text/html") << TQString::fromLatin1("text/html")
<< TQString::fromLatin1("text/plain") << TQString::fromLatin1("text/plain")

30
kmail/kmreadermainwin.cpp
Unescape View File

@ -348,29 +348,29 @@ void KMReaderMainWin::setupAccel()
// this, TQT_SLOT( slotSaveMsg() ), // this, TQT_SLOT( slotSaveMsg() ),
// actionCollection(), "file_save_as" ); // actionCollection(), "file_save_as" );
mSaveAsAction = KStdAction::saveAs( TQT_TQOBJECT(mReaderWin), TQT_SLOT( slotSaveMsg() ), mSaveAsAction = KStdAction::saveAs( mReaderWin, TQT_SLOT( slotSaveMsg() ),
actionCollection() ); actionCollection() );
mSaveAsAction->setShortcut( TDEStdAccel::shortcut( TDEStdAccel::Save ) ); mSaveAsAction->setShortcut( TDEStdAccel::shortcut( TDEStdAccel::Save ) );
mPrintAction = KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT( slotPrintMsg() ), mPrintAction = KStdAction::print( this, TQT_SLOT( slotPrintMsg() ),
actionCollection() ); actionCollection() );
TDEAction *closeAction = KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() ); TDEAction *closeAction = KStdAction::close( this, TQT_SLOT( close() ), actionCollection() );
TDEShortcut closeShortcut = closeAction->shortcut(); TDEShortcut closeShortcut = closeAction->shortcut();
closeShortcut.append( KKey(Key_Escape)); closeShortcut.append( KKey(Key_Escape));
closeAction->setShortcut(closeShortcut); closeAction->setShortcut(closeShortcut);
//----- Edit Menu //----- Edit Menu
KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( slotCopy() ), actionCollection() ); KStdAction::copy( this, TQT_SLOT( slotCopy() ), actionCollection() );
KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( slotMarkAll() ), actionCollection() ); KStdAction::selectAll( this, TQT_SLOT( slotMarkAll() ), actionCollection() );
KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT(slotFind()), actionCollection() ); KStdAction::find( this, TQT_SLOT(slotFind()), actionCollection() );
KStdAction::findNext( TQT_TQOBJECT(this), TQT_SLOT( slotFindNext() ), actionCollection() ); KStdAction::findNext( this, TQT_SLOT( slotFindNext() ), actionCollection() );
mTrashAction = new TDEAction( KGuiItem( i18n( "&Move to Trash" ), "edittrash", mTrashAction = new TDEAction( KGuiItem( i18n( "&Move to Trash" ), "edittrash",
i18n( "Move message to trashcan" ) ), i18n( "Move message to trashcan" ) ),
Key_Delete, TQT_TQOBJECT(this), TQT_SLOT( slotTrashMsg() ), Key_Delete, this, TQT_SLOT( slotTrashMsg() ),
actionCollection(), "move_to_trash" ); actionCollection(), "move_to_trash" );
//----- View Menu //----- View Menu
mViewSourceAction = new TDEAction( i18n("&View Source"), Key_V, TQT_TQOBJECT(this), mViewSourceAction = new TDEAction( i18n("&View Source"), Key_V, this,
TQT_SLOT(slotShowMsgSrc()), actionCollection(), TQT_SLOT(slotShowMsgSrc()), actionCollection(),
"view_source" ); "view_source" );
@ -379,25 +379,25 @@ void KMReaderMainWin::setupAccel()
"mail-forward", actionCollection(), "mail-forward", actionCollection(),
"message_forward" ); "message_forward" );
mForwardInlineAction = new TDEAction( i18n("&Inline..."), mForwardInlineAction = new TDEAction( i18n("&Inline..."),
"mail-forward", SHIFT+Key_F, TQT_TQOBJECT(this), "mail-forward", SHIFT+Key_F, this,
TQT_SLOT(slotForwardInlineMsg()), TQT_SLOT(slotForwardInlineMsg()),
actionCollection(), actionCollection(),
"message_forward_inline" ); "message_forward_inline" );
mForwardAttachedAction = new TDEAction( i18n("Message->Forward->","As &Attachment..."), mForwardAttachedAction = new TDEAction( i18n("Message->Forward->","As &Attachment..."),
"mail-forward", Key_F, TQT_TQOBJECT(this), "mail-forward", Key_F, this,
TQT_SLOT(slotForwardAttachedMsg()), TQT_SLOT(slotForwardAttachedMsg()),
actionCollection(), actionCollection(),
"message_forward_as_attachment" ); "message_forward_as_attachment" );
mForwardDigestAction = new TDEAction( i18n("Message->Forward->","As Di&gest..."), mForwardDigestAction = new TDEAction( i18n("Message->Forward->","As Di&gest..."),
"mail-forward", 0, TQT_TQOBJECT(this), "mail-forward", 0, this,
TQT_SLOT(slotForwardDigestMsg()), TQT_SLOT(slotForwardDigestMsg()),
actionCollection(), actionCollection(),
"message_forward_as_digest" ); "message_forward_as_digest" );
mRedirectAction = new TDEAction( i18n("Message->Forward->","&Redirect..."), mRedirectAction = new TDEAction( i18n("Message->Forward->","&Redirect..."),
"mail-forward", Key_E, TQT_TQOBJECT(this), "mail-forward", Key_E, this,
TQT_SLOT(slotRedirectMsg()), TQT_SLOT(slotRedirectMsg()),
actionCollection(), actionCollection(),
"message_forward_redirect" ); "message_forward_redirect" );
@ -435,7 +435,7 @@ void KMReaderMainWin::setupAccel()
mReaderWin, TQT_SLOT(slotUrlClicked())); mReaderWin, TQT_SLOT(slotUrlClicked()));
setStandardToolBarMenuEnabled(true); setStandardToolBarMenuEnabled(true);
KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotEditToolbars()), actionCollection()); KStdAction::configureToolbars(this, TQT_SLOT(slotEditToolbars()), actionCollection());
} }
@ -503,7 +503,7 @@ void KMReaderMainWin::slotMsgPopup(KMMessage &aMsg, const KURL &aUrl, const TQPo
TQPopupMenu* copyMenu = new TQPopupMenu(menu); TQPopupMenu* copyMenu = new TQPopupMenu(menu);
KMMainWidget* mainwin = kmkernel->getKMMainWidget(); KMMainWidget* mainwin = kmkernel->getKMMainWidget();
if ( mainwin ) if ( mainwin )
mainwin->folderTree()->folderToPopupMenu( KMFolderTree::CopyMessage, TQT_TQOBJECT(this), mainwin->folderTree()->folderToPopupMenu( KMFolderTree::CopyMessage, this,
&mMenuToFolder, copyMenu ); &mMenuToFolder, copyMenu );
menu->insertItem( i18n("&Copy To" ), copyMenu ); menu->insertItem( i18n("&Copy To" ), copyMenu );
menu->insertSeparator(); menu->insertSeparator();

88
kmail/kmreaderwin.cpp
Unescape View File

@ -470,13 +470,13 @@ KMReaderWin::KMReaderWin(TQWidget *aParent,
mLevelQuote = GlobalSettings::self()->collapseQuoteLevelSpin() - 1; mLevelQuote = GlobalSettings::self()->collapseQuoteLevelSpin() - 1;
connect( &mUpdateReaderWinTimer, TQT_SIGNAL(timeout()), connect( &mUpdateReaderWinTimer, TQT_SIGNAL(timeout()),
TQT_TQOBJECT(this), TQT_SLOT(updateReaderWin()) ); this, TQT_SLOT(updateReaderWin()) );
connect( &mResizeTimer, TQT_SIGNAL(timeout()), connect( &mResizeTimer, TQT_SIGNAL(timeout()),
TQT_TQOBJECT(this), TQT_SLOT(slotDelayedResize()) ); this, TQT_SLOT(slotDelayedResize()) );
connect( &mDelayedMarkTimer, TQT_SIGNAL(timeout()), connect( &mDelayedMarkTimer, TQT_SIGNAL(timeout()),
TQT_TQOBJECT(this), TQT_SLOT(slotTouchMessage()) ); this, TQT_SLOT(slotTouchMessage()) );
connect( &mHeaderRefreshTimer, TQT_SIGNAL(timeout()), connect( &mHeaderRefreshTimer, TQT_SIGNAL(timeout()),
TQT_TQOBJECT(this), TQT_SLOT(updateHeader()) ); this, TQT_SLOT(updateHeader()) );
} }
@ -492,45 +492,45 @@ void KMReaderWin::createActions( TDEActionCollection * ac ) {
headerMenu->setToolTip( i18n("Choose display style of message headers") ); headerMenu->setToolTip( i18n("Choose display style of message headers") );
connect( headerMenu, TQT_SIGNAL(activated()), connect( headerMenu, TQT_SIGNAL(activated()),
TQT_TQOBJECT(this), TQT_SLOT(slotCycleHeaderStyles()) ); this, TQT_SLOT(slotCycleHeaderStyles()) );
raction = new TDERadioAction( i18n("View->headers->", "&Enterprise Headers"), 0, raction = new TDERadioAction( i18n("View->headers->", "&Enterprise Headers"), 0,
TQT_TQOBJECT(this), TQT_SLOT(slotEnterpriseHeaders()), this, TQT_SLOT(slotEnterpriseHeaders()),
ac, "view_headers_enterprise" ); ac, "view_headers_enterprise" );
raction->setToolTip( i18n("Show the list of headers in Enterprise style") ); raction->setToolTip( i18n("Show the list of headers in Enterprise style") );
raction->setExclusiveGroup( "view_headers_group" ); raction->setExclusiveGroup( "view_headers_group" );
headerMenu->insert(raction); headerMenu->insert(raction);
raction = new TDERadioAction( i18n("View->headers->", "&Fancy Headers"), 0, raction = new TDERadioAction( i18n("View->headers->", "&Fancy Headers"), 0,
TQT_TQOBJECT(this), TQT_SLOT(slotFancyHeaders()), this, TQT_SLOT(slotFancyHeaders()),
ac, "view_headers_fancy" ); ac, "view_headers_fancy" );
raction->setToolTip( i18n("Show the list of headers in a fancy format") ); raction->setToolTip( i18n("Show the list of headers in a fancy format") );
raction->setExclusiveGroup( "view_headers_group" ); raction->setExclusiveGroup( "view_headers_group" );
headerMenu->insert( raction ); headerMenu->insert( raction );
raction = new TDERadioAction( i18n("View->headers->", "&Brief Headers"), 0, raction = new TDERadioAction( i18n("View->headers->", "&Brief Headers"), 0,
TQT_TQOBJECT(this), TQT_SLOT(slotBriefHeaders()), this, TQT_SLOT(slotBriefHeaders()),
ac, "view_headers_brief" ); ac, "view_headers_brief" );
raction->setToolTip( i18n("Show brief list of message headers") ); raction->setToolTip( i18n("Show brief list of message headers") );
raction->setExclusiveGroup( "view_headers_group" ); raction->setExclusiveGroup( "view_headers_group" );
headerMenu->insert( raction ); headerMenu->insert( raction );
raction = new TDERadioAction( i18n("View->headers->", "&Standard Headers"), 0, raction = new TDERadioAction( i18n("View->headers->", "&Standard Headers"), 0,
TQT_TQOBJECT(this), TQT_SLOT(slotStandardHeaders()), this, TQT_SLOT(slotStandardHeaders()),
ac, "view_headers_standard" ); ac, "view_headers_standard" );
raction->setToolTip( i18n("Show standard list of message headers") ); raction->setToolTip( i18n("Show standard list of message headers") );
raction->setExclusiveGroup( "view_headers_group" ); raction->setExclusiveGroup( "view_headers_group" );
headerMenu->insert( raction ); headerMenu->insert( raction );
raction = new TDERadioAction( i18n("View->headers->", "&Long Headers"), 0, raction = new TDERadioAction( i18n("View->headers->", "&Long Headers"), 0,
TQT_TQOBJECT(this), TQT_SLOT(slotLongHeaders()), this, TQT_SLOT(slotLongHeaders()),
ac, "view_headers_long" ); ac, "view_headers_long" );
raction->setToolTip( i18n("Show long list of message headers") ); raction->setToolTip( i18n("Show long list of message headers") );
raction->setExclusiveGroup( "view_headers_group" ); raction->setExclusiveGroup( "view_headers_group" );
headerMenu->insert( raction ); headerMenu->insert( raction );
raction = new TDERadioAction( i18n("View->headers->", "&All Headers"), 0, raction = new TDERadioAction( i18n("View->headers->", "&All Headers"), 0,
TQT_TQOBJECT(this), TQT_SLOT(slotAllHeaders()), this, TQT_SLOT(slotAllHeaders()),
ac, "view_headers_all" ); ac, "view_headers_all" );
raction->setToolTip( i18n("Show all message headers") ); raction->setToolTip( i18n("Show all message headers") );
raction->setExclusiveGroup( "view_headers_group" ); raction->setExclusiveGroup( "view_headers_group" );
@ -541,38 +541,38 @@ void KMReaderWin::createActions( TDEActionCollection * ac ) {
new TDEActionMenu( i18n("View->", "&Attachments"), ac, "view_attachments" ); new TDEActionMenu( i18n("View->", "&Attachments"), ac, "view_attachments" );
attachmentMenu->setToolTip( i18n("Choose display style of attachments") ); attachmentMenu->setToolTip( i18n("Choose display style of attachments") );
connect( attachmentMenu, TQT_SIGNAL(activated()), connect( attachmentMenu, TQT_SIGNAL(activated()),
TQT_TQOBJECT(this), TQT_SLOT(slotCycleAttachmentStrategy()) ); this, TQT_SLOT(slotCycleAttachmentStrategy()) );
raction = new TDERadioAction( i18n("View->attachments->", "&As Icons"), 0, raction = new TDERadioAction( i18n("View->attachments->", "&As Icons"), 0,
TQT_TQOBJECT(this), TQT_SLOT(slotIconicAttachments()), this, TQT_SLOT(slotIconicAttachments()),
ac, "view_attachments_as_icons" ); ac, "view_attachments_as_icons" );
raction->setToolTip( i18n("Show all attachments as icons. Click to see them.") ); raction->setToolTip( i18n("Show all attachments as icons. Click to see them.") );
raction->setExclusiveGroup( "view_attachments_group" ); raction->setExclusiveGroup( "view_attachments_group" );
attachmentMenu->insert( raction ); attachmentMenu->insert( raction );
raction = new TDERadioAction( i18n("View->attachments->", "&Smart"), 0, raction = new TDERadioAction( i18n("View->attachments->", "&Smart"), 0,
TQT_TQOBJECT(this), TQT_SLOT(slotSmartAttachments()), this, TQT_SLOT(slotSmartAttachments()),
ac, "view_attachments_smart" ); ac, "view_attachments_smart" );
raction->setToolTip( i18n("Show attachments as suggested by sender.") ); raction->setToolTip( i18n("Show attachments as suggested by sender.") );
raction->setExclusiveGroup( "view_attachments_group" ); raction->setExclusiveGroup( "view_attachments_group" );
attachmentMenu->insert( raction ); attachmentMenu->insert( raction );
raction = new TDERadioAction( i18n("View->attachments->", "&Inline"), 0, raction = new TDERadioAction( i18n("View->attachments->", "&Inline"), 0,
TQT_TQOBJECT(this), TQT_SLOT(slotInlineAttachments()), this, TQT_SLOT(slotInlineAttachments()),
ac, "view_attachments_inline" ); ac, "view_attachments_inline" );
raction->setToolTip( i18n("Show all attachments inline (if possible)") ); raction->setToolTip( i18n("Show all attachments inline (if possible)") );
raction->setExclusiveGroup( "view_attachments_group" ); raction->setExclusiveGroup( "view_attachments_group" );
attachmentMenu->insert( raction ); attachmentMenu->insert( raction );
raction = new TDERadioAction( i18n("View->attachments->", "&Hide"), 0, raction = new TDERadioAction( i18n("View->attachments->", "&Hide"), 0,
TQT_TQOBJECT(this), TQT_SLOT(slotHideAttachments()), this, TQT_SLOT(slotHideAttachments()),
ac, "view_attachments_hide" ); ac, "view_attachments_hide" );
raction->setToolTip( i18n("Do not show attachments in the message viewer") ); raction->setToolTip( i18n("Do not show attachments in the message viewer") );
raction->setExclusiveGroup( "view_attachments_group" ); raction->setExclusiveGroup( "view_attachments_group" );
attachmentMenu->insert( raction ); attachmentMenu->insert( raction );
mHeaderOnlyAttachmentsAction = new TDERadioAction( i18n( "View->attachments->", "In Header &Only" ), 0, mHeaderOnlyAttachmentsAction = new TDERadioAction( i18n( "View->attachments->", "In Header &Only" ), 0,
TQT_TQOBJECT(this), TQT_SLOT( slotHeaderOnlyAttachments() ), this, TQT_SLOT( slotHeaderOnlyAttachments() ),
ac, "view_attachments_headeronly" ); ac, "view_attachments_headeronly" );
mHeaderOnlyAttachmentsAction->setToolTip( i18n( "Show Attachments only in the header of the mail" ) ); mHeaderOnlyAttachmentsAction->setToolTip( i18n( "Show Attachments only in the header of the mail" ) );
mHeaderOnlyAttachmentsAction->setExclusiveGroup( "view_attachments_group" ); mHeaderOnlyAttachmentsAction->setExclusiveGroup( "view_attachments_group" );
@ -580,7 +580,7 @@ void KMReaderWin::createActions( TDEActionCollection * ac ) {
// Set Encoding submenu // Set Encoding submenu
mSelectEncodingAction = new TDESelectAction( i18n( "&Set Encoding" ), "charset", 0, mSelectEncodingAction = new TDESelectAction( i18n( "&Set Encoding" ), "charset", 0,
TQT_TQOBJECT(this), TQT_SLOT( slotSetEncoding() ), this, TQT_SLOT( slotSetEncoding() ),
ac, "encoding" ); ac, "encoding" );
TQStringList encodings = KMMsgBase::supportedEncodings( false ); TQStringList encodings = KMMsgBase::supportedEncodings( false );
encodings.prepend( i18n( "Auto" ) ); encodings.prepend( i18n( "Auto" ) );
@ -588,44 +588,44 @@ void KMReaderWin::createActions( TDEActionCollection * ac ) {
mSelectEncodingAction->setCurrentItem( 0 ); mSelectEncodingAction->setCurrentItem( 0 );
mMailToComposeAction = new TDEAction( i18n("New Message To..."), "mail-message-new", mMailToComposeAction = new TDEAction( i18n("New Message To..."), "mail-message-new",
0, TQT_TQOBJECT(this), TQT_SLOT(slotMailtoCompose()), ac, 0, this, TQT_SLOT(slotMailtoCompose()), ac,
"mailto_compose" ); "mailto_compose" );
mMailToReplyAction = new TDEAction( i18n("Reply To..."), "mail-reply-sender", mMailToReplyAction = new TDEAction( i18n("Reply To..."), "mail-reply-sender",
0, TQT_TQOBJECT(this), TQT_SLOT(slotMailtoReply()), ac, 0, this, TQT_SLOT(slotMailtoReply()), ac,
"mailto_reply" ); "mailto_reply" );
mMailToForwardAction = new TDEAction( i18n("Forward To..."), "mail-forward", mMailToForwardAction = new TDEAction( i18n("Forward To..."), "mail-forward",
0, TQT_TQOBJECT(this), TQT_SLOT(slotMailtoForward()), ac, 0, this, TQT_SLOT(slotMailtoForward()), ac,
"mailto_forward" ); "mailto_forward" );
mAddAddrBookAction = new TDEAction( i18n("Add to Address Book"), mAddAddrBookAction = new TDEAction( i18n("Add to Address Book"),
0, TQT_TQOBJECT(this), TQT_SLOT(slotMailtoAddAddrBook()), 0, this, TQT_SLOT(slotMailtoAddAddrBook()),
ac, "add_addr_book" ); ac, "add_addr_book" );
mOpenAddrBookAction = new TDEAction( i18n("Open in Address Book"), mOpenAddrBookAction = new TDEAction( i18n("Open in Address Book"),
0, TQT_TQOBJECT(this), TQT_SLOT(slotMailtoOpenAddrBook()), 0, this, TQT_SLOT(slotMailtoOpenAddrBook()),
ac, "openin_addr_book" ); ac, "openin_addr_book" );
mCopyAction = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopySelectedText()), ac, "kmail_copy"); mCopyAction = KStdAction::copy( this, TQT_SLOT(slotCopySelectedText()), ac, "kmail_copy");
mSelectAllAction = new TDEAction( i18n("Select All Text"), CTRL+SHIFT+Key_A, TQT_TQOBJECT(this), mSelectAllAction = new TDEAction( i18n("Select All Text"), CTRL+SHIFT+Key_A, this,
TQT_SLOT(selectAll()), ac, "mark_all_text" ); TQT_SLOT(selectAll()), ac, "mark_all_text" );
mCopyURLAction = new TDEAction( i18n("Copy Link Address"), 0, TQT_TQOBJECT(this), mCopyURLAction = new TDEAction( i18n("Copy Link Address"), 0, this,
TQT_SLOT(slotUrlCopy()), ac, "copy_url" ); TQT_SLOT(slotUrlCopy()), ac, "copy_url" );
mUrlOpenAction = new TDEAction( i18n("Open URL"), 0, TQT_TQOBJECT(this), mUrlOpenAction = new TDEAction( i18n("Open URL"), 0, this,
TQT_SLOT(slotUrlOpen()), ac, "open_url" ); TQT_SLOT(slotUrlOpen()), ac, "open_url" );
mAddBookmarksAction = new TDEAction( i18n("Bookmark This Link"), mAddBookmarksAction = new TDEAction( i18n("Bookmark This Link"),
"bookmark_add", "bookmark_add",
0, TQT_TQOBJECT(this), TQT_SLOT(slotAddBookmarks()), 0, this, TQT_SLOT(slotAddBookmarks()),
ac, "add_bookmarks" ); ac, "add_bookmarks" );
mUrlSaveAsAction = new TDEAction( i18n("Save Link As..."), 0, TQT_TQOBJECT(this), mUrlSaveAsAction = new TDEAction( i18n("Save Link As..."), 0, this,
TQT_SLOT(slotUrlSave()), ac, "saveas_url" ); TQT_SLOT(slotUrlSave()), ac, "saveas_url" );
mToggleFixFontAction = new TDEToggleAction( i18n("Use Fi&xed Font"), mToggleFixFontAction = new TDEToggleAction( i18n("Use Fi&xed Font"),
Key_X, TQT_TQOBJECT(this), TQT_SLOT(slotToggleFixedFont()), Key_X, this, TQT_SLOT(slotToggleFixedFont()),
ac, "toggle_fixedfont" ); ac, "toggle_fixedfont" );
mToggleMimePartTreeAction = new TDEToggleAction( i18n("Show Message Structure"), mToggleMimePartTreeAction = new TDEToggleAction( i18n("Show Message Structure"),
0, ac, "toggle_mimeparttree" ); 0, ac, "toggle_mimeparttree" );
connect(mToggleMimePartTreeAction, TQT_SIGNAL(toggled(bool)), connect(mToggleMimePartTreeAction, TQT_SIGNAL(toggled(bool)),
TQT_TQOBJECT(this), TQT_SLOT(slotToggleMimePartTree())); this, TQT_SLOT(slotToggleMimePartTree()));
mStartIMChatAction = new TDEAction( i18n("Chat &With..."), 0, TQT_TQOBJECT(this), mStartIMChatAction = new TDEAction( i18n("Chat &With..."), 0, this,
TQT_SLOT(slotIMChat()), ac, "start_im_chat" ); TQT_SLOT(slotIMChat()), ac, "start_im_chat" );
} }
@ -1029,9 +1029,9 @@ void KMReaderWin::initHtmlWidget(void)
connect(mViewer,TQT_SIGNAL(popupMenu(const TQString &, const TQPoint &)), connect(mViewer,TQT_SIGNAL(popupMenu(const TQString &, const TQPoint &)),
TQT_SLOT(slotUrlPopup(const TQString &, const TQPoint &))); TQT_SLOT(slotUrlPopup(const TQString &, const TQPoint &)));
connect( kmkernel->imProxy(), TQT_SIGNAL( sigContactPresenceChanged( const TQString & ) ), connect( kmkernel->imProxy(), TQT_SIGNAL( sigContactPresenceChanged( const TQString & ) ),
TQT_TQOBJECT(this), TQT_SLOT( contactStatusChanged( const TQString & ) ) ); this, TQT_SLOT( contactStatusChanged( const TQString & ) ) );
connect( kmkernel->imProxy(), TQT_SIGNAL( sigPresenceInfoExpired() ), connect( kmkernel->imProxy(), TQT_SIGNAL( sigPresenceInfoExpired() ),
TQT_TQOBJECT(this), TQT_SLOT( updateReaderWin() ) ); this, TQT_SLOT( updateReaderWin() ) );
} }
void KMReaderWin::contactStatusChanged( const TQString &uid) void KMReaderWin::contactStatusChanged( const TQString &uid)
@ -1497,7 +1497,7 @@ void KMReaderWin::displayMessage() {
htmlWriter()->queue("</body></html>"); htmlWriter()->queue("</body></html>");
htmlWriter()->flush(); htmlWriter()->flush();
TQTimer::singleShot( 1, TQT_TQOBJECT(this), TQT_SLOT(injectAttachments()) ); TQTimer::singleShot( 1, this, TQT_SLOT(injectAttachments()) );
} }
static bool message_was_saved_decrypted_before( const KMMessage * msg ) { 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 ); menu->insertItem( i18n("Scroll To"), 10 );
} }
connect(menu, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotHandleAttachment(int))); connect(menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHandleAttachment(int)));
menu->exec( p ,0 ); menu->exec( p ,0 );
delete menu; delete menu;
} }
@ -2106,7 +2106,7 @@ void KMReaderWin::slotHandleAttachment( int choice )
node, message(), mAtmCurrent, mAtmCurrentName, node, message(), mAtmCurrent, mAtmCurrentName,
KMHandleAttachmentCommand::AttachmentAction( choice ), 0, this ); KMHandleAttachmentCommand::AttachmentAction( choice ), 0, this );
connect( command, TQT_SIGNAL( showAttachment( int, const TQString& ) ), connect( command, TQT_SIGNAL( showAttachment( int, const TQString& ) ),
TQT_TQOBJECT(this), TQT_SLOT( slotAtmView( int, const TQString& ) ) ); this, TQT_SLOT( slotAtmView( int, const TQString& ) ) );
command->start(); command->start();
} else if ( choice == 7 ) { } else if ( choice == 7 ) {
slotDeleteAttachment( node ); slotDeleteAttachment( node );
@ -2394,7 +2394,7 @@ void KMReaderWin::openAttachment( int id, const TQString & name )
message(), mAtmCurrent, mAtmCurrentName, KMHandleAttachmentCommand::Save, message(), mAtmCurrent, mAtmCurrentName, KMHandleAttachmentCommand::Save,
offer, this ); offer, this );
connect( command, TQT_SIGNAL( showAttachment( int, const TQString& ) ), connect( command, TQT_SIGNAL( showAttachment( int, const TQString& ) ),
TQT_TQOBJECT(this), TQT_SLOT( slotAtmView( int, const TQString& ) ) ); this, TQT_SLOT( slotAtmView( int, const TQString& ) ) );
command->start(); command->start();
} }
else if( choice == KMessageBox::No ) { // Open else if( choice == KMessageBox::No ) { // Open
@ -2404,7 +2404,7 @@ void KMReaderWin::openAttachment( int id, const TQString & name )
KMHandleAttachmentCommand* command = new KMHandleAttachmentCommand( node, KMHandleAttachmentCommand* command = new KMHandleAttachmentCommand( node,
message(), mAtmCurrent, mAtmCurrentName, action, offer, this ); message(), mAtmCurrent, mAtmCurrentName, action, offer, this );
connect( command, TQT_SIGNAL( showAttachment( int, const TQString& ) ), connect( command, TQT_SIGNAL( showAttachment( int, const TQString& ) ),
TQT_TQOBJECT(this), TQT_SLOT( slotAtmView( int, const TQString& ) ) ); this, TQT_SLOT( slotAtmView( int, const TQString& ) ) );
command->start(); command->start();
} else { // Cancel } else { // Cancel
kdDebug(5006) << "Canceled opening attachment" << endl; kdDebug(5006) << "Canceled opening attachment" << endl;
@ -2802,7 +2802,7 @@ bool KMReaderWin::eventFilter( TQObject *, TQEvent *e )
// case we started a drag. If the event is missed, the HTML view gets into a wrong // case we started a drag. If the event is missed, the HTML view gets into a wrong
// state, in which funny things like unsolicited drags start to happen. // state, in which funny things like unsolicited drags start to happen.
TQMouseEvent mouseEvent( TQEvent::MouseButtonRelease, me->pos(), TQt::NoButton, TQt::NoButton ); TQMouseEvent mouseEvent( TQEvent::MouseButtonRelease, me->pos(), TQt::NoButton, TQt::NoButton );
TQT_TQOBJECT( mViewer->view() )->eventFilter( mViewer->view()->viewport(), static_cast<TQObject*>(mViewer->view())->eventFilter( mViewer->view()->viewport(),
&mouseEvent ); &mouseEvent );
return true; return true;
} }
@ -2854,9 +2854,9 @@ void KMReaderWin::slotDeleteAttachment(partNode * node)
KMDeleteAttachmentCommand* command = new KMDeleteAttachmentCommand( nodeId, msg, this ); KMDeleteAttachmentCommand* command = new KMDeleteAttachmentCommand( nodeId, msg, this );
command->start(); command->start();
connect( command, TQT_SIGNAL( completed( KMCommand * ) ), connect( command, TQT_SIGNAL( completed( KMCommand * ) ),
TQT_TQOBJECT(this), TQT_SLOT( updateReaderWin() ) ); this, TQT_SLOT( updateReaderWin() ) );
connect( command, TQT_SIGNAL( completed( KMCommand * ) ), connect( command, TQT_SIGNAL( completed( KMCommand * ) ),
TQT_TQOBJECT(this), TQT_SLOT( disconnectMsgAdded() ) ); this, TQT_SLOT( disconnectMsgAdded() ) );
// ### HACK: Since the command will do delete + add, a new message will arrive. However, we don't // ### 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 // want the selection to change. Therefore, as soon as a new message arrives, select it, and then
@ -2865,7 +2865,7 @@ void KMReaderWin::slotDeleteAttachment(partNode * node)
// And it won't work properly with multiple main windows // And it won't work properly with multiple main windows
const KMHeaders * const headers = KMKernel::self()->getKMMainWidget()->headers(); const KMHeaders * const headers = KMKernel::self()->getKMMainWidget()->headers();
connect( headers, TQT_SIGNAL( msgAddedToListView( TQListViewItem* ) ), connect( headers, TQT_SIGNAL( msgAddedToListView( TQListViewItem* ) ),
TQT_TQOBJECT(this), TQT_SLOT( msgAdded( TQListViewItem* ) ) ); this, TQT_SLOT( msgAdded( TQListViewItem* ) ) );
} }
// If we are operating on a copy of parts of the message, make sure to update the copy as well. // If we are operating on a copy of parts of the message, make sure to update the copy as well.
@ -2891,7 +2891,7 @@ void KMReaderWin::disconnectMsgAdded()
{ {
const KMHeaders *const headers = KMKernel::self()->getKMMainWidget()->headers(); const KMHeaders *const headers = KMKernel::self()->getKMMainWidget()->headers();
disconnect( headers, TQT_SIGNAL( msgAddedToListView( TQListViewItem* ) ), disconnect( headers, TQT_SIGNAL( msgAddedToListView( TQListViewItem* ) ),
TQT_TQOBJECT(this), TQT_SLOT( msgAdded( TQListViewItem* ) ) ); this, TQT_SLOT( msgAdded( TQListViewItem* ) ) );
} }
void KMReaderWin::slotEditAttachment(partNode * node) void KMReaderWin::slotEditAttachment(partNode * node)

2
kmail/kmsearchpatternedit.cpp
Unescape View File

@ -116,7 +116,7 @@ void KMSearchRuleWidget::initWidget()
RuleWidgetHandlerManager::instance()->createWidgets( mFunctionStack, RuleWidgetHandlerManager::instance()->createWidgets( mFunctionStack,
mValueStack, mValueStack,
TQT_TQOBJECT(this) ); this );
// redirect focus to the header field combo box // redirect focus to the header field combo box
setFocusProxy( mRuleField ); setFocusProxy( mRuleField );

2
kmail/kmservertest.cpp
Unescape View File

@ -166,7 +166,7 @@ void KMServerTest::slotSlaveResult(TDEIO::Slave *aSlave, int error,
if ( error ) if ( error )
{ {
mJob = 0; mJob = 0;
KMessageBox::error( TQT_TQWIDGET(kapp->activeWindow()), KMessageBox::error( kapp->activeWindow(),
TDEIO::buildErrorString( error, errorText ), TDEIO::buildErrorString( error, errorText ),
i18n("Error") ); i18n("Error") );
emit capabilities( mListNormal, mListSSL ); emit capabilities( mListNormal, mListSSL );

2
kmail/kmtransport.cpp
Unescape View File

@ -401,7 +401,7 @@ void KMTransportDialog::makeSmtpPage()
label = new TQLabel( i18n("&Port:"), page1 ); label = new TQLabel( i18n("&Port:"), page1 );
grid->addWidget( label, 4, 0 ); grid->addWidget( label, 4, 0 );
mSmtp.portEdit = new KLineEdit( page1 ); mSmtp.portEdit = new KLineEdit( page1 );
mSmtp.portEdit->setValidator( new TQIntValidator(TQT_TQOBJECT(this)) ); mSmtp.portEdit->setValidator( new TQIntValidator(this) );
TQWhatsThis::add(mSmtp.portEdit, TQWhatsThis::add(mSmtp.portEdit,
i18n("The port number that the SMTP server " i18n("The port number that the SMTP server "
"is listening on. The default port is 25.")); "is listening on. The default port is 25."));

2
kmail/regexplineedit.cpp
Unescape View File

@ -120,7 +120,7 @@ namespace KMail {
void RegExpLineEdit::slotEditRegExp() void RegExpLineEdit::slotEditRegExp()
{ {
if ( !mRegExpEditDialog ) if ( !mRegExpEditDialog )
mRegExpEditDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this) ); mRegExpEditDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), this );
KRegExpEditorInterface *iface = KRegExpEditorInterface *iface =
static_cast<KRegExpEditorInterface *>( mRegExpEditDialog->tqt_cast( "KRegExpEditorInterface" ) ); static_cast<KRegExpEditorInterface *>( mRegExpEditDialog->tqt_cast( "KRegExpEditorInterface" ) );

26
kmail/rulewidgethandlermanager.cpp
Unescape View File

@ -251,7 +251,7 @@ void KMail::RuleWidgetHandlerManager::createWidgets( TQWidgetStack *functionStac
for ( int i = 0; for ( int i = 0;
( w = (*it)->createFunctionWidget( i, functionStack, receiver ) ); ( w = (*it)->createFunctionWidget( i, functionStack, receiver ) );
++i ) { ++i ) {
if ( childCount( TQT_TQOBJECT(functionStack), w->name() ) < 2 ) { if ( childCount( functionStack, w->name() ) < 2 ) {
// there wasn't already a widget with this name, so add this widget // there wasn't already a widget with this name, so add this widget
functionStack->addWidget( w ); functionStack->addWidget( w );
} }
@ -266,7 +266,7 @@ void KMail::RuleWidgetHandlerManager::createWidgets( TQWidgetStack *functionStac
for ( int i = 0; for ( int i = 0;
( w = (*it)->createValueWidget( i, valueStack, receiver ) ); ( w = (*it)->createValueWidget( i, valueStack, receiver ) );
++i ) { ++i ) {
if ( childCount( TQT_TQOBJECT(valueStack), w->name() ) < 2 ) { if ( childCount( valueStack, w->name() ) < 2 ) {
// there wasn't already a widget with this name, so add this widget // there wasn't already a widget with this name, so add this widget
valueStack->addWidget( w ); valueStack->addWidget( w );
} }
@ -646,14 +646,14 @@ namespace {
if ( func == KMSearchRule::FuncIsInAddressbook || if ( func == KMSearchRule::FuncIsInAddressbook ||
func == KMSearchRule::FuncIsNotInAddressbook ) { func == KMSearchRule::FuncIsNotInAddressbook ) {
TQWidget *w = TQWidget *w =
TQT_TQWIDGET( valueStack->child( "textRuleValueHider", static_cast<TQWidget*>( valueStack->child( "textRuleValueHider",
0, false ) ); 0, false ) );
valueStack->raiseWidget( w ); valueStack->raiseWidget( w );
} }
else if ( func == KMSearchRule::FuncIsInCategory || else if ( func == KMSearchRule::FuncIsInCategory ||
func == KMSearchRule::FuncIsNotInCategory) { func == KMSearchRule::FuncIsNotInCategory) {
TQComboBox *combo = TQComboBox *combo =
static_cast<TQComboBox*>( TQT_TQWIDGET(valueStack->child( "categoryCombo", static_cast<TQComboBox*>( static_cast<TQWidget*>(valueStack->child( "categoryCombo",
0, false )) ); 0, false )) );
combo->blockSignals( true ); combo->blockSignals( true );
for ( i = 0; i < combo->count(); ++i ) for ( i = 0; i < combo->count(); ++i )
@ -692,7 +692,7 @@ namespace {
{ {
// raise the correct function widget // raise the correct function widget
functionStack->raiseWidget( functionStack->raiseWidget(
TQT_TQWIDGET( functionStack->child( "textRuleFuncCombo", static_cast<TQWidget*>( functionStack->child( "textRuleFuncCombo",
0, false ) ) ); 0, false ) ) );
// raise the correct value widget // raise the correct value widget
@ -700,13 +700,13 @@ namespace {
if ( func == KMSearchRule::FuncIsInAddressbook || if ( func == KMSearchRule::FuncIsInAddressbook ||
func == KMSearchRule::FuncIsNotInAddressbook ) { func == KMSearchRule::FuncIsNotInAddressbook ) {
valueStack->raiseWidget( valueStack->raiseWidget(
TQT_TQWIDGET( valueStack->child( "textRuleValueHider", static_cast<TQWidget*>( valueStack->child( "textRuleValueHider",
0, false ) ) ); 0, false ) ) );
} }
else if ( func == KMSearchRule::FuncIsInCategory || else if ( func == KMSearchRule::FuncIsInCategory ||
func == KMSearchRule::FuncIsNotInCategory) { func == KMSearchRule::FuncIsNotInCategory) {
valueStack->raiseWidget( valueStack->raiseWidget(
TQT_TQWIDGET( valueStack->child( "categoryCombo", static_cast<TQWidget*>( valueStack->child( "categoryCombo",
0, false ) ) ); 0, false ) ) );
} }
else { else {
@ -947,7 +947,7 @@ namespace {
if ( func == KMSearchRule::FuncHasAttachment || if ( func == KMSearchRule::FuncHasAttachment ||
func == KMSearchRule::FuncHasNoAttachment ) { func == KMSearchRule::FuncHasNoAttachment ) {
TQWidget *w = TQWidget *w =
TQT_TQWIDGET( valueStack->child( "textRuleValueHider", static_cast<TQWidget*>( valueStack->child( "textRuleValueHider",
0, false ) ); 0, false ) );
valueStack->raiseWidget( w ); valueStack->raiseWidget( w );
} }
@ -978,7 +978,7 @@ namespace {
return false; return false;
// raise the correct function widget // raise the correct function widget
functionStack->raiseWidget( functionStack->raiseWidget(
TQT_TQWIDGET( functionStack->child( "messageRuleFuncCombo", static_cast<TQWidget*>( functionStack->child( "messageRuleFuncCombo",
0, false ) ) ); 0, false ) ) );
// raise the correct value widget // raise the correct value widget
@ -986,7 +986,7 @@ namespace {
if ( func == KMSearchRule::FuncHasAttachment || if ( func == KMSearchRule::FuncHasAttachment ||
func == KMSearchRule::FuncHasNoAttachment ) { func == KMSearchRule::FuncHasNoAttachment ) {
TQWidget *w = TQWidget *w =
TQT_TQWIDGET( valueStack->child( "textRuleValueHider", static_cast<TQWidget*>( valueStack->child( "textRuleValueHider",
0, false ) ); 0, false ) );
valueStack->raiseWidget( w ); valueStack->raiseWidget( w );
} }
@ -1249,12 +1249,12 @@ namespace {
// raise the correct function widget // raise the correct function widget
functionStack->raiseWidget( functionStack->raiseWidget(
TQT_TQWIDGET( functionStack->child( "statusRuleFuncCombo", static_cast<TQWidget*>( functionStack->child( "statusRuleFuncCombo",
0, false ) ) ); 0, false ) ) );
// raise the correct value widget // raise the correct value widget
valueStack->raiseWidget( valueStack->raiseWidget(
TQT_TQWIDGET( valueStack->child( "statusRuleValueCombo", static_cast<TQWidget*>( valueStack->child( "statusRuleValueCombo",
0, false ) ) ); 0, false ) ) );
return true; return true;
} }
@ -1502,7 +1502,7 @@ namespace {
// raise the correct function widget // raise the correct function widget
functionStack->raiseWidget( functionStack->raiseWidget(
TQT_TQWIDGET( functionStack->child( "numericRuleFuncCombo", static_cast<TQWidget*>( functionStack->child( "numericRuleFuncCombo",
0, false ) ) ); 0, false ) ) );
// raise the correct value widget // raise the correct value widget

76
kmail/searchwindow.cpp
Unescape View File

@ -189,7 +189,7 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
object = list->first(); object = list->first();
delete list; delete list;
if (!searchFolder && object && ::tqt_cast<TQComboBox*>(object)) if (!searchFolder && object && ::tqt_cast<TQComboBox*>(object))
static_cast<TQComboBox*>(TQT_TQWIDGET(object))->setCurrentText(i18n("Subject")); static_cast<TQComboBox*>(object)->setCurrentText(i18n("Subject"));
vbl->addWidget( mPatternEdit ); vbl->addWidget( mPatternEdit );
@ -199,7 +199,7 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
connect( mChkbxSpecificFolders, TQT_SIGNAL(toggled(bool)), connect( mChkbxSpecificFolders, TQT_SIGNAL(toggled(bool)),
mChkSubFolders, TQT_SLOT(setEnabled(bool)) ); mChkSubFolders, TQT_SLOT(setEnabled(bool)) );
connect( mChkbxAllFolders, TQT_SIGNAL(toggled(bool)), connect( mChkbxAllFolders, TQT_SIGNAL(toggled(bool)),
TQT_TQOBJECT(this), TQT_SLOT(setEnabledSearchButton(bool)) ); this, TQT_SLOT(setEnabledSearchButton(bool)) );
mLbxMatches = new MatchListView(searchWidget, this, "Find Messages"); mLbxMatches = new MatchListView(searchWidget, this, "Find Messages");
@ -237,13 +237,13 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
mLbxMatches->setDragEnabled( true ); mLbxMatches->setDragEnabled( true );
connect( mLbxMatches, TQT_SIGNAL(clicked(TQListViewItem *)), connect( mLbxMatches, TQT_SIGNAL(clicked(TQListViewItem *)),
TQT_TQOBJECT(this), TQT_SLOT(slotShowMsg(TQListViewItem *)) ); this, TQT_SLOT(slotShowMsg(TQListViewItem *)) );
connect( mLbxMatches, TQT_SIGNAL(doubleClicked(TQListViewItem *)), connect( mLbxMatches, TQT_SIGNAL(doubleClicked(TQListViewItem *)),
TQT_TQOBJECT(this), TQT_SLOT(slotViewMsg(TQListViewItem *)) ); this, TQT_SLOT(slotViewMsg(TQListViewItem *)) );
connect( mLbxMatches, TQT_SIGNAL(currentChanged(TQListViewItem *)), connect( mLbxMatches, TQT_SIGNAL(currentChanged(TQListViewItem *)),
TQT_TQOBJECT(this), TQT_SLOT(slotCurrentChanged(TQListViewItem *)) ); this, TQT_SLOT(slotCurrentChanged(TQListViewItem *)) );
connect( mLbxMatches, TQT_SIGNAL(contextMenuRequested(TQListViewItem *,const TQPoint &,int)), connect( mLbxMatches, TQT_SIGNAL(contextMenuRequested(TQListViewItem *,const TQPoint &,int)),
TQT_TQOBJECT(this), TQT_SLOT(slotContextMenuRequested(TQListViewItem *,const TQPoint &,int)) ); this, TQT_SLOT(slotContextMenuRequested(TQListViewItem *,const TQPoint &,int)) );
vbl->addWidget( mLbxMatches ); vbl->addWidget( mLbxMatches );
TQHBoxLayout *hbl2 = new TQHBoxLayout( vbl, spacingHint(), "kmfs_hbl2" ); TQHBoxLayout *hbl2 = new TQHBoxLayout( vbl, spacingHint(), "kmfs_hbl2" );
@ -261,16 +261,16 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
mSearchFolderOpenBtn->setEnabled(false); mSearchFolderOpenBtn->setEnabled(false);
hbl2->addWidget(mSearchFolderOpenBtn); hbl2->addWidget(mSearchFolderOpenBtn);
connect( mSearchFolderEdt, TQT_SIGNAL( textChanged( const TQString &)), connect( mSearchFolderEdt, TQT_SIGNAL( textChanged( const TQString &)),
TQT_TQOBJECT(this), TQT_SLOT( scheduleRename( const TQString & ))); this, TQT_SLOT( scheduleRename( const TQString & )));
connect( &mRenameTimer, TQT_SIGNAL( timeout() ), connect( &mRenameTimer, TQT_SIGNAL( timeout() ),
TQT_TQOBJECT(this), TQT_SLOT( renameSearchFolder() )); this, TQT_SLOT( renameSearchFolder() ));
connect( mSearchFolderOpenBtn, TQT_SIGNAL( clicked() ), connect( mSearchFolderOpenBtn, TQT_SIGNAL( clicked() ),
TQT_TQOBJECT(this), TQT_SLOT( openSearchFolder() )); this, TQT_SLOT( openSearchFolder() ));
mSearchResultOpenBtn = new TQPushButton(i18n("Open &Message"), searchWidget); mSearchResultOpenBtn = new TQPushButton(i18n("Open &Message"), searchWidget);
mSearchResultOpenBtn->setEnabled(false); mSearchResultOpenBtn->setEnabled(false);
hbl2->addWidget(mSearchResultOpenBtn); hbl2->addWidget(mSearchResultOpenBtn);
connect( mSearchResultOpenBtn, TQT_SIGNAL( clicked() ), connect( mSearchResultOpenBtn, TQT_SIGNAL( clicked() ),
TQT_TQOBJECT(this), TQT_SLOT( slotViewSelectedMsg() )); this, TQT_SLOT( slotViewSelectedMsg() ));
mStatusBar = new KStatusBar(searchWidget); mStatusBar = new KStatusBar(searchWidget);
mStatusBar->insertFixedItem(i18n("AMiddleLengthText..."), 0, true); mStatusBar->insertFixedItem(i18n("AMiddleLengthText..."), 0, true);
mStatusBar->changeItem(i18n("Ready."), 0); mStatusBar->changeItem(i18n("Ready."), 0);
@ -294,12 +294,12 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
connect(this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(slotSearch())); connect(this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(slotSearch()));
connect(this, TQT_SIGNAL(user2Clicked()), TQT_SLOT(slotStop())); connect(this, TQT_SIGNAL(user2Clicked()), TQT_SLOT(slotStop()));
connect(this, TQT_SIGNAL(finished()), TQT_TQOBJECT(this), TQT_SLOT(deleteLater())); connect(this, TQT_SIGNAL(finished()), this, TQT_SLOT(deleteLater()));
// give focus to the value field of the first search rule // give focus to the value field of the first search rule
object = mPatternEdit->child( "regExpLineEdit" ); object = mPatternEdit->child( "regExpLineEdit" );
if ( object && object->isWidgetType() ) { if ( object && object->isWidgetType() ) {
TQT_TQWIDGET(object)->setFocus(); static_cast<TQWidget*>(object)->setFocus();
//kdDebug(5006) << "SearchWindow: focus has been given to widget " //kdDebug(5006) << "SearchWindow: focus has been given to widget "
// << object->name() << endl; // << object->name() << endl;
} }
@ -309,13 +309,13 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
//set up actions //set up actions
TDEActionCollection *ac = actionCollection(); TDEActionCollection *ac = actionCollection();
ac->setWidget( this ); ac->setWidget( this );
mReplyAction = new TDEAction( i18n("&Reply..."), "mail-reply-sender", 0, TQT_TQOBJECT(this), mReplyAction = new TDEAction( i18n("&Reply..."), "mail-reply-sender", 0, this,
TQT_SLOT(slotReplyToMsg()), ac, "search_reply" ); TQT_SLOT(slotReplyToMsg()), ac, "search_reply" );
mReplyAllAction = new TDEAction( i18n("Reply to &All..."), "mail-reply-all", mReplyAllAction = new TDEAction( i18n("Reply to &All..."), "mail-reply-all",
0, TQT_TQOBJECT(this), TQT_SLOT(slotReplyAllToMsg()), 0, this, TQT_SLOT(slotReplyAllToMsg()),
ac, "search_reply_all" ); ac, "search_reply_all" );
mReplyListAction = new TDEAction( i18n("Reply to Mailing-&List..."), mReplyListAction = new TDEAction( i18n("Reply to Mailing-&List..."),
"mail_replylist", 0, TQT_TQOBJECT(this), "mail_replylist", 0, this,
TQT_SLOT(slotReplyListToMsg()), ac, TQT_SLOT(slotReplyListToMsg()), ac,
"search_reply_list" ); "search_reply_list" );
mForwardActionMenu = new TDEActionMenu( i18n("Message->","&Forward"), mForwardActionMenu = new TDEActionMenu( i18n("Message->","&Forward"),
@ -324,11 +324,11 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
connect( mForwardActionMenu, TQT_SIGNAL(activated()), this, connect( mForwardActionMenu, TQT_SIGNAL(activated()), this,
TQT_SLOT(slotForwardInlineMsg()) ); TQT_SLOT(slotForwardInlineMsg()) );
mForwardAttachedAction = new TDEAction( i18n("Message->Forward->","As &Attachment..."), mForwardAttachedAction = new TDEAction( i18n("Message->Forward->","As &Attachment..."),
"mail-forward", 0, TQT_TQOBJECT(this), "mail-forward", 0, this,
TQT_SLOT(slotForwardAttachedMsg()), ac, TQT_SLOT(slotForwardAttachedMsg()), ac,
"search_message_forward_as_attachment" ); "search_message_forward_as_attachment" );
mForwardInlineAction = new TDEAction( i18n("&Inline..."), mForwardInlineAction = new TDEAction( i18n("&Inline..."),
"mail-forward", 0, TQT_TQOBJECT(this), "mail-forward", 0, this,
TQT_SLOT(slotForwardInlineMsg()), ac, TQT_SLOT(slotForwardInlineMsg()), ac,
"search_message_forward_inline" ); "search_message_forward_inline" );
if ( GlobalSettings::self()->forwardingInlineByDefault() ) { if ( GlobalSettings::self()->forwardingInlineByDefault() ) {
@ -340,32 +340,32 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name,
} }
mForwardDigestAction = new TDEAction( i18n("Message->Forward->","As Di&gest..."), mForwardDigestAction = new TDEAction( i18n("Message->Forward->","As Di&gest..."),
"mail-forward", 0, TQT_TQOBJECT(this), "mail-forward", 0, this,
TQT_SLOT(slotForwardDigestMsg()), ac, TQT_SLOT(slotForwardDigestMsg()), ac,
"search_message_forward_as_digest" ); "search_message_forward_as_digest" );
mForwardActionMenu->insert( mForwardDigestAction ); mForwardActionMenu->insert( mForwardDigestAction );
mRedirectAction = new TDEAction( i18n("Message->Forward->","&Redirect..."), mRedirectAction = new TDEAction( i18n("Message->Forward->","&Redirect..."),
"mail-forward", 0, TQT_TQOBJECT(this), "mail-forward", 0, this,
TQT_SLOT(slotRedirectMsg()), ac, TQT_SLOT(slotRedirectMsg()), ac,
"search_message_forward_redirect" ); "search_message_forward_redirect" );
mForwardActionMenu->insert( mRedirectAction ); mForwardActionMenu->insert( mRedirectAction );
mSaveAsAction = KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT(slotSaveMsg()), ac, "search_file_save_as" ); mSaveAsAction = KStdAction::saveAs( this, TQT_SLOT(slotSaveMsg()), ac, "search_file_save_as" );
mSaveAtchAction = new TDEAction( i18n("Save Attachments..."), "attach", 0, mSaveAtchAction = new TDEAction( i18n("Save Attachments..."), "attach", 0,
TQT_TQOBJECT(this), TQT_SLOT(slotSaveAttachments()), ac, "search_save_attachments" ); this, TQT_SLOT(slotSaveAttachments()), ac, "search_save_attachments" );
mPrintAction = KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT(slotPrintMsg()), ac, "search_print" ); mPrintAction = KStdAction::print( this, TQT_SLOT(slotPrintMsg()), ac, "search_print" );
mClearAction = new TDEAction( i18n("Clear Selection"), 0, 0, TQT_TQOBJECT(this), mClearAction = new TDEAction( i18n("Clear Selection"), 0, 0, this,
TQT_SLOT(slotClearSelection()), ac, "search_clear_selection" ); TQT_SLOT(slotClearSelection()), ac, "search_clear_selection" );
mCopyAction = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopyMsgs()), ac, "search_copy_messages" ); mCopyAction = KStdAction::copy( this, TQT_SLOT(slotCopyMsgs()), ac, "search_copy_messages" );
mCutAction = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT(slotCutMsgs()), ac, "search_cut_messages" ); mCutAction = KStdAction::cut( this, TQT_SLOT(slotCutMsgs()), ac, "search_cut_messages" );
connect(mTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(updStatus())); connect(mTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updStatus()));
connect(kmkernel->searchFolderMgr(), TQT_SIGNAL(folderInvalidated(KMFolder*)), connect(kmkernel->searchFolderMgr(), TQT_SIGNAL(folderInvalidated(KMFolder*)),
TQT_TQOBJECT(this), TQT_SLOT(folderInvalidated(KMFolder*))); this, TQT_SLOT(folderInvalidated(KMFolder*)));
connect(mCbxFolders, TQT_SIGNAL(folderChanged(KMFolder*)), connect(mCbxFolders, TQT_SIGNAL(folderChanged(KMFolder*)),
TQT_TQOBJECT(this), TQT_SLOT(slotFolderActivated())); this, TQT_SLOT(slotFolderActivated()));
} }
@ -508,17 +508,17 @@ void SearchWindow::slotSearch()
} }
mFolder->stopSearch(); mFolder->stopSearch();
disconnect(mFolder, TQT_SIGNAL(msgAdded(int)), disconnect(mFolder, TQT_SIGNAL(msgAdded(int)),
TQT_TQOBJECT(this), TQT_SLOT(slotAddMsg(int))); this, TQT_SLOT(slotAddMsg(int)));
disconnect(mFolder, TQT_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)), disconnect(mFolder, TQT_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)),
TQT_TQOBJECT(this), TQT_SLOT(slotRemoveMsg(KMFolder*, TQ_UINT32))); this, TQT_SLOT(slotRemoveMsg(KMFolder*, TQ_UINT32)));
connect(mFolder, TQT_SIGNAL(msgAdded(int)), connect(mFolder, TQT_SIGNAL(msgAdded(int)),
TQT_TQOBJECT(this), TQT_SLOT(slotAddMsg(int))); this, TQT_SLOT(slotAddMsg(int)));
connect(mFolder, TQT_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)), connect(mFolder, TQT_SIGNAL(msgRemoved(KMFolder*, TQ_UINT32)),
TQT_TQOBJECT(this), TQT_SLOT(slotRemoveMsg(KMFolder*, TQ_UINT32))); this, TQT_SLOT(slotRemoveMsg(KMFolder*, TQ_UINT32)));
mSearchFolderEdt->setEnabled(false); mSearchFolderEdt->setEnabled(false);
KMSearch *search = new KMSearch(); KMSearch *search = new KMSearch();
connect(search, TQT_SIGNAL(finished(bool)), connect(search, TQT_SIGNAL(finished(bool)),
TQT_TQOBJECT(this), TQT_SLOT(searchDone())); this, TQT_SLOT(searchDone()));
if (mChkbxAllFolders->isChecked()) { if (mChkbxAllFolders->isChecked()) {
search->setRecursive(true); search->setRecursive(true);
} else { } else {
@ -543,7 +543,7 @@ void SearchWindow::searchDone()
mTimer->stop(); mTimer->stop();
updStatus(); updStatus();
TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(enableGUI())); TQTimer::singleShot(0, this, TQT_SLOT(enableGUI()));
if(mLastFocus) if(mLastFocus)
mLastFocus->setFocus(); mLastFocus->setFocus();
if (mCloseRequested) if (mCloseRequested)
@ -623,7 +623,7 @@ void SearchWindow::closeEvent(TQCloseEvent *e)
//Cancel search in progress by setting the search folder search to //Cancel search in progress by setting the search folder search to
//the null search //the null search
mFolder->setSearch(new KMSearch()); mFolder->setSearch(new KMSearch());
TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotClose())); TQTimer::singleShot(0, this, TQT_SLOT(slotClose()));
} else { } else {
KDialogBase::closeEvent(e); KDialogBase::closeEvent(e);
} }
@ -677,7 +677,7 @@ void SearchWindow::folderInvalidated(KMFolder *folder)
mLbxMatches->clear(); mLbxMatches->clear();
if (mFolder->search()) if (mFolder->search())
connect(mFolder->search(), TQT_SIGNAL(finished(bool)), connect(mFolder->search(), TQT_SIGNAL(finished(bool)),
TQT_TQOBJECT(this), TQT_SLOT(searchDone())); this, TQT_SLOT(searchDone()));
mTimer->start(200); mTimer->start(200);
enableGUI(); enableGUI();
} }
@ -840,10 +840,10 @@ void SearchWindow::slotContextMenuRequested( TQListViewItem *lvi, const TQPoint
mMenuToFolder.clear(); mMenuToFolder.clear();
TQPopupMenu *msgMoveMenu = new TQPopupMenu(menu); TQPopupMenu *msgMoveMenu = new TQPopupMenu(menu);
mKMMainWidget->folderTree()->folderToPopupMenu( KMFolderTree::MoveMessage, mKMMainWidget->folderTree()->folderToPopupMenu( KMFolderTree::MoveMessage,
TQT_TQOBJECT(this), &mMenuToFolder, msgMoveMenu ); this, &mMenuToFolder, msgMoveMenu );
TQPopupMenu *msgCopyMenu = new TQPopupMenu(menu); TQPopupMenu *msgCopyMenu = new TQPopupMenu(menu);
mKMMainWidget->folderTree()->folderToPopupMenu( KMFolderTree::CopyMessage, mKMMainWidget->folderTree()->folderToPopupMenu( KMFolderTree::CopyMessage,
TQT_TQOBJECT(this), &mMenuToFolder, msgCopyMenu ); this, &mMenuToFolder, msgCopyMenu );
// show most used actions // show most used actions
mReplyAction->plug(menu); mReplyAction->plug(menu);

4
kmail/templatesinsertcommand.cpp
Unescape View File

@ -41,11 +41,11 @@ TemplatesInsertCommand::TemplatesInsertCommand( TQWidget *parent,
TDEAction *action; TDEAction *action;
TDEActionMenu *menu; TDEActionMenu *menu;
TQSignalMapper *mapper = new TQSignalMapper( TQT_TQOBJECT(this) ); TQSignalMapper *mapper = new TQSignalMapper( this );
connect( mapper, TQT_SIGNAL( mapped(int) ), connect( mapper, TQT_SIGNAL( mapped(int) ),
this, TQT_SLOT( slotMapped(int) ) ); this, TQT_SLOT( slotMapped(int) ) );
mMenu = new TDEActionMenu( i18n( "Insert Command..." ), TQT_TQOBJECT(this) ); mMenu = new TDEActionMenu( i18n( "Insert Command..." ), this );
// ****************************************************** // ******************************************************
menu = new TDEActionMenu( i18n( "Original Message" ), mMenu ); menu = new TDEActionMenu( i18n( "Original Message" ), mMenu );

2
kmail/vacationdialog.cpp
Unescape View File

@ -96,7 +96,7 @@ namespace KMail {
mDomainCheck->setChecked( false ); mDomainCheck->setChecked( false );
mDomainEdit = new TQLineEdit( plainPage(), "mDomainEdit" ); mDomainEdit = new TQLineEdit( plainPage(), "mDomainEdit" );
mDomainEdit->setEnabled( false ); mDomainEdit->setEnabled( false );
mDomainEdit->setValidator( new TQRegExpValidator( TQRegExp( "[a-zA-Z0-9+-]+(?:\\.[a-zA-Z0-9+-]+)*" ), TQT_TQOBJECT(mDomainEdit) ) ); mDomainEdit->setValidator( new TQRegExpValidator( TQRegExp( "[a-zA-Z0-9+-]+(?:\\.[a-zA-Z0-9+-]+)*" ), mDomainEdit ) );
glay->addWidget( mDomainCheck, row, 0 ); glay->addWidget( mDomainCheck, row, 0 );
glay->addWidget( mDomainEdit, row, 1 ); glay->addWidget( mDomainEdit, row, 1 );
connect( mDomainCheck, TQT_SIGNAL(toggled(bool)), connect( mDomainCheck, TQT_SIGNAL(toggled(bool)),

24
kmobile/kmobile.cpp
Unescape View File

@ -93,29 +93,29 @@ KMobile::~KMobile()
void KMobile::setupActions() void KMobile::setupActions()
{ {
KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(dockApplication()), actionCollection()); KStdAction::close(this, TQT_SLOT(dockApplication()), actionCollection());
KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection()); KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection());
m_toolbarAction = KStdAction::showToolbar(TQT_TQOBJECT(this), TQT_SLOT(optionsShowToolbar()), actionCollection()); m_toolbarAction = KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection());
optionsShowToolbar(); optionsShowToolbar();
m_statusbarAction = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(optionsShowStatusbar()), actionCollection()); m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection());
KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection()); KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection());
KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection()); KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection());
KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(optionsPreferences()), actionCollection()); KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection());
new TDEAction(i18n("&Add Device..."), "folder-new", 0, new TDEAction(i18n("&Add Device..."), "folder-new", 0,
TQT_TQOBJECT(this), TQT_SLOT(addDevice()), actionCollection(), "device_add"); this, TQT_SLOT(addDevice()), actionCollection(), "device_add");
new TDEAction( KGuiItem( i18n("&Remove Device"), "edittrash", i18n("Remove this device") ), new TDEAction( KGuiItem( i18n("&Remove Device"), "edittrash", i18n("Remove this device") ),
"Delete", TQT_TQOBJECT(this), TQT_SLOT(removeDevice()), actionCollection(), "device_remove"); "Delete", this, TQT_SLOT(removeDevice()), actionCollection(), "device_remove");
new TDEAction(i18n("Re&name Device..."), 0, Key_F2, new TDEAction(i18n("Re&name Device..."), 0, Key_F2,
TQT_TQOBJECT(this), TQT_SLOT(renameDevice()), actionCollection(), "device_rename"); this, TQT_SLOT(renameDevice()), actionCollection(), "device_rename");
new TDEAction(i18n("&Configure Device..."), "configure", 0, new TDEAction(i18n("&Configure Device..."), "configure", 0,
TQT_TQOBJECT(this), TQT_SLOT(configDevice()), actionCollection(), "device_configure"); this, TQT_SLOT(configDevice()), actionCollection(), "device_configure");
createGUI(); createGUI();
connect( kapp, TQT_SIGNAL(aboutToQuit()), TQT_TQOBJECT(this), TQT_SLOT(saveAll()) ); connect( kapp, TQT_SIGNAL(aboutToQuit()), this, TQT_SLOT(saveAll()) );
} }

4
kmobile/systemtray.cpp
Unescape View File

@ -60,7 +60,7 @@ SystemTray::~SystemTray()
void SystemTray::contextMenuAboutToShow(TDEPopupMenu *menu) void SystemTray::contextMenuAboutToShow(TDEPopupMenu *menu)
{ {
KMobile *main = static_cast<KMobile *>(TQT_TQWIDGET(parent())); KMobile *main = static_cast<KMobile *>(parent());
const int pos = 3; const int pos = 3;
while (menu->idAt(pos)>=SYSTEMTRAY_STARTID && while (menu->idAt(pos)>=SYSTEMTRAY_STARTID &&
@ -84,7 +84,7 @@ void SystemTray::menuItemSelected()
if (m_menuID<SYSTEMTRAY_STARTID || m_menuID>SYSTEMTRAY_STARTID+1000) if (m_menuID<SYSTEMTRAY_STARTID || m_menuID>SYSTEMTRAY_STARTID+1000)
return; return;
TQString devName = contextMenu()->text(m_menuID); TQString devName = contextMenu()->text(m_menuID);
KMobile *main = static_cast<KMobile *>(TQT_TQWIDGET(parent())); KMobile *main = static_cast<KMobile *>(parent());
main->mainView()->startKonqueror(devName); main->mainView()->startKonqueror(devName);
} }

56
knode/articlewidget.cpp
Unescape View File

@ -134,58 +134,58 @@ ArticleWidget::~ArticleWidget()
void ArticleWidget::initActions() void ArticleWidget::initActions()
{ {
mSaveAction = KStdAction::save( TQT_TQOBJECT(this), TQT_SLOT(slotSave()), mActionCollection ); mSaveAction = KStdAction::save( this, TQT_SLOT(slotSave()), mActionCollection );
mSaveAction->setText( KStdGuiItem::saveAs().text() ); mSaveAction->setText( KStdGuiItem::saveAs().text() );
mPrintAction = KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT(slotPrint()), mActionCollection ); mPrintAction = KStdAction::print( this, TQT_SLOT(slotPrint()), mActionCollection );
mCopySelectionAction = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopySelection()), mActionCollection ); mCopySelectionAction = KStdAction::copy( this, TQT_SLOT(slotCopySelection()), mActionCollection );
mSelectAllAction = KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT(slotSelectAll()), mActionCollection ); mSelectAllAction = KStdAction::selectAll( this, TQT_SLOT(slotSelectAll()), mActionCollection );
mFindAction = KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT(slotFind()), mActionCollection, "find_in_article" ); mFindAction = KStdAction::find( this, TQT_SLOT(slotFind()), mActionCollection, "find_in_article" );
mFindAction->setText( i18n("F&ind in Article...") ); mFindAction->setText( i18n("F&ind in Article...") );
mViewSourceAction = new TDEAction( i18n("&View Source"), Key_V , TQT_TQOBJECT(this), mViewSourceAction = new TDEAction( i18n("&View Source"), Key_V , this,
TQT_SLOT(slotViewSource()), mActionCollection, "article_viewSource" ); TQT_SLOT(slotViewSource()), mActionCollection, "article_viewSource" );
mReplyAction = new TDEAction( i18n("&Followup to Newsgroup..."), "message_reply", mReplyAction = new TDEAction( i18n("&Followup to Newsgroup..."), "message_reply",
Key_R, TQT_TQOBJECT(this), TQT_SLOT(slotReply()), mActionCollection, "article_postReply" ); Key_R, this, TQT_SLOT(slotReply()), mActionCollection, "article_postReply" );
mRemailAction = new TDEAction( i18n("Reply by E&mail..."), "mail-reply-sender", mRemailAction = new TDEAction( i18n("Reply by E&mail..."), "mail-reply-sender",
Key_A, TQT_TQOBJECT(this), TQT_SLOT(slotRemail()), mActionCollection, "article_mailReply" ); Key_A, this, TQT_SLOT(slotRemail()), mActionCollection, "article_mailReply" );
mForwardAction = new TDEAction( i18n("Forw&ard by Email..."), "mail-forward", mForwardAction = new TDEAction( i18n("Forw&ard by Email..."), "mail-forward",
Key_F, TQT_TQOBJECT(this), TQT_SLOT(slotForward()), mActionCollection, "article_forward" ); Key_F, this, TQT_SLOT(slotForward()), mActionCollection, "article_forward" );
mCancelAction = new TDEAction( i18n("article","&Cancel Article"), mCancelAction = new TDEAction( i18n("article","&Cancel Article"),
0, TQT_TQOBJECT(this), TQT_SLOT(slotCancel()), mActionCollection, "article_cancel" ); 0, this, TQT_SLOT(slotCancel()), mActionCollection, "article_cancel" );
mSupersedeAction = new TDEAction(i18n("S&upersede Article"), mSupersedeAction = new TDEAction(i18n("S&upersede Article"),
0, TQT_TQOBJECT(this), TQT_SLOT(slotSupersede()), mActionCollection, "article_supersede" ); 0, this, TQT_SLOT(slotSupersede()), mActionCollection, "article_supersede" );
mFixedFontToggle = new TDEToggleAction( i18n("U&se Fixed Font"), mFixedFontToggle = new TDEToggleAction( i18n("U&se Fixed Font"),
Key_X ,TQT_TQOBJECT(this), TQT_SLOT(slotToggleFixedFont()), mActionCollection, "view_useFixedFont" ); Key_X ,this, TQT_SLOT(slotToggleFixedFont()), mActionCollection, "view_useFixedFont" );
mFancyToggle = new TDEToggleAction( i18n("Fancy Formating"), mFancyToggle = new TDEToggleAction( i18n("Fancy Formating"),
Key_Y, TQT_TQOBJECT(this), TQT_SLOT(slotToggleFancyFormating()), mActionCollection, "view_fancyFormating" ); Key_Y, this, TQT_SLOT(slotToggleFancyFormating()), mActionCollection, "view_fancyFormating" );
mRot13Toggle = new TDEToggleAction( i18n("&Unscramble (Rot 13)"), "decrypted", 0 , TQT_TQOBJECT(this), mRot13Toggle = new TDEToggleAction( i18n("&Unscramble (Rot 13)"), "decrypted", 0 , this,
TQT_SLOT(slotToggleRot13()), mActionCollection, "view_rot13" ); TQT_SLOT(slotToggleRot13()), mActionCollection, "view_rot13" );
mRot13Toggle->setChecked( false ); mRot13Toggle->setChecked( false );
TDERadioAction *ra; TDERadioAction *ra;
mHeaderStyleMenu = new TDEActionMenu( i18n("&Headers"), mActionCollection, "view_headers" ); mHeaderStyleMenu = new TDEActionMenu( i18n("&Headers"), mActionCollection, "view_headers" );
ra = new TDERadioAction( i18n("&Fancy Headers"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFancyHeaders()), ra = new TDERadioAction( i18n("&Fancy Headers"), 0, this, TQT_SLOT(slotFancyHeaders()),
mActionCollection, "view_headers_fancy" ); mActionCollection, "view_headers_fancy" );
ra->setExclusiveGroup( "view_headers" ); ra->setExclusiveGroup( "view_headers" );
mHeaderStyleMenu->insert( ra ); mHeaderStyleMenu->insert( ra );
ra = new TDERadioAction( i18n("&Standard Headers"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotStandardHeaders()), ra = new TDERadioAction( i18n("&Standard Headers"), 0, this, TQT_SLOT(slotStandardHeaders()),
mActionCollection, "view_headers_standard" ); mActionCollection, "view_headers_standard" );
ra->setExclusiveGroup( "view_headers" ); ra->setExclusiveGroup( "view_headers" );
mHeaderStyleMenu->insert( ra ); mHeaderStyleMenu->insert( ra );
ra = new TDERadioAction( i18n("&All Headers"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAllHeaders()), ra = new TDERadioAction( i18n("&All Headers"), 0, this, TQT_SLOT(slotAllHeaders()),
mActionCollection, "view_headers_all" ); mActionCollection, "view_headers_all" );
ra->setExclusiveGroup( "view_headers" ); ra->setExclusiveGroup( "view_headers" );
mHeaderStyleMenu->insert( ra ); mHeaderStyleMenu->insert( ra );
mAttachmentStyleMenu = new TDEActionMenu( i18n("&Attachments"), mActionCollection, "view_attachments" ); mAttachmentStyleMenu = new TDEActionMenu( i18n("&Attachments"), mActionCollection, "view_attachments" );
ra = new TDERadioAction( i18n("&As Icon"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotIconAttachments()), ra = new TDERadioAction( i18n("&As Icon"), 0, this, TQT_SLOT(slotIconAttachments()),
mActionCollection, "view_attachments_icon" ); mActionCollection, "view_attachments_icon" );
ra->setExclusiveGroup( "view_attachments" ); ra->setExclusiveGroup( "view_attachments" );
mAttachmentStyleMenu->insert( ra ); mAttachmentStyleMenu->insert( ra );
ra = new TDERadioAction( i18n("&Inline"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInlineAttachments()), ra = new TDERadioAction( i18n("&Inline"), 0, this, TQT_SLOT(slotInlineAttachments()),
mActionCollection, "view_attachments_inline" ); mActionCollection, "view_attachments_inline" );
ra->setExclusiveGroup( "view_attachments" ); ra->setExclusiveGroup( "view_attachments" );
mAttachmentStyleMenu->insert( ra ); mAttachmentStyleMenu->insert( ra );
ra = new TDERadioAction( i18n("&Hide"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotHideAttachments()), ra = new TDERadioAction( i18n("&Hide"), 0, this, TQT_SLOT(slotHideAttachments()),
mActionCollection, "view_attachments_hide" ); mActionCollection, "view_attachments_hide" );
ra->setExclusiveGroup( "view_attachments" ); ra->setExclusiveGroup( "view_attachments" );
mAttachmentStyleMenu->insert( ra ); mAttachmentStyleMenu->insert( ra );
@ -197,22 +197,22 @@ void ArticleWidget::initActions()
mCharsetSelect->setItems( cs ); mCharsetSelect->setItems( cs );
mCharsetSelect->setCurrentItem( 0 ); mCharsetSelect->setCurrentItem( 0 );
connect( mCharsetSelect, TQT_SIGNAL(activated(const TQString&)),TQT_SLOT(slotSetCharset(const TQString&)) ); connect( mCharsetSelect, TQT_SIGNAL(activated(const TQString&)),TQT_SLOT(slotSetCharset(const TQString&)) );
mCharsetSelectKeyb = new TDEAction( i18n("Charset"), Key_C, TQT_TQOBJECT(this), mCharsetSelectKeyb = new TDEAction( i18n("Charset"), Key_C, this,
TQT_SLOT(slotSetCharsetKeyboard()), mActionCollection, "set_charset_keyboard" ); TQT_SLOT(slotSetCharsetKeyboard()), mActionCollection, "set_charset_keyboard" );
new TDEAction( i18n("&Open URL"), "document-open", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenURL()), new TDEAction( i18n("&Open URL"), "document-open", 0, this, TQT_SLOT(slotOpenURL()),
mActionCollection, "open_url" ); mActionCollection, "open_url" );
new TDEAction( i18n("&Copy Link Address"), "edit-copy", 0, TQT_TQOBJECT(this), TQT_SLOT( slotCopyURL()), new TDEAction( i18n("&Copy Link Address"), "edit-copy", 0, this, TQT_SLOT( slotCopyURL()),
mActionCollection, "copy_url" ); mActionCollection, "copy_url" );
new TDEAction( i18n("&Bookmark This Link"), "bookmark_add", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddBookmark()), new TDEAction( i18n("&Bookmark This Link"), "bookmark_add", 0, this, TQT_SLOT(slotAddBookmark()),
mActionCollection, "add_bookmark" ); mActionCollection, "add_bookmark" );
new TDEAction( i18n("&Add to Address Book"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddToAddressBook()), new TDEAction( i18n("&Add to Address Book"), 0, this, TQT_SLOT(slotAddToAddressBook()),
mActionCollection, "add_addr_book" ); mActionCollection, "add_addr_book" );
new TDEAction( i18n("&Open in Address Book"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenInAddressBook()), new TDEAction( i18n("&Open in Address Book"), 0, this, TQT_SLOT(slotOpenInAddressBook()),
mActionCollection, "openin_addr_book" ); mActionCollection, "openin_addr_book" );
new TDEAction( i18n("&Open Attachment"), "document-open", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenAttachment()), new TDEAction( i18n("&Open Attachment"), "document-open", 0, this, TQT_SLOT(slotOpenAttachment()),
mActionCollection, "open_attachment" ); mActionCollection, "open_attachment" );
new TDEAction( i18n("&Save Attachment As..."), "document-save-as", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveAttachment()), new TDEAction( i18n("&Save Attachment As..."), "document-save-as", 0, this, TQT_SLOT(slotSaveAttachment()),
mActionCollection, "save_attachment" ); mActionCollection, "save_attachment" );
} }

4
knode/knarticlewindow.cpp
Unescape View File

@ -100,10 +100,10 @@ KNArticleWindow::KNArticleWindow(KNArticle *art)
mInstances.append( this ); mInstances.append( this );
// file menu // file menu
KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection() ); KStdAction::close( this, TQT_SLOT(close()), actionCollection() );
// settings menu // settings menu
KStdAction::preferences(TQT_TQOBJECT(knGlobals.top), TQT_SLOT(slotSettings()), actionCollection()); KStdAction::preferences(knGlobals.top, TQT_SLOT(slotSettings()), actionCollection());
TDEAccel *accel = new TDEAccel( this ); TDEAccel *accel = new TDEAccel( this );
artW->setCharsetKeyboardAction()->plugAccel( accel ); artW->setCharsetKeyboardAction()->plugAccel( accel );

76
knode/kncomposer.cpp
Unescape View File

@ -205,70 +205,70 @@ KNComposer::KNComposer(KNLocalArticle *a, const TQString &text, const TQString &
//------------------------------- <Actions> -------------------------------------- //------------------------------- <Actions> --------------------------------------
//file menu //file menu
new TDEAction(i18n("&Send Now"),"mail-send", CTRL + Key_Return , TQT_TQOBJECT(this), new TDEAction(i18n("&Send Now"),"mail-send", CTRL + Key_Return , this,
TQT_SLOT(slotSendNow()), actionCollection(), "send_now"); TQT_SLOT(slotSendNow()), actionCollection(), "send_now");
new TDEAction(i18n("Send &Later"), "queue", 0, TQT_TQOBJECT(this), new TDEAction(i18n("Send &Later"), "queue", 0, this,
TQT_SLOT(slotSendLater()), actionCollection(), "send_later"); TQT_SLOT(slotSendLater()), actionCollection(), "send_later");
new TDEAction(i18n("Save as &Draft"),"document-save", 0 , TQT_TQOBJECT(this), new TDEAction(i18n("Save as &Draft"),"document-save", 0 , this,
TQT_SLOT(slotSaveAsDraft()), actionCollection(), "save_as_draft"); TQT_SLOT(slotSaveAsDraft()), actionCollection(), "save_as_draft");
new TDEAction(i18n("D&elete"),"edit-delete", 0 , TQT_TQOBJECT(this), new TDEAction(i18n("D&elete"),"edit-delete", 0 , this,
TQT_SLOT(slotArtDelete()), actionCollection(), "art_delete"); TQT_SLOT(slotArtDelete()), actionCollection(), "art_delete");
KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()),actionCollection()); KStdAction::close(this, TQT_SLOT(close()),actionCollection());
//edit menu //edit menu
KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(slotUndo()), actionCollection()); KStdAction::undo(this, TQT_SLOT(slotUndo()), actionCollection());
KStdAction::redo(TQT_TQOBJECT(this), TQT_SLOT(slotRedo()), actionCollection()); KStdAction::redo(this, TQT_SLOT(slotRedo()), actionCollection());
KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(slotCut()), actionCollection()); KStdAction::cut(this, TQT_SLOT(slotCut()), actionCollection());
KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), actionCollection()); KStdAction::copy(this, TQT_SLOT(slotCopy()), actionCollection());
KStdAction::pasteText(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), actionCollection()); KStdAction::pasteText(this, TQT_SLOT(slotPaste()), actionCollection());
new TDEAction(i18n("Paste as &Quotation"), 0, TQT_TQOBJECT(v_iew->e_dit), new TDEAction(i18n("Paste as &Quotation"), 0, v_iew->e_dit,
TQT_SLOT(slotPasteAsQuotation()), actionCollection(), "paste_quoted"); TQT_SLOT(slotPasteAsQuotation()), actionCollection(), "paste_quoted");
KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT(slotSelectAll()), actionCollection()); KStdAction::selectAll(this, TQT_SLOT(slotSelectAll()), actionCollection());
KStdAction::find(TQT_TQOBJECT(v_iew->e_dit), TQT_SLOT(slotFind()), actionCollection()); KStdAction::find(v_iew->e_dit, TQT_SLOT(slotFind()), actionCollection());
KStdAction::findNext(TQT_TQOBJECT(v_iew->e_dit), TQT_SLOT(slotSearchAgain()), actionCollection()); KStdAction::findNext(v_iew->e_dit, TQT_SLOT(slotSearchAgain()), actionCollection());
KStdAction::replace(TQT_TQOBJECT(v_iew->e_dit), TQT_SLOT(slotReplace()), actionCollection()); KStdAction::replace(v_iew->e_dit, TQT_SLOT(slotReplace()), actionCollection());
//attach menu //attach menu
new TDEAction(i18n("Append &Signature"), 0 , TQT_TQOBJECT(this), TQT_SLOT(slotAppendSig()), new TDEAction(i18n("Append &Signature"), 0 , this, TQT_SLOT(slotAppendSig()),
actionCollection(), "append_signature"); actionCollection(), "append_signature");
new TDEAction(i18n("&Insert File..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInsertFile()), new TDEAction(i18n("&Insert File..."), 0, this, TQT_SLOT(slotInsertFile()),
actionCollection(), "insert_file"); actionCollection(), "insert_file");
new TDEAction(i18n("Insert File (in a &box)..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInsertFileBoxed()), new TDEAction(i18n("Insert File (in a &box)..."), 0, this, TQT_SLOT(slotInsertFileBoxed()),
actionCollection(), "insert_file_boxed"); actionCollection(), "insert_file_boxed");
new TDEAction(i18n("Attach &File..."), "attach", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAttachFile()), new TDEAction(i18n("Attach &File..."), "attach", 0, this, TQT_SLOT(slotAttachFile()),
actionCollection(), "attach_file"); actionCollection(), "attach_file");
a_ctPGPsign = new TDEToggleAction(i18n("Sign Article with &PGP"), a_ctPGPsign = new TDEToggleAction(i18n("Sign Article with &PGP"),
"signature", 0, "signature", 0,
actionCollection(), "sign_article"); actionCollection(), "sign_article");
a_ctRemoveAttachment = new TDEAction(i18n("&Remove"), 0, TQT_TQOBJECT(this), a_ctRemoveAttachment = new TDEAction(i18n("&Remove"), 0, this,
TQT_SLOT(slotRemoveAttachment()), actionCollection(), "remove_attachment"); TQT_SLOT(slotRemoveAttachment()), actionCollection(), "remove_attachment");
a_ctAttachmentProperties = new TDEAction(i18n("&Properties"), 0, TQT_TQOBJECT(this), a_ctAttachmentProperties = new TDEAction(i18n("&Properties"), 0, this,
TQT_SLOT(slotAttachmentProperties()), actionCollection(), "attachment_properties"); TQT_SLOT(slotAttachmentProperties()), actionCollection(), "attachment_properties");
//options menu //options menu
a_ctDoPost = new TDEToggleAction(i18n("Send &News Article"), "document-new", 0 , TQT_TQOBJECT(this), a_ctDoPost = new TDEToggleAction(i18n("Send &News Article"), "document-new", 0 , this,
TQT_SLOT(slotToggleDoPost()), actionCollection(), "send_news"); TQT_SLOT(slotToggleDoPost()), actionCollection(), "send_news");
a_ctDoMail = new TDEToggleAction(i18n("Send E&mail"), "mail_generic" , 0 , TQT_TQOBJECT(this), a_ctDoMail = new TDEToggleAction(i18n("Send E&mail"), "mail_generic" , 0 , this,
TQT_SLOT(slotToggleDoMail()), actionCollection(), "send_mail"); TQT_SLOT(slotToggleDoMail()), actionCollection(), "send_mail");
a_ctSetCharset = new TDESelectAction(i18n("Set &Charset"), 0, actionCollection(), "set_charset"); a_ctSetCharset = new TDESelectAction(i18n("Set &Charset"), 0, actionCollection(), "set_charset");
@ -277,50 +277,50 @@ KNComposer::KNComposer(KNLocalArticle *a, const TQString &text, const TQString &
connect(a_ctSetCharset, TQT_SIGNAL(activated(const TQString&)), connect(a_ctSetCharset, TQT_SIGNAL(activated(const TQString&)),
this, TQT_SLOT(slotSetCharset(const TQString&))); this, TQT_SLOT(slotSetCharset(const TQString&)));
a_ctSetCharsetKeyb = new TDEAction(i18n("Set Charset"), 0, TQT_TQOBJECT(this), a_ctSetCharsetKeyb = new TDEAction(i18n("Set Charset"), 0, this,
TQT_SLOT(slotSetCharsetKeyboard()), actionCollection(), "set_charset_keyboard"); TQT_SLOT(slotSetCharsetKeyboard()), actionCollection(), "set_charset_keyboard");
a_ctWordWrap = new TDEToggleAction(i18n("&Word Wrap"), 0 , TQT_TQOBJECT(this), a_ctWordWrap = new TDEToggleAction(i18n("&Word Wrap"), 0 , this,
TQT_SLOT(slotToggleWordWrap()), actionCollection(), "toggle_wordwrap"); TQT_SLOT(slotToggleWordWrap()), actionCollection(), "toggle_wordwrap");
//tools menu //tools menu
new TDEAction(i18n("Add &Quote Characters"), 0, TQT_TQOBJECT(v_iew->e_dit), new TDEAction(i18n("Add &Quote Characters"), 0, v_iew->e_dit,
TQT_SLOT(slotAddQuotes()), actionCollection(), "tools_quote"); TQT_SLOT(slotAddQuotes()), actionCollection(), "tools_quote");
new TDEAction(i18n("&Remove Quote Characters"), 0, TQT_TQOBJECT(v_iew->e_dit), new TDEAction(i18n("&Remove Quote Characters"), 0, v_iew->e_dit,
TQT_SLOT(slotRemoveQuotes()), actionCollection(), "tools_unquote"); TQT_SLOT(slotRemoveQuotes()), actionCollection(), "tools_unquote");
new TDEAction(i18n("Add &Box"), 0, TQT_TQOBJECT(v_iew->e_dit), new TDEAction(i18n("Add &Box"), 0, v_iew->e_dit,
TQT_SLOT(slotAddBox()), actionCollection(), "tools_box"); TQT_SLOT(slotAddBox()), actionCollection(), "tools_box");
new TDEAction(i18n("Re&move Box"), 0, TQT_TQOBJECT(v_iew->e_dit), new TDEAction(i18n("Re&move Box"), 0, v_iew->e_dit,
TQT_SLOT(slotRemoveBox()), actionCollection(), "tools_unbox"); TQT_SLOT(slotRemoveBox()), actionCollection(), "tools_unbox");
TDEAction *undoRewrap = new TDEAction(i18n("Get &Original Text (not re-wrapped)"), 0, TQT_TQOBJECT(this), TDEAction *undoRewrap = new TDEAction(i18n("Get &Original Text (not re-wrapped)"), 0, this,
TQT_SLOT(slotUndoRewrap()), actionCollection(), "tools_undoRewrap"); TQT_SLOT(slotUndoRewrap()), actionCollection(), "tools_undoRewrap");
undoRewrap->setEnabled(!u_nwraped.isNull()); undoRewrap->setEnabled(!u_nwraped.isNull());
TDEAction *rot13 = new TDEAction(i18n("S&cramble (Rot 13)"), "encrypted", 0, TQT_TQOBJECT(v_iew->e_dit), TDEAction *rot13 = new TDEAction(i18n("S&cramble (Rot 13)"), "encrypted", 0, v_iew->e_dit,
TQT_SLOT(slotRot13()), actionCollection(), "tools_rot13"); TQT_SLOT(slotRot13()), actionCollection(), "tools_rot13");
rot13->setEnabled(false); rot13->setEnabled(false);
connect(v_iew->e_dit, TQT_SIGNAL(copyAvailable(bool)), rot13, TQT_SLOT(setEnabled(bool))); connect(v_iew->e_dit, TQT_SIGNAL(copyAvailable(bool)), rot13, TQT_SLOT(setEnabled(bool)));
a_ctExternalEditor = new TDEAction(i18n("Start &External Editor"), "system-run", 0, TQT_TQOBJECT(this), a_ctExternalEditor = new TDEAction(i18n("Start &External Editor"), "system-run", 0, this,
TQT_SLOT(slotExternalEditor()), actionCollection(), "external_editor"); TQT_SLOT(slotExternalEditor()), actionCollection(), "external_editor");
a_ctSpellCheck = KStdAction::spelling (TQT_TQOBJECT(this), TQT_SLOT(slotSpellcheck()), actionCollection()); a_ctSpellCheck = KStdAction::spelling (this, TQT_SLOT(slotSpellcheck()), actionCollection());
//settings menu //settings menu
createStandardStatusBarAction(); createStandardStatusBarAction();
setStandardToolBarMenuEnabled(true); setStandardToolBarMenuEnabled(true);
KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotConfKeys()), actionCollection()); KStdAction::keyBindings(this, TQT_SLOT(slotConfKeys()), actionCollection());
KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfToolbar()), actionCollection()); KStdAction::configureToolbars(this, TQT_SLOT(slotConfToolbar()), actionCollection());
KStdAction::preferences(TQT_TQOBJECT(knGlobals.top), TQT_SLOT(slotSettings()), actionCollection()); KStdAction::preferences(knGlobals.top, TQT_SLOT(slotSettings()), actionCollection());
a_ccel=new TDEAccel(this); a_ccel=new TDEAccel(this);
a_ctSetCharsetKeyb->plugAccel(a_ccel); a_ctSetCharsetKeyb->plugAccel(a_ccel);
@ -1327,7 +1327,7 @@ void KNComposer::slotSpellcheck()
a_ctExternalEditor->setEnabled(false); a_ctExternalEditor->setEnabled(false);
a_ctSpellCheck->setEnabled(false); a_ctSpellCheck->setEnabled(false);
s_pellChecker = new KSpell(TQT_TQWIDGET(this), i18n("Spellcheck"), TQT_TQOBJECT(this), TQT_SLOT(slotSpellStarted(KSpell *))); s_pellChecker = new KSpell(this, i18n("Spellcheck"), this, TQT_SLOT(slotSpellStarted(KSpell *)));
TQStringList l = KSpellingHighlighter::personalWords(); TQStringList l = KSpellingHighlighter::personalWords();
for ( TQStringList::Iterator it = l.begin(); it != l.end(); ++it ) { for ( TQStringList::Iterator it = l.begin(); it != l.end(); ++it ) {
s_pellChecker->addPersonal( *it ); s_pellChecker->addPersonal( *it );
@ -2398,7 +2398,7 @@ void KNComposer::Editor::contentsContextMenuEvent( TQContextMenuEvent */*e*/ )
} }
else else
{ {
spell = new KSpell(this, i18n("Spellcheck"), TQT_TQOBJECT(this), TQT_SLOT(slotSpellStarted(KSpell *))); spell = new KSpell(this, i18n("Spellcheck"), this, TQT_SLOT(slotSpellStarted(KSpell *)));
TQStringList l = KSpellingHighlighter::personalWords(); TQStringList l = KSpellingHighlighter::personalWords();
for ( TQStringList::Iterator it = l.begin(); it != l.end(); ++it ) { for ( TQStringList::Iterator it = l.begin(); it != l.end(); ++it ) {
spell->addPersonal( *it ); spell->addPersonal( *it );

148
knode/knmainwidget.cpp
Unescape View File

@ -550,113 +550,113 @@ void KNMainWidget::initActions()
//navigation //navigation
a_ctNavNextArt = new TDEAction( KGuiItem(i18n("&Next Article"), "go-next", a_ctNavNextArt = new TDEAction( KGuiItem(i18n("&Next Article"), "go-next",
i18n("Go to next article")), "N;Right", TQT_TQOBJECT(h_drView), i18n("Go to next article")), "N;Right", h_drView,
TQT_SLOT(nextArticle()), actionCollection(), "go_nextArticle" ); TQT_SLOT(nextArticle()), actionCollection(), "go_nextArticle" );
a_ctNavPrevArt = new TDEAction( KGuiItem(i18n("&Previous Article"), "go-previous", a_ctNavPrevArt = new TDEAction( KGuiItem(i18n("&Previous Article"), "go-previous",
i18n("Go to previous article")), "P;Left" , TQT_TQOBJECT(h_drView), i18n("Go to previous article")), "P;Left" , h_drView,
TQT_SLOT(prevArticle()), actionCollection(), "go_prevArticle" ); TQT_SLOT(prevArticle()), actionCollection(), "go_prevArticle" );
a_ctNavNextUnreadArt = new TDEAction(i18n("Next Unread &Article"), "1rightarrow", ALT+SHIFT+Key_Space , TQT_TQOBJECT(this), a_ctNavNextUnreadArt = new TDEAction(i18n("Next Unread &Article"), "1rightarrow", ALT+SHIFT+Key_Space , this,
TQT_SLOT(slotNavNextUnreadArt()), actionCollection(), "go_nextUnreadArticle"); TQT_SLOT(slotNavNextUnreadArt()), actionCollection(), "go_nextUnreadArticle");
a_ctNavNextUnreadThread = new TDEAction(i18n("Next Unread &Thread"),"2rightarrow", SHIFT+Key_Space , TQT_TQOBJECT(this), a_ctNavNextUnreadThread = new TDEAction(i18n("Next Unread &Thread"),"2rightarrow", SHIFT+Key_Space , this,
TQT_SLOT(slotNavNextUnreadThread()), actionCollection(), "go_nextUnreadThread"); TQT_SLOT(slotNavNextUnreadThread()), actionCollection(), "go_nextUnreadThread");
a_ctNavNextGroup = new TDEAction(i18n("Ne&xt Group"), "go-down", Key_Plus , TQT_TQOBJECT(c_olView), a_ctNavNextGroup = new TDEAction(i18n("Ne&xt Group"), "go-down", Key_Plus , c_olView,
TQT_SLOT(nextGroup()), actionCollection(), "go_nextGroup"); TQT_SLOT(nextGroup()), actionCollection(), "go_nextGroup");
a_ctNavPrevGroup = new TDEAction(i18n("Pre&vious Group"), "go-up", Key_Minus , TQT_TQOBJECT(c_olView), a_ctNavPrevGroup = new TDEAction(i18n("Pre&vious Group"), "go-up", Key_Minus , c_olView,
TQT_SLOT(prevGroup()), actionCollection(), "go_prevGroup"); TQT_SLOT(prevGroup()), actionCollection(), "go_prevGroup");
a_ctNavReadThrough = new TDEAction(i18n("Read &Through Articles"), Key_Space , TQT_TQOBJECT(this), a_ctNavReadThrough = new TDEAction(i18n("Read &Through Articles"), Key_Space , this,
TQT_SLOT(slotNavReadThrough()), actionCollection(), "go_readThrough"); TQT_SLOT(slotNavReadThrough()), actionCollection(), "go_readThrough");
a_ctNavReadThrough->plugAccel(a_ccel); a_ctNavReadThrough->plugAccel(a_ccel);
TQAccel *accel = new TQAccel( this ); TQAccel *accel = new TQAccel( this );
new TDEAction( i18n("Focus on Next Folder"), CTRL+Key_Right, TQT_TQOBJECT(c_olView), new TDEAction( i18n("Focus on Next Folder"), CTRL+Key_Right, c_olView,
TQT_SLOT(incCurrentFolder()), actionCollection(), "inc_current_folder" ); TQT_SLOT(incCurrentFolder()), actionCollection(), "inc_current_folder" );
accel->connectItem(accel->insertItem(CTRL+Key_Right), accel->connectItem(accel->insertItem(CTRL+Key_Right),
c_olView, TQT_SLOT(incCurrentFolder())); c_olView, TQT_SLOT(incCurrentFolder()));
new TDEAction( i18n("Focus on Previous Folder"), CTRL+Key_Left, TQT_TQOBJECT(c_olView), new TDEAction( i18n("Focus on Previous Folder"), CTRL+Key_Left, c_olView,
TQT_SLOT(decCurrentFolder()), actionCollection(), "dec_current_folder" ); TQT_SLOT(decCurrentFolder()), actionCollection(), "dec_current_folder" );
accel->connectItem(accel->insertItem(CTRL+Key_Left), accel->connectItem(accel->insertItem(CTRL+Key_Left),
c_olView, TQT_SLOT(decCurrentFolder())); c_olView, TQT_SLOT(decCurrentFolder()));
new TDEAction( i18n("Select Folder with Focus"), CTRL+Key_Space, TQT_TQOBJECT(c_olView), new TDEAction( i18n("Select Folder with Focus"), CTRL+Key_Space, c_olView,
TQT_SLOT(selectCurrentFolder()), actionCollection(), "select_current_folder" ); TQT_SLOT(selectCurrentFolder()), actionCollection(), "select_current_folder" );
accel->connectItem(accel->insertItem(CTRL+Key_Space), accel->connectItem(accel->insertItem(CTRL+Key_Space),
c_olView, TQT_SLOT(selectCurrentFolder())); c_olView, TQT_SLOT(selectCurrentFolder()));
new TDEAction( i18n("Focus on Next Article"), ALT+Key_Right, TQT_TQOBJECT(h_drView), new TDEAction( i18n("Focus on Next Article"), ALT+Key_Right, h_drView,
TQT_SLOT(incCurrentArticle()), actionCollection(), "inc_current_article" ); TQT_SLOT(incCurrentArticle()), actionCollection(), "inc_current_article" );
accel->connectItem( accel->insertItem(ALT+Key_Right), accel->connectItem( accel->insertItem(ALT+Key_Right),
TQT_TQOBJECT(h_drView), TQT_SLOT(incCurrentArticle()) ); h_drView, TQT_SLOT(incCurrentArticle()) );
new TDEAction( i18n("Focus on Previous Article"), ALT+Key_Left, TQT_TQOBJECT(h_drView), new TDEAction( i18n("Focus on Previous Article"), ALT+Key_Left, h_drView,
TQT_SLOT(decCurrentArticle()), actionCollection(), "dec_current_article" ); TQT_SLOT(decCurrentArticle()), actionCollection(), "dec_current_article" );
accel->connectItem( accel->insertItem(ALT+Key_Left), accel->connectItem( accel->insertItem(ALT+Key_Left),
TQT_TQOBJECT(h_drView), TQT_SLOT(decCurrentArticle()) ); h_drView, TQT_SLOT(decCurrentArticle()) );
new TDEAction( i18n("Select Article with Focus"), ALT+Key_Space, TQT_TQOBJECT(h_drView), new TDEAction( i18n("Select Article with Focus"), ALT+Key_Space, h_drView,
TQT_SLOT(selectCurrentArticle()), actionCollection(), "select_current_article" ); TQT_SLOT(selectCurrentArticle()), actionCollection(), "select_current_article" );
accel->connectItem( accel->insertItem(ALT+Key_Space), accel->connectItem( accel->insertItem(ALT+Key_Space),
TQT_TQOBJECT(h_drView), TQT_SLOT(selectCurrentArticle()) ); h_drView, TQT_SLOT(selectCurrentArticle()) );
//collection-view - accounts //collection-view - accounts
a_ctAccProperties = new TDEAction(i18n("Account &Properties"), "configure", 0, TQT_TQOBJECT(this), a_ctAccProperties = new TDEAction(i18n("Account &Properties"), "configure", 0, this,
TQT_SLOT(slotAccProperties()), actionCollection(), "account_properties"); TQT_SLOT(slotAccProperties()), actionCollection(), "account_properties");
a_ctAccRename = new TDEAction(i18n("&Rename Account"), "text", 0, TQT_TQOBJECT(this), a_ctAccRename = new TDEAction(i18n("&Rename Account"), "text", 0, this,
TQT_SLOT(slotAccRename()), actionCollection(), "account_rename"); TQT_SLOT(slotAccRename()), actionCollection(), "account_rename");
a_ctAccSubscribe = new TDEAction(i18n("&Subscribe to Newsgroups..."), "news_subscribe", 0, TQT_TQOBJECT(this), a_ctAccSubscribe = new TDEAction(i18n("&Subscribe to Newsgroups..."), "news_subscribe", 0, this,
TQT_SLOT(slotAccSubscribe()), actionCollection(), "account_subscribe"); TQT_SLOT(slotAccSubscribe()), actionCollection(), "account_subscribe");
a_ctAccExpireAll = new TDEAction(i18n("&Expire All Groups"), 0, TQT_TQOBJECT(this), a_ctAccExpireAll = new TDEAction(i18n("&Expire All Groups"), 0, this,
TQT_SLOT(slotAccExpireAll()), actionCollection(), "account_expire_all"); TQT_SLOT(slotAccExpireAll()), actionCollection(), "account_expire_all");
a_ctAccGetNewHdrs = new TDEAction(i18n("&Get New Articles in All Groups"), "mail_get", 0, TQT_TQOBJECT(this), a_ctAccGetNewHdrs = new TDEAction(i18n("&Get New Articles in All Groups"), "mail_get", 0, this,
TQT_SLOT(slotAccGetNewHdrs()), actionCollection(), "account_dnlHeaders"); TQT_SLOT(slotAccGetNewHdrs()), actionCollection(), "account_dnlHeaders");
a_ctAccGetNewHdrsAll = new TDEAction(i18n("&Get New Articles in All Accounts"), "mail_get_all", 0, TQT_TQOBJECT(this), a_ctAccGetNewHdrsAll = new TDEAction(i18n("&Get New Articles in All Accounts"), "mail_get_all", 0, this,
TQT_SLOT(slotAccGetNewHdrsAll()), actionCollection(), "account_dnlAllHeaders"); TQT_SLOT(slotAccGetNewHdrsAll()), actionCollection(), "account_dnlAllHeaders");
a_ctAccDelete = new TDEAction(i18n("&Delete Account"), "edit-delete", 0, TQT_TQOBJECT(this), a_ctAccDelete = new TDEAction(i18n("&Delete Account"), "edit-delete", 0, this,
TQT_SLOT(slotAccDelete()), actionCollection(), "account_delete"); TQT_SLOT(slotAccDelete()), actionCollection(), "account_delete");
a_ctAccPostNewArticle = new TDEAction(i18n("&Post to Newsgroup..."), "mail-message-new", CTRL+Key_N, TQT_TQOBJECT(this), a_ctAccPostNewArticle = new TDEAction(i18n("&Post to Newsgroup..."), "mail-message-new", CTRL+Key_N, this,
TQT_SLOT(slotAccPostNewArticle()), actionCollection(), "article_postNew"); TQT_SLOT(slotAccPostNewArticle()), actionCollection(), "article_postNew");
//collection-view - groups //collection-view - groups
a_ctGrpProperties = new TDEAction(i18n("Group &Properties"), "configure", 0, TQT_TQOBJECT(this), a_ctGrpProperties = new TDEAction(i18n("Group &Properties"), "configure", 0, this,
TQT_SLOT(slotGrpProperties()), actionCollection(), "group_properties"); TQT_SLOT(slotGrpProperties()), actionCollection(), "group_properties");
a_ctGrpRename = new TDEAction(i18n("Rename &Group"), "text", 0, TQT_TQOBJECT(this), a_ctGrpRename = new TDEAction(i18n("Rename &Group"), "text", 0, this,
TQT_SLOT(slotGrpRename()), actionCollection(), "group_rename"); TQT_SLOT(slotGrpRename()), actionCollection(), "group_rename");
a_ctGrpGetNewHdrs = new TDEAction(i18n("&Get New Articles"), "mail_get" , 0, TQT_TQOBJECT(this), a_ctGrpGetNewHdrs = new TDEAction(i18n("&Get New Articles"), "mail_get" , 0, this,
TQT_SLOT(slotGrpGetNewHdrs()), actionCollection(), "group_dnlHeaders"); TQT_SLOT(slotGrpGetNewHdrs()), actionCollection(), "group_dnlHeaders");
a_ctGrpExpire = new TDEAction(i18n("E&xpire Group"), "wizard", 0, TQT_TQOBJECT(this), a_ctGrpExpire = new TDEAction(i18n("E&xpire Group"), "wizard", 0, this,
TQT_SLOT(slotGrpExpire()), actionCollection(), "group_expire"); TQT_SLOT(slotGrpExpire()), actionCollection(), "group_expire");
a_ctGrpReorganize = new TDEAction(i18n("Re&organize Group"), 0, TQT_TQOBJECT(this), a_ctGrpReorganize = new TDEAction(i18n("Re&organize Group"), 0, this,
TQT_SLOT(slotGrpReorganize()), actionCollection(), "group_reorg"); TQT_SLOT(slotGrpReorganize()), actionCollection(), "group_reorg");
a_ctGrpUnsubscribe = new TDEAction(i18n("&Unsubscribe From Group"), "news_unsubscribe", 0, TQT_TQOBJECT(this), a_ctGrpUnsubscribe = new TDEAction(i18n("&Unsubscribe From Group"), "news_unsubscribe", 0, this,
TQT_SLOT(slotGrpUnsubscribe()), actionCollection(), "group_unsubscribe"); TQT_SLOT(slotGrpUnsubscribe()), actionCollection(), "group_unsubscribe");
a_ctGrpSetAllRead = new TDEAction(i18n("Mark All as &Read"), "goto", 0, TQT_TQOBJECT(this), a_ctGrpSetAllRead = new TDEAction(i18n("Mark All as &Read"), "goto", 0, this,
TQT_SLOT(slotGrpSetAllRead()), actionCollection(), "group_allRead"); TQT_SLOT(slotGrpSetAllRead()), actionCollection(), "group_allRead");
a_ctGrpSetAllUnread = new TDEAction(i18n("Mark All as U&nread"), 0, TQT_TQOBJECT(this), a_ctGrpSetAllUnread = new TDEAction(i18n("Mark All as U&nread"), 0, this,
TQT_SLOT(slotGrpSetAllUnread()), actionCollection(), "group_allUnread"); TQT_SLOT(slotGrpSetAllUnread()), actionCollection(), "group_allUnread");
a_ctGrpSetUnread = new TDEAction(i18n("Mark Last as Unr&ead..."), 0, TQT_TQOBJECT(this), a_ctGrpSetUnread = new TDEAction(i18n("Mark Last as Unr&ead..."), 0, this,
TQT_SLOT(slotGrpSetUnread()), actionCollection(), "group_unread"); TQT_SLOT(slotGrpSetUnread()), actionCollection(), "group_unread");
(void) new TDEAction( i18n("&Configure KNode..."), (void) new TDEAction( i18n("&Configure KNode..."),
"configure", 0, TQT_TQOBJECT(this), "configure", 0, this,
TQT_SLOT(slotSettings()), actionCollection(), TQT_SLOT(slotSettings()), actionCollection(),
"knode_configure_knode" ); "knode_configure_knode" );
//collection-view - folder //collection-view - folder
a_ctFolNew = new TDEAction(i18n("&New Folder"), "folder-new", 0, TQT_TQOBJECT(this), a_ctFolNew = new TDEAction(i18n("&New Folder"), "folder-new", 0, this,
TQT_SLOT(slotFolNew()), actionCollection(), "folder-new"); TQT_SLOT(slotFolNew()), actionCollection(), "folder-new");
a_ctFolNewChild = new TDEAction(i18n("New &Subfolder"), "folder-new", 0, TQT_TQOBJECT(this), a_ctFolNewChild = new TDEAction(i18n("New &Subfolder"), "folder-new", 0, this,
TQT_SLOT(slotFolNewChild()), actionCollection(), "folder_newChild"); TQT_SLOT(slotFolNewChild()), actionCollection(), "folder_newChild");
a_ctFolDelete = new TDEAction(i18n("&Delete Folder"), "edit-delete", 0, TQT_TQOBJECT(this), a_ctFolDelete = new TDEAction(i18n("&Delete Folder"), "edit-delete", 0, this,
TQT_SLOT(slotFolDelete()), actionCollection(), "folder_delete"); TQT_SLOT(slotFolDelete()), actionCollection(), "folder_delete");
a_ctFolRename = new TDEAction(i18n("&Rename Folder"), "text", 0, TQT_TQOBJECT(this), a_ctFolRename = new TDEAction(i18n("&Rename Folder"), "text", 0, this,
TQT_SLOT(slotFolRename()), actionCollection(), "folder_rename"); TQT_SLOT(slotFolRename()), actionCollection(), "folder_rename");
a_ctFolCompact = new TDEAction(i18n("C&ompact Folder"), "wizard", 0, TQT_TQOBJECT(this), a_ctFolCompact = new TDEAction(i18n("C&ompact Folder"), "wizard", 0, this,
TQT_SLOT(slotFolCompact()), actionCollection(), "folder_compact"); TQT_SLOT(slotFolCompact()), actionCollection(), "folder_compact");
a_ctFolCompactAll = new TDEAction(i18n("Co&mpact All Folders"), 0, TQT_TQOBJECT(this), a_ctFolCompactAll = new TDEAction(i18n("Co&mpact All Folders"), 0, this,
TQT_SLOT(slotFolCompactAll()), actionCollection(), "folder_compact_all"); TQT_SLOT(slotFolCompactAll()), actionCollection(), "folder_compact_all");
a_ctFolEmpty = new TDEAction(i18n("&Empty Folder"), 0, TQT_TQOBJECT(this), a_ctFolEmpty = new TDEAction(i18n("&Empty Folder"), 0, this,
TQT_SLOT(slotFolEmpty()), actionCollection(), "folder_empty"); TQT_SLOT(slotFolEmpty()), actionCollection(), "folder_empty");
a_ctFolMboxImport = new TDEAction(i18n("&Import MBox Folder..."), 0, TQT_TQOBJECT(this), a_ctFolMboxImport = new TDEAction(i18n("&Import MBox Folder..."), 0, this,
TQT_SLOT(slotFolMBoxImport()), actionCollection(), "folder_MboxImport"); TQT_SLOT(slotFolMBoxImport()), actionCollection(), "folder_MboxImport");
a_ctFolMboxExport = new TDEAction(i18n("E&xport as MBox Folder..."), 0, TQT_TQOBJECT(this), a_ctFolMboxExport = new TDEAction(i18n("E&xport as MBox Folder..."), 0, this,
TQT_SLOT(slotFolMBoxExport()), actionCollection(), "folder_MboxExport"); TQT_SLOT(slotFolMBoxExport()), actionCollection(), "folder_MboxExport");
//header-view - list-handling //header-view - list-handling
@ -670,7 +670,7 @@ void KNMainWidget::initActions()
a_ctArtSortHeaders->setItems(items); a_ctArtSortHeaders->setItems(items);
a_ctArtSortHeaders->setShortcutConfigurable(false); a_ctArtSortHeaders->setShortcutConfigurable(false);
connect(a_ctArtSortHeaders, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotArtSortHeaders(int))); connect(a_ctArtSortHeaders, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotArtSortHeaders(int)));
a_ctArtSortHeadersKeyb = new TDEAction(i18n("Sort"), TQString(), Key_F7 , TQT_TQOBJECT(this), a_ctArtSortHeadersKeyb = new TDEAction(i18n("Sort"), TQString(), Key_F7 , this,
TQT_SLOT(slotArtSortHeadersKeyb()), actionCollection(), "view_Sort_Keyb"); TQT_SLOT(slotArtSortHeadersKeyb()), actionCollection(), "view_Sort_Keyb");
a_ctArtSortHeadersKeyb->plugAccel(a_ccel); a_ctArtSortHeadersKeyb->plugAccel(a_ccel);
a_ctArtFilter = new KNFilterSelectAction(i18n("&Filter"), "filter", a_ctArtFilter = new KNFilterSelectAction(i18n("&Filter"), "filter",
@ -678,86 +678,86 @@ void KNMainWidget::initActions()
a_ctArtFilter->setShortcutConfigurable(false); a_ctArtFilter->setShortcutConfigurable(false);
a_ctArtFilterKeyb = new TDEAction(i18n("Filter"), Key_F6, actionCollection(), "view_Filter_Keyb"); a_ctArtFilterKeyb = new TDEAction(i18n("Filter"), Key_F6, actionCollection(), "view_Filter_Keyb");
a_ctArtFilterKeyb->plugAccel(a_ccel); a_ctArtFilterKeyb->plugAccel(a_ccel);
a_ctArtSearch = new TDEAction(i18n("&Search Articles..."),"mail_find" , Key_F4 , TQT_TQOBJECT(this), a_ctArtSearch = new TDEAction(i18n("&Search Articles..."),"mail_find" , Key_F4 , this,
TQT_SLOT(slotArtSearch()), actionCollection(), "article_search"); TQT_SLOT(slotArtSearch()), actionCollection(), "article_search");
a_ctArtRefreshList = new TDEAction(i18n("&Refresh List"),"reload", TDEStdAccel::shortcut(TDEStdAccel::Reload), TQT_TQOBJECT(this), a_ctArtRefreshList = new TDEAction(i18n("&Refresh List"),"reload", TDEStdAccel::shortcut(TDEStdAccel::Reload), this,
TQT_SLOT(slotArtRefreshList()), actionCollection(), "view_Refresh"); TQT_SLOT(slotArtRefreshList()), actionCollection(), "view_Refresh");
a_ctArtCollapseAll = new TDEAction(i18n("&Collapse All Threads"), 0 , TQT_TQOBJECT(this), a_ctArtCollapseAll = new TDEAction(i18n("&Collapse All Threads"), 0 , this,
TQT_SLOT(slotArtCollapseAll()), actionCollection(), "view_CollapseAll"); TQT_SLOT(slotArtCollapseAll()), actionCollection(), "view_CollapseAll");
a_ctArtExpandAll = new TDEAction(i18n("E&xpand All Threads"), 0 , TQT_TQOBJECT(this), a_ctArtExpandAll = new TDEAction(i18n("E&xpand All Threads"), 0 , this,
TQT_SLOT(slotArtExpandAll()), actionCollection(), "view_ExpandAll"); TQT_SLOT(slotArtExpandAll()), actionCollection(), "view_ExpandAll");
a_ctArtToggleThread = new TDEAction(i18n("&Toggle Subthread"), Key_T, TQT_TQOBJECT(this), a_ctArtToggleThread = new TDEAction(i18n("&Toggle Subthread"), Key_T, this,
TQT_SLOT(slotArtToggleThread()), actionCollection(), "thread_toggle"); TQT_SLOT(slotArtToggleThread()), actionCollection(), "thread_toggle");
a_ctArtToggleShowThreads = new TDEToggleAction(i18n("Show T&hreads"), 0 , TQT_TQOBJECT(this), a_ctArtToggleShowThreads = new TDEToggleAction(i18n("Show T&hreads"), 0 , this,
TQT_SLOT(slotArtToggleShowThreads()), actionCollection(), "view_showThreads"); TQT_SLOT(slotArtToggleShowThreads()), actionCollection(), "view_showThreads");
a_ctArtToggleShowThreads->setCheckedState(i18n("Hide T&hreads")); a_ctArtToggleShowThreads->setCheckedState(i18n("Hide T&hreads"));
a_ctArtToggleShowThreads->setChecked(c_fgManager->readNewsGeneral()->showThreads()); a_ctArtToggleShowThreads->setChecked(c_fgManager->readNewsGeneral()->showThreads());
//header-view - remote articles //header-view - remote articles
a_ctArtSetArtRead = new TDEAction(i18n("Mark as &Read"), Key_D , TQT_TQOBJECT(this), a_ctArtSetArtRead = new TDEAction(i18n("Mark as &Read"), Key_D , this,
TQT_SLOT(slotArtSetArtRead()), actionCollection(), "article_read"); TQT_SLOT(slotArtSetArtRead()), actionCollection(), "article_read");
a_ctArtSetArtUnread = new TDEAction(i18n("Mar&k as Unread"), Key_U , TQT_TQOBJECT(this), a_ctArtSetArtUnread = new TDEAction(i18n("Mar&k as Unread"), Key_U , this,
TQT_SLOT(slotArtSetArtUnread()), actionCollection(), "article_unread"); TQT_SLOT(slotArtSetArtUnread()), actionCollection(), "article_unread");
a_ctArtSetThreadRead = new TDEAction(i18n("Mark &Thread as Read"), CTRL+Key_D , TQT_TQOBJECT(this), a_ctArtSetThreadRead = new TDEAction(i18n("Mark &Thread as Read"), CTRL+Key_D , this,
TQT_SLOT(slotArtSetThreadRead()), actionCollection(), "thread_read"); TQT_SLOT(slotArtSetThreadRead()), actionCollection(), "thread_read");
a_ctArtSetThreadUnread = new TDEAction(i18n("Mark T&hread as Unread"), CTRL+Key_U , TQT_TQOBJECT(this), a_ctArtSetThreadUnread = new TDEAction(i18n("Mark T&hread as Unread"), CTRL+Key_U , this,
TQT_SLOT(slotArtSetThreadUnread()), actionCollection(), "thread_unread"); TQT_SLOT(slotArtSetThreadUnread()), actionCollection(), "thread_unread");
a_ctArtOpenNewWindow = new TDEAction(i18n("Open in Own &Window"), "window-new", Key_O , TQT_TQOBJECT(this), a_ctArtOpenNewWindow = new TDEAction(i18n("Open in Own &Window"), "window-new", Key_O , this,
TQT_SLOT(slotArtOpenNewWindow()), actionCollection(), "article_ownWindow"); TQT_SLOT(slotArtOpenNewWindow()), actionCollection(), "article_ownWindow");
// scoring // scoring
a_ctScoresEdit = new TDEAction(i18n("&Edit Scoring Rules..."), "edit", CTRL+Key_E, TQT_TQOBJECT(this), a_ctScoresEdit = new TDEAction(i18n("&Edit Scoring Rules..."), "edit", CTRL+Key_E, this,
TQT_SLOT(slotScoreEdit()), actionCollection(), "scoreedit"); TQT_SLOT(slotScoreEdit()), actionCollection(), "scoreedit");
a_ctReScore = new TDEAction(i18n("Recalculate &Scores"), 0, TQT_TQOBJECT(this), a_ctReScore = new TDEAction(i18n("Recalculate &Scores"), 0, this,
TQT_SLOT(slotReScore()),actionCollection(),"rescore"); TQT_SLOT(slotReScore()),actionCollection(),"rescore");
a_ctScoreLower = new TDEAction(i18n("&Lower Score for Author..."), CTRL+Key_L, TQT_TQOBJECT(this), a_ctScoreLower = new TDEAction(i18n("&Lower Score for Author..."), CTRL+Key_L, this,
TQT_SLOT(slotScoreLower()), actionCollection(), "scorelower"); TQT_SLOT(slotScoreLower()), actionCollection(), "scorelower");
a_ctScoreRaise = new TDEAction(i18n("&Raise Score for Author..."), CTRL+Key_I, TQT_TQOBJECT(this), a_ctScoreRaise = new TDEAction(i18n("&Raise Score for Author..."), CTRL+Key_I, this,
TQT_SLOT(slotScoreRaise()),actionCollection(),"scoreraise"); TQT_SLOT(slotScoreRaise()),actionCollection(),"scoreraise");
a_ctArtToggleIgnored = new TDEAction(i18n("&Ignore Thread"), "go-bottom", Key_I , TQT_TQOBJECT(this), a_ctArtToggleIgnored = new TDEAction(i18n("&Ignore Thread"), "go-bottom", Key_I , this,
TQT_SLOT(slotArtToggleIgnored()), actionCollection(), "thread_ignore"); TQT_SLOT(slotArtToggleIgnored()), actionCollection(), "thread_ignore");
a_ctArtToggleWatched = new TDEAction(i18n("&Watch Thread"), "go-top", Key_W , TQT_TQOBJECT(this), a_ctArtToggleWatched = new TDEAction(i18n("&Watch Thread"), "go-top", Key_W , this,
TQT_SLOT(slotArtToggleWatched()), actionCollection(), "thread_watch"); TQT_SLOT(slotArtToggleWatched()), actionCollection(), "thread_watch");
//header-view local articles //header-view local articles
a_ctArtSendOutbox = new TDEAction(i18n("Sen&d Pending Messages"), "mail-send", 0, TQT_TQOBJECT(this), a_ctArtSendOutbox = new TDEAction(i18n("Sen&d Pending Messages"), "mail-send", 0, this,
TQT_SLOT(slotArtSendOutbox()), actionCollection(), "net_sendPending"); TQT_SLOT(slotArtSendOutbox()), actionCollection(), "net_sendPending");
a_ctArtDelete = new TDEAction(i18n("&Delete Article"), "edit-delete", Key_Delete, TQT_TQOBJECT(this), a_ctArtDelete = new TDEAction(i18n("&Delete Article"), "edit-delete", Key_Delete, this,
TQT_SLOT(slotArtDelete()), actionCollection(), "article_delete"); TQT_SLOT(slotArtDelete()), actionCollection(), "article_delete");
a_ctArtSendNow = new TDEAction(i18n("Send &Now"),"mail-send", 0 , TQT_TQOBJECT(this), a_ctArtSendNow = new TDEAction(i18n("Send &Now"),"mail-send", 0 , this,
TQT_SLOT(slotArtSendNow()), actionCollection(), "article_sendNow"); TQT_SLOT(slotArtSendNow()), actionCollection(), "article_sendNow");
a_ctArtEdit = new TDEAction(i18n("edit article","&Edit Article..."), "edit", Key_E , TQT_TQOBJECT(this), a_ctArtEdit = new TDEAction(i18n("edit article","&Edit Article..."), "edit", Key_E , this,
TQT_SLOT(slotArtEdit()), actionCollection(), "article_edit"); TQT_SLOT(slotArtEdit()), actionCollection(), "article_edit");
//network //network
a_ctNetCancel = new TDEAction(i18n("Stop &Network"),"process-stop",0, TQT_TQOBJECT(this), a_ctNetCancel = new TDEAction(i18n("Stop &Network"),"process-stop",0, this,
TQT_SLOT(slotNetCancel()), actionCollection(), "net_stop"); TQT_SLOT(slotNetCancel()), actionCollection(), "net_stop");
a_ctNetCancel->setEnabled(false); a_ctNetCancel->setEnabled(false);
a_ctFetchArticleWithID = new TDEAction(i18n("&Fetch Article with ID..."), 0, TQT_TQOBJECT(this), a_ctFetchArticleWithID = new TDEAction(i18n("&Fetch Article with ID..."), 0, this,
TQT_SLOT(slotFetchArticleWithID()), actionCollection(), "fetch_article_with_id"); TQT_SLOT(slotFetchArticleWithID()), actionCollection(), "fetch_article_with_id");
a_ctFetchArticleWithID->setEnabled(false); a_ctFetchArticleWithID->setEnabled(false);
a_ctToggleGroupView = new TDEToggleAction(i18n("Show &Group View"), CTRL+Key_G, TQT_TQOBJECT(this), a_ctToggleGroupView = new TDEToggleAction(i18n("Show &Group View"), CTRL+Key_G, this,
TQT_SLOT(slotToggleGroupView()), actionCollection(), "settings_show_groupView"); TQT_SLOT(slotToggleGroupView()), actionCollection(), "settings_show_groupView");
a_ctToggleGroupView->setCheckedState(i18n("Hide &Group View")); a_ctToggleGroupView->setCheckedState(i18n("Hide &Group View"));
a_ctToggleHeaderView = new TDEToggleAction(i18n("Show &Header View"), CTRL+Key_H, TQT_TQOBJECT(this), a_ctToggleHeaderView = new TDEToggleAction(i18n("Show &Header View"), CTRL+Key_H, this,
TQT_SLOT(slotToggleHeaderView()), actionCollection(), "settings_show_headerView"); TQT_SLOT(slotToggleHeaderView()), actionCollection(), "settings_show_headerView");
a_ctToggleHeaderView->setCheckedState(i18n("Hide &Header View")); a_ctToggleHeaderView->setCheckedState(i18n("Hide &Header View"));
a_ctToggleArticleViewer = new TDEToggleAction(i18n("Show &Article Viewer"), CTRL+Key_J, TQT_TQOBJECT(this), a_ctToggleArticleViewer = new TDEToggleAction(i18n("Show &Article Viewer"), CTRL+Key_J, this,
TQT_SLOT(slotToggleArticleViewer()), actionCollection(), "settings_show_articleViewer"); TQT_SLOT(slotToggleArticleViewer()), actionCollection(), "settings_show_articleViewer");
a_ctToggleArticleViewer->setCheckedState(i18n("Hide &Article Viewer")); a_ctToggleArticleViewer->setCheckedState(i18n("Hide &Article Viewer"));
a_ctToggleQuickSearch = new TDEToggleAction(i18n("Show Quick Search"), TQString(), TQT_TQOBJECT(this), a_ctToggleQuickSearch = new TDEToggleAction(i18n("Show Quick Search"), TQString(), this,
TQT_SLOT(slotToggleQuickSearch()), actionCollection(), "settings_show_quickSearch"); TQT_SLOT(slotToggleQuickSearch()), actionCollection(), "settings_show_quickSearch");
a_ctToggleQuickSearch->setCheckedState(i18n("Hide Quick Search")); a_ctToggleQuickSearch->setCheckedState(i18n("Hide Quick Search"));
a_ctSwitchToGroupView = new TDEAction(i18n("Switch to Group View"), Key_G , TQT_TQOBJECT(this), a_ctSwitchToGroupView = new TDEAction(i18n("Switch to Group View"), Key_G , this,
TQT_SLOT(slotSwitchToGroupView()), actionCollection(), "switch_to_group_view"); TQT_SLOT(slotSwitchToGroupView()), actionCollection(), "switch_to_group_view");
a_ctSwitchToGroupView->plugAccel(a_ccel); a_ctSwitchToGroupView->plugAccel(a_ccel);
a_ctSwitchToHeaderView = new TDEAction(i18n("Switch to Header View"), Key_H , TQT_TQOBJECT(this), a_ctSwitchToHeaderView = new TDEAction(i18n("Switch to Header View"), Key_H , this,
TQT_SLOT(slotSwitchToHeaderView()), actionCollection(), "switch_to_header_view"); TQT_SLOT(slotSwitchToHeaderView()), actionCollection(), "switch_to_header_view");
a_ctSwitchToHeaderView->plugAccel(a_ccel); a_ctSwitchToHeaderView->plugAccel(a_ccel);
a_ctSwitchToArticleViewer = new TDEAction(i18n("Switch to Article Viewer"), Key_J , TQT_TQOBJECT(this), a_ctSwitchToArticleViewer = new TDEAction(i18n("Switch to Article Viewer"), Key_J , this,
TQT_SLOT(slotSwitchToArticleViewer()), actionCollection(), "switch_to_article_viewer"); TQT_SLOT(slotSwitchToArticleViewer()), actionCollection(), "switch_to_article_viewer");
a_ctSwitchToArticleViewer->plugAccel(a_ccel); a_ctSwitchToArticleViewer->plugAccel(a_ccel);
} }

6
knode/knode.cpp
Unescape View File

@ -46,9 +46,9 @@ KNMainWindow::KNMainWindow( TQWidget* pWidget )
setStandardToolBarMenuEnabled(true); setStandardToolBarMenuEnabled(true);
//config stuff //config stuff
KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(closeAllWindows()), actionCollection()); KStdAction::quit(kapp, TQT_SLOT(closeAllWindows()), actionCollection());
KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfToolbar()), actionCollection()); KStdAction::configureToolbars(this, TQT_SLOT(slotConfToolbar()), actionCollection());
KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotConfKeys()), actionCollection()); KStdAction::keyBindings(this, TQT_SLOT(slotConfKeys()), actionCollection());
m_mainWidget = new KNMainWidget( this, true, this, 0 ); m_mainWidget = new KNMainWidget( this, true, this, 0 );
connect( m_mainWidget, TQT_SIGNAL(signalCaptionChangeRequest(const TQString&)), connect( m_mainWidget, TQT_SIGNAL(signalCaptionChangeRequest(const TQString&)),

46
knotes/knote.cpp
Unescape View File

@ -105,47 +105,47 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char *
// create the menu items for the note - not the editor... // create the menu items for the note - not the editor...
// rename, mail, print, save as, insert date, alarm, close, delete, new note // rename, mail, print, save as, insert date, alarm, close, delete, new note
new TDEAction( i18n("New"), "document-new", 0, new TDEAction( i18n("New"), "document-new", 0,
TQT_TQOBJECT(this),TQT_SLOT(slotRequestNewNote()) , actionCollection(), "new_note" ); this,TQT_SLOT(slotRequestNewNote()) , actionCollection(), "new_note" );
new TDEAction( i18n("Rename..."), "text", 0, new TDEAction( i18n("Rename..."), "text", 0,
TQT_TQOBJECT(this), TQT_SLOT(slotRename()), actionCollection(), "rename_note" ); this, TQT_SLOT(slotRename()), actionCollection(), "rename_note" );
m_readOnly = new TDEToggleAction( i18n("Lock"), "system-lock-screen" , 0, m_readOnly = new TDEToggleAction( i18n("Lock"), "system-lock-screen" , 0,
TQT_TQOBJECT(this), TQT_SLOT(slotUpdateReadOnly()), actionCollection(), "lock_note" ); this, TQT_SLOT(slotUpdateReadOnly()), actionCollection(), "lock_note" );
m_readOnly->setCheckedState( KGuiItem( i18n("Unlock"), "unlock" ) ); m_readOnly->setCheckedState( KGuiItem( i18n("Unlock"), "unlock" ) );
new TDEAction( i18n("Hide"), "window-close" , Key_Escape, new TDEAction( i18n("Hide"), "window-close" , Key_Escape,
TQT_TQOBJECT(this), TQT_SLOT(slotClose()), actionCollection(), "hide_note" ); this, TQT_SLOT(slotClose()), actionCollection(), "hide_note" );
new TDEAction( i18n("Delete"), "knotes_delete", 0, new TDEAction( i18n("Delete"), "knotes_delete", 0,
TQT_TQOBJECT(this), TQT_SLOT(slotKill()), actionCollection(), "delete_note" ); this, TQT_SLOT(slotKill()), actionCollection(), "delete_note" );
new TDEAction( i18n("Insert Date"), "knotes_date", 0 , new TDEAction( i18n("Insert Date"), "knotes_date", 0 ,
TQT_TQOBJECT(this), TQT_SLOT(slotInsDate()), actionCollection(), "insert_date" ); this, TQT_SLOT(slotInsDate()), actionCollection(), "insert_date" );
new TDEAction( i18n("Set Alarm..."), "knotes_alarm", 0 , new TDEAction( i18n("Set Alarm..."), "knotes_alarm", 0 ,
TQT_TQOBJECT(this), TQT_SLOT(slotSetAlarm()), actionCollection(), "set_alarm" ); this, TQT_SLOT(slotSetAlarm()), actionCollection(), "set_alarm" );
new TDEAction( i18n("Send..."), "network", 0, new TDEAction( i18n("Send..."), "network", 0,
TQT_TQOBJECT(this), TQT_SLOT(slotSend()), actionCollection(), "send_note" ); this, TQT_SLOT(slotSend()), actionCollection(), "send_note" );
new TDEAction( i18n("Mail..."), "mail-send", 0, new TDEAction( i18n("Mail..."), "mail-send", 0,
TQT_TQOBJECT(this), TQT_SLOT(slotMail()), actionCollection(), "mail_note" ); this, TQT_SLOT(slotMail()), actionCollection(), "mail_note" );
new TDEAction( i18n("Save As..."), "document-save-as", 0, new TDEAction( i18n("Save As..."), "document-save-as", 0,
TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs()), actionCollection(), "save_note" ); this, TQT_SLOT(slotSaveAs()), actionCollection(), "save_note" );
KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT(slotPrint()), actionCollection(), "print_note" ); KStdAction::print( this, TQT_SLOT(slotPrint()), actionCollection(), "print_note" );
new TDEAction( i18n("Preferences..."), "configure", 0, new TDEAction( i18n("Preferences..."), "configure", 0,
TQT_TQOBJECT(this), TQT_SLOT(slotPreferences()), actionCollection(), "configure_note" ); this, TQT_SLOT(slotPreferences()), actionCollection(), "configure_note" );
m_keepAbove = new TDEToggleAction( i18n("Keep Above Others"), "go-up", 0, m_keepAbove = new TDEToggleAction( i18n("Keep Above Others"), "go-up", 0,
TQT_TQOBJECT(this), TQT_SLOT(slotUpdateKeepAboveBelow()), actionCollection(), "keep_above" ); this, TQT_SLOT(slotUpdateKeepAboveBelow()), actionCollection(), "keep_above" );
m_keepAbove->setExclusiveGroup( "keepAB" ); m_keepAbove->setExclusiveGroup( "keepAB" );
m_keepBelow = new TDEToggleAction( i18n("Keep Below Others"), "go-down", 0, m_keepBelow = new TDEToggleAction( i18n("Keep Below Others"), "go-down", 0,
TQT_TQOBJECT(this), TQT_SLOT(slotUpdateKeepAboveBelow()), actionCollection(), "keep_below" ); this, TQT_SLOT(slotUpdateKeepAboveBelow()), actionCollection(), "keep_below" );
m_keepBelow->setExclusiveGroup( "keepAB" ); m_keepBelow->setExclusiveGroup( "keepAB" );
m_toDesktop = new TDEListAction( i18n("To Desktop"), 0, m_toDesktop = new TDEListAction( i18n("To Desktop"), 0,
TQT_TQOBJECT(this), TQT_SLOT(slotPopupActionToDesktop(int)), actionCollection(), "to_desktop" ); this, TQT_SLOT(slotPopupActionToDesktop(int)), actionCollection(), "to_desktop" );
connect( m_toDesktop->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateDesktopActions()) ); connect( m_toDesktop->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotUpdateDesktopActions()) );
// invisible action to walk through the notes to make this configurable // invisible action to walk through the notes to make this configurable
new TDEAction( i18n("Walk Through Notes"), 0, SHIFT+Key_BackTab, new TDEAction( i18n("Walk Through Notes"), 0, SHIFT+Key_BackTab,
TQT_TQOBJECT(this), TQT_SIGNAL(sigShowNextNote()), actionCollection(), "walk_notes" ); this, TQT_SIGNAL(sigShowNextNote()), actionCollection(), "walk_notes" );
// create the note header, button and label... // create the note header, button and label...
m_label = new TQLabel( this ); m_label = new TQLabel( this );
@ -155,17 +155,17 @@ 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 setName( m_journal->summary() ); // don't worry, no signals are connected at this stage yet
m_button = new KNoteButton( "knotes_close", this ); m_button = new KNoteButton( "knotes_close", this );
connect( m_button, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotClose()) ); connect( m_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClose()) );
// create the note editor // create the note editor
m_editor = new KNoteEdit( actionCollection(), this ); m_editor = new KNoteEdit( actionCollection(), this );
m_editor->setNote( this ); m_editor->setNote( this );
m_editor->installEventFilter( this ); // receive events (for modified) m_editor->installEventFilter( this ); // receive events (for modified)
m_editor->viewport()->installEventFilter( this ); m_editor->viewport()->installEventFilter( this );
connect( m_editor, TQT_SIGNAL(contentsMoving( int, int )), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateViewport( int, int ))); connect( m_editor, TQT_SIGNAL(contentsMoving( int, int )), this, TQT_SLOT(slotUpdateViewport( int, int )));
KXMLGUIBuilder builder( this ); KXMLGUIBuilder builder( this );
KXMLGUIFactory factory( &builder, TQT_TQOBJECT(this) ); KXMLGUIFactory factory( &builder, this );
factory.addClient( this ); factory.addClient( this );
m_menu = dynamic_cast<TDEPopupMenu*>(factory.container( "note_context", this )); m_menu = dynamic_cast<TDEPopupMenu*>(factory.container( "note_context", this ));
@ -601,8 +601,8 @@ void KNote::find( const TQString& pattern, long options )
m_find = new KFind( pattern, options, this ); m_find = new KFind( pattern, options, this );
connect( m_find, TQT_SIGNAL(highlight( const TQString &, int, int )), connect( m_find, TQT_SIGNAL(highlight( const TQString &, int, int )),
TQT_TQOBJECT(this), TQT_SLOT(slotHighlight( const TQString &, int, int )) ); this, TQT_SLOT(slotHighlight( const TQString &, int, int )) );
connect( m_find, TQT_SIGNAL(findNext()), TQT_TQOBJECT(this), TQT_SLOT(slotFindNext()) ); connect( m_find, TQT_SIGNAL(findNext()), this, TQT_SLOT(slotFindNext()) );
m_find->setData( plainText() ); m_find->setData( plainText() );
slotFindNext(); slotFindNext();
@ -816,7 +816,7 @@ void KNote::slotPreferences()
// create a new preferences dialog... // create a new preferences dialog...
KNoteConfigDlg *dialog = new KNoteConfigDlg( m_config, name(), this, noteId().utf8() ); KNoteConfigDlg *dialog = new KNoteConfigDlg( m_config, name(), this, noteId().utf8() );
connect( dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotApplyConfig()) ); connect( dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(slotApplyConfig()) );
connect( this, TQT_SIGNAL(sigNameChanged()), dialog, TQT_SLOT(slotUpdateCaption()) ); connect( this, TQT_SIGNAL(sigNameChanged()), dialog, TQT_SLOT(slotUpdateCaption()) );
dialog->show(); dialog->show();
} }

54
knotes/knoteedit.cpp
Unescape View File

@ -45,27 +45,27 @@ KNoteEdit::KNoteEdit( TDEActionCollection *actions, TQWidget *parent, const char
setLinkUnderline( true ); setLinkUnderline( true );
setCheckSpellingEnabled(false); setCheckSpellingEnabled(false);
// create the actions for the RMB menu // create the actions for the RMB menu
undo = KStdAction::undo( TQT_TQOBJECT(this), TQT_SLOT(undo()), actions ); undo = KStdAction::undo( this, TQT_SLOT(undo()), actions );
redo = KStdAction::redo( TQT_TQOBJECT(this), TQT_SLOT(redo()), actions ); redo = KStdAction::redo( this, TQT_SLOT(redo()), actions );
undo->setEnabled( isUndoAvailable() ); undo->setEnabled( isUndoAvailable() );
redo->setEnabled( isRedoAvailable() ); redo->setEnabled( isRedoAvailable() );
m_cut = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT(cut()), actions ); m_cut = KStdAction::cut( this, TQT_SLOT(cut()), actions );
m_copy = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(copy()), actions ); m_copy = KStdAction::copy( this, TQT_SLOT(copy()), actions );
m_paste = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT(paste()), actions ); m_paste = KStdAction::paste( this, TQT_SLOT(paste()), actions );
m_cut->setEnabled( false ); m_cut->setEnabled( false );
m_copy->setEnabled( false ); m_copy->setEnabled( false );
m_paste->setEnabled( true ); m_paste->setEnabled( true );
connect( this, TQT_SIGNAL(undoAvailable(bool)), TQT_TQOBJECT(this), TQT_SLOT(setEnabledUndo(bool)) ); connect( this, TQT_SIGNAL(undoAvailable(bool)), this, TQT_SLOT(setEnabledUndo(bool)) );
connect( this, TQT_SIGNAL(redoAvailable(bool)), TQT_TQOBJECT(this), TQT_SLOT(setEnabledRedo(bool)) ); connect( this, TQT_SIGNAL(redoAvailable(bool)), this, TQT_SLOT(setEnabledRedo(bool)) );
connect( this, TQT_SIGNAL(copyAvailable(bool)), TQT_TQOBJECT(this), TQT_SLOT( slotCutEnabled( 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, TQT_SIGNAL(copyAvailable(bool)), m_copy, TQT_SLOT(setEnabled(bool)) );
new TDEAction( KStdGuiItem::clear(), 0, TQT_TQOBJECT(this), TQT_SLOT(clear()), actions, "edit_clear" ); new TDEAction( KStdGuiItem::clear(), 0, this, TQT_SLOT(clear()), actions, "edit_clear" );
KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT(selectAll()), actions ); KStdAction::selectAll( this, TQT_SLOT(selectAll()), actions );
// create the actions modifying the text format // create the actions modifying the text format
m_textBold = new TDEToggleAction( i18n("Bold"), "format-text-bold", CTRL + Key_B, 0, 0, m_textBold = new TDEToggleAction( i18n("Bold"), "format-text-bold", CTRL + Key_B, 0, 0,
@ -83,17 +83,17 @@ KNoteEdit::KNoteEdit( TDEActionCollection *actions, TQWidget *parent, const char
connect( m_textStrikeOut, TQT_SIGNAL(toggled(bool)), TQT_SLOT(textStrikeOut(bool)) ); connect( m_textStrikeOut, TQT_SIGNAL(toggled(bool)), TQT_SLOT(textStrikeOut(bool)) );
m_textAlignLeft = new TDEToggleAction( i18n("Align Left"), "format-text-direction-ltr", ALT + Key_L, m_textAlignLeft = new TDEToggleAction( i18n("Align Left"), "format-text-direction-ltr", ALT + Key_L,
TQT_TQOBJECT(this), TQT_SLOT(textAlignLeft()), this, TQT_SLOT(textAlignLeft()),
actions, "format_alignleft" ); actions, "format_alignleft" );
m_textAlignLeft->setChecked( true ); // just a dummy, will be updated later m_textAlignLeft->setChecked( true ); // just a dummy, will be updated later
m_textAlignCenter = new TDEToggleAction( i18n("Align Center"), "text_center", ALT + Key_C, m_textAlignCenter = new TDEToggleAction( i18n("Align Center"), "text_center", ALT + Key_C,
TQT_TQOBJECT(this), TQT_SLOT(textAlignCenter()), this, TQT_SLOT(textAlignCenter()),
actions, "format_aligncenter" ); actions, "format_aligncenter" );
m_textAlignRight = new TDEToggleAction( i18n("Align Right"), "format-text-direction-rtl", ALT + Key_R, m_textAlignRight = new TDEToggleAction( i18n("Align Right"), "format-text-direction-rtl", ALT + Key_R,
TQT_TQOBJECT(this), TQT_SLOT(textAlignRight()), this, TQT_SLOT(textAlignRight()),
actions, "format_alignright" ); actions, "format_alignright" );
m_textAlignBlock = new TDEToggleAction( i18n("Align Block"), "text_block", ALT + Key_B, m_textAlignBlock = new TDEToggleAction( i18n("Align Block"), "text_block", ALT + Key_B,
TQT_TQOBJECT(this), TQT_SLOT(textAlignBlock()), this, TQT_SLOT(textAlignBlock()),
actions, "format_alignblock" ); actions, "format_alignblock" );
m_textAlignLeft->setExclusiveGroup( "align" ); m_textAlignLeft->setExclusiveGroup( "align" );
@ -102,16 +102,16 @@ KNoteEdit::KNoteEdit( TDEActionCollection *actions, TQWidget *parent, const char
m_textAlignBlock->setExclusiveGroup( "align" ); m_textAlignBlock->setExclusiveGroup( "align" );
m_textList = new TDEToggleAction( i18n("List"), "enum_list", 0, m_textList = new TDEToggleAction( i18n("List"), "enum_list", 0,
TQT_TQOBJECT(this), TQT_SLOT(textList()), this, TQT_SLOT(textList()),
actions, "format_list" ); actions, "format_list" );
m_textList->setExclusiveGroup( "style" ); m_textList->setExclusiveGroup( "style" );
m_textSuper = new TDEToggleAction( i18n("Superscript"), "text_super", 0, m_textSuper = new TDEToggleAction( i18n("Superscript"), "text_super", 0,
TQT_TQOBJECT(this), TQT_SLOT(textSuperScript()), this, TQT_SLOT(textSuperScript()),
actions, "format_super" ); actions, "format_super" );
m_textSub = new TDEToggleAction( i18n("Subscript"), "text_sub", 0, m_textSub = new TDEToggleAction( i18n("Subscript"), "text_sub", 0,
TQT_TQOBJECT(this), TQT_SLOT(textSubScript()), this, TQT_SLOT(textSubScript()),
actions, "format_sub" ); actions, "format_sub" );
m_textSuper->setExclusiveGroup( "valign" ); 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 // There is no easy possibility to implement text indenting with TQTextEdit
// //
// m_textIncreaseIndent = new TDEAction( i18n("Increase Indent"), "format_increaseindent", 0, // m_textIncreaseIndent = new TDEAction( i18n("Increase Indent"), "format_increaseindent", 0,
// TQT_TQOBJECT(this), TQT_SLOT(textIncreaseIndent()), // this, TQT_SLOT(textIncreaseIndent()),
// actions, "format_increaseindent" ); // actions, "format_increaseindent" );
// //
// m_textDecreaseIndent = new TDEAction( i18n("Decrease Indent"), "format_decreaseindent", 0, // m_textDecreaseIndent = new TDEAction( i18n("Decrease Indent"), "format_decreaseindent", 0,
// TQT_TQOBJECT(this), TQT_SLOT(textDecreaseIndent()), // this, TQT_SLOT(textDecreaseIndent()),
// actions, "format_decreaseindent" ); // actions, "format_decreaseindent" );
TQPixmap pix( ICON_SIZE, ICON_SIZE ); TQPixmap pix( ICON_SIZE, ICON_SIZE );
pix.fill( black ); // just a dummy, gets updated before widget is shown pix.fill( black ); // just a dummy, gets updated before widget is shown
m_textColor = new TDEAction( i18n("Text Color..."), pix, 0, TQT_TQOBJECT(this), m_textColor = new TDEAction( i18n("Text Color..."), pix, 0, this,
TQT_SLOT(textColor()), actions, "format_color" ); TQT_SLOT(textColor()), actions, "format_color" );
m_textFont = new TDEFontAction( i18n("Text Font"), "text", KKey(), m_textFont = new TDEFontAction( i18n("Text Font"), "text", KKey(),
actions, "format_font" ); actions, "format_font" );
connect( m_textFont, TQT_SIGNAL(activated( const TQString & )), connect( m_textFont, TQT_SIGNAL(activated( const TQString & )),
TQT_TQOBJECT(this), TQT_SLOT(setFamily( const TQString & )) ); this, TQT_SLOT(setFamily( const TQString & )) );
m_textSize = new TDEFontSizeAction( i18n("Text Size"), KKey(), m_textSize = new TDEFontSizeAction( i18n("Text Size"), KKey(),
actions, "format_size" ); actions, "format_size" );
connect( m_textSize, TQT_SIGNAL(fontSizeChanged( int )), connect( m_textSize, TQT_SIGNAL(fontSizeChanged( int )),
TQT_TQOBJECT(this), TQT_SLOT(setPointSize( int )) ); this, TQT_SLOT(setPointSize( int )) );
// TQTextEdit connections // TQTextEdit connections
connect( this, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) ); connect( this, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) );
connect( this, TQT_SIGNAL(currentFontChanged( const TQFont & )), connect( this, TQT_SIGNAL(currentFontChanged( const TQFont & )),
TQT_TQOBJECT(this), TQT_SLOT(fontChanged( const TQFont & )) ); this, TQT_SLOT(fontChanged( const TQFont & )) );
connect( this, TQT_SIGNAL(currentColorChanged( const TQColor & )), connect( this, TQT_SIGNAL(currentColorChanged( const TQColor & )),
TQT_TQOBJECT(this), TQT_SLOT(colorChanged( const TQColor & )) ); this, TQT_SLOT(colorChanged( const TQColor & )) );
connect( this, TQT_SIGNAL(currentAlignmentChanged( int )), connect( this, TQT_SIGNAL(currentAlignmentChanged( int )),
TQT_TQOBJECT(this), TQT_SLOT(alignmentChanged( int )) ); this, TQT_SLOT(alignmentChanged( int )) );
connect( this, TQT_SIGNAL(currentVerticalAlignmentChanged( VerticalAlignment )), connect( this, TQT_SIGNAL(currentVerticalAlignmentChanged( VerticalAlignment )),
TQT_TQOBJECT(this), TQT_SLOT(verticalAlignmentChanged( VerticalAlignment )) ); this, TQT_SLOT(verticalAlignmentChanged( VerticalAlignment )) );
} }
KNoteEdit::~KNoteEdit() KNoteEdit::~KNoteEdit()
@ -541,7 +541,7 @@ TQPopupMenu *KNoteEdit::createPopupMenu( const TQPoint &pos )
menu->insertSeparator(); menu->insertSeparator();
id = menu->insertItem( SmallIconSet( "tools-check-spelling" ), i18n( "Check Spelling..." ), id = menu->insertItem( SmallIconSet( "tools-check-spelling" ), i18n( "Check Spelling..." ),
TQT_TQOBJECT(this), TQT_SLOT( checkSpelling() ) ); this, TQT_SLOT( checkSpelling() ) );
if( text().isEmpty() ) if( text().isEmpty() )
menu->setItemEnabled( id, false ); menu->setItemEnabled( id, false );

38
knotes/knotesapp.cpp
Unescape View File

@ -112,25 +112,25 @@ KNotesApp::KNotesApp()
// create the GUI... // create the GUI...
new TDEAction( i18n("New Note"), "document-new", 0, new TDEAction( i18n("New Note"), "document-new", 0,
TQT_TQOBJECT(this), TQT_SLOT(newNote()), actionCollection(), "new_note" ); this, TQT_SLOT(newNote()), actionCollection(), "new_note" );
new TDEAction( i18n("New Note From Clipboard"), "edit-paste", 0, new TDEAction( i18n("New Note From Clipboard"), "edit-paste", 0,
TQT_TQOBJECT(this), TQT_SLOT(newNoteFromClipboard()), actionCollection(), "new_note_clipboard" ); this, TQT_SLOT(newNoteFromClipboard()), actionCollection(), "new_note_clipboard" );
new TDEAction( i18n("Show All Notes"), "knotes", 0, new TDEAction( i18n("Show All Notes"), "knotes", 0,
TQT_TQOBJECT(this), TQT_SLOT(showAllNotes()), actionCollection(), "show_all_notes" ); this, TQT_SLOT(showAllNotes()), actionCollection(), "show_all_notes" );
new TDEAction( i18n("Hide All Notes"), "window-close", 0, new TDEAction( i18n("Hide All Notes"), "window-close", 0,
TQT_TQOBJECT(this), TQT_SLOT(hideAllNotes()), actionCollection(), "hide_all_notes" ); this, TQT_SLOT(hideAllNotes()), actionCollection(), "hide_all_notes" );
new KHelpMenu( this, kapp->aboutData(), false, actionCollection() ); new KHelpMenu( this, kapp->aboutData(), false, actionCollection() );
m_findAction = KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT(slotOpenFindDialog()), actionCollection() ); m_findAction = KStdAction::find( this, TQT_SLOT(slotOpenFindDialog()), actionCollection() );
KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT(slotPreferences()), actionCollection() ); KStdAction::preferences( this, TQT_SLOT(slotPreferences()), actionCollection() );
KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT(slotConfigureAccels()), actionCollection() ); KStdAction::keyBindings( this, TQT_SLOT(slotConfigureAccels()), actionCollection() );
//FIXME: no shortcut removing!? //FIXME: no shortcut removing!?
KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection() )->setShortcut( 0 ); KStdAction::quit( this, TQT_SLOT(slotQuit()), actionCollection() )->setShortcut( 0 );
setXMLFile( instance()->instanceName() + "appui.rc" ); setXMLFile( instance()->instanceName() + "appui.rc" );
m_guiBuilder = new KXMLGUIBuilder( this ); m_guiBuilder = new KXMLGUIBuilder( this );
m_guiFactory = new KXMLGUIFactory( m_guiBuilder, TQT_TQOBJECT(this) ); m_guiFactory = new KXMLGUIFactory( m_guiBuilder, this );
m_guiFactory->addClient( this ); m_guiFactory->addClient( this );
m_context_menu = static_cast<TDEPopupMenu*>(m_guiFactory->container( "knotes_context", this )); m_context_menu = static_cast<TDEPopupMenu*>(m_guiFactory->container( "knotes_context", this ));
@ -147,19 +147,19 @@ KNotesApp::KNotesApp()
m_noteGUI.setContent( doc ); m_noteGUI.setContent( doc );
// create accels for global shortcuts // create accels for global shortcuts
m_globalAccel = new TDEGlobalAccel( TQT_TQOBJECT(this), "global accel" ); m_globalAccel = new TDEGlobalAccel( this, "global accel" );
m_globalAccel->insert( "global_new_note", i18n("New Note"), "", m_globalAccel->insert( "global_new_note", i18n("New Note"), "",
TDEShortcut(), TDEShortcut(), TDEShortcut(), TDEShortcut(),
TQT_TQOBJECT(this), TQT_SLOT(newNote()), true, true ); this, TQT_SLOT(newNote()), true, true );
m_globalAccel->insert( "global_new_note_clipboard", i18n("New Note From Clipboard"), "", m_globalAccel->insert( "global_new_note_clipboard", i18n("New Note From Clipboard"), "",
TDEShortcut(), TDEShortcut(), TDEShortcut(), TDEShortcut(),
TQT_TQOBJECT(this), TQT_SLOT(newNoteFromClipboard()), true, true ); this, TQT_SLOT(newNoteFromClipboard()), true, true );
m_globalAccel->insert( "global_hide_all_notes", i18n("Hide All Notes"), "", m_globalAccel->insert( "global_hide_all_notes", i18n("Hide All Notes"), "",
TDEShortcut(), TDEShortcut(), TDEShortcut(), TDEShortcut(),
TQT_TQOBJECT(this), TQT_SLOT(hideAllNotes()), true, true ); this, TQT_SLOT(hideAllNotes()), true, true );
m_globalAccel->insert( "global_show_all_notes", i18n("Show All Notes"), "", m_globalAccel->insert( "global_show_all_notes", i18n("Show All Notes"), "",
TDEShortcut(), TDEShortcut(), TDEShortcut(), TDEShortcut(),
TQT_TQOBJECT(this), TQT_SLOT(showAllNotes()), true, true ); this, TQT_SLOT(showAllNotes()), true, true );
m_globalAccel->readSettings(); m_globalAccel->readSettings();
@ -196,7 +196,7 @@ KNotesApp::KNotesApp()
// set up the alarm reminder - do it after loading the notes because this // set up the alarm reminder - do it after loading the notes because this
// is used as a check if updateNoteActions has to be called for a new note // is used as a check if updateNoteActions has to be called for a new note
m_alarm = new KNotesAlarm( m_manager, TQT_TQOBJECT(this) ); m_alarm = new KNotesAlarm( m_manager, this );
// create the socket and possibly start listening for connections // create the socket and possibly start listening for connections
m_listener = new TDEServerSocket(); m_listener = new TDEServerSocket();
@ -575,8 +575,8 @@ void KNotesApp::slotPreferences()
// create a new preferences dialog... // create a new preferences dialog...
KNoteConfigDlg *dialog = new KNoteConfigDlg( 0, i18n("Settings"), this, KNoteConfigDlg *dialog = new KNoteConfigDlg( 0, i18n("Settings"), this,
"KNotes Settings" ); "KNotes Settings" );
connect( dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(updateNetworkListener()) ); connect( dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(updateNetworkListener()) );
connect( dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(updateStyle()) ); connect( dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(updateStyle()) );
dialog->show(); dialog->show();
} }
@ -694,7 +694,7 @@ void KNotesApp::acceptConnection()
{ {
KNotesNetworkReceiver *recv = new KNotesNetworkReceiver( s ); KNotesNetworkReceiver *recv = new KNotesNetworkReceiver( s );
connect( recv, TQT_SIGNAL(sigNoteReceived( const TQString &, const TQString & )), connect( recv, TQT_SIGNAL(sigNoteReceived( const TQString &, const TQString & )),
TQT_TQOBJECT(this), TQT_SLOT(newNote( const TQString &, const TQString & )) ); this, TQT_SLOT(newNote( const TQString &, const TQString & )) );
} }
} }
@ -725,7 +725,7 @@ void KNotesApp::updateNoteActions()
for ( TQDictIterator<KNote> it( m_noteList ); it.current(); ++it ) for ( TQDictIterator<KNote> it( m_noteList ); it.current(); ++it )
{ {
TDEAction *action = new TDEAction( it.current()->name().replace("&", "&&"), TDEAction *action = new TDEAction( it.current()->name().replace("&", "&&"),
TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotShowNote()), TDEShortcut(), this, TQT_SLOT(slotShowNote()),
(TQObject *)0, (TQObject *)0,
it.current()->noteId().utf8() ); it.current()->noteId().utf8() );
TDEIconEffect effect; TDEIconEffect effect;

8
knotes/knotesnetsend.cpp
Unescape View File

@ -48,11 +48,11 @@ KNotesNetworkSender::KNotesNetworkSender( const TQString& hostname, int port )
// TQObject:: prefix needed, otherwise the KStreamSocket::connect() // TQObject:: prefix needed, otherwise the KStreamSocket::connect()
// mehtod is called!!! // mehtod is called!!!
TQObject::connect( TQT_TQOBJECT(this), TQT_SIGNAL(connected( const KResolverEntry& )), TQObject::connect( this, TQT_SIGNAL(connected( const KResolverEntry& )),
TQT_SLOT(slotConnected( const KResolverEntry& )) ); TQT_SLOT(slotConnected( const KResolverEntry& )) );
TQObject::connect( TQT_TQOBJECT(this), TQT_SIGNAL(gotError( int )), TQT_SLOT(slotError( int )) ); TQObject::connect( this, TQT_SIGNAL(gotError( int )), TQT_SLOT(slotError( int )) );
TQObject::connect( TQT_TQOBJECT(this), TQT_SIGNAL(closed()), TQT_SLOT(slotClosed()) ); TQObject::connect( this, TQT_SIGNAL(closed()), TQT_SLOT(slotClosed()) );
TQObject::connect( TQT_TQOBJECT(this), TQT_SIGNAL(readyWrite()), TQT_SLOT(slotReadyWrite()) ); TQObject::connect( this, TQT_SIGNAL(readyWrite()), TQT_SLOT(slotReadyWrite()) );
} }
void KNotesNetworkSender::setSenderId( const TQString& sender ) void KNotesNetworkSender::setSenderId( const TQString& sender )

2
kontact/interfaces/core.cpp
Unescape View File

@ -66,7 +66,7 @@ KParts::ReadOnlyPart *Core::createPart( const char *libname )
KParts::ReadOnlyPart *part = KParts::ReadOnlyPart *part =
KParts::ComponentFactory:: KParts::ComponentFactory::
createPartInstanceFromLibrary<KParts::ReadOnlyPart> createPartInstanceFromLibrary<KParts::ReadOnlyPart>
( libname, this, 0, TQT_TQOBJECT(this), "kontact", TQStringList(), &error ); ( libname, this, 0, this, "kontact", TQStringList(), &error );
KParts::ReadOnlyPart *pimPart = dynamic_cast<KParts::ReadOnlyPart*>( part ); KParts::ReadOnlyPart *pimPart = dynamic_cast<KParts::ReadOnlyPart*>( part );
if ( pimPart ) { if ( pimPart ) {

2
kontact/plugins/akregator/akregator_plugin.cpp
Unescape View File

@ -49,7 +49,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_akregator,
PluginFactory( "kontact_akregator" ) ) PluginFactory( "kontact_akregator" ) )
AkregatorPlugin::AkregatorPlugin( Kontact::Core *core, const char *, const TQStringList& ) AkregatorPlugin::AkregatorPlugin( Kontact::Core *core, const char *, const TQStringList& )
: Kontact::Plugin( core, TQT_TQOBJECT(core), "akregator" ), m_stub(0) : Kontact::Plugin( core, core, "akregator" ), m_stub(0)
{ {
setInstance( PluginFactory::instance() ); setInstance( PluginFactory::instance() );

2
kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
Unescape View File

@ -52,7 +52,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_kaddressbookplugin,
KAddressbookPluginFactory( "kontact_kaddressbookplugin" ) ) KAddressbookPluginFactory( "kontact_kaddressbookplugin" ) )
KAddressbookPlugin::KAddressbookPlugin( Kontact::Core *core, const char *, const TQStringList& ) KAddressbookPlugin::KAddressbookPlugin( Kontact::Core *core, const char *, const TQStringList& )
: Kontact::Plugin( core, TQT_TQOBJECT(core), "kaddressbook" ), : Kontact::Plugin( core, core, "kaddressbook" ),
mStub( 0 ) mStub( 0 )
{ {
setInstance( KAddressbookPluginFactory::instance() ); setInstance( KAddressbookPluginFactory::instance() );

2
kontact/plugins/karm/karm_plugin.cpp
Unescape View File

@ -37,7 +37,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_karm,
KarmPluginFactory( "kontact_karm" ) ) KarmPluginFactory( "kontact_karm" ) )
KarmPlugin::KarmPlugin( Kontact::Core *core, const char *, const TQStringList& ) KarmPlugin::KarmPlugin( Kontact::Core *core, const char *, const TQStringList& )
: Kontact::Plugin( core, TQT_TQOBJECT(core), "KArm" ) : Kontact::Plugin( core, core, "KArm" )
{ {
setInstance( KarmPluginFactory::instance() ); setInstance( KarmPluginFactory::instance() );
(void)dcopClient(); (void)dcopClient();

2
kontact/plugins/kmail/kmail_plugin.cpp
Unescape View File

@ -56,7 +56,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_kmailplugin,
KMailPluginFactory( "kontact_kmailplugin" ) ) KMailPluginFactory( "kontact_kmailplugin" ) )
KMailPlugin::KMailPlugin(Kontact::Core *core, const char *, const TQStringList& ) KMailPlugin::KMailPlugin(Kontact::Core *core, const char *, const TQStringList& )
: Kontact::Plugin( core, TQT_TQOBJECT(core), "kmail" ), : Kontact::Plugin( core, core, "kmail" ),
mStub( 0 ) mStub( 0 )
{ {
setInstance( KMailPluginFactory::instance() ); setInstance( KMailPluginFactory::instance() );

2
kontact/plugins/kmail/summarywidget.cpp
Unescape View File

@ -163,7 +163,7 @@ void SummaryWidget::updateFolderList( const TQStringList& folders )
bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e ) bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
{ {
if ( obj->inherits( "KURLLabel" ) ) { if ( obj->inherits( "KURLLabel" ) ) {
KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) ); KURLLabel* label = static_cast<KURLLabel*>( obj );
if ( e->type() == TQEvent::Enter ) if ( e->type() == TQEvent::Enter )
emit message( i18n( "Open Folder: \"%1\"" ).arg( label->text() ) ); emit message( i18n( "Open Folder: \"%1\"" ).arg( label->text() ) );
if ( e->type() == TQEvent::Leave ) if ( e->type() == TQEvent::Leave )

2
kontact/plugins/knode/knode_plugin.cpp
Unescape View File

@ -45,7 +45,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_knodeplugin,
KNodePlugin::KNodePlugin( Kontact::Core *core, const char *, const TQStringList& ) KNodePlugin::KNodePlugin( Kontact::Core *core, const char *, const TQStringList& )
: Kontact::Plugin( core, TQT_TQOBJECT(core), "knode" ), mStub(0) : Kontact::Plugin( core, core, "knode" ), mStub(0)
{ {
setInstance( KNodePluginFactory::instance() ); setInstance( KNodePluginFactory::instance() );

2
kontact/plugins/knotes/knotes_part_p.h
Unescape View File

@ -144,7 +144,7 @@ class KNoteEditDlg : public KDialogBase, virtual public KXMLGUIClient
mNoteEdit->setFocus(); mNoteEdit->setFocus();
KXMLGUIBuilder builder( page ); KXMLGUIBuilder builder( page );
KXMLGUIFactory factory( &builder, TQT_TQOBJECT(this) ); KXMLGUIFactory factory( &builder, this );
factory.addClient( this ); factory.addClient( this );
mTool = static_cast<TDEToolBar *>(factory.container( "note_tool", this )); mTool = static_cast<TDEToolBar *>(factory.container( "note_tool", this ));

2
kontact/plugins/knotes/knotes_plugin.cpp
Unescape View File

@ -39,7 +39,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_knotesplugin,
KNotesPlugin::KNotesPlugin( Kontact::Core *core, const char *, const TQStringList & ) KNotesPlugin::KNotesPlugin( Kontact::Core *core, const char *, const TQStringList & )
: Kontact::Plugin( core, TQT_TQOBJECT(core), "knotes" ), : Kontact::Plugin( core, core, "knotes" ),
mAboutData( 0 ) mAboutData( 0 )
{ {
setInstance( KNotesPluginFactory::instance() ); setInstance( KNotesPluginFactory::instance() );

8
kontact/plugins/knotes/knotetip.cpp
Unescape View File

@ -75,7 +75,7 @@ void KNoteTip::setNote( KNotesIconViewItem *item )
mNoteIVI = item; mNoteIVI = item;
if ( !mNoteIVI ) { if ( !mNoteIVI ) {
TQT_TQOBJECT(this)->killTimers(); this->killTimers();
if ( isVisible() ) { if ( isVisible() ) {
setFilter( false ); setFilter( false );
hide(); hide();
@ -104,7 +104,7 @@ void KNoteTip::setNote( KNotesIconViewItem *item )
resize( w, TQMIN( h, desk.height() / 2 - 20 ) ); resize( w, TQMIN( h, desk.height() / 2 - 20 ) );
hide(); hide();
TQT_TQOBJECT(this)->killTimers(); this->killTimers();
setFilter( true ); setFilter( true );
startTimer( 600 ); // delay showing the tooltip for 0.7 sec startTimer( 600 ); // delay showing the tooltip for 0.7 sec
} }
@ -121,7 +121,7 @@ void KNoteTip::resizeEvent( TQResizeEvent *ev )
void KNoteTip::timerEvent( TQTimerEvent * ) void KNoteTip::timerEvent( TQTimerEvent * )
{ {
TQT_TQOBJECT(this)->killTimers(); this->killTimers();
if ( !isVisible() ) { if ( !isVisible() ) {
startTimer( 15000 ); // show the tooltip for 15 sec startTimer( 15000 ); // show the tooltip for 15 sec
@ -144,7 +144,7 @@ bool KNoteTip::eventFilter( TQObject *, TQEvent *e )
case TQEvent::FocusIn: case TQEvent::FocusIn:
case TQEvent::FocusOut: case TQEvent::FocusOut:
case TQEvent::Wheel: case TQEvent::Wheel:
TQT_TQOBJECT(this)->killTimers(); this->killTimers();
setFilter( false ); setFilter( false );
hide(); hide();
default: default:

2
kontact/plugins/knotes/summarywidget.cpp
Unescape View File

@ -138,7 +138,7 @@ void KNotesSummaryWidget::urlClicked( const TQString &/*uid*/ )
bool KNotesSummaryWidget::eventFilter( TQObject *obj, TQEvent* e ) bool KNotesSummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
{ {
if ( obj->inherits( "KURLLabel" ) ) { if ( obj->inherits( "KURLLabel" ) ) {
KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) ); KURLLabel* label = static_cast<KURLLabel*>( obj );
if ( e->type() == TQEvent::Enter ) if ( e->type() == TQEvent::Enter )
emit message( i18n( "Read Note: \"%1\"" ).arg( label->text() ) ); emit message( i18n( "Read Note: \"%1\"" ).arg( label->text() ) );
if ( e->type() == TQEvent::Leave ) if ( e->type() == TQEvent::Leave )

2
kontact/plugins/korganizer/journalplugin.cpp
Unescape View File

@ -43,7 +43,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_journalplugin,
JournalPluginFactory( "kontact_journalplugin" ) ) JournalPluginFactory( "kontact_journalplugin" ) )
JournalPlugin::JournalPlugin( Kontact::Core *core, const char *, const TQStringList& ) JournalPlugin::JournalPlugin( Kontact::Core *core, const char *, const TQStringList& )
: Kontact::Plugin( core, TQT_TQOBJECT(core), "korganizer" ), : Kontact::Plugin( core, core, "korganizer" ),
mIface( 0 ) mIface( 0 )
{ {
setInstance( JournalPluginFactory::instance() ); setInstance( JournalPluginFactory::instance() );

2
kontact/plugins/korganizer/korganizerplugin.cpp
Unescape View File

@ -57,7 +57,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_korganizerplugin,
KOrganizerPluginFactory( "kontact_korganizerplugin" ) ) KOrganizerPluginFactory( "kontact_korganizerplugin" ) )
KOrganizerPlugin::KOrganizerPlugin( Kontact::Core *core, const char *, const TQStringList& ) KOrganizerPlugin::KOrganizerPlugin( Kontact::Core *core, const char *, const TQStringList& )
: Kontact::Plugin( core, TQT_TQOBJECT(core), "korganizer" ), : Kontact::Plugin( core, core, "korganizer" ),
mIface( 0 ) mIface( 0 )
{ {

2
kontact/plugins/korganizer/summarywidget.cpp
Unescape View File

@ -286,7 +286,7 @@ void SummaryWidget::popupMenu( const TQString &uid )
bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e ) bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
{ {
if ( obj->inherits( "KURLLabel" ) ) { if ( obj->inherits( "KURLLabel" ) ) {
KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) ); KURLLabel* label = static_cast<KURLLabel*>( obj );
if ( e->type() == TQEvent::Enter ) if ( e->type() == TQEvent::Enter )
emit message( i18n( "Edit Appointment: \"%1\"" ).arg( label->text() ) ); emit message( i18n( "Edit Appointment: \"%1\"" ).arg( label->text() ) );
if ( e->type() == TQEvent::Leave ) if ( e->type() == TQEvent::Leave )

2
kontact/plugins/korganizer/todoplugin.cpp
Unescape View File

@ -55,7 +55,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_todoplugin,
TodoPluginFactory( "kontact_todoplugin" ) ) TodoPluginFactory( "kontact_todoplugin" ) )
TodoPlugin::TodoPlugin( Kontact::Core *core, const char *, const TQStringList& ) TodoPlugin::TodoPlugin( Kontact::Core *core, const char *, const TQStringList& )
: Kontact::Plugin( core, TQT_TQOBJECT(core), "korganizer" ), : Kontact::Plugin( core, core, "korganizer" ),
mIface( 0 ) mIface( 0 )
{ {
setInstance( TodoPluginFactory::instance() ); setInstance( TodoPluginFactory::instance() );

4
kontact/plugins/korganizer/todosummarywidget.cpp
Unescape View File

@ -211,7 +211,7 @@ void TodoSummaryWidget::removeTodo( const TQString &uid )
void TodoSummaryWidget::completeTodo( const TQString &uid ) void TodoSummaryWidget::completeTodo( const TQString &uid )
{ {
KCal::Todo *todo = mCalendar->todo( uid ); KCal::Todo *todo = mCalendar->todo( uid );
IncidenceChanger *changer = new IncidenceChanger( mCalendar, TQT_TQOBJECT(this) ); IncidenceChanger *changer = new IncidenceChanger( mCalendar, this );
if ( !todo->isReadOnly() && changer->beginChange( todo, 0, TQString() ) ) { if ( !todo->isReadOnly() && changer->beginChange( todo, 0, TQString() ) ) {
KCal::Todo *oldTodo = todo->clone(); KCal::Todo *oldTodo = todo->clone();
todo->setCompleted( TQDateTime::currentDateTime() ); todo->setCompleted( TQDateTime::currentDateTime() );
@ -251,7 +251,7 @@ void TodoSummaryWidget::popupMenu( const TQString &uid )
bool TodoSummaryWidget::eventFilter( TQObject *obj, TQEvent* e ) bool TodoSummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
{ {
if ( obj->inherits( "KURLLabel" ) ) { if ( obj->inherits( "KURLLabel" ) ) {
KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) ); KURLLabel* label = static_cast<KURLLabel*>( obj );
if ( e->type() == TQEvent::Enter ) if ( e->type() == TQEvent::Enter )
emit message( i18n( "Edit To-do: \"%1\"" ).arg( label->text() ) ); emit message( i18n( "Edit To-do: \"%1\"" ).arg( label->text() ) );
if ( e->type() == TQEvent::Leave ) if ( e->type() == TQEvent::Leave )

2
kontact/plugins/kpilot/kpilot_plugin.cpp
Unescape View File

@ -35,7 +35,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_kpilotplugin,
KPilotPluginFactory( "kontact_kpilotplugin" ) ) KPilotPluginFactory( "kontact_kpilotplugin" ) )
KPilotPlugin::KPilotPlugin( Kontact::Core *core, const char *name, const TQStringList& ) KPilotPlugin::KPilotPlugin( Kontact::Core *core, const char *name, const TQStringList& )
: Kontact::Plugin( core, TQT_TQOBJECT(core), "kpilot" ), mAboutData( 0 ) : Kontact::Plugin( core, core, "kpilot" ), mAboutData( 0 )
{ {
setInstance( KPilotPluginFactory::instance() ); setInstance( KPilotPluginFactory::instance() );
// TODO: Make sure kpilotDaemon is running! // TODO: Make sure kpilotDaemon is running!

2
kontact/plugins/newsticker/newsticker_plugin.cpp
Unescape View File

@ -32,7 +32,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_newstickerplugin,
NewsTickerPluginFactory( "kontact_newstickerplugin" ) ) NewsTickerPluginFactory( "kontact_newstickerplugin" ) )
NewsTickerPlugin::NewsTickerPlugin( Kontact::Core *core, const char *name, const TQStringList& ) NewsTickerPlugin::NewsTickerPlugin( Kontact::Core *core, const char *name, const TQStringList& )
: Kontact::Plugin( core, TQT_TQOBJECT(core), name ) : Kontact::Plugin( core, core, name )
{ {
setInstance( NewsTickerPluginFactory::instance() ); setInstance( NewsTickerPluginFactory::instance() );
} }

2
kontact/plugins/newsticker/summarywidget.cpp
Unescape View File

@ -306,7 +306,7 @@ void SummaryWidget::rmbMenu( const TQString& url )
bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e ) bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
{ {
if ( obj->inherits( "KURLLabel" ) ) { if ( obj->inherits( "KURLLabel" ) ) {
KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) ); KURLLabel* label = static_cast<KURLLabel*>( obj );
if ( e->type() == TQEvent::Enter ) if ( e->type() == TQEvent::Enter )
emit message( label->url() ); emit message( label->url() );
if ( e->type() == TQEvent::Leave ) if ( e->type() == TQEvent::Leave )

2
kontact/plugins/specialdates/sdsummarywidget.cpp
Unescape View File

@ -593,7 +593,7 @@ void SDSummaryWidget::popupMenu( const TQString &uid )
bool SDSummaryWidget::eventFilter( TQObject *obj, TQEvent* e ) bool SDSummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
{ {
if ( obj->inherits( "KURLLabel" ) ) { if ( obj->inherits( "KURLLabel" ) ) {
KURLLabel* label = static_cast<KURLLabel*>( TQT_TQWIDGET(obj) ); KURLLabel* label = static_cast<KURLLabel*>( obj );
if ( e->type() == TQEvent::Enter ) if ( e->type() == TQEvent::Enter )
emit message( i18n( "Mail to:\"%1\"" ).arg( label->text() ) ); emit message( i18n( "Mail to:\"%1\"" ).arg( label->text() ) );
if ( e->type() == TQEvent::Leave ) if ( e->type() == TQEvent::Leave )

2
kontact/plugins/specialdates/specialdates_plugin.cpp
Unescape View File

@ -38,7 +38,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_specialdatesplugin,
SpecialdatesPluginFactory( "kontact_specialdatesplugin" ) ) SpecialdatesPluginFactory( "kontact_specialdatesplugin" ) )
SpecialdatesPlugin::SpecialdatesPlugin( Kontact::Core *core, const char *name, const TQStringList& ) SpecialdatesPlugin::SpecialdatesPlugin( Kontact::Core *core, const char *name, const TQStringList& )
: Kontact::Plugin( core, TQT_TQOBJECT(core), name ), : Kontact::Plugin( core, core, name ),
mAboutData( 0 ) mAboutData( 0 )
{ {
setInstance( SpecialdatesPluginFactory::instance() ); setInstance( SpecialdatesPluginFactory::instance() );

2
kontact/plugins/summary/summaryview_plugin.cpp
Unescape View File

@ -34,7 +34,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_summaryplugin,
SummaryViewFactory( "kontact_summaryplugin" ) ) SummaryViewFactory( "kontact_summaryplugin" ) )
SummaryView::SummaryView( Kontact::Core *core, const char *name, const TQStringList& ) SummaryView::SummaryView( Kontact::Core *core, const char *name, const TQStringList& )
: Kontact::Plugin( core, TQT_TQOBJECT(core), name), : Kontact::Plugin( core, core, name),
mAboutData( 0 ), mPart( 0 ) mAboutData( 0 ), mPart( 0 )
{ {
setInstance( SummaryViewFactory::instance() ); setInstance( SummaryViewFactory::instance() );

2
kontact/plugins/test/test_plugin.cpp
Unescape View File

@ -35,7 +35,7 @@ typedef KGenericFactory< TestPlugin, Kontact::Core > TestPluginFactory;
K_EXPORT_COMPONENT_FACTORY( libkptestplugin, TestPluginFactory( "kptestplugin" ) ) K_EXPORT_COMPONENT_FACTORY( libkptestplugin, TestPluginFactory( "kptestplugin" ) )
TestPlugin::TestPlugin(Kontact::Core *_core, const char *name, const TQStringList &) TestPlugin::TestPlugin(Kontact::Core *_core, const char *name, const TQStringList &)
: Kontact::Plugin(_core, TQT_TQOBJECT(_core), name) : Kontact::Plugin(_core, _core, name)
{ {
setInstance(TestPluginFactory::instance()); setInstance(TestPluginFactory::instance());

2
kontact/plugins/weather/weather_plugin.cpp
Unescape View File

@ -32,7 +32,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_weatherplugin,
WeatherPluginFactory( "kontact_weatherplugin" ) ) WeatherPluginFactory( "kontact_weatherplugin" ) )
WeatherPlugin::WeatherPlugin( Kontact::Core *core, const char *name, const TQStringList& ) WeatherPlugin::WeatherPlugin( Kontact::Core *core, const char *name, const TQStringList& )
: Kontact::Plugin( core, TQT_TQOBJECT(core), name ), mAboutData( 0 ) : Kontact::Plugin( core, core, name ), mAboutData( 0 )
{ {
setInstance( WeatherPluginFactory::instance() ); setInstance( WeatherPluginFactory::instance() );
} }

2
kontact/src/iconsidepane.cpp
Unescape View File

@ -275,7 +275,7 @@ Navigator::Navigator( IconSidePane *parent, const char *name )
TQT_SLOT( slotMouseOn( TQListBoxItem * ) ) ); TQT_SLOT( slotMouseOn( TQListBoxItem * ) ) );
connect( this, TQT_SIGNAL( onViewport() ), TQT_SLOT( slotMouseOff() ) ); connect( this, TQT_SIGNAL( onViewport() ), TQT_SLOT( slotMouseOff() ) );
mMapper = new TQSignalMapper( TQT_TQOBJECT(this) ); mMapper = new TQSignalMapper( this );
connect( mMapper, TQT_SIGNAL( mapped( int ) ), TQT_SLOT( shortCutSelected( int ) ) ); connect( mMapper, TQT_SIGNAL( mapped( int ) ), TQT_SLOT( shortCutSelected( int ) ) );
TQToolTip::remove( this ); TQToolTip::remove( this );

28
kontact/src/mainwindow.cpp
Unescape View File

@ -96,7 +96,7 @@ class SettingsDialogWrapper : public KSettings::Dialog
void fixButtonLabel( TQWidget *widget ) void fixButtonLabel( TQWidget *widget )
{ {
TQObject *object = widget->child( "KJanusWidget::buttonBelowList" ); TQObject *object = widget->child( "KJanusWidget::buttonBelowList" );
TQPushButton *button = static_cast<TQPushButton*>( TQT_TQWIDGET(object) ); TQPushButton *button = static_cast<TQPushButton*>( object );
if ( button ) if ( button )
button->setText( i18n( "Select Components ..." ) ); button->setText( i18n( "Select Components ..." ) );
} }
@ -133,7 +133,7 @@ void MainWindow::initGUI()
(*it)->load(); (*it)->load();
TDEAction *action = new TDEAction( (*it)->name(), (*it)->icon(), TDEShortcut(), TDEAction *action = new TDEAction( (*it)->name(), (*it)->icon(), TDEShortcut(),
TQT_TQOBJECT(this), TQT_SLOT(slotActionTriggered()), this, TQT_SLOT(slotActionTriggered()),
actionCollection(), (*it)->pluginName().latin1() ); actionCollection(), (*it)->pluginName().latin1() );
action->setName( (*it)->pluginName().latin1() ); action->setName( (*it)->pluginName().latin1() );
action->setWhatsThis( i18n( "Switch to plugin %1" ).arg( (*it)->name() ) ); action->setWhatsThis( i18n( "Switch to plugin %1" ).arg( (*it)->name() ) );
@ -144,8 +144,8 @@ void MainWindow::initGUI()
} }
} }
KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( configureShortcuts() ), actionCollection() ); KStdAction::keyBindings( this, TQT_SLOT( configureShortcuts() ), actionCollection() );
KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT( configureToolbars() ), actionCollection() ); KStdAction::configureToolbars( this, TQT_SLOT( configureToolbars() ), actionCollection() );
setXMLFile( "kontactui.rc" ); setXMLFile( "kontactui.rc" );
setStandardToolBarMenuEnabled( true ); setStandardToolBarMenuEnabled( true );
@ -175,7 +175,7 @@ void MainWindow::initObject()
mSidePane->updatePlugins(); mSidePane->updatePlugins();
} }
KSettings::Dispatcher::self()->registerInstance( instance(), TQT_TQOBJECT(this), KSettings::Dispatcher::self()->registerInstance( instance(), this,
TQT_SLOT( updateConfig() ) ); TQT_SLOT( updateConfig() ) );
loadSettings(); loadSettings();
@ -333,9 +333,9 @@ void MainWindow::initAboutScreen()
void MainWindow::setupActions() void MainWindow::setupActions()
{ {
KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( slotQuit() ), actionCollection() ); KStdAction::quit( this, TQT_SLOT( slotQuit() ), actionCollection() );
mNewActions = new TDEToolBarPopupAction( KGuiItem( i18n( "New" ), "" ), mNewActions = new TDEToolBarPopupAction( KGuiItem( i18n( "New" ), "" ),
TDEStdAccel::shortcut(TDEStdAccel::New), TQT_TQOBJECT(this), TQT_SLOT( slotNewClicked() ), TDEStdAccel::shortcut(TDEStdAccel::New), this, TQT_SLOT( slotNewClicked() ),
actionCollection(), "action_new" ); actionCollection(), "action_new" );
TDEConfig* const cfg = Prefs::self()->config(); TDEConfig* const cfg = Prefs::self()->config();
@ -344,18 +344,18 @@ void MainWindow::setupActions()
if ( mSyncActionsEnabled ) { if ( mSyncActionsEnabled ) {
mSyncActions = new TDEToolBarPopupAction( KGuiItem( i18n( "Synchronize" ) ), mSyncActions = new TDEToolBarPopupAction( KGuiItem( i18n( "Synchronize" ) ),
TDEStdAccel::shortcut(TDEStdAccel::Reload), TQT_TQOBJECT(this), TQT_SLOT( slotSyncClicked() ), TDEStdAccel::shortcut(TDEStdAccel::Reload), this, TQT_SLOT( slotSyncClicked() ),
actionCollection(), "action_sync" ); actionCollection(), "action_sync" );
} }
new TDEAction( i18n( "Configure Kontact..." ), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPreferences() ), new TDEAction( i18n( "Configure Kontact..." ), "configure", 0, this, TQT_SLOT( slotPreferences() ),
actionCollection(), "settings_configure_kontact" ); actionCollection(), "settings_configure_kontact" );
new TDEAction( i18n( "Configure &Profiles..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotConfigureProfiles() ), new TDEAction( i18n( "Configure &Profiles..." ), 0, this, TQT_SLOT( slotConfigureProfiles() ),
actionCollection(), "settings_configure_kontact_profiles" ); actionCollection(), "settings_configure_kontact_profiles" );
new TDEAction( i18n( "&Kontact Introduction" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotShowIntroduction() ), new TDEAction( i18n( "&Kontact Introduction" ), 0, this, TQT_SLOT( slotShowIntroduction() ),
actionCollection(), "help_introduction" ); actionCollection(), "help_introduction" );
new TDEAction( i18n( "&Tip of the Day" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotShowTip() ), new TDEAction( i18n( "&Tip of the Day" ), 0, this, TQT_SLOT( slotShowTip() ),
actionCollection(), "help_tipofday" ); actionCollection(), "help_tipofday" );
KWidgetAction* spacerAction = new KWidgetAction( new TQWidget( this ), "SpacerAction", "", 0, 0, actionCollection(), "navigator_spacer_item" ); KWidgetAction* spacerAction = new KWidgetAction( new TQWidget( this ), "SpacerAction", "", 0, 0, actionCollection(), "navigator_spacer_item" );
@ -543,7 +543,7 @@ void MainWindow::loadPlugins()
kdDebug(5600) << "Loading Plugin: " << (*it)->name() << endl; kdDebug(5600) << "Loading Plugin: " << (*it)->name() << endl;
Kontact::Plugin *plugin = Kontact::Plugin *plugin =
KParts::ComponentFactory::createInstanceFromService<Kontact::Plugin>( KParts::ComponentFactory::createInstanceFromService<Kontact::Plugin>(
(*it)->service(), TQT_TQOBJECT(this) ); (*it)->service(), this );
if ( !plugin ) if ( !plugin )
continue; continue;
@ -763,7 +763,7 @@ void MainWindow::slotSyncClicked()
TDEToolBar* Kontact::MainWindow::findToolBar(const char* name) TDEToolBar* Kontact::MainWindow::findToolBar(const char* name)
{ {
// like TDEMainWindow::toolBar, but which doesn't create the toolbar if not found // like TDEMainWindow::toolBar, but which doesn't create the toolbar if not found
return static_cast<TDEToolBar *>(TQT_TQWIDGET(child(name, "TDEToolBar"))); return static_cast<TDEToolBar *>(child(name, "TDEToolBar"));
} }
void MainWindow::slotActionTriggered() void MainWindow::slotActionTriggered()

140
korganizer/actionmanager.cpp
Unescape View File

@ -127,7 +127,7 @@ void ActionManager::init()
mWindowList = new KOWindowList; mWindowList = new KOWindowList;
// Show tip of the day, when the first calendar is shown. // Show tip of the day, when the first calendar is shown.
if ( !mIsPart ) if ( !mIsPart )
TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( showTipOnStart() ) ); TQTimer::singleShot( 0, this, TQT_SLOT( showTipOnStart() ) );
} }
// Note: We need this ActionManager to be fully constructed, and // Note: We need this ActionManager to be fully constructed, and
// parent() to have a valid reference to it before the following // parent() to have a valid reference to it before the following
@ -156,9 +156,9 @@ void ActionManager::init()
connect( mCalendarView, TQT_SIGNAL( configChanged() ), TQT_SLOT( updateConfig() ) ); connect( mCalendarView, TQT_SIGNAL( configChanged() ), TQT_SLOT( updateConfig() ) );
connect( mCalendarView, TQT_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ), connect( mCalendarView, TQT_SIGNAL( incidenceSelected( Incidence *,const TQDate & ) ),
TQT_TQOBJECT(this), TQT_SLOT( processIncidenceSelection( Incidence *,const TQDate & ) ) ); this, TQT_SLOT( processIncidenceSelection( Incidence *,const TQDate & ) ) );
connect( mCalendarView, TQT_SIGNAL( exportHTML( HTMLExportSettings * ) ), connect( mCalendarView, TQT_SIGNAL( exportHTML( HTMLExportSettings * ) ),
TQT_TQOBJECT(this), TQT_SLOT( exportHTML( HTMLExportSettings * ) ) ); this, TQT_SLOT( exportHTML( HTMLExportSettings * ) ) );
processIncidenceSelection( 0, TQDate() ); processIncidenceSelection( 0, TQDate() );
@ -227,58 +227,58 @@ void ActionManager::initActions()
//~~~~~~~~~~~~~~~~~~~~~~~ LOADING / SAVING ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //~~~~~~~~~~~~~~~~~~~~~~~ LOADING / SAVING ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
if ( mIsPart ) { if ( mIsPart ) {
if ( mMainWindow->hasDocument() ) { if ( mMainWindow->hasDocument() ) {
KStdAction::openNew( TQT_TQOBJECT(this), TQT_SLOT(file_new()), mACollection, "korganizer_openNew" ); KStdAction::openNew( this, TQT_SLOT(file_new()), mACollection, "korganizer_openNew" );
KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( file_open() ), mACollection, "korganizer_open" ); KStdAction::open( this, TQT_SLOT( file_open() ), mACollection, "korganizer_open" );
mRecent = KStdAction::openRecent( TQT_TQOBJECT(this), TQT_SLOT( file_open( const KURL& ) ), mRecent = KStdAction::openRecent( this, TQT_SLOT( file_open( const KURL& ) ),
mACollection, "korganizer_openRecent" ); mACollection, "korganizer_openRecent" );
KStdAction::revert( this,TQT_SLOT( file_revert() ), mACollection, "korganizer_revert" ); KStdAction::revert( this,TQT_SLOT( file_revert() ), mACollection, "korganizer_revert" );
KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT( file_saveas() ), mACollection, KStdAction::saveAs( this, TQT_SLOT( file_saveas() ), mACollection,
"korganizer_saveAs" ); "korganizer_saveAs" );
KStdAction::save( TQT_TQOBJECT(this), TQT_SLOT( file_save() ), mACollection, "korganizer_save" ); KStdAction::save( this, TQT_SLOT( file_save() ), mACollection, "korganizer_save" );
} }
KStdAction::print( TQT_TQOBJECT(mCalendarView), TQT_SLOT( print() ), mACollection, "korganizer_print" ); KStdAction::print( mCalendarView, TQT_SLOT( print() ), mACollection, "korganizer_print" );
} else { } else {
KStdAction::openNew( TQT_TQOBJECT(this), TQT_SLOT( file_new() ), mACollection ); KStdAction::openNew( this, TQT_SLOT( file_new() ), mACollection );
KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( file_open() ), mACollection ); KStdAction::open( this, TQT_SLOT( file_open() ), mACollection );
mRecent = KStdAction::openRecent( TQT_TQOBJECT(this), TQT_SLOT( file_open( const KURL& ) ), mRecent = KStdAction::openRecent( this, TQT_SLOT( file_open( const KURL& ) ),
mACollection ); mACollection );
if ( mMainWindow->hasDocument() ) { if ( mMainWindow->hasDocument() ) {
KStdAction::revert( this,TQT_SLOT( file_revert() ), mACollection ); KStdAction::revert( this,TQT_SLOT( file_revert() ), mACollection );
KStdAction::save( TQT_TQOBJECT(this), TQT_SLOT( file_save() ), mACollection ); KStdAction::save( this, TQT_SLOT( file_save() ), mACollection );
KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT( file_saveas() ), mACollection ); KStdAction::saveAs( this, TQT_SLOT( file_saveas() ), mACollection );
} }
KStdAction::print( TQT_TQOBJECT(mCalendarView), TQT_SLOT( print() ), mACollection ); KStdAction::print( mCalendarView, TQT_SLOT( print() ), mACollection );
} }
//~~~~~~~~~~~~~~~~~~~~~~~~ IMPORT / EXPORT ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //~~~~~~~~~~~~~~~~~~~~~~~~ IMPORT / EXPORT ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
new TDEAction( i18n("Import &Event/Calendar (ICS-/VCS-File)..."), 0, TQT_TQOBJECT(this), TQT_SLOT( file_merge() ), new TDEAction( i18n("Import &Event/Calendar (ICS-/VCS-File)..."), 0, this, TQT_SLOT( file_merge() ),
mACollection, "import_icalendar" ); mACollection, "import_icalendar" );
new TDEAction( i18n("&Import From UNIX Ical tool (.calendar-File)"), 0, TQT_TQOBJECT(this), TQT_SLOT( file_icalimport() ), new TDEAction( i18n("&Import From UNIX Ical tool (.calendar-File)"), 0, this, TQT_SLOT( file_icalimport() ),
mACollection, "import_ical" ); mACollection, "import_ical" );
new TDEAction( i18n("Get &Hot New Stuff..."), 0, this, new TDEAction( i18n("Get &Hot New Stuff..."), 0, this,
TQT_SLOT( downloadNewStuff() ), mACollection, TQT_SLOT( downloadNewStuff() ), mACollection,
"downloadnewstuff" ); "downloadnewstuff" );
new TDEAction( i18n("Export &Web Page..."), "webexport", 0, new TDEAction( i18n("Export &Web Page..."), "webexport", 0,
TQT_TQOBJECT(mCalendarView), TQT_SLOT( exportWeb() ), mCalendarView, TQT_SLOT( exportWeb() ),
mACollection, "export_web" ); mACollection, "export_web" );
new TDEAction( i18n("&iCalendar..."), 0, new TDEAction( i18n("&iCalendar..."), 0,
TQT_TQOBJECT(mCalendarView), TQT_SLOT( exportICalendar() ), mCalendarView, TQT_SLOT( exportICalendar() ),
mACollection, "export_icalendar" ); mACollection, "export_icalendar" );
new TDEAction( i18n("&vCalendar..."), 0, new TDEAction( i18n("&vCalendar..."), 0,
TQT_TQOBJECT(mCalendarView), TQT_SLOT( exportVCalendar() ), mCalendarView, TQT_SLOT( exportVCalendar() ),
mACollection, "export_vcalendar" ); mACollection, "export_vcalendar" );
new TDEAction( i18n("Upload &Hot New Stuff..."), 0, TQT_TQOBJECT(this), new TDEAction( i18n("Upload &Hot New Stuff..."), 0, this,
TQT_SLOT( uploadNewStuff() ), mACollection, TQT_SLOT( uploadNewStuff() ), mACollection,
"uploadnewstuff" ); "uploadnewstuff" );
new TDEAction( i18n("Archive O&ld Entries..."), 0, TQT_TQOBJECT(this), TQT_SLOT( file_archive() ), new TDEAction( i18n("Archive O&ld Entries..."), 0, this, TQT_SLOT( file_archive() ),
mACollection, "file_archive" ); mACollection, "file_archive" );
new TDEAction( i18n("delete completed to-dos", "Pur&ge Completed To-dos"), 0, new TDEAction( i18n("delete completed to-dos", "Pur&ge Completed To-dos"), 0,
TQT_TQOBJECT(mCalendarView), TQT_SLOT( purgeCompleted() ), mACollection, mCalendarView, TQT_SLOT( purgeCompleted() ), mACollection,
"purge_completed" ); "purge_completed" );
@ -289,28 +289,28 @@ void ActionManager::initActions()
KOrg::History *h = mCalendarView->history(); KOrg::History *h = mCalendarView->history();
if ( mIsPart ) { if ( mIsPart ) {
// edit menu // edit menu
mCutAction = KStdAction::cut( TQT_TQOBJECT(mCalendarView), TQT_SLOT( edit_cut() ), mCutAction = KStdAction::cut( mCalendarView, TQT_SLOT( edit_cut() ),
mACollection, "korganizer_cut" ); mACollection, "korganizer_cut" );
mCopyAction = KStdAction::copy( TQT_TQOBJECT(mCalendarView), TQT_SLOT( edit_copy() ), mCopyAction = KStdAction::copy( mCalendarView, TQT_SLOT( edit_copy() ),
mACollection, "korganizer_copy" ); mACollection, "korganizer_copy" );
pasteAction = KStdAction::paste( TQT_TQOBJECT(mCalendarView), TQT_SLOT( edit_paste() ), pasteAction = KStdAction::paste( mCalendarView, TQT_SLOT( edit_paste() ),
mACollection, "korganizer_paste" ); mACollection, "korganizer_paste" );
mUndoAction = KStdAction::undo( h, TQT_SLOT( undo() ), mUndoAction = KStdAction::undo( h, TQT_SLOT( undo() ),
mACollection, "korganizer_undo" ); mACollection, "korganizer_undo" );
mRedoAction = KStdAction::redo( h, TQT_SLOT( redo() ), mRedoAction = KStdAction::redo( h, TQT_SLOT( redo() ),
mACollection, "korganizer_redo" ); mACollection, "korganizer_redo" );
} else { } else {
mCutAction = KStdAction::cut( TQT_TQOBJECT(mCalendarView),TQT_SLOT( edit_cut() ), mCutAction = KStdAction::cut( mCalendarView,TQT_SLOT( edit_cut() ),
mACollection ); mACollection );
mCopyAction = KStdAction::copy( TQT_TQOBJECT(mCalendarView),TQT_SLOT( edit_copy() ), mCopyAction = KStdAction::copy( mCalendarView,TQT_SLOT( edit_copy() ),
mACollection ); mACollection );
pasteAction = KStdAction::paste( TQT_TQOBJECT(mCalendarView),TQT_SLOT( edit_paste() ), pasteAction = KStdAction::paste( mCalendarView,TQT_SLOT( edit_paste() ),
mACollection ); mACollection );
mUndoAction = KStdAction::undo( TQT_TQOBJECT(h), TQT_SLOT( undo() ), mACollection ); mUndoAction = KStdAction::undo( h, TQT_SLOT( undo() ), mACollection );
mRedoAction = KStdAction::redo( TQT_TQOBJECT(h), TQT_SLOT( redo() ), mACollection ); mRedoAction = KStdAction::redo( h, TQT_SLOT( redo() ), mACollection );
} }
mDeleteAction = new TDEAction( i18n("&Delete"), "edit-delete", 0, mDeleteAction = new TDEAction( i18n("&Delete"), "edit-delete", 0,
TQT_TQOBJECT(mCalendarView), TQT_SLOT( appointment_delete() ), mCalendarView, TQT_SLOT( appointment_delete() ),
mACollection, "edit_delete" ); mACollection, "edit_delete" );
if ( mIsPart ) { if ( mIsPart ) {
KStdAction::find( mCalendarView->dialogManager(), TQT_SLOT( showSearchDialog() ), KStdAction::find( mCalendarView->dialogManager(), TQT_SLOT( showSearchDialog() ),
@ -381,7 +381,7 @@ void ActionManager::initActions()
//~~~~~~~~~~~~~~~~~~~~~~~~~~~ FILTERS ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //~~~~~~~~~~~~~~~~~~~~~~~~~~~ FILTERS ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
new TDEAction( i18n("&Refresh"), 0, new TDEAction( i18n("&Refresh"), 0,
TQT_TQOBJECT(mCalendarView), TQT_SLOT( updateView() ), mCalendarView, TQT_SLOT( updateView() ),
mACollection, "update" ); mACollection, "update" );
// TODO: // TODO:
// new TDEAction( i18n("Hide &Completed To-dos"), 0, // new TDEAction( i18n("Hide &Completed To-dos"), 0,
@ -398,7 +398,7 @@ void ActionManager::initActions()
connect( mCalendarView, TQT_SIGNAL( selectFilterSignal( int ) ), connect( mCalendarView, TQT_SIGNAL( selectFilterSignal( int ) ),
mFilterAction, TQT_SLOT( setCurrentItem( int ) ) ); mFilterAction, TQT_SLOT( setCurrentItem( int ) ) );
connect( mCalendarView, TQT_SIGNAL( filterChanged() ), connect( mCalendarView, TQT_SIGNAL( filterChanged() ),
TQT_TQOBJECT(this), TQT_SLOT( setTitle() ) ); this, TQT_SLOT( setTitle() ) );
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ZOOM ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ZOOM ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -422,11 +422,11 @@ void ActionManager::initActions()
//************************** Actions MENU ********************************* //************************** Actions MENU *********************************
new TDEAction( i18n("Go to &Today"), "today", 0, new TDEAction( i18n("Go to &Today"), "today", 0,
TQT_TQOBJECT(mCalendarView),TQT_SLOT( goToday() ), mCalendarView,TQT_SLOT( goToday() ),
mACollection, "go_today" ); mACollection, "go_today" );
bool isRTL = TQApplication::reverseLayout(); bool isRTL = TQApplication::reverseLayout();
action = new TDEAction( i18n("Go &Backward"), isRTL ? "forward" : "back", 0, action = new TDEAction( i18n("Go &Backward"), isRTL ? "forward" : "back", 0,
TQT_TQOBJECT(mCalendarView),TQT_SLOT( goPrevious() ), mCalendarView,TQT_SLOT( goPrevious() ),
mACollection, "go_previous" ); mACollection, "go_previous" );
// Changing the action text by setText makes the toolbar button disappear. // Changing the action text by setText makes the toolbar button disappear.
@ -435,10 +435,10 @@ void ActionManager::initActions()
connect( mCalendarView, TQT_SIGNAL( changeNavStringPrev( const TQString & ) ), connect( mCalendarView, TQT_SIGNAL( changeNavStringPrev( const TQString & ) ),
action, TQT_SLOT( setText( const TQString & ) ) ); action, TQT_SLOT( setText( const TQString & ) ) );
connect( mCalendarView, TQT_SIGNAL( changeNavStringPrev( const TQString & ) ), connect( mCalendarView, TQT_SIGNAL( changeNavStringPrev( const TQString & ) ),
TQT_TQOBJECT(this), TQT_SLOT( dumpText( const TQString & ) ) );*/ this, TQT_SLOT( dumpText( const TQString & ) ) );*/
action = new TDEAction( i18n("Go &Forward"), isRTL ? "back" : "forward", 0, action = new TDEAction( i18n("Go &Forward"), isRTL ? "back" : "forward", 0,
TQT_TQOBJECT(mCalendarView),TQT_SLOT( goNext() ), mCalendarView,TQT_SLOT( goNext() ),
mACollection, "go_next" ); mACollection, "go_next" );
/* /*
connect( mCalendarView,TQT_SIGNAL( changeNavStringNext( const TQString & ) ), connect( mCalendarView,TQT_SIGNAL( changeNavStringNext( const TQString & ) ),
@ -449,35 +449,35 @@ void ActionManager::initActions()
//************************** Actions MENU ********************************* //************************** Actions MENU *********************************
new TDEAction( i18n("New E&vent..."), new TDEAction( i18n("New E&vent..."),
KOGlobals::self()->smallIcon( "newappointment" ), 0, KOGlobals::self()->smallIcon( "newappointment" ), 0,
TQT_TQOBJECT(mCalendarView), TQT_SLOT(newEvent()), mCalendarView, TQT_SLOT(newEvent()),
mACollection, "new_event" ); mACollection, "new_event" );
new TDEAction( i18n("New &To-do..."), new TDEAction( i18n("New &To-do..."),
KOGlobals::self()->smallIcon( "newtodo" ), 0, KOGlobals::self()->smallIcon( "newtodo" ), 0,
TQT_TQOBJECT(mCalendarView), TQT_SLOT(newTodo()), mCalendarView, TQT_SLOT(newTodo()),
mACollection, "new_todo" ); mACollection, "new_todo" );
action = new TDEAction( i18n("New Su&b-to-do..."), 0, action = new TDEAction( i18n("New Su&b-to-do..."), 0,
TQT_TQOBJECT(mCalendarView),TQT_SLOT( newSubTodo() ), mCalendarView,TQT_SLOT( newSubTodo() ),
mACollection, "new_subtodo" ); mACollection, "new_subtodo" );
action->setEnabled( false ); action->setEnabled( false );
connect( mCalendarView,TQT_SIGNAL( todoSelected( bool ) ), connect( mCalendarView,TQT_SIGNAL( todoSelected( bool ) ),
action,TQT_SLOT( setEnabled( bool ) ) ); action,TQT_SLOT( setEnabled( bool ) ) );
new TDEAction( i18n("New &Journal..."), new TDEAction( i18n("New &Journal..."),
KOGlobals::self()->smallIcon( "newjournal" ), 0, KOGlobals::self()->smallIcon( "newjournal" ), 0,
TQT_TQOBJECT(mCalendarView), TQT_SLOT(newJournal()), mCalendarView, TQT_SLOT(newJournal()),
mACollection, "new_journal" ); mACollection, "new_journal" );
mShowIncidenceAction = new TDEAction( i18n("&Show"), 0, mShowIncidenceAction = new TDEAction( i18n("&Show"), 0,
TQT_TQOBJECT(mCalendarView),TQT_SLOT( showIncidence() ), mCalendarView,TQT_SLOT( showIncidence() ),
mACollection, "show_incidence" ); mACollection, "show_incidence" );
mEditIncidenceAction = new TDEAction( i18n("&Edit..."), 0, mEditIncidenceAction = new TDEAction( i18n("&Edit..."), 0,
TQT_TQOBJECT(mCalendarView),TQT_SLOT( editIncidence() ), mCalendarView,TQT_SLOT( editIncidence() ),
mACollection, "edit_incidence" ); mACollection, "edit_incidence" );
mDeleteIncidenceAction = new TDEAction( i18n("&Delete"), Key_Delete, mDeleteIncidenceAction = new TDEAction( i18n("&Delete"), Key_Delete,
TQT_TQOBJECT(mCalendarView),TQT_SLOT( deleteIncidence()), mCalendarView,TQT_SLOT( deleteIncidence()),
mACollection, "delete_incidence" ); mACollection, "delete_incidence" );
action = new TDEAction( i18n("&Make Sub-to-do Independent"), 0, action = new TDEAction( i18n("&Make Sub-to-do Independent"), 0,
TQT_TQOBJECT(mCalendarView),TQT_SLOT( todo_unsub() ), mCalendarView,TQT_SLOT( todo_unsub() ),
mACollection, "unsub_todo" ); mACollection, "unsub_todo" );
action->setEnabled( false ); action->setEnabled( false );
connect( mCalendarView,TQT_SIGNAL( subtodoSelected( bool ) ), connect( mCalendarView,TQT_SIGNAL( subtodoSelected( bool ) ),
@ -496,27 +496,27 @@ void ActionManager::initActions()
//************************** SCHEDULE MENU ******************************** //************************** SCHEDULE MENU ********************************
mPublishEvent = new TDEAction( i18n("&Publish Item Information..."), "mail-send", 0, mPublishEvent = new TDEAction( i18n("&Publish Item Information..."), "mail-send", 0,
TQT_TQOBJECT(mCalendarView), TQT_SLOT( schedule_publish() ), mCalendarView, TQT_SLOT( schedule_publish() ),
mACollection, "schedule_publish" ); mACollection, "schedule_publish" );
mPublishEvent->setEnabled( false ); mPublishEvent->setEnabled( false );
mSendInvitation = new TDEAction( i18n( "Send &Invitation to Attendees" ), mSendInvitation = new TDEAction( i18n( "Send &Invitation to Attendees" ),
"mail_generic", 0, "mail_generic", 0,
TQT_TQOBJECT(mCalendarView), TQT_SLOT(schedule_request()), mCalendarView, TQT_SLOT(schedule_request()),
mACollection, "schedule_request" ); mACollection, "schedule_request" );
mSendInvitation->setEnabled( false ); mSendInvitation->setEnabled( false );
connect( mCalendarView, TQT_SIGNAL(organizerEventsSelected(bool)), connect( mCalendarView, TQT_SIGNAL(organizerEventsSelected(bool)),
mSendInvitation, TQT_SLOT(setEnabled(bool)) ); mSendInvitation, TQT_SLOT(setEnabled(bool)) );
mRequestUpdate = new TDEAction( i18n( "Re&quest Update" ), 0, mRequestUpdate = new TDEAction( i18n( "Re&quest Update" ), 0,
TQT_TQOBJECT(mCalendarView), TQT_SLOT(schedule_refresh()), mCalendarView, TQT_SLOT(schedule_refresh()),
mACollection, "schedule_refresh" ); mACollection, "schedule_refresh" );
mRequestUpdate->setEnabled( false ); mRequestUpdate->setEnabled( false );
connect( mCalendarView, TQT_SIGNAL(groupEventsSelected(bool)), connect( mCalendarView, TQT_SIGNAL(groupEventsSelected(bool)),
mRequestUpdate, TQT_SLOT(setEnabled(bool)) ); mRequestUpdate, TQT_SLOT(setEnabled(bool)) );
mSendCancel = new TDEAction( i18n( "Send &Cancelation to Attendees" ), 0, mSendCancel = new TDEAction( i18n( "Send &Cancelation to Attendees" ), 0,
TQT_TQOBJECT(mCalendarView), TQT_SLOT(schedule_cancel()), mCalendarView, TQT_SLOT(schedule_cancel()),
mACollection, "schedule_cancel" ); mACollection, "schedule_cancel" );
mSendCancel->setEnabled( false ); mSendCancel->setEnabled( false );
connect( mCalendarView, TQT_SIGNAL(organizerEventsSelected(bool)), connect( mCalendarView, TQT_SIGNAL(organizerEventsSelected(bool)),
@ -524,37 +524,37 @@ void ActionManager::initActions()
mSendStatusUpdate = new TDEAction( i18n( "Send Status &Update" ), mSendStatusUpdate = new TDEAction( i18n( "Send Status &Update" ),
"mail-reply-sender", 0, "mail-reply-sender", 0,
TQT_TQOBJECT(mCalendarView),TQT_SLOT(schedule_reply()), mCalendarView,TQT_SLOT(schedule_reply()),
mACollection, "schedule_reply" ); mACollection, "schedule_reply" );
mSendStatusUpdate->setEnabled( false ); mSendStatusUpdate->setEnabled( false );
connect( mCalendarView, TQT_SIGNAL(groupEventsSelected(bool)), connect( mCalendarView, TQT_SIGNAL(groupEventsSelected(bool)),
mSendStatusUpdate, TQT_SLOT(setEnabled(bool)) ); mSendStatusUpdate, TQT_SLOT(setEnabled(bool)) );
mRequestChange = new TDEAction( i18n( "counter proposal", "Request Chan&ge" ), 0, mRequestChange = new TDEAction( i18n( "counter proposal", "Request Chan&ge" ), 0,
TQT_TQOBJECT(mCalendarView), TQT_SLOT(schedule_counter()), mCalendarView, TQT_SLOT(schedule_counter()),
mACollection, "schedule_counter" ); mACollection, "schedule_counter" );
mRequestChange->setEnabled( false ); mRequestChange->setEnabled( false );
connect( mCalendarView, TQT_SIGNAL(groupEventsSelected(bool)), connect( mCalendarView, TQT_SIGNAL(groupEventsSelected(bool)),
mRequestChange, TQT_SLOT(setEnabled(bool)) ); mRequestChange, TQT_SLOT(setEnabled(bool)) );
mForwardEvent = new TDEAction( i18n("&Send as iCalendar..."), "mail-forward", 0, mForwardEvent = new TDEAction( i18n("&Send as iCalendar..."), "mail-forward", 0,
TQT_TQOBJECT(mCalendarView), TQT_SLOT(schedule_forward()), mCalendarView, TQT_SLOT(schedule_forward()),
mACollection, "schedule_forward" ); mACollection, "schedule_forward" );
mForwardEvent->setEnabled( false ); mForwardEvent->setEnabled( false );
action = new TDEAction( i18n("&Mail Free Busy Information..."), 0, action = new TDEAction( i18n("&Mail Free Busy Information..."), 0,
TQT_TQOBJECT(mCalendarView), TQT_SLOT( mailFreeBusy() ), mCalendarView, TQT_SLOT( mailFreeBusy() ),
mACollection, "mail_freebusy" ); mACollection, "mail_freebusy" );
action->setEnabled( true ); action->setEnabled( true );
action = new TDEAction( i18n("&Upload Free Busy Information"), 0, action = new TDEAction( i18n("&Upload Free Busy Information"), 0,
TQT_TQOBJECT(mCalendarView), TQT_SLOT( uploadFreeBusy() ), mCalendarView, TQT_SLOT( uploadFreeBusy() ),
mACollection, "upload_freebusy" ); mACollection, "upload_freebusy" );
action->setEnabled( true ); action->setEnabled( true );
if ( !mIsPart ) { if ( !mIsPart ) {
action = new TDEAction( i18n("&Addressbook"),"contents",0, action = new TDEAction( i18n("&Addressbook"),"contents",0,
TQT_TQOBJECT(mCalendarView),TQT_SLOT( openAddressbook() ), mCalendarView,TQT_SLOT( openAddressbook() ),
mACollection,"addressbook" ); mACollection,"addressbook" );
} }
@ -565,13 +565,13 @@ void ActionManager::initActions()
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~ SIDEBAR ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~ SIDEBAR ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
mDateNavigatorShowAction = new TDEToggleAction( i18n("Show Date Navigator"), 0, mDateNavigatorShowAction = new TDEToggleAction( i18n("Show Date Navigator"), 0,
TQT_TQOBJECT(this), TQT_SLOT( toggleDateNavigator() ), this, TQT_SLOT( toggleDateNavigator() ),
mACollection, "show_datenavigator" ); mACollection, "show_datenavigator" );
mTodoViewShowAction = new TDEToggleAction ( i18n("Show To-do View"), 0, mTodoViewShowAction = new TDEToggleAction ( i18n("Show To-do View"), 0,
TQT_TQOBJECT(this), TQT_SLOT( toggleTodoView() ), this, TQT_SLOT( toggleTodoView() ),
mACollection, "show_todoview" ); mACollection, "show_todoview" );
mEventViewerShowAction = new TDEToggleAction ( i18n("Show Item Viewer"), 0, mEventViewerShowAction = new TDEToggleAction ( i18n("Show Item Viewer"), 0,
TQT_TQOBJECT(this), TQT_SLOT( toggleEventViewer() ), this, TQT_SLOT( toggleEventViewer() ),
mACollection, "show_eventviewer" ); mACollection, "show_eventviewer" );
TDEConfig *config = KOGlobals::self()->config(); TDEConfig *config = KOGlobals::self()->config();
config->setGroup( "Settings" ); config->setGroup( "Settings" );
@ -590,10 +590,10 @@ void ActionManager::initActions()
if ( !mMainWindow->hasDocument() ) { if ( !mMainWindow->hasDocument() ) {
mResourceViewShowAction = new TDEToggleAction ( i18n("Show Resource View"), 0, mResourceViewShowAction = new TDEToggleAction ( i18n("Show Resource View"), 0,
TQT_TQOBJECT(this), TQT_SLOT( toggleResourceView() ), this, TQT_SLOT( toggleResourceView() ),
mACollection, "show_resourceview" ); mACollection, "show_resourceview" );
mResourceButtonsAction = new TDEToggleAction( i18n("Show &Resource Buttons"), 0, mResourceButtonsAction = new TDEToggleAction( i18n("Show &Resource Buttons"), 0,
TQT_TQOBJECT(this), TQT_SLOT( toggleResourceButtons() ), this, TQT_SLOT( toggleResourceButtons() ),
mACollection, "show_resourcebuttons" ); mACollection, "show_resourcebuttons" );
mResourceViewShowAction->setChecked( mResourceViewShowAction->setChecked(
config->readBoolEntry( "ResourceViewVisible", true ) ); config->readBoolEntry( "ResourceViewVisible", true ) );
@ -608,35 +608,35 @@ void ActionManager::initActions()
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~ SIDEBAR ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~ SIDEBAR ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
new TDEAction( i18n("Configure &Date && Time..."), 0, new TDEAction( i18n("Configure &Date && Time..."), 0,
TQT_TQOBJECT(this), TQT_SLOT( configureDateTime() ), this, TQT_SLOT( configureDateTime() ),
mACollection, "conf_datetime" ); mACollection, "conf_datetime" );
// TODO: Add an item to show the resource management dlg // TODO: Add an item to show the resource management dlg
// new TDEAction( i18n("Manage &Resources..."), 0, // new TDEAction( i18n("Manage &Resources..."), 0,
// TQT_TQOBJECT(this), TQT_SLOT( manageResources() ), // this, TQT_SLOT( manageResources() ),
// mACollection, "conf_resources" ); // mACollection, "conf_resources" );
new TDEAction( i18n("Manage View &Filters..."), "configure", 0, new TDEAction( i18n("Manage View &Filters..."), "configure", 0,
TQT_TQOBJECT(mCalendarView), TQT_SLOT( editFilters() ), mCalendarView, TQT_SLOT( editFilters() ),
mACollection, "edit_filters" ); mACollection, "edit_filters" );
new TDEAction( i18n("Manage C&ategories..."), 0, new TDEAction( i18n("Manage C&ategories..."), 0,
TQT_TQOBJECT(mCalendarView->dialogManager()), TQT_SLOT( showCategoryEditDialog() ), mCalendarView->dialogManager(), TQT_SLOT( showCategoryEditDialog() ),
mACollection, "edit_categories" ); mACollection, "edit_categories" );
if ( mIsPart ) { if ( mIsPart ) {
new TDEAction( i18n("&Configure Calendar..."), "configure", 0, new TDEAction( i18n("&Configure Calendar..."), "configure", 0,
TQT_TQOBJECT(mCalendarView), TQT_SLOT( edit_options() ), mCalendarView, TQT_SLOT( edit_options() ),
mACollection, "korganizer_configure" ); mACollection, "korganizer_configure" );
KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( keyBindings() ), KStdAction::keyBindings( this, TQT_SLOT( keyBindings() ),
mACollection, "korganizer_configure_shortcuts" ); mACollection, "korganizer_configure_shortcuts" );
} else { } else {
KStdAction::preferences( TQT_TQOBJECT(mCalendarView), TQT_SLOT( edit_options() ), KStdAction::preferences( mCalendarView, TQT_SLOT( edit_options() ),
mACollection ); mACollection );
KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( keyBindings() ), mACollection ); KStdAction::keyBindings( this, TQT_SLOT( keyBindings() ), mACollection );
} }
//**************************** HELP MENU ********************************** //**************************** HELP MENU **********************************
KStdAction::tipOfDay( TQT_TQOBJECT(this), TQT_SLOT( showTip() ), mACollection, KStdAction::tipOfDay( this, TQT_SLOT( showTip() ), mACollection,
"help_tipofday" ); "help_tipofday" );
// new TDEAction( i18n("Show Intro Page"), 0, // new TDEAction( i18n("Show Intro Page"), 0,
// mCalendarView,TQT_SLOT( showIntro() ), // mCalendarView,TQT_SLOT( showIntro() ),

6
korganizer/calendarview.cpp
Unescape View File

@ -131,8 +131,8 @@ CalendarView::CalendarView( TQWidget *parent, const char *name )
mExtensions.setAutoDelete( true ); mExtensions.setAutoDelete( true );
mDateNavigator = new DateNavigator( TQT_TQOBJECT(this) ); mDateNavigator = new DateNavigator( this );
mDateChecker = new DateChecker( TQT_TQOBJECT(this) ); mDateChecker = new DateChecker( this );
TQBoxLayout *topLayout = new TQVBoxLayout( this ); TQBoxLayout *topLayout = new TQVBoxLayout( this );
@ -311,7 +311,7 @@ void CalendarView::setCalendar( Calendar *cal )
connect( mHistory, TQT_SIGNAL( redone() ), TQT_SLOT( updateView() ) ); connect( mHistory, TQT_SIGNAL( redone() ), TQT_SLOT( updateView() ) );
if ( mChanger ) delete mChanger; if ( mChanger ) delete mChanger;
setIncidenceChanger( new IncidenceChanger( mCalendar, TQT_TQOBJECT(this) ) ); setIncidenceChanger( new IncidenceChanger( mCalendar, this ) );
mCalendar->registerObserver( this ); mCalendar->registerObserver( this );

2
korganizer/interfaces/korganizer/part.h
Unescape View File

@ -39,7 +39,7 @@ class Part : public KParts::Part
typedef TQPtrList<Part> List; typedef TQPtrList<Part> List;
Part( MainWindow *parent, const char *name ) Part( MainWindow *parent, const char *name )
: KParts::Part( parent?(TQT_TQOBJECT(parent->topLevelWidget())):0, name ), mMainWindow( parent ) {} : KParts::Part( parent?(parent->topLevelWidget()):0, name ), mMainWindow( parent ) {}
virtual ~Part() {} virtual ~Part() {}

2
korganizer/koagenda.cpp
Unescape View File

@ -423,7 +423,7 @@ bool KOAgenda::eventFilter_drag( TQObject *object, TQDropEvent *de )
#ifndef KORG_NODND #ifndef KORG_NODND
TQPoint viewportPos; TQPoint viewportPos;
if ( object != viewport() && object != this ) { if ( object != viewport() && object != this ) {
viewportPos = TQT_TQWIDGET( object )->mapToParent( de->pos() ); viewportPos = static_cast<TQWidget*>( object )->mapToParent( de->pos() );
} else { } else {
viewportPos = de->pos(); viewportPos = de->pos();
} }

16
korganizer/koeditorattachments.cpp
Unescape View File

@ -490,29 +490,29 @@ KOEditorAttachments::KOEditorAttachments( int spacing, TQWidget *parent,
mContextMenu = new TDEPopupMenu( this ); mContextMenu = new TDEPopupMenu( this );
TDEActionCollection* ac = new TDEActionCollection( TQT_TQWIDGET(this), TQT_TQOBJECT(this) ); TDEActionCollection* ac = new TDEActionCollection( this, this );
mOpenAction = new TDEAction( i18n("Open"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShow()), ac ); mOpenAction = new TDEAction( i18n("Open"), 0, this, TQT_SLOT(slotShow()), ac );
mOpenAction->plug( mContextMenu ); mOpenAction->plug( mContextMenu );
mSaveAsAction = new TDEAction( i18n( "Save As..." ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs()), ac ); mSaveAsAction = new TDEAction( i18n( "Save As..." ), 0, this, TQT_SLOT(slotSaveAs()), ac );
mSaveAsAction->plug( mContextMenu ); mSaveAsAction->plug( mContextMenu );
mContextMenu->insertSeparator(); mContextMenu->insertSeparator();
mCopyAction = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), ac ); mCopyAction = KStdAction::copy(this, TQT_SLOT(slotCopy()), ac );
mCopyAction->plug( mContextMenu ); mCopyAction->plug( mContextMenu );
mCutAction = KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(slotCut()), ac ); mCutAction = KStdAction::cut(this, TQT_SLOT(slotCut()), ac );
mCutAction->plug( mContextMenu ); mCutAction->plug( mContextMenu );
TDEAction *action = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), ac ); TDEAction *action = KStdAction::paste(this, TQT_SLOT(slotPaste()), ac );
action->plug( mContextMenu ); action->plug( mContextMenu );
mContextMenu->insertSeparator(); mContextMenu->insertSeparator();
mDeleteAction = new TDEAction( i18n( "&Remove" ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotRemove()), ac ); mDeleteAction = new TDEAction( i18n( "&Remove" ), 0, this, TQT_SLOT(slotRemove()), ac );
mDeleteAction->plug( mContextMenu ); mDeleteAction->plug( mContextMenu );
mDeleteAction->setShortcut( Key_Delete ); mDeleteAction->setShortcut( Key_Delete );
mContextMenu->insertSeparator(); mContextMenu->insertSeparator();
mEditAction = new TDEAction( i18n( "&Properties..." ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotEdit()), ac ); mEditAction = new TDEAction( i18n( "&Properties..." ), 0, this, TQT_SLOT(slotEdit()), ac );
mEditAction->plug( mContextMenu ); mEditAction->plug( mContextMenu );
selectionChanged(); selectionChanged();

2
korganizer/koeditorgeneral.cpp
Unescape View File

@ -573,7 +573,7 @@ void KOEditorGeneral::setDescription( const TQString &text )
TQObject *KOEditorGeneral::typeAheadReceiver() const TQObject *KOEditorGeneral::typeAheadReceiver() const
{ {
return TQT_TQOBJECT(mSummaryEdit); return mSummaryEdit;
} }
void KOEditorGeneral::updateAttendeeSummary(int count) void KOEditorGeneral::updateAttendeeSummary(int count)

2
korganizer/koeditorgeneraljournal.cpp
Unescape View File

@ -47,7 +47,7 @@
KOEditorGeneralJournal::KOEditorGeneralJournal( TQWidget *parent, KOEditorGeneralJournal::KOEditorGeneralJournal( TQWidget *parent,
const char *name ) const char *name )
: KOEditorGeneral( TQT_TQOBJECT(parent), name ) : KOEditorGeneral( parent, name )
{ {
setType( "Journal" ); setType( "Journal" );
} }

2
korganizer/koeventeditor.cpp
Unescape View File

@ -116,7 +116,7 @@ void KOEventEditor::reload()
void KOEventEditor::setupGeneral() void KOEventEditor::setupGeneral()
{ {
mGeneral = new KOEditorGeneralEvent( TQT_TQOBJECT(this) ); mGeneral = new KOEditorGeneralEvent( this );
if( KOPrefs::instance()->mCompactDialogs ) { if( KOPrefs::instance()->mCompactDialogs ) {
TQFrame *topFrame = addPage(i18n("General")); TQFrame *topFrame = addPage(i18n("General"));

8
korganizer/korganizer.cpp
Unescape View File

@ -101,8 +101,8 @@ KOrganizer::KOrganizer( const char *name )
mCalendarView = new CalendarView( this, "KOrganizer::CalendarView" ); mCalendarView = new CalendarView( this, "KOrganizer::CalendarView" );
setCentralWidget(mCalendarView); setCentralWidget(mCalendarView);
mActionManager = new ActionManager( this, mCalendarView, TQT_TQOBJECT(this), this, false ); mActionManager = new ActionManager( this, mCalendarView, this, this, false );
(void)new KOrganizerIfaceImpl( mActionManager, TQT_TQOBJECT(this), "IfaceImpl" ); (void)new KOrganizerIfaceImpl( mActionManager, this, "IfaceImpl" );
} }
KOrganizer::~KOrganizer() KOrganizer::~KOrganizer()
@ -209,8 +209,8 @@ void KOrganizer::initActions()
createStandardStatusBarAction(); createStandardStatusBarAction();
KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection()); KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection());
KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configureToolbars() ), actionCollection()); KStdAction::configureToolbars(this, TQT_SLOT(configureToolbars() ), actionCollection());
KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() ); KStdAction::quit( this, TQT_SLOT( close() ), actionCollection() );
setAutoSaveSettings(); setAutoSaveSettings();
createGUI( 0 ); createGUI( 0 );

2
korganizer/kotodoeditor.cpp
Unescape View File

@ -94,7 +94,7 @@ void KOTodoEditor::reload()
void KOTodoEditor::setupGeneral() void KOTodoEditor::setupGeneral()
{ {
mGeneral = new KOEditorGeneralTodo(TQT_TQOBJECT(this)); mGeneral = new KOEditorGeneralTodo(this);
if (KOPrefs::instance()->mCompactDialogs) { if (KOPrefs::instance()->mCompactDialogs) {
TQFrame *topFrame = addPage(i18n("General")); TQFrame *topFrame = addPage(i18n("General"));

2
korn/account_input.cpp
Unescape View File

@ -65,7 +65,7 @@ TextInput::TextInput( TQWidget *parent, const TQString& title, int min, int max,
{ {
_left = new TQLabel( title, parent, "label" ); _left = new TQLabel( title, parent, "label" );
_right = new KLineEdit( "", parent, "edit" ); _right = new KLineEdit( "", parent, "edit" );
_right->setValidator( new TQIntValidator( min, max, TQT_TQOBJECT(_right), "validator" ) ); _right->setValidator( new TQIntValidator( min, max, _right, "validator" ) );
setValue( defaul ); setValue( defaul );
} }

2
korn/dockeditem.cpp
Unescape View File

@ -37,7 +37,7 @@
#include <tqmovie.h> #include <tqmovie.h>
DockedItem::DockedItem( TQWidget * parent, const char * name ) DockedItem::DockedItem( TQWidget * parent, const char * name )
: BoxContainerItem( TQT_TQOBJECT(parent), name ), : BoxContainerItem( parent, name ),
_systemtray( new SystemTray( parent, "System tray" ) ) _systemtray( new SystemTray( parent, "System tray" ) )
{ {
this->fillTDEPopupMenu( _systemtray->contextMenu(), _systemtray->actionCollection() ); this->fillTDEPopupMenu( _systemtray->contextMenu(), _systemtray->actionCollection() );

2
korn/hvitem.cpp
Unescape View File

@ -39,7 +39,7 @@ HVItem::HVItem( TQWidget *parent, const char *name )
_popup->insertTitle( kapp->miniIcon(), kapp->caption() ); _popup->insertTitle( kapp->miniIcon(), kapp->caption() );
this->fillTDEPopupMenu( _popup, _actions ); this->fillTDEPopupMenu( _popup, _actions );
_popup->insertSeparator(); _popup->insertSeparator();
KStdAction::quit( TQT_TQOBJECT(kapp), TQT_SLOT( quit() ), _actions )->plug( _popup ); KStdAction::quit( kapp, TQT_SLOT( quit() ), _actions )->plug( _popup );
connect( _label, TQT_SIGNAL( mouseButtonPressed( TQt::ButtonState ) ), this, TQT_SLOT( mouseButtonPressed( TQt::ButtonState ) ) ); connect( _label, TQT_SIGNAL( mouseButtonPressed( TQt::ButtonState ) ), this, TQT_SLOT( mouseButtonPressed( TQt::ButtonState ) ) );
} }

2
korn/kornaccountcfgimpl.cpp
Unescape View File

@ -195,7 +195,7 @@ void KornAccountCfgImpl::slotProtocolChanged( const TQString& proto )
delete groupBoxes; delete groupBoxes;
AccountInput *input; AccountInput *input;
protocol->configFields( _groupBoxes, TQT_TQOBJECT(this), _accountinput ); protocol->configFields( _groupBoxes, this, _accountinput );
for( unsigned int groupCounter = 0; groupCounter < _groupBoxes->count(); ++groupCounter ) for( unsigned int groupCounter = 0; groupCounter < _groupBoxes->count(); ++groupCounter )
{ {

6
korn/kornshell.cpp
Unescape View File

@ -99,11 +99,11 @@ void KornShell::readConfig()
KOrnPassword::setUseWallet( _config->readBoolEntry( "usewallet", false ) ); KOrnPassword::setUseWallet( _config->readBoolEntry( "usewallet", false ) );
if( layout == 'H' ) if( layout == 'H' )
_box = new HVContainer( TQt::Horizontal, TQT_TQOBJECT(this), "horizontal container" ); _box = new HVContainer( TQt::Horizontal, this, "horizontal container" );
else if( layout == 'V' ) else if( layout == 'V' )
_box = new HVContainer( TQt::Vertical, TQT_TQOBJECT(this), "vertical container" ); _box = new HVContainer( TQt::Vertical, this, "vertical container" );
else else
_box = new DockedContainer( TQT_TQOBJECT(this), "docked container" ); _box = new DockedContainer( this, "docked container" );
connect( _box, TQT_SIGNAL( showConfiguration() ), this, TQT_SLOT( optionDlg() ) ); connect( _box, TQT_SIGNAL( showConfiguration() ), this, TQT_SLOT( optionDlg() ) );

28
ktnef/gui/ktnefmain.cpp
Unescape View File

@ -85,19 +85,19 @@ KTNEFMain::~KTNEFMain()
void KTNEFMain::setupActions() void KTNEFMain::setupActions()
{ {
// File menu // File menu
KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(openFile()), actionCollection()); KStdAction::open(this, TQT_SLOT(openFile()), actionCollection());
KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection()); KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection());
// Action menu // Action menu
new TDEAction(i18n("View"), TQString("viewmag"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewFile()), actionCollection(), "view_file"); new TDEAction(i18n("View"), TQString("viewmag"), 0, this, TQT_SLOT(viewFile()), actionCollection(), "view_file");
new TDEAction(i18n("View With..."), TQString("package_applications"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewFileAs()), actionCollection(), "view_file_as"); new TDEAction(i18n("View With..."), TQString("package_applications"), 0, this, TQT_SLOT(viewFileAs()), actionCollection(), "view_file_as");
new TDEAction(i18n("Extract"), 0, TQT_TQOBJECT(this), TQT_SLOT(extractFile()), actionCollection(), "extract_file"); new TDEAction(i18n("Extract"), 0, this, TQT_SLOT(extractFile()), actionCollection(), "extract_file");
new TDEAction(i18n("Extract To..."), TQString("ktnef_extract_to"), 0, TQT_TQOBJECT(this), TQT_SLOT(extractFileTo()), actionCollection(), "extract_file_to"); 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, TQT_TQOBJECT(this), TQT_SLOT(extractAllFiles()), actionCollection(), "extract_all_files"); 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, TQT_TQOBJECT(this), TQT_SLOT( slotShowMessageProperties() ), actionCollection(), "msg_properties" ); new TDEAction( i18n( "Message Properties" ), "help", 0, this, TQT_SLOT( slotShowMessageProperties() ), actionCollection(), "msg_properties" );
new TDEAction(i18n("Properties"), TQString("contents"), 0, TQT_TQOBJECT(this), TQT_SLOT(propertiesFile()), actionCollection(), "properties_file"); new TDEAction(i18n("Properties"), TQString("contents"), 0, this, TQT_SLOT(propertiesFile()), actionCollection(), "properties_file");
new TDEAction( i18n( "Show Message Text" ), "mail_generic", 0, TQT_TQOBJECT(this), TQT_SLOT( slotShowMessageText() ), actionCollection(), "msg_text" ); 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, TQT_TQOBJECT(this), TQT_SLOT( slotSaveMessageText() ), actionCollection(), "msg_save" ); new TDEAction( i18n( "Save Message Text As..." ), "document-save", 0, this, TQT_SLOT( slotSaveMessageText() ), actionCollection(), "msg_save" );
actionCollection()->action("view_file")->setEnabled(false); actionCollection()->action("view_file")->setEnabled(false);
actionCollection()->action("view_file_as")->setEnabled(false); actionCollection()->action("view_file_as")->setEnabled(false);
actionCollection()->action("extract_file")->setEnabled(false); actionCollection()->action("extract_file")->setEnabled(false);
@ -106,12 +106,12 @@ void KTNEFMain::setupActions()
actionCollection()->action("properties_file")->setEnabled(false); actionCollection()->action("properties_file")->setEnabled(false);
// Option menu // Option menu
new TDEAction(i18n("Default Folder..."), TQString("folder_open"), 0, TQT_TQOBJECT(this), TQT_SLOT(optionDefaultDir()), actionCollection(), "options_default_dir"); new TDEAction(i18n("Default Folder..."), TQString("folder_open"), 0, this, TQT_SLOT(optionDefaultDir()), actionCollection(), "options_default_dir");
createStandardStatusBarAction(); createStandardStatusBarAction();
setStandardToolBarMenuEnabled(true); setStandardToolBarMenuEnabled(true);
KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotEditToolbars()), actionCollection()); KStdAction::configureToolbars(this, TQT_SLOT(slotEditToolbars()), actionCollection());
KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( slotConfigureKeys() ), actionCollection() ); KStdAction::keyBindings( this, TQT_SLOT( slotConfigureKeys() ), actionCollection() );
createGUI(); createGUI();
} }

10
libtdepim/addresseeselector.cpp
Unescape View File

@ -227,8 +227,8 @@ class SelectionViewItem : public TQListViewItem
AddresseeSelector::AddresseeSelector( Selection *selection, TQWidget *parent, const char *name ) AddresseeSelector::AddresseeSelector( Selection *selection, TQWidget *parent, const char *name )
: TQWidget( parent, name ), mSelection( selection ), mManager( 0 ) : TQWidget( parent, name ), mSelection( selection ), mManager( 0 )
{ {
mMoveMapper = new TQSignalMapper( TQT_TQOBJECT(this) ); mMoveMapper = new TQSignalMapper( this );
mRemoveMapper = new TQSignalMapper( TQT_TQOBJECT(this) ); mRemoveMapper = new TQSignalMapper( this );
mAddressBookManager = new AddressBookManager(); mAddressBookManager = new AddressBookManager();
@ -300,7 +300,7 @@ void AddresseeSelector::initGUI()
connect( listView, TQT_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ), connect( listView, TQT_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int ) ),
mRemoveMapper, TQT_SLOT( map() ) ); mRemoveMapper, TQT_SLOT( map() ) );
mRemoveMapper->setMapping( TQT_TQOBJECT(listView), i ); mRemoveMapper->setMapping( listView, i );
TQVBoxLayout *buttonLayout = new TQVBoxLayout( this ); TQVBoxLayout *buttonLayout = new TQVBoxLayout( this );
buttonLayout->setAlignment( TQt::AlignBottom ); buttonLayout->setAlignment( TQt::AlignBottom );
@ -313,7 +313,7 @@ void AddresseeSelector::initGUI()
connect( moveButton, TQT_SIGNAL( clicked() ), connect( moveButton, TQT_SIGNAL( clicked() ),
mMoveMapper, TQT_SLOT( map() ) ); mMoveMapper, TQT_SLOT( map() ) );
mMoveMapper->setMapping( TQT_TQOBJECT(moveButton), i ); mMoveMapper->setMapping( moveButton, i );
// remove button // remove button
TQToolButton *removeButton = new TQToolButton( this ); TQToolButton *removeButton = new TQToolButton( this );
@ -322,7 +322,7 @@ void AddresseeSelector::initGUI()
connect( removeButton, TQT_SIGNAL( clicked() ), connect( removeButton, TQT_SIGNAL( clicked() ),
mRemoveMapper, TQT_SLOT( map() ) ); mRemoveMapper, TQT_SLOT( map() ) );
mRemoveMapper->setMapping( TQT_TQOBJECT(removeButton), i ); mRemoveMapper->setMapping( removeButton, i );
buttonLayout->addWidget( moveButton ); buttonLayout->addWidget( moveButton );
buttonLayout->addWidget( removeButton ); buttonLayout->addWidget( removeButton );

2
libtdepim/designerfields.cpp
Unescape View File

@ -83,7 +83,7 @@ void DesignerFields::initGUI( const TQString &uiFile )
if ( name.startsWith( "X_" ) ) { if ( name.startsWith( "X_" ) ) {
name = name.mid( 2 ); name = name.mid( 2 );
TQWidget *widget = TQT_TQWIDGET( it.current() ); TQWidget *widget = static_cast<TQWidget*>( it.current() );
if ( !name.isEmpty() ) if ( !name.isEmpty() )
mWidgets.insert( name, widget ); mWidgets.insert( name, widget );

2
libtdepim/embeddedurlpage.cpp
Unescape View File

@ -55,7 +55,7 @@ void EmbeddedURLPage::loadContents()
if ( mimetype == "auto" ) if ( mimetype == "auto" )
mimetype == KMimeType::findByURL( mUri )->name(); mimetype == KMimeType::findByURL( mUri )->name();
// "this" is both the parent widget and the parent object // "this" is both the parent widget and the parent object
mPart = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype, TQString(), TQT_TQWIDGET(this), 0, TQT_TQOBJECT(this), 0 ); mPart = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype, TQString(), this, 0, this, 0 );
if ( mPart ) { if ( mPart ) {
mPart->openURL( mUri ); mPart->openURL( mUri );
mPart->widget()->show(); mPart->widget()->show();

4
libtdepim/kcmdesignerfields.cpp
Unescape View File

@ -91,7 +91,7 @@ class PageItem : public TQCheckListItem
new TQListViewItem( this, name, new TQListViewItem( this, name,
allowedTypes[ it.current()->className() ], allowedTypes[ it.current()->className() ],
it.current()->className(), it.current()->className(),
TQWhatsThis::textFor( TQT_TQWIDGET( it.current() ) ) ); TQWhatsThis::textFor( static_cast<TQWidget*>( it.current() ) ) );
} }
} }
@ -162,7 +162,7 @@ void KCMDesignerFields::delayedInit()
load(); load();
// Install a dirwatcher that will detect newly created or removed designer files // Install a dirwatcher that will detect newly created or removed designer files
KDirWatch *dw = new KDirWatch( TQT_TQOBJECT(this) ); KDirWatch *dw = new KDirWatch( this );
TDEStandardDirs::makeDir(localUiDir()); TDEStandardDirs::makeDir(localUiDir());
dw->addDir( localUiDir(), true ); dw->addDir( localUiDir(), true );
connect( dw, TQT_SIGNAL( created(const TQString&) ), TQT_SLOT( rebuildList() ) ); connect( dw, TQT_SIGNAL( created(const TQString&) ), TQT_SLOT( rebuildList() ) );

2
libtdepim/kdateedit.cpp
Unescape View File

@ -38,7 +38,7 @@ class DateValidator : public TQValidator
{ {
public: public:
DateValidator( const TQStringList &keywords, TQWidget* parent, const char* name = 0 ) DateValidator( const TQStringList &keywords, TQWidget* parent, const char* name = 0 )
: TQValidator( TQT_TQOBJECT(parent), name ), mKeywords( keywords ) : TQValidator( parent, name ), mKeywords( keywords )
{} {}
virtual State validate( TQString &str, int& ) const virtual State validate( TQString &str, int& ) const

2
libtdepim/kincidencechooser.cpp
Unescape View File

@ -249,7 +249,7 @@ void KIncidenceChooser::showIncidence1()
void KIncidenceChooser::detailsDialogClosed() void KIncidenceChooser::detailsDialogClosed()
{ {
KDialogBase* dialog = static_cast<KDialogBase *>(TQT_TQWIDGET(const_cast<TQObject*>(sender()))) ; KDialogBase* dialog = static_cast<KDialogBase *>(const_cast<TQObject*>(sender())) ;
if ( dialog == mTbL ) if ( dialog == mTbL )
mShowDetails1->setText( i18n( "Show details..." ) ); mShowDetails1->setText( i18n( "Show details..." ) );
else else

8
libtdepim/kpixmapregionselectorwidget.cpp
Unescape View File

@ -144,13 +144,13 @@ TDEPopupMenu *KPixmapRegionSelectorWidget::createPopupMenu()
popup->insertTitle(i18n("Image Operations")); popup->insertTitle(i18n("Image Operations"));
TDEAction *action = new TDEAction(i18n("&Rotate Clockwise"), "object-rotate-right", TDEAction *action = new TDEAction(i18n("&Rotate Clockwise"), "object-rotate-right",
0, TQT_TQOBJECT(this), TQT_SLOT(rotateClockwise()), 0, this, TQT_SLOT(rotateClockwise()),
TQT_TQOBJECT(popup), "rotateclockwise"); popup, "rotateclockwise");
action->plug(popup); action->plug(popup);
action = new TDEAction(i18n("Rotate &Counterclockwise"), "object-rotate-left", action = new TDEAction(i18n("Rotate &Counterclockwise"), "object-rotate-left",
0, TQT_TQOBJECT(this), TQT_SLOT(rotateCounterclockwise()), 0, this, TQT_SLOT(rotateCounterclockwise()),
TQT_TQOBJECT(popup), "rotatecounterclockwise"); popup, "rotatecounterclockwise");
action->plug(popup); action->plug(popup);
/* /*

2
libtdepim/ktimeedit.cpp
Unescape View File

@ -43,7 +43,7 @@
class KOTimeValidator : public TQValidator class KOTimeValidator : public TQValidator
{ {
public: public:
KOTimeValidator(TQWidget* parent, const char* name=0) : TQValidator(TQT_TQOBJECT(parent), name) {} KOTimeValidator(TQWidget* parent, const char* name=0) : TQValidator(parent, name) {}
virtual State validate(TQString& str, int& /*cursorPos*/) const virtual State validate(TQString& str, int& /*cursorPos*/) const
{ {

2
libtdepim/ldapsearchdialog.cpp
Unescape View File

@ -258,7 +258,7 @@ void LDAPSearchDialog::restoreSettings()
if ( !pwdBindDN.isEmpty() ) if ( !pwdBindDN.isEmpty() )
ldapServer.setPwdBindDN( pwdBindDN ); ldapServer.setPwdBindDN( pwdBindDN );
KPIM::LdapClient* ldapClient = new KPIM::LdapClient( 0, TQT_TQOBJECT(this), "ldapclient" ); KPIM::LdapClient* ldapClient = new KPIM::LdapClient( 0, this, "ldapclient" );
ldapClient->setServer( ldapServer ); ldapClient->setServer( ldapServer );
TQStringList attrs; TQStringList attrs;

2
libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp
Unescape View File

@ -48,7 +48,7 @@ void KPartsGenericPart::load()
delete m_part; delete m_part;
} }
// "this" is both the parent widget and the parent object // "this" is both the parent widget and the parent object
m_part = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype, TQString(), TQT_TQWIDGET(this), 0, TQT_TQOBJECT(this), 0 ); m_part = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype, TQString(), this, 0, this, 0 );
if ( m_part ) { if ( m_part ) {
m_part->openURL( m_url ); m_part->openURL( m_url );
m_part->widget()->show(); m_part->widget()->show();

Write Preview
Loading…
Cancel
Save