diff options
400 files changed, 2456 insertions, 2456 deletions
diff --git a/akregator/src/actionmanager.h b/akregator/src/actionmanager.h index 9a41c4d58..70e347d37 100644 --- a/akregator/src/actionmanager.h +++ b/akregator/src/actionmanager.h @@ -29,7 +29,7 @@ class TQWidget; -class KAction; +class TDEAction; namespace Akregator { @@ -46,7 +46,7 @@ class ActionManager : public TQObject ActionManager(TQObject* parent=0, const char* name=0); virtual ~ActionManager(); - virtual KAction* action(const char* name, const char* classname=0) = 0; + virtual TDEAction* action(const char* name, const char* classname=0) = 0; virtual TQWidget* container(const char* name) = 0; private: diff --git a/akregator/src/actionmanagerimpl.cpp b/akregator/src/actionmanagerimpl.cpp index 827d1a95e..1de44c31c 100644 --- a/akregator/src/actionmanagerimpl.cpp +++ b/akregator/src/actionmanagerimpl.cpp @@ -71,10 +71,10 @@ class ActionManagerImpl::NodeSelectVisitor : public TreeNodeVisitor virtual bool visitFeed(Feed* node) { - KAction* remove = m_manager->action("feed_remove"); + TDEAction* remove = m_manager->action("feed_remove"); if (remove) remove->setEnabled(true); - KAction* hp = m_manager->action("feed_homepage"); + TDEAction* hp = m_manager->action("feed_homepage"); if (hp) hp->setEnabled(!node->htmlUrl().isEmpty()); m_manager->action("feed_fetch")->setText(i18n("&Fetch Feed")); @@ -87,10 +87,10 @@ class ActionManagerImpl::NodeSelectVisitor : public TreeNodeVisitor virtual bool visitFolder(Folder* node) { - KAction* remove = m_manager->action("feed_remove"); + TDEAction* remove = m_manager->action("feed_remove"); if (remove) remove->setEnabled(node->parent()); // root nodes must not be deleted - KAction* hp = m_manager->action("feed_homepage"); + TDEAction* hp = m_manager->action("feed_homepage"); if (hp) hp->setEnabled(false); @@ -104,10 +104,10 @@ class ActionManagerImpl::NodeSelectVisitor : public TreeNodeVisitor virtual bool visitTagNode(TagNode* /*node*/) { - KAction* remove = m_manager->action("feed_remove"); + TDEAction* remove = m_manager->action("feed_remove"); if (remove) remove->setEnabled(true); - KAction* hp = m_manager->action("feed_homepage"); + TDEAction* hp = m_manager->action("feed_homepage"); if (hp) hp->setEnabled(false); m_manager->action("feed_mark_all_as_read")->setText(i18n("&Mark Articles as Read")); @@ -131,12 +131,12 @@ public: ArticleViewer* articleViewer; Part* part; TrayIcon* trayIcon; - KActionMenu* tagMenu; - KActionCollection* actionCollection; + TDEActionMenu* tagMenu; + TDEActionCollection* actionCollection; TagSet* tagSet; TQMap<TQString, TagAction*> tagActions; TabWidget* tabWidget; - KAction* speakSelectedArticlesAction; + TDEAction* speakSelectedArticlesAction; }; void ActionManagerImpl::slotUpdateTagActions(bool enabled, const TQStringList& tagIds) @@ -252,7 +252,7 @@ void ActionManagerImpl::initTrayIcon(TrayIcon* trayIcon) return; else d->trayIcon = trayIcon; - KPopupMenu* traypop = trayIcon->contextMenu(); + TDEPopupMenu* traypop = trayIcon->contextMenu(); if (actionCollection()->action("feed_fetch_all")) actionCollection()->action("feed_fetch_all")->plug(traypop, 1); @@ -262,15 +262,15 @@ void ActionManagerImpl::initTrayIcon(TrayIcon* trayIcon) void ActionManagerImpl::initPart() { - new KAction(i18n("&Import Feeds..."), "", "", d->part, TQT_SLOT(fileImport()), d->actionCollection, "file_import"); - new KAction(i18n("&Export Feeds..."), "", "", d->part, TQT_SLOT(fileExport()), d->actionCollection, "file_export"); - //new KAction(i18n("&Get Feeds From Web..."), "", "", d->part, TQT_SLOT(fileGetFeeds()), d->actionCollection, "file_getfromweb"); + new TDEAction(i18n("&Import Feeds..."), "", "", d->part, TQT_SLOT(fileImport()), d->actionCollection, "file_import"); + new TDEAction(i18n("&Export Feeds..."), "", "", d->part, TQT_SLOT(fileExport()), d->actionCollection, "file_export"); + //new TDEAction(i18n("&Get Feeds From Web..."), "", "", d->part, TQT_SLOT(fileGetFeeds()), d->actionCollection, "file_getfromweb"); - new KAction(i18n("Send &Link Address..."), "mail_generic", "", d->part, TQT_SLOT(fileSendLink()), d->actionCollection, "file_sendlink"); - new KAction(i18n("Send &File..."), "mail_generic", "", d->part, TQT_SLOT(fileSendFile()), d->actionCollection, "file_sendfile"); + new TDEAction(i18n("Send &Link Address..."), "mail_generic", "", d->part, TQT_SLOT(fileSendLink()), d->actionCollection, "file_sendlink"); + new TDEAction(i18n("Send &File..."), "mail_generic", "", d->part, TQT_SLOT(fileSendFile()), d->actionCollection, "file_sendfile"); KStdAction::configureNotifications(d->part, TQT_SLOT(showKNotifyOptions()), d->actionCollection); // options_configure_notifications - new KAction( i18n("Configure &Akregator..."), "configure", "", d->part, TQT_SLOT(showOptions()), d->actionCollection, "akregator_configure_akregator" ); + new TDEAction( i18n("Configure &Akregator..."), "configure", "", d->part, TQT_SLOT(showOptions()), d->actionCollection, "akregator_configure_akregator" ); } void ActionManagerImpl::initView(View* view) @@ -281,93 +281,93 @@ void ActionManagerImpl::initView(View* view) d->view = view; // tag actions - new KAction(i18n("&New Tag..."), "", "", TQT_TQOBJECT(d->view), TQT_SLOT(slotNewTag()), actionCollection(), "tag_new"); + new TDEAction(i18n("&New Tag..."), "", "", TQT_TQOBJECT(d->view), TQT_SLOT(slotNewTag()), actionCollection(), "tag_new"); // Feed/Feed Group popup menu - new KAction(i18n("&Open Homepage"), "", "Ctrl+H", TQT_TQOBJECT(d->view), TQT_SLOT(slotOpenHomepage()), actionCollection(), "feed_homepage"); - new KAction(i18n("&Add Feed..."), "bookmark_add", "Insert", TQT_TQOBJECT(d->view), TQT_SLOT(slotFeedAdd()), actionCollection(), "feed_add"); - new KAction(i18n("Ne&w Folder..."), "folder_new", "Shift+Insert", TQT_TQOBJECT(d->view), TQT_SLOT(slotFeedAddGroup()), actionCollection(), "feed_add_group"); - new KAction(i18n("&Delete Feed"), "editdelete", "Alt+Delete", TQT_TQOBJECT(d->view), TQT_SLOT(slotFeedRemove()), actionCollection(), "feed_remove"); - new KAction(i18n("&Edit Feed..."), "edit", "F2", TQT_TQOBJECT(d->view), TQT_SLOT(slotFeedModify()), actionCollection(), "feed_modify"); - KActionMenu* vm = new KActionMenu( i18n( "&View Mode" ), actionCollection(), "view_mode" ); - - KRadioAction *ra = new KRadioAction(i18n("&Normal View"), "view_top_bottom", "Ctrl+Shift+1", TQT_TQOBJECT(d->view), TQT_SLOT(slotNormalView()), actionCollection(), "normal_view"); + new TDEAction(i18n("&Open Homepage"), "", "Ctrl+H", TQT_TQOBJECT(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("Ne&w Folder..."), "folder_new", "Shift+Insert", TQT_TQOBJECT(d->view), TQT_SLOT(slotFeedAddGroup()), actionCollection(), "feed_add_group"); + new TDEAction(i18n("&Delete Feed"), "editdelete", "Alt+Delete", TQT_TQOBJECT(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"); + 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"); ra->setExclusiveGroup( "ViewMode" ); vm->insert(ra); - ra = new KRadioAction(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", TQT_TQOBJECT(d->view), TQT_SLOT(slotWidescreenView()), actionCollection(), "widescreen_view"); ra->setExclusiveGroup( "ViewMode" ); vm->insert(ra); - ra = new KRadioAction(i18n("C&ombined View"), "view_text", "Ctrl+Shift+3", TQT_TQOBJECT(d->view), TQT_SLOT(slotCombinedView()), actionCollection(), "combined_view"); + ra = new TDERadioAction(i18n("C&ombined View"), "view_text", "Ctrl+Shift+3", TQT_TQOBJECT(d->view), TQT_SLOT(slotCombinedView()), actionCollection(), "combined_view"); ra->setExclusiveGroup( "ViewMode" ); vm->insert(ra); // toolbar / feed menu - new KAction(i18n("&Fetch Feed"), "down", KStdAccel::shortcut(KStdAccel::Reload), TQT_TQOBJECT(d->view), TQT_SLOT(slotFetchCurrentFeed()), actionCollection(), "feed_fetch"); - new KAction(i18n("Fe&tch All Feeds"), "bottom", "Ctrl+L", TQT_TQOBJECT(d->view), TQT_SLOT(slotFetchAllFeeds()), actionCollection(), "feed_fetch_all"); + new TDEAction(i18n("&Fetch Feed"), "down", TDEStdAccel::shortcut(TDEStdAccel::Reload), TQT_TQOBJECT(d->view), TQT_SLOT(slotFetchCurrentFeed()), actionCollection(), "feed_fetch"); + new TDEAction(i18n("Fe&tch All Feeds"), "bottom", "Ctrl+L", TQT_TQOBJECT(d->view), TQT_SLOT(slotFetchAllFeeds()), actionCollection(), "feed_fetch_all"); - KAction* stopAction = new KAction(i18n( "&Abort Fetches" ), "stop", Key_Escape, Kernel::self()->fetchQueue(), TQT_SLOT(slotAbort()), actionCollection(), "feed_stop"); + TDEAction* stopAction = new TDEAction(i18n( "&Abort Fetches" ), "stop", Key_Escape, Kernel::self()->fetchQueue(), TQT_SLOT(slotAbort()), actionCollection(), "feed_stop"); stopAction->setEnabled(false); - new KAction(i18n("&Mark Feed as Read"), "goto", "Ctrl+R", TQT_TQOBJECT(d->view), TQT_SLOT(slotMarkAllRead()), actionCollection(), "feed_mark_all_as_read"); - new KAction(i18n("Ma&rk All Feeds as Read"), "goto", "Ctrl+Shift+R", TQT_TQOBJECT(d->view), TQT_SLOT(slotMarkAllFeedsRead()), actionCollection(), "feed_mark_all_feeds_as_read"); + 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("Ma&rk All Feeds as Read"), "goto", "Ctrl+Shift+R", TQT_TQOBJECT(d->view), TQT_SLOT(slotMarkAllFeedsRead()), actionCollection(), "feed_mark_all_feeds_as_read"); // Settings menu - KToggleAction* sqf = new KToggleAction(i18n("Show Quick Filter"), TQString(), 0, TQT_TQOBJECT(d->view), TQT_SLOT(slotToggleShowQuickFilter()), actionCollection(), "show_quick_filter"); + TDEToggleAction* sqf = new TDEToggleAction(i18n("Show Quick Filter"), TQString(), 0, TQT_TQOBJECT(d->view), TQT_SLOT(slotToggleShowQuickFilter()), actionCollection(), "show_quick_filter"); sqf->setChecked( Settings::showQuickFilter() ); - new KAction( i18n("Open in Tab"), "tab_new", "Shift+Return", TQT_TQOBJECT(d->view), TQT_SLOT(slotOpenCurrentArticle()), actionCollection(), "article_open" ); - new KAction( i18n("Open in Background Tab"), TQString(), "tab_new", TQT_TQOBJECT(d->view), TQT_SLOT(slotOpenCurrentArticleBackgroundTab()), actionCollection(), "article_open_background_tab" ); - new KAction( i18n("Open in External Browser"), "window_new", "Ctrl+Shift+Return", TQT_TQOBJECT(d->view), TQT_SLOT(slotOpenCurrentArticleExternal()), actionCollection(), "article_open_external" ); - new KAction( i18n("Copy Link Address"), TQString(), TQString(), TQT_TQOBJECT(d->view), TQT_SLOT(slotCopyLinkAddress()), actionCollection(), "article_copy_link_address" ); + new TDEAction( i18n("Open in Tab"), "tab_new", "Shift+Return", TQT_TQOBJECT(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 External Browser"), "window_new", "Ctrl+Shift+Return", TQT_TQOBJECT(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 KAction(i18n("Pre&vious Unread Article"), "", Key_Minus, TQT_TQOBJECT(d->view), TQT_SLOT(slotPrevUnreadArticle()),actionCollection(), "go_prev_unread_article"); - new KAction(i18n("Ne&xt Unread Article"), "", Key_Plus, TQT_TQOBJECT(d->view), TQT_SLOT(slotNextUnreadArticle()),actionCollection(), "go_next_unread_article"); + new TDEAction(i18n("Pre&vious Unread Article"), "", Key_Minus, TQT_TQOBJECT(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 KAction(i18n("&Delete"), "editdelete", "Delete", TQT_TQOBJECT(d->view), TQT_SLOT(slotArticleDelete()), actionCollection(), "article_delete"); + new TDEAction(i18n("&Delete"), "editdelete", "Delete", TQT_TQOBJECT(d->view), TQT_SLOT(slotArticleDelete()), actionCollection(), "article_delete"); if (Settings::showTaggingGUI()) { - d->tagMenu = new KActionMenu ( i18n( "&Set Tags" ), "rss_tag", actionCollection(), "article_tagmenu" ); + d->tagMenu = new TDEActionMenu ( i18n( "&Set Tags" ), "rss_tag", actionCollection(), "article_tagmenu" ); d->tagMenu->setEnabled(false); // only enabled when articles are selected } - KActionMenu* statusMenu = new KActionMenu ( i18n( "&Mark As" ), + TDEActionMenu* statusMenu = new TDEActionMenu ( i18n( "&Mark As" ), actionCollection(), "article_set_status" ); - d->speakSelectedArticlesAction = new KAction(i18n("&Speak Selected Articles"), "kttsd", "", TQT_TQOBJECT(d->view), TQT_SLOT(slotTextToSpeechRequest()), actionCollection(), "akr_texttospeech"); + d->speakSelectedArticlesAction = new TDEAction(i18n("&Speak Selected Articles"), "kttsd", "", TQT_TQOBJECT(d->view), TQT_SLOT(slotTextToSpeechRequest()), actionCollection(), "akr_texttospeech"); - KAction* abortTTS = new KAction(i18n( "&Stop Speaking" ), "player_stop", Key_Escape, SpeechClient::self(), TQT_SLOT(slotAbortJobs()), actionCollection(), "akr_aborttexttospeech"); + TDEAction* abortTTS = new TDEAction(i18n( "&Stop Speaking" ), "player_stop", Key_Escape, SpeechClient::self(), TQT_SLOT(slotAbortJobs()), actionCollection(), "akr_aborttexttospeech"); abortTTS->setEnabled(false); connect(SpeechClient::self(), TQT_SIGNAL(signalActivated(bool)), abortTTS, TQT_SLOT(setEnabled(bool))); - statusMenu->insert(new KAction(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")), "Ctrl+E", TQT_TQOBJECT(d->view), TQT_SLOT(slotSetSelectedArticleRead()), actionCollection(), "article_set_status_read")); - statusMenu->insert(new KAction(KGuiItem(i18n("&New"), "", + statusMenu->insert(new TDEAction(KGuiItem(i18n("&New"), "", i18n("Mark selected article as new")), "Ctrl+N", TQT_TQOBJECT(d->view), TQT_SLOT(slotSetSelectedArticleNew()), actionCollection(), "article_set_status_new" )); - statusMenu->insert(new KAction(KGuiItem(i18n("&Unread"), "", + statusMenu->insert(new TDEAction(KGuiItem(i18n("&Unread"), "", i18n("Mark selected article as unread")), "Ctrl+U", TQT_TQOBJECT(d->view), TQT_SLOT(slotSetSelectedArticleUnread()), actionCollection(), "article_set_status_unread")); - KToggleAction* importantAction = new KToggleAction(i18n("&Mark as Important"), "flag", "Ctrl+I", actionCollection(), "article_set_status_important"); + TDEToggleAction* importantAction = new TDEToggleAction(i18n("&Mark as Important"), "flag", "Ctrl+I", actionCollection(), "article_set_status_important"); importantAction->setCheckedState(i18n("Remove &Important Mark")); connect(importantAction, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(d->view), TQT_SLOT(slotArticleToggleKeepFlag(bool))); - new KAction( i18n("Move Node Up"), TQString(), "Shift+Alt+Up", TQT_TQOBJECT(view), TQT_SLOT(slotMoveCurrentNodeUp()), d->actionCollection, "feedstree_move_up" ); - new KAction( i18n("Move Node Down"), TQString(), "Shift+Alt+Down", TQT_TQOBJECT(view), TQT_SLOT(slotMoveCurrentNodeDown()), d->actionCollection, "feedstree_move_down" ); - new KAction( i18n("Move Node Left"), TQString(), "Shift+Alt+Left", TQT_TQOBJECT(view), TQT_SLOT(slotMoveCurrentNodeLeft()), d->actionCollection, "feedstree_move_left" ); - new KAction( i18n("Move Node Right"), TQString(), "Shift+Alt+Right", TQT_TQOBJECT(view), TQT_SLOT(slotMoveCurrentNodeRight()), d->actionCollection, "feedstree_move_right"); + 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 Down"), TQString(), "Shift+Alt+Down", TQT_TQOBJECT(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 Right"), TQString(), "Shift+Alt+Right", TQT_TQOBJECT(view), TQT_SLOT(slotMoveCurrentNodeRight()), d->actionCollection, "feedstree_move_right"); } void ActionManagerImpl::initArticleViewer(ArticleViewer* articleViewer) @@ -385,8 +385,8 @@ void ActionManagerImpl::initArticleListView(ArticleListView* articleList) else d->articleList = articleList; - new KAction( i18n("&Previous Article"), TQString(), "Left", TQT_TQOBJECT(articleList), TQT_SLOT(slotPreviousArticle()), actionCollection(), "go_previous_article" ); - new KAction( i18n("&Next Article"), TQString(), "Right", TQT_TQOBJECT(articleList), TQT_SLOT(slotNextArticle()), actionCollection(), "go_next_article" ); + new TDEAction( i18n("&Previous Article"), TQString(), "Left", TQT_TQOBJECT(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" ); } void ActionManagerImpl::initListTabWidget(ListTabWidget* listTabWidget) @@ -396,17 +396,17 @@ void ActionManagerImpl::initListTabWidget(ListTabWidget* listTabWidget) else d->listTabWidget = listTabWidget; - new KAction(i18n("&Previous Feed"), "", "P", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotPrevFeed()),actionCollection(), "go_prev_feed"); - new KAction(i18n("&Next Feed"), "", "N", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotNextFeed()),actionCollection(), "go_next_feed"); - new KAction(i18n("N&ext Unread Feed"), "", "Alt+Plus", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotNextUnreadFeed()),actionCollection(), "go_next_unread_feed"); - new KAction(i18n("Prev&ious Unread Feed"), "", "Alt+Minus", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotPrevUnreadFeed()),actionCollection(), "go_prev_unread_feed"); - - new KAction( i18n("Go to Top of Tree"), TQString(), "Ctrl+Home", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemBegin()), d->actionCollection, "feedstree_home" ); - new KAction( i18n("Go to Bottom of Tree"), TQString(), "Ctrl+End", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemEnd()), d->actionCollection, "feedstree_end" ); - new KAction( i18n("Go Left in Tree"), TQString(), "Ctrl+Left", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemLeft()), d->actionCollection, "feedstree_left" ); - new KAction( i18n("Go Right in Tree"), TQString(), "Ctrl+Right", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemRight()), d->actionCollection, "feedstree_right" ); - new KAction( i18n("Go Up in Tree"), TQString(), "Ctrl+Up", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemUp()), d->actionCollection, "feedstree_up" ); - new KAction( i18n("Go Down in Tree"), TQString(), "Ctrl+Down", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemDown()), d->actionCollection, "feedstree_down" ); + new TDEAction(i18n("&Previous Feed"), "", "P", TQT_TQOBJECT(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("N&ext Unread Feed"), "", "Alt+Plus", TQT_TQOBJECT(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("Go to Top of Tree"), TQString(), "Ctrl+Home", TQT_TQOBJECT(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 Left in Tree"), TQString(), "Ctrl+Left", TQT_TQOBJECT(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 Up in Tree"), TQString(), "Ctrl+Up", TQT_TQOBJECT(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" ); } void ActionManagerImpl::initTabWidget(TabWidget* tabWidget) @@ -416,11 +416,11 @@ void ActionManagerImpl::initTabWidget(TabWidget* tabWidget) else d->tabWidget = tabWidget; - new KAction(i18n("Select Next Tab"), "", "Ctrl+Period", TQT_TQOBJECT(d->tabWidget), TQT_SLOT(slotNextTab()),actionCollection(), "select_next_tab"); - new KAction(i18n("Select Previous Tab"), "", "Ctrl+Comma", TQT_TQOBJECT(d->tabWidget), TQT_SLOT(slotPreviousTab()),actionCollection(), "select_previous_tab"); - new KAction( i18n("Detach Tab"), "tab_breakoff", CTRL+SHIFT+Key_B, TQT_TQOBJECT(d->tabWidget), TQT_SLOT(slotDetachTab()), actionCollection(), "tab_detach" ); - new KAction( i18n("Copy Link Address"), TQString(), TQString(), TQT_TQOBJECT(d->tabWidget), TQT_SLOT(slotCopyLinkAddress()), actionCollection(), "tab_copylinkaddress" ); - new KAction( i18n("&Close Tab"), "tab_remove", KStdAccel::close(), TQT_TQOBJECT(d->tabWidget), TQT_SLOT(slotCloseTab()), actionCollection(), "tab_remove" ); + new TDEAction(i18n("Select Next Tab"), "", "Ctrl+Period", TQT_TQOBJECT(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("Detach Tab"), "tab_breakoff", CTRL+SHIFT+Key_B, TQT_TQOBJECT(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("&Close Tab"), "tab_remove", TDEStdAccel::close(), TQT_TQOBJECT(d->tabWidget), TQT_SLOT(slotCloseTab()), actionCollection(), "tab_remove" ); } TQWidget* ActionManagerImpl::container(const char* name) @@ -429,11 +429,11 @@ TQWidget* ActionManagerImpl::container(const char* name) } -KActionCollection* ActionManagerImpl::actionCollection() +TDEActionCollection* ActionManagerImpl::actionCollection() { return d->actionCollection; } -KAction* ActionManagerImpl::action(const char* name, const char* classname) +TDEAction* ActionManagerImpl::action(const char* name, const char* classname) { return d->actionCollection != 0 ? d->actionCollection->action(name, classname) : 0; } diff --git a/akregator/src/actionmanagerimpl.h b/akregator/src/actionmanagerimpl.h index 76b30e297..adbb66270 100644 --- a/akregator/src/actionmanagerimpl.h +++ b/akregator/src/actionmanagerimpl.h @@ -29,9 +29,9 @@ class TQStringList; class TQWidget; -class KAction; -class KActionMenu; -class KActionCollection; +class TDEAction; +class TDEActionMenu; +class TDEActionCollection; namespace Akregator { @@ -56,7 +56,7 @@ class ActionManagerImpl : public ActionManager ActionManagerImpl(Part* part, TQObject* parent=0, const char* name=0); virtual ~ActionManagerImpl(); - virtual KAction* action(const char* name, const char* classname=0); + virtual TDEAction* action(const char* name, const char* classname=0); virtual TQWidget* container(const char* name); void initView(View* view); @@ -80,7 +80,7 @@ class ActionManagerImpl : public ActionManager protected: - KActionCollection* actionCollection(); + TDEActionCollection* actionCollection(); private: diff --git a/akregator/src/akregator_view.cpp b/akregator/src/akregator_view.cpp index d9f397101..5e0809f62 100644 --- a/akregator/src/akregator_view.cpp +++ b/akregator/src/akregator_view.cpp @@ -249,7 +249,7 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons m_feedListView = new NodeListView( this, "feedtree" ); m_listTabWidget->addView(m_feedListView, i18n("Feeds"), TDEGlobal::iconLoader()->loadIcon("folder", KIcon::Small)); - connect(m_feedListView, TQT_SIGNAL(signalContextMenu(KListView*, TreeNode*, const TQPoint&)), this, TQT_SLOT(slotFeedTreeContextMenu(KListView*, TreeNode*, const TQPoint&))); + connect(m_feedListView, TQT_SIGNAL(signalContextMenu(TDEListView*, TreeNode*, const TQPoint&)), this, TQT_SLOT(slotFeedTreeContextMenu(TDEListView*, TreeNode*, const TQPoint&))); connect(m_feedListView, TQT_SIGNAL(signalDropped (KURL::List &, TreeNode*, Folder*)), this, TQT_SLOT(slotFeedURLDropped (KURL::List &, @@ -258,7 +258,7 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons m_tagNodeListView = new NodeListView(this); m_listTabWidget->addView(m_tagNodeListView, i18n("Tags"), TDEGlobal::iconLoader()->loadIcon("rss_tag", KIcon::Small)); - connect(m_tagNodeListView, TQT_SIGNAL(signalContextMenu(KListView*, TreeNode*, const TQPoint&)), this, TQT_SLOT(slotFeedTreeContextMenu(KListView*, TreeNode*, const TQPoint&))); + connect(m_tagNodeListView, TQT_SIGNAL(signalContextMenu(TDEListView*, TreeNode*, const TQPoint&)), this, TQT_SLOT(slotFeedTreeContextMenu(TDEListView*, TreeNode*, const TQPoint&))); ProgressManager::self()->setFeedList(m_feedList); @@ -714,7 +714,7 @@ void View::slotFrameChanged(Frame *f) } } -void View::slotFeedTreeContextMenu(KListView*, TreeNode* /*node*/, const TQPoint& /*p*/) +void View::slotFeedTreeContextMenu(TDEListView*, TreeNode* /*node*/, const TQPoint& /*p*/) { m_tabs->showPage(m_mainTab); } @@ -1190,7 +1190,7 @@ void View::slotArticleSelected(const Article& article) } } - KToggleAction* maai = dynamic_cast<KToggleAction*>(m_actionManager->action("article_set_status_important")); + TDEToggleAction* maai = dynamic_cast<TDEToggleAction*>(m_actionManager->action("article_set_status_important")); maai->setChecked(a.keep()); kdDebug() << "selected: " << a.guid() << endl; diff --git a/akregator/src/akregator_view.h b/akregator/src/akregator_view.h index 939b7aa49..bfc08df4b 100644 --- a/akregator/src/akregator_view.h +++ b/akregator/src/akregator_view.h @@ -45,8 +45,8 @@ class KComboBox; class TDEConfig; class KFileItem; class KLineEdit; -class KListView; -class KListViewItem; +class TDEListView; +class TDEListViewItem; class KTabWidget; class Viewer; @@ -151,7 +151,7 @@ namespace Akregator { void slotArticleSelected(const Article&); /** Shows requested popup menu for feed tree */ - void slotFeedTreeContextMenu(KListView*, TreeNode*, const TQPoint&); + void slotFeedTreeContextMenu(TDEListView*, TreeNode*, const TQPoint&); /** emits @ref signalUnreadCountChanged(int) */ void slotSetTotalUnread(); diff --git a/akregator/src/articlelistview.cpp b/akregator/src/articlelistview.cpp index aad2dd05a..c08867b21 100644 --- a/akregator/src/articlelistview.cpp +++ b/akregator/src/articlelistview.cpp @@ -126,7 +126,7 @@ class ArticleListView::ColumnLayoutVisitor : public TreeNodeVisitor }; -class ArticleListView::ArticleItem : public KListViewItem +class ArticleListView::ArticleItem : public TDEListViewItem { friend class ArticleListView; @@ -141,9 +141,9 @@ class ArticleListView::ArticleItem : public KListViewItem void updateItem(const Article& article); - virtual ArticleItem* itemAbove() { return static_cast<ArticleItem*>(KListViewItem::itemAbove()); } + virtual ArticleItem* itemAbove() { return static_cast<ArticleItem*>(TDEListViewItem::itemAbove()); } - virtual ArticleItem* nextSibling() { return static_cast<ArticleItem*>(KListViewItem::nextSibling()); } + virtual ArticleItem* nextSibling() { return static_cast<ArticleItem*>(TDEListViewItem::nextSibling()); } private: Article m_article; @@ -156,7 +156,7 @@ class ArticleListView::ArticleItem : public KListViewItem // FIXME: Remove resolveEntities for KDE 4.0, it's now done in the parser ArticleListView::ArticleItem::ArticleItem( TQListView *parent, const Article& a) - : KListViewItem( parent, KCharsets::resolveEntities(a.title()), a.feed()->title(), TDEGlobal::locale()->formatDateTime(a.pubDate(), true, false) ), m_article(a), m_pubDate(a.pubDate().toTime_t()) + : TDEListViewItem( parent, KCharsets::resolveEntities(a.title()), a.feed()->title(), TDEGlobal::locale()->formatDateTime(a.pubDate(), true, false) ), m_article(a), m_pubDate(a.pubDate().toTime_t()) { if (a.keep()) setPixmap(0, keepFlag()); @@ -175,7 +175,7 @@ Article& ArticleListView::ArticleItem::article() void ArticleListView::ArticleItem::paintCell ( TQPainter * p, const TQColorGroup & cg, int column, int width, int align ) { if (article().status() == Article::Read) - KListViewItem::paintCell( p, cg, column, width, align ); + TDEListViewItem::paintCell( p, cg, column, width, align ); else { // if article status is unread or new, we change the color: FIXME: make colors configurable @@ -186,7 +186,7 @@ void ArticleListView::ArticleItem::paintCell ( TQPainter * p, const TQColorGroup else // New cg2.setColor(TQColorGroup::Text, TQt::red); - KListViewItem::paintCell( p, cg2, column, width, align ); + TDEListViewItem::paintCell( p, cg2, column, width, align ); } } @@ -208,13 +208,13 @@ int ArticleListView::ArticleItem::compare(TQListViewItem *i, int col, bool ascen return 0; return (m_pubDate > item->m_pubDate) ? 1 : -1; } - return KListViewItem::compare(i, col, ascending); + return TDEListViewItem::compare(i, col, ascending); } /* ==================================================================================== */ ArticleListView::ArticleListView(TQWidget *parent, const char *name) - : KListView(parent, name) + : TDEListView(parent, name) { d = new ArticleListViewPrivate(this); d->noneSelected = true; @@ -274,15 +274,15 @@ ArticleListView::ArticleListView(TQWidget *parent, const char *name) connect(this, TQT_SIGNAL(currentChanged(TQListViewItem*)), this, TQT_SLOT(slotCurrentChanged(TQListViewItem* ))); connect(this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged())); connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), this, TQT_SLOT(slotDoubleClicked(TQListViewItem*, const TQPoint&, int)) ); - connect(this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*, const TQPoint&))); + connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&))); connect(this, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem *, const TQPoint &, int)), this, TQT_SLOT(slotMouseButtonPressed(int, TQListViewItem *, const TQPoint &, int))); } Article ArticleListView::currentArticle() const { - ArticleItem* ci = dynamic_cast<ArticleItem*>(KListView::currentItem()); + ArticleItem* ci = dynamic_cast<ArticleItem*>(TDEListView::currentItem()); return (ci && !selectedItems().isEmpty()) ? ci->article() : Article(); } @@ -572,7 +572,7 @@ void ArticleListView::paintInfoBox(const TQString &message) void ArticleListView::viewportPaintEvent(TQPaintEvent *e) { - KListView::viewportPaintEvent(e); + TDEListView::viewportPaintEvent(e); if(!e) return; @@ -770,7 +770,7 @@ void ArticleListView::slotDoubleClicked(TQListViewItem* item, const TQPoint& p, emit signalDoubleClicked(ali->article(), p, i); } -void ArticleListView::slotContextMenu(KListView* /*list*/, TQListViewItem* /*item*/, const TQPoint& p) +void ArticleListView::slotContextMenu(TDEListView* /*list*/, TQListViewItem* /*item*/, const TQPoint& p) { TQWidget* w = ActionManager::getInstance()->container("article_popup"); TQPopupMenu* popup = static_cast<TQPopupMenu *>(w); diff --git a/akregator/src/articlelistview.h b/akregator/src/articlelistview.h index 47f34757b..4e2ad4ff6 100644 --- a/akregator/src/articlelistview.h +++ b/akregator/src/articlelistview.h @@ -40,7 +40,7 @@ namespace Akregator class ArticleMatcher; } - class ArticleListView : public KListView + class ArticleListView : public TDEListView { Q_OBJECT @@ -84,7 +84,7 @@ namespace Akregator signals: void signalArticleChosen(const Article& article); void signalDoubleClicked(const Article&, const TQPoint&, int); - //void signalContextMenu(KListView*, ArticleItem*, const TQPoint&); + //void signalContextMenu(TDEListView*, ArticleItem*, const TQPoint&); void signalMouseButtonPressed(int, const Article&, const TQPoint &, int); protected: @@ -120,7 +120,7 @@ namespace Akregator virtual void slotCurrentChanged(TQListViewItem* item); virtual void slotSelectionChanged(); virtual void slotDoubleClicked(TQListViewItem* item, const TQPoint& p, int i); - virtual void slotContextMenu(KListView* list, TQListViewItem* item, const TQPoint& p); + virtual void slotContextMenu(TDEListView* list, TQListViewItem* item, const TQPoint& p); virtual void slotMouseButtonPressed(int, TQListViewItem *, const TQPoint &, int); public: // compat with KDE-3.x assertions, remove for KDE 4 diff --git a/akregator/src/articleviewer.cpp b/akregator/src/articleviewer.cpp index 68af3860c..757e56eb3 100644 --- a/akregator/src/articleviewer.cpp +++ b/akregator/src/articleviewer.cpp @@ -169,8 +169,8 @@ ArticleViewer::ArticleViewer(TQWidget *parent, const char *name) generateNormalModeCSS(); generateCombinedModeCSS(); - new KAction( i18n("&Scroll Up"), TQString(), "Up", this, TQT_SLOT(slotScrollUp()), actionCollection(), "articleviewer_scroll_up" ); - new KAction( i18n("&Scroll Down"), TQString(), "Down", this, TQT_SLOT(slotScrollDown()), actionCollection(), "articleviewer_scroll_down" ); + new TDEAction( i18n("&Scroll Up"), TQString(), "Up", this, TQT_SLOT(slotScrollUp()), actionCollection(), "articleviewer_scroll_up" ); + new TDEAction( i18n("&Scroll Down"), TQString(), "Down", this, TQT_SLOT(slotScrollDown()), actionCollection(), "articleviewer_scroll_down" ); connect(this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged())); diff --git a/akregator/src/feeditem.cpp b/akregator/src/feeditem.cpp index f9d1b3d1a..da53ca16f 100644 --- a/akregator/src/feeditem.cpp +++ b/akregator/src/feeditem.cpp @@ -39,12 +39,12 @@ FeedItem::FeedItem(FolderItem* parent, Feed* node) : TreeNodeItem(parent, node) initialize(node); } -FeedItem::FeedItem(KListView* parent, Feed* node) : TreeNodeItem(parent, node) +FeedItem::FeedItem(TDEListView* parent, Feed* node) : TreeNodeItem(parent, node) { initialize(node); } -FeedItem::FeedItem(KListView* parent, TreeNodeItem* after, Feed* node) : TreeNodeItem(parent, after, node) +FeedItem::FeedItem(TDEListView* parent, TreeNodeItem* after, Feed* node) : TreeNodeItem(parent, after, node) { initialize(node); } diff --git a/akregator/src/feeditem.h b/akregator/src/feeditem.h index ad0de2a3c..60e2b1826 100644 --- a/akregator/src/feeditem.h +++ b/akregator/src/feeditem.h @@ -42,8 +42,8 @@ class FeedItem : public TreeNodeItem FeedItem(FolderItem* parent, Feed* node); FeedItem(FolderItem* parent, TreeNodeItem* after, Feed* node); - FeedItem(KListView* parent, Feed* node); - FeedItem(KListView* parent, TreeNodeItem* after, Feed* node); + FeedItem(TDEListView* parent, Feed* node); + FeedItem(TDEListView* parent, TreeNodeItem* after, Feed* node); virtual ~FeedItem(); virtual Feed* node(); diff --git a/akregator/src/feedlistview.cpp b/akregator/src/feedlistview.cpp index 117d94c0e..2bb1cbfc0 100644 --- a/akregator/src/feedlistview.cpp +++ b/akregator/src/feedlistview.cpp @@ -353,7 +353,7 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor }; NodeListView::NodeListView( TQWidget *parent, const char *name) - : KListView(parent, name), d(new NodeListViewPrivate) + : TDEListView(parent, name), d(new NodeListViewPrivate) { d->showTagFolders = true; d->connectNodeVisitor = new ConnectNodeVisitor(this), @@ -380,7 +380,7 @@ NodeListView::NodeListView( TQWidget *parent, const char *name) connect( this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*)), this, TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*)) ); connect( this, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotSelectionChanged(TQListViewItem*)) ); connect( this, TQT_SIGNAL(itemRenamed(TQListViewItem*, int, const TQString&)), this, TQT_SLOT(slotItemRenamed(TQListViewItem*, int, const TQString&)) ); - connect( this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), this, TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*, const TQPoint&)) ); + connect( this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); connect( &(d->autoopentimer), TQT_SIGNAL( timeout() ), this, TQT_SLOT( openFolder() ) ); clear(); @@ -462,7 +462,7 @@ TreeNodeItem* NodeListView::findNodeItem(TreeNode* node) TreeNodeItem* NodeListView::findItemByTitle(const TQString& text, int column, ComparisonFlags compare) const { - return dynamic_cast<TreeNodeItem*> (KListView::findItem(text, column, compare)); + return dynamic_cast<TreeNodeItem*> (TDEListView::findItem(text, column, compare)); } void NodeListView::ensureNodeVisible(TreeNode* node) @@ -487,7 +487,7 @@ void NodeListView::clear() d->itemDict.clear(); d->nodeList = 0; - KListView::clear(); + TDEListView::clear(); } void NodeListView::drawContentsOffset( TQPainter * p, int ox, int oy, @@ -495,7 +495,7 @@ void NodeListView::drawContentsOffset( TQPainter * p, int ox, int oy, { bool oldUpdatesEnabled = isUpdatesEnabled(); setUpdatesEnabled(false); - KListView::drawContentsOffset( p, ox, oy, cx, cy, cw, ch ); + TDEListView::drawContentsOffset( p, ox, oy, cx, cy, cw, ch ); setUpdatesEnabled(oldUpdatesEnabled); } @@ -543,7 +543,7 @@ void NodeListView::movableDropEvent(TQListViewItem* /*parent*/, TQListViewItem* current->parent()->removeChild(current); parentNode->insertChild(current, afterMeNode); - KListView::movableDropEvent(d->parent, d->afterme); + TDEListView::movableDropEvent(d->parent, d->afterme); } } @@ -649,8 +649,8 @@ void NodeListView::contentsDragMoveEvent(TQDragMoveEvent* event) d->autoopentimer.stop(); } - // the rest is handled by KListView. - KListView::contentsDragMoveEvent(event); + // the rest is handled by TDEListView. + TDEListView::contentsDragMoveEvent(event); } bool NodeListView::acceptDrag(TQDropEvent *e) const @@ -876,7 +876,7 @@ void NodeListView::slotItemRenamed(TQListViewItem* item, int col, const TQString } } } -void NodeListView::slotContextMenu(KListView* list, TQListViewItem* item, const TQPoint& p) +void NodeListView::slotContextMenu(TDEListView* list, TQListViewItem* item, const TQPoint& p) { TreeNodeItem* ti = dynamic_cast<TreeNodeItem*>(item); emit signalContextMenu(list, ti ? ti->node() : 0, p); @@ -995,7 +995,7 @@ void NodeListView::slotNodeChanged(TreeNode* node) TQDragObject *NodeListView::dragObject() { KMultipleDrag *md = new KMultipleDrag(viewport()); - TQDragObject *obj = KListView::dragObject(); + TQDragObject *obj = TDEListView::dragObject(); if (obj) { md->addDragObject(obj); } diff --git a/akregator/src/feedlistview.h b/akregator/src/feedlistview.h index 8a4cd7754..4451c00fe 100644 --- a/akregator/src/feedlistview.h +++ b/akregator/src/feedlistview.h @@ -36,7 +36,7 @@ class TreeNode; class TreeNodeItem; class TagNodeList; -class NodeListView : public KListView +class NodeListView : public TDEListView { Q_OBJECT @@ -106,7 +106,7 @@ signals: void signalDropped (KURL::List &, TreeNode*, Folder*); void signalNodeSelected(TreeNode*); void signalRootNodeChanged(NodeListView*, TreeNode*); - void signalContextMenu(KListView*, TreeNode*, const TQPoint&); + void signalContextMenu(TDEListView*, TreeNode*, const TQPoint&); public: // compat with KDE-3.x assertions, remove for KDE 4 // protected: @@ -144,7 +144,7 @@ protected slots: void slotDropped(TQDropEvent *e, TQListViewItem* after); void slotRootNodeChanged(TreeNode*); virtual void slotSelectionChanged(TQListViewItem* item); - virtual void slotContextMenu(KListView* list, TQListViewItem* item, const TQPoint& p); + virtual void slotContextMenu(TDEListView* list, TQListViewItem* item, const TQPoint& p); virtual void slotItemRenamed(TQListViewItem* item, int col, const TQString& text); virtual void slotFeedFetchStarted(Feed* feed); virtual void slotFeedFetchAborted(Feed* feed); diff --git a/akregator/src/folderitem.cpp b/akregator/src/folderitem.cpp index af01736ba..ed33312ea 100644 --- a/akregator/src/folderitem.cpp +++ b/akregator/src/folderitem.cpp @@ -43,12 +43,12 @@ FolderItem::FolderItem(FolderItem* parent, TreeNodeItem* after, Folder* node) : initialize(node); } -FolderItem::FolderItem(KListView* parent, Folder* node) : TreeNodeItem(parent, node) +FolderItem::FolderItem(TDEListView* parent, Folder* node) : TreeNodeItem(parent, node) { initialize(node); } -FolderItem::FolderItem(KListView* parent, TreeNodeItem* after, Folder* node) : TreeNodeItem(parent, after, node) +FolderItem::FolderItem(TDEListView* parent, TreeNodeItem* after, Folder* node) : TreeNodeItem(parent, after, node) { initialize(node); } @@ -69,7 +69,7 @@ Folder* FolderItem::node() void FolderItem::setOpen(bool open) { node()->setOpen(open); - KListViewItem::setOpen(open); + TDEListViewItem::setOpen(open); } FolderItem::~FolderItem() diff --git a/akregator/src/folderitem.h b/akregator/src/folderitem.h index efc4d4e9f..a9e6b7c0b 100644 --- a/akregator/src/folderitem.h +++ b/akregator/src/folderitem.h @@ -43,8 +43,8 @@ class FolderItem : public TreeNodeItem public: FolderItem(FolderItem* parent, Folder* node); FolderItem(FolderItem* parent, TreeNodeItem* after, Folder* node); - FolderItem(KListView* parent, Folder* node); - FolderItem(KListView* parent, TreeNodeItem* after, Folder* node); + FolderItem(TDEListView* parent, Folder* node); + FolderItem(TDEListView* parent, TreeNodeItem* after, Folder* node); virtual ~FolderItem(); virtual Folder* node(); diff --git a/akregator/src/frame.cpp b/akregator/src/frame.cpp index 8f1a65121..988549e97 100644 --- a/akregator/src/frame.cpp +++ b/akregator/src/frame.cpp @@ -62,7 +62,7 @@ Frame::Frame(TQObject * parent, KParts::ReadOnlyPart *p, TQWidget *visWidget, co connect(p, TQT_SIGNAL(canceled(const TQString &)), this, TQT_SLOT(setCanceled(const TQString&))); connect(p, TQT_SIGNAL(completed(bool)), this, TQT_SLOT(setCompleted())); -/* KActionCollection *coll=p->actionCollection(); +/* TDEActionCollection *coll=p->actionCollection(); if (coll) { connect( coll, TQT_SIGNAL( actionStatusText( const TQString & ) ), diff --git a/akregator/src/main.cpp b/akregator/src/main.cpp index 797188cc6..70567e504 100644 --- a/akregator/src/main.cpp +++ b/akregator/src/main.cpp @@ -102,7 +102,7 @@ int main(int argc, char **argv) { #undef RESTORE #define RESTORE(type) { int n = 1;\ - while (KMainWindow::canBeRestored(n)){\ + while (TDEMainWindow::canBeRestored(n)){\ (new type)->restore(n, false);\ n++;}} diff --git a/akregator/src/mainwindow.cpp b/akregator/src/mainwindow.cpp index 065d02480..afe2ecbab 100644 --- a/akregator/src/mainwindow.cpp +++ b/akregator/src/mainwindow.cpp @@ -223,7 +223,7 @@ KParts::BrowserExtension *MainWindow::browserExtension(KParts::ReadOnlyPart *p) // from konqmainwindow -void MainWindow::connectActionCollection( KActionCollection *coll ) +void MainWindow::connectActionCollection( TDEActionCollection *coll ) { if (!coll) return; connect( coll, TQT_SIGNAL( actionStatusText( const TQString & ) ), @@ -243,7 +243,7 @@ bool MainWindow::queryExit() else kdDebug("MainWindow::queryExit(): saving session"); - return KMainWindow::queryExit(); + return TDEMainWindow::queryExit(); } void MainWindow::slotQuit() diff --git a/akregator/src/mainwindow.h b/akregator/src/mainwindow.h index 6f0374b67..4acf5adaa 100644 --- a/akregator/src/mainwindow.h +++ b/akregator/src/mainwindow.h @@ -35,8 +35,8 @@ #include <tdeparts/browserextension.h> #include <tdeio/job.h> -class KActionCollection; -class KToggleAction; +class TDEActionCollection; +class TDEToggleAction; class KSqueezedTextLabel; class KProgress; @@ -127,7 +127,7 @@ protected slots: private: void setupActions(); - void connectActionCollection(KActionCollection *coll); + void connectActionCollection(TDEActionCollection *coll); KParts::BrowserExtension *browserExtension(KParts::ReadOnlyPart *p); diff --git a/akregator/src/pageviewer.cpp b/akregator/src/pageviewer.cpp index 63d944c6b..6fb91780b 100644 --- a/akregator/src/pageviewer.cpp +++ b/akregator/src/pageviewer.cpp @@ -86,10 +86,10 @@ class PageViewer::PageViewerPrivate TQValueList<HistoryEntry> history; TQValueList<HistoryEntry>::Iterator current; - KToolBarPopupAction* backAction; - KToolBarPopupAction* forwardAction; - KAction* reloadAction; - KAction* stopAction; + TDEToolBarPopupAction* backAction; + TDEToolBarPopupAction* forwardAction; + TDEAction* reloadAction; + TDEAction* stopAction; TQString caption; }; @@ -107,8 +107,8 @@ PageViewer::PageViewer(TQWidget *parent, const char *name) TQPair< KGuiItem, KGuiItem > backForward = KStdGuiItem::backAndForward(); - d->backAction = new KToolBarPopupAction(backForward.first, - KStdAccel::shortcut(KStdAccel::Back), this, + d->backAction = new TDEToolBarPopupAction(backForward.first, + TDEStdAccel::shortcut(TDEStdAccel::Back), this, TQT_SLOT(slotBack()), actionCollection(), "pageviewer_back"); @@ -118,8 +118,8 @@ PageViewer::PageViewer(TQWidget *parent, const char *name) this, TQT_SLOT(slotPopupActivated(int))); - d->forwardAction = new KToolBarPopupAction(backForward.second, - KStdAccel::shortcut(KStdAccel::Forward),this, + d->forwardAction = new TDEToolBarPopupAction(backForward.second, + TDEStdAccel::shortcut(TDEStdAccel::Forward),this, TQT_SLOT(slotForward()), actionCollection(), "pageviewer_forward"); @@ -128,10 +128,10 @@ PageViewer::PageViewer(TQWidget *parent, const char *name) connect(d->forwardAction->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPopupActivated(int))); - d->reloadAction = new KAction(i18n("Reload"), "reload", 0, + d->reloadAction = new TDEAction(i18n("Reload"), "reload", 0, this, TQT_SLOT(slotReload()), actionCollection(), "pageviewer_reload"); - d->stopAction = new KAction(KStdGuiItem::guiItem(KStdGuiItem::Stop), 0, + d->stopAction = new TDEAction(KStdGuiItem::guiItem(KStdGuiItem::Stop), 0, this, TQT_SLOT(slotStop()), actionCollection(), "pageviewer_stop"); @@ -185,7 +185,7 @@ void PageViewer::slotForward() void PageViewer::slotBackAboutToShow() { - KPopupMenu *popup = d->backAction->popupMenu(); + TDEPopupMenu *popup = d->backAction->popupMenu(); popup->clear(); if ( d->current == d->history.begin() ) @@ -211,7 +211,7 @@ void PageViewer::slotBackAboutToShow() void PageViewer::slotForwardAboutToShow() { - KPopupMenu *popup = d->forwardAction->popupMenu(); + TDEPopupMenu *popup = d->forwardAction->popupMenu(); popup->clear(); if ( d->current == d->history.fromLast() ) @@ -424,7 +424,7 @@ void PageViewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kur const bool isLink = (kpf & (KParts::BrowserExtension::ShowNavigationItems | KParts::BrowserExtension::ShowTextSelectionItems)) == 0; const bool isSelection = (kpf & KParts::BrowserExtension::ShowTextSelectionItems) != 0; - KPopupMenu popup(this->widget()); + TDEPopupMenu popup(this->widget()); int idNewWindow = -2; if (isLink) @@ -435,7 +435,7 @@ void PageViewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kur popup.insertSeparator(); action("savelinkas")->plug(&popup); - KAction* copylinkaddress = action("copylinkaddress"); + TDEAction* copylinkaddress = action("copylinkaddress"); if (copylinkaddress) { copylinkaddress->plug( &popup); @@ -463,8 +463,8 @@ void PageViewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kur popup.insertSeparator(); } - KAction* incFontAction = this->action("incFontSizes"); - KAction* decFontAction = this->action("decFontSizes"); + TDEAction* incFontAction = this->action("incFontSizes"); + TDEAction* decFontAction = this->action("decFontSizes"); if ( incFontAction && decFontAction ) { incFontAction->plug( &popup ); @@ -477,7 +477,7 @@ void PageViewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kur action("viewer_print")->plug(&popup); popup.insertSeparator(); - KAction *ac = action("setEncoding"); + TDEAction *ac = action("setEncoding"); if (ac) ac->plug(&popup); popup.insertItem(SmallIcon("bookmark_add"),i18n("Add to Konqueror Bookmarks"), this, TQT_SLOT(slotGlobalBookmarkArticle())); diff --git a/akregator/src/pageviewer.h b/akregator/src/pageviewer.h index 8b4b59e40..d337779a6 100644 --- a/akregator/src/pageviewer.h +++ b/akregator/src/pageviewer.h @@ -29,8 +29,8 @@ #include "viewer.h" -class KAction; -class KToolBarPopupAction; +class TDEAction; +class TDEToolBarPopupAction; class TQString; namespace Akregator diff --git a/akregator/src/settings_appearance.ui b/akregator/src/settings_appearance.ui index c049638d0..e2a6998c5 100644 --- a/akregator/src/settings_appearance.ui +++ b/akregator/src/settings_appearance.ui @@ -133,7 +133,7 @@ <string>Standard font:</string> </property> </widget> - <widget class="KFontCombo" row="0" column="1"> + <widget class="TDEFontCombo" row="0" column="1"> <property name="name"> <cstring>kcfg_StandardFont</cstring> </property> @@ -146,7 +146,7 @@ <string>Fixed font:</string> </property> </widget> - <widget class="KFontCombo" row="1" column="1"> + <widget class="TDEFontCombo" row="1" column="1"> <property name="name"> <cstring>kcfg_FixedFont</cstring> </property> @@ -159,7 +159,7 @@ <string>Serif font:</string> </property> </widget> - <widget class="KFontCombo" row="2" column="1"> + <widget class="TDEFontCombo" row="2" column="1"> <property name="name"> <cstring>kcfg_SerifFont</cstring> </property> @@ -172,7 +172,7 @@ <string>Sans serif font:</string> </property> </widget> - <widget class="KFontCombo" row="3" column="1"> + <widget class="TDEFontCombo" row="3" column="1"> <property name="name"> <cstring>kcfg_SansSerifFont</cstring> </property> diff --git a/akregator/src/simplenodeselector.cpp b/akregator/src/simplenodeselector.cpp index cb296beeb..d0d69e456 100644 --- a/akregator/src/simplenodeselector.cpp +++ b/akregator/src/simplenodeselector.cpp @@ -81,7 +81,7 @@ void SelectNodeDialog::slotNodeSelected(TreeNode* node) class SimpleNodeSelector::SimpleNodeSelectorPrivate { public: - KListView* view; + TDEListView* view; FeedList* list; NodeVisitor* visitor; TQMap<TreeNode*,TQListViewItem*> nodeToItem; @@ -113,11 +113,11 @@ class SimpleNodeSelector::NodeVisitor : public TreeNodeVisitor { TQListViewItem* pi = node->parent() ? m_view->d->nodeToItem[node->parent()] : 0; - KListViewItem* item = 0; + TDEListViewItem* item = 0; if (pi != 0) - item = new KListViewItem(pi, node->title()); + item = new TDEListViewItem(pi, node->title()); else - item = new KListViewItem(m_view->d->view, node->title()); + item = new TDEListViewItem(m_view->d->view, node->title()); item->setExpandable(false); m_view->d->nodeToItem.insert(node, item); m_view->d->itemToNode.insert(item, node); @@ -136,7 +136,7 @@ SimpleNodeSelector::SimpleNodeSelector(FeedList* feedList, TQWidget* parent, con d->list = feedList; connect(feedList, TQT_SIGNAL(signalDestroyed(FeedList*)), this, TQT_SLOT(slotFeedListDestroyed(FeedList*))); - d->view = new KListView(this); + d->view = new TDEListView(this); d->view->setRootIsDecorated(true); d->view->addColumn(i18n("Feeds")); diff --git a/akregator/src/tagaction.cpp b/akregator/src/tagaction.cpp index 3fe5c2fbb..d3bcce299 100644 --- a/akregator/src/tagaction.cpp +++ b/akregator/src/tagaction.cpp @@ -45,8 +45,8 @@ class TagAction::TagActionPrivate }; TagAction::TagAction(const Tag& tag, const TQObject *receiver, const char *slot, TQObject *parent) -//KAction (const TQString &text, const KShortcut &cut, const TQObject *receiver, const char *slot, TQObject *parent, const char *name=0) - : KToggleAction(tag.name(), KShortcut(), 0, 0, parent), d(new TagActionPrivate) +//TDEAction (const TQString &text, const TDEShortcut &cut, const TQObject *receiver, const char *slot, TQObject *parent, const char *name=0) + : TDEToggleAction(tag.name(), TDEShortcut(), 0, 0, parent), d(new TagActionPrivate) { d->tag = tag; connect(this, TQT_SIGNAL(toggled(const Tag&, bool)), receiver, slot); @@ -67,7 +67,7 @@ Tag TagAction::tag() const /* void TagAction::unplug(TQWidget* widget) { - KToggleAction::unplug(widget); + TDEToggleAction::unplug(widget); TQPopupMenu* popup = ::tqt_cast<TQPopupMenu *>(widget); if (popup) @@ -83,10 +83,10 @@ int TagAction::plug(TQWidget* widget, int index) TQPopupMenu* popup = ::tqt_cast<TQPopupMenu *>( widget ); if (!popup) { - kdWarning() << "Can not plug KToggleAction in " << widget->className() << endl; + kdWarning() << "Can not plug TDEToggleAction in " << widget->className() << endl; return -1; } - if (kapp && !kapp->authorizeKAction(name())) + if (kapp && !kapp->authorizeTDEAction(name())) return -1; TagMenuItem* item = new TagMenuItem(d->tag); diff --git a/akregator/src/tagaction.h b/akregator/src/tagaction.h index 59ea3ccb6..b869f9ecd 100644 --- a/akregator/src/tagaction.h +++ b/akregator/src/tagaction.h @@ -34,8 +34,8 @@ namespace Akregator { class Tag; -/** a KToggleAction for assigning and removing tags. Displays the tag name and emits the tag when activated */ -class TagAction : public KToggleAction +/** a TDEToggleAction for assigning and removing tags. Displays the tag name and emits the tag when activated */ +class TagAction : public TDEToggleAction { Q_OBJECT diff --git a/akregator/src/tagfolderitem.cpp b/akregator/src/tagfolderitem.cpp index 09fcf0c2b..68bab5a5d 100644 --- a/akregator/src/tagfolderitem.cpp +++ b/akregator/src/tagfolderitem.cpp @@ -41,11 +41,11 @@ TagFolderItem::TagFolderItem(FolderItem* parent, TreeNodeItem* after, TagFolder* { } -TagFolderItem::TagFolderItem(KListView* parent, TagFolder* node) : FolderItem(parent, node) +TagFolderItem::TagFolderItem(TDEListView* parent, TagFolder* node) : FolderItem(parent, node) { } -TagFolderItem::TagFolderItem(KListView* parent, TreeNodeItem* after, TagFolder* node) : FolderItem(parent, after, node) +TagFolderItem::TagFolderItem(TDEListView* parent, TreeNodeItem* after, TagFolder* node) : FolderItem(parent, after, node) { } diff --git a/akregator/src/tagfolderitem.h b/akregator/src/tagfolderitem.h index fc9102666..78bc91529 100644 --- a/akregator/src/tagfolderitem.h +++ b/akregator/src/tagfolderitem.h @@ -42,8 +42,8 @@ class TagFolderItem : public FolderItem public: TagFolderItem(FolderItem* parent, TagFolder* node); TagFolderItem(FolderItem* parent, TreeNodeItem* after, TagFolder* node); - TagFolderItem(KListView* parent, TagFolder* node); - TagFolderItem(KListView* parent, TreeNodeItem* after, TagFolder* node); + TagFolderItem(TDEListView* parent, TagFolder* node); + TagFolderItem(TDEListView* parent, TreeNodeItem* after, TagFolder* node); virtual ~TagFolderItem(); virtual TagFolder* node(); diff --git a/akregator/src/tagnodeitem.cpp b/akregator/src/tagnodeitem.cpp index 2c2e7f340..8697a3419 100644 --- a/akregator/src/tagnodeitem.cpp +++ b/akregator/src/tagnodeitem.cpp @@ -45,12 +45,12 @@ TagNodeItem::TagNodeItem(FolderItem* parent, TreeNodeItem* after, TagNode* node) initialize(node); } -TagNodeItem::TagNodeItem(KListView* parent, TagNode* node) : TreeNodeItem(parent, node) +TagNodeItem::TagNodeItem(TDEListView* parent, TagNode* node) : TreeNodeItem(parent, node) { initialize(node); } -TagNodeItem::TagNodeItem(KListView* parent, TreeNodeItem* after, TagNode* node) : TreeNodeItem(parent, after, node) +TagNodeItem::TagNodeItem(TDEListView* parent, TreeNodeItem* after, TagNode* node) : TreeNodeItem(parent, after, node) { initialize(node); } diff --git a/akregator/src/tagnodeitem.h b/akregator/src/tagnodeitem.h index a2719bb30..aee76d7f7 100644 --- a/akregator/src/tagnodeitem.h +++ b/akregator/src/tagnodeitem.h @@ -39,8 +39,8 @@ class TagNodeItem : public TreeNodeItem public: TagNodeItem(FolderItem* parent, TagNode* node); TagNodeItem(FolderItem* parent, TreeNodeItem* after, TagNode* node); - TagNodeItem(KListView* parent, TagNode* node); - TagNodeItem(KListView* parent, TreeNodeItem* after, TagNode* node); + TagNodeItem(TDEListView* parent, TagNode* node); + TagNodeItem(TDEListView* parent, TreeNodeItem* after, TagNode* node); virtual ~TagNodeItem(); virtual void nodeChanged(); diff --git a/akregator/src/treenodeitem.cpp b/akregator/src/treenodeitem.cpp index 3299e2783..4e60ea9af 100644 --- a/akregator/src/treenodeitem.cpp +++ b/akregator/src/treenodeitem.cpp @@ -37,24 +37,24 @@ namespace Akregator { TreeNodeItem::TreeNodeItem(FolderItem* parent, TreeNode* node) - : KListViewItem(parent), m_node(node) + : TDEListViewItem(parent), m_node(node) { initialize(node); } -TreeNodeItem::TreeNodeItem(KListView* parent, TreeNode* node) - : KListViewItem(parent), m_node(node) +TreeNodeItem::TreeNodeItem(TDEListView* parent, TreeNode* node) + : TDEListViewItem(parent), m_node(node) { initialize(node); } -TreeNodeItem::TreeNodeItem(KListView* parent, TreeNodeItem* after, TreeNode* node) : KListViewItem(parent, after), m_node(node) +TreeNodeItem::TreeNodeItem(TDEListView* parent, TreeNodeItem* after, TreeNode* node) : TDEListViewItem(parent, after), m_node(node) { initialize(node); } TreeNodeItem::TreeNodeItem(FolderItem* parent, TreeNodeItem* after, TreeNode* node) - : KListViewItem(parent, after), m_node(node) + : TDEListViewItem(parent, after), m_node(node) { initialize(node); } @@ -91,17 +91,17 @@ void TreeNodeItem::nodeChanged() TreeNodeItem* TreeNodeItem::firstChild() const { - return static_cast<TreeNodeItem*>(KListViewItem::firstChild()); + return static_cast<TreeNodeItem*>(TDEListViewItem::firstChild()); } TreeNodeItem* TreeNodeItem::nextSibling() const { - return static_cast<TreeNodeItem*>(KListViewItem::nextSibling()); + return static_cast<TreeNodeItem*>(TDEListViewItem::nextSibling()); } FolderItem* TreeNodeItem::parent() const { - return static_cast<FolderItem*>(KListViewItem::parent()); + return static_cast<FolderItem*>(TDEListViewItem::parent()); } @@ -114,7 +114,7 @@ void TreeNodeItem::paintCell( TQPainter * p, const TQColorGroup & cg, if (u <= 0) { - KListViewItem::paintCell(p,cg,column,width,align); + TDEListViewItem::paintCell(p,cg,column,width,align); return; } @@ -123,7 +123,7 @@ void TreeNodeItem::paintCell( TQPainter * p, const TQColorGroup & cg, setText( column, " " ); // draw bg - KListViewItem::paintCell(p,cg,column,width,align); + TDEListViewItem::paintCell(p,cg,column,width,align); setText( column, oldText); diff --git a/akregator/src/treenodeitem.h b/akregator/src/treenodeitem.h index 386da0d5d..ca1583471 100644 --- a/akregator/src/treenodeitem.h +++ b/akregator/src/treenodeitem.h @@ -38,15 +38,15 @@ class TreeNode; /** abstract base class for all items in the feeds tree */ -class TreeNodeItem : public KListViewItem +class TreeNodeItem : public TDEListViewItem { public: TreeNodeItem(FolderItem* parent, TreeNode* node); TreeNodeItem(FolderItem* parent, TreeNodeItem* after, TreeNode* node); - TreeNodeItem(KListView* parent, TreeNode* node); - TreeNodeItem(KListView* parent, TreeNodeItem* after, TreeNode* node); + TreeNodeItem(TDEListView* parent, TreeNode* node); + TreeNodeItem(TDEListView* parent, TreeNodeItem* after, TreeNode* node); virtual ~TreeNodeItem(); virtual TreeNode* node(); diff --git a/akregator/src/viewer.cpp b/akregator/src/viewer.cpp index 20cf59244..57afb3ec2 100644 --- a/akregator/src/viewer.cpp +++ b/akregator/src/viewer.cpp @@ -67,17 +67,17 @@ Viewer::Viewer(TQWidget *parent, const char *name) KStdAction::print(this, TQT_SLOT(slotPrint()), actionCollection(), "viewer_print"); KStdAction::copy(this, TQT_SLOT(slotCopy()), actionCollection(), "viewer_copy"); - new KAction( i18n("&Increase Font Sizes"), "viewmag+", "Ctrl+Plus", this, TQT_SLOT(slotZoomIn()), actionCollection(), "incFontSizes" ); - new KAction( i18n("&Decrease Font Sizes"), "viewmag-", "Ctrl+Minus", this, TQT_SLOT(slotZoomOut()), actionCollection(), "decFontSizes" ); + new TDEAction( i18n("&Increase Font Sizes"), "viewmag+", "Ctrl+Plus", this, TQT_SLOT(slotZoomIn()), actionCollection(), "incFontSizes" ); + new TDEAction( i18n("&Decrease Font Sizes"), "viewmag-", "Ctrl+Minus", this, TQT_SLOT(slotZoomOut()), actionCollection(), "decFontSizes" ); connect(this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged())); connect( browserExtension(), TQT_SIGNAL(openURLRequestDelayed(const KURL&, const KParts::URLArgs&)), this, TQT_SLOT(slotOpenURLRequest(const KURL&, const KParts::URLArgs& )) ); - new KAction(i18n("Copy &Link Address"), "", 0, + new TDEAction(i18n("Copy &Link Address"), "", 0, this, TQT_SLOT(slotCopyLinkAddress()), actionCollection(), "copylinkaddress"); - new KAction(i18n("&Save Link As..."), "", 0, + new TDEAction(i18n("&Save Link As..."), "", 0, this, TQT_SLOT(slotSaveLinkAs()), actionCollection(), "savelinkas"); } @@ -173,7 +173,7 @@ void Viewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kurl, c TQString url = kurl.url(); m_url = url; - KPopupMenu popup; + TDEPopupMenu popup; if (isLink && !isSelection) { @@ -191,7 +191,7 @@ void Viewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kurl, c popup.insertSeparator(); } action("viewer_print")->plug(&popup); - //KAction *ac = action("setEncoding"); + //TDEAction *ac = action("setEncoding"); //if (ac) // ac->plug(&popup); } diff --git a/certmanager/certmanager.cpp b/certmanager/certmanager.cpp index 57ea1432d..170f64268 100644 --- a/certmanager/certmanager.cpp +++ b/certmanager/certmanager.cpp @@ -162,7 +162,7 @@ namespace { CertManager::CertManager( bool remote, const TQString& query, const TQString & import, TQWidget* parent, const char* name, WFlags f ) - : KMainWindow( parent, name, f|WDestructiveClose ), + : TDEMainWindow( parent, name, f|WDestructiveClose ), mCrlView( 0 ), mDirmngrProc( 0 ), mHierarchyAnalyser( 0 ), @@ -250,104 +250,104 @@ static inline void connectEnableOperationSignal( TQObject * s, TQObject * d ) { void CertManager::createActions() { - KAction * action = 0; + TDEAction * action = 0; (void)KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection() ); action = KStdAction::redisplay( TQT_TQOBJECT(this), TQT_SLOT(slotRedisplay()), actionCollection() ); // work around the fact that the stdaction has no shortcut - KShortcut reloadShortcut = KStdAccel::shortcut(KStdAccel::Reload); + TDEShortcut reloadShortcut = TDEStdAccel::shortcut(TDEStdAccel::Reload); reloadShortcut.append(KKey(CTRL + Key_R)); action->setShortcut( reloadShortcut ); connectEnableOperationSignal( TQT_TQOBJECT(this), action ); - action = new KAction( i18n("Stop Operation"), "stop", Key_Escape, + action = new TDEAction( i18n("Stop Operation"), "stop", Key_Escape, TQT_TQOBJECT(this), TQT_SIGNAL(stopOperations()), actionCollection(), "view_stop_operations" ); action->setEnabled( false ); - (void) new KAction( i18n("New Key Pair..."), "filenew", 0, + (void) new TDEAction( i18n("New Key Pair..."), "filenew", 0, TQT_TQOBJECT(this), TQT_SLOT(newCertificate()), actionCollection(), "file_new_certificate" ); - connect( new KToggleAction( i18n("Hierarchical Key List"), 0, + connect( new TDEToggleAction( i18n("Hierarchical Key List"), 0, actionCollection(), "view_hierarchical" ), TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggleHierarchicalView(bool)) ); - action = new KAction( i18n("Expand All"), 0, CTRL+Key_Period, + action = new TDEAction( i18n("Expand All"), 0, CTRL+Key_Period, TQT_TQOBJECT(this), TQT_SLOT(slotExpandAll()), actionCollection(), "view_expandall" ); - action = new KAction( i18n("Collapse All"), 0, CTRL+Key_Comma, + action = new TDEAction( i18n("Collapse All"), 0, CTRL+Key_Comma, TQT_TQOBJECT(this), TQT_SLOT(slotCollapseAll()), actionCollection(), "view_collapseall" ); - (void) new KAction( i18n("Refresh CRLs"), 0, 0, + (void) new TDEAction( i18n("Refresh CRLs"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotRefreshKeys()), actionCollection(), "certificates_refresh_clr" ); #ifdef NOT_IMPLEMENTED_ANYWAY - mRevokeCertificateAction = new KAction( i18n("Revoke"), 0, + mRevokeCertificateAction = new TDEAction( i18n("Revoke"), 0, TQT_TQOBJECT(this), TQT_SLOT(revokeCertificate()), actionCollection(), "edit_revoke_certificate" ); connectEnableOperationSignal( this, mRevokeCertificateAction ); - mExtendCertificateAction = new KAction( i18n("Extend"), 0, + mExtendCertificateAction = new TDEAction( i18n("Extend"), 0, TQT_TQOBJECT(this), TQT_SLOT(extendCertificate()), actionCollection(), "edit_extend_certificate" ); connectEnableOperationSignal( this, mExtendCertificateAction ); #endif - mDeleteCertificateAction = new KAction( i18n("Delete"), "editdelete", Key_Delete, + mDeleteCertificateAction = new TDEAction( i18n("Delete"), "editdelete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotDeleteCertificate()), actionCollection(), "edit_delete_certificate" ); connectEnableOperationSignal( TQT_TQOBJECT(this), mDeleteCertificateAction ); - mValidateCertificateAction = new KAction( i18n("Validate"), "reload", SHIFT + Key_F5, + mValidateCertificateAction = new TDEAction( i18n("Validate"), "reload", SHIFT + Key_F5, TQT_TQOBJECT(this), TQT_SLOT(slotValidate()), actionCollection(), "certificates_validate" ); connectEnableOperationSignal( TQT_TQOBJECT(this), mValidateCertificateAction ); - mImportCertFromFileAction = new KAction( i18n("Import Certificates..."), 0, + mImportCertFromFileAction = new TDEAction( i18n("Import Certificates..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotImportCertFromFile()), actionCollection(), "file_import_certificates" ); connectEnableOperationSignal( TQT_TQOBJECT(this), mImportCertFromFileAction ); - mImportCRLFromFileAction = new KAction( i18n("Import CRLs..."), 0, + mImportCRLFromFileAction = new TDEAction( i18n("Import CRLs..."), 0, TQT_TQOBJECT(this), TQT_SLOT(importCRLFromFile()), actionCollection(), "file_import_crls" ); connectEnableOperationSignal( TQT_TQOBJECT(this), mImportCRLFromFileAction ); - mExportCertificateAction = new KAction( i18n("Export Certificates..."), "export", 0, + mExportCertificateAction = new TDEAction( i18n("Export Certificates..."), "export", 0, TQT_TQOBJECT(this), TQT_SLOT(slotExportCertificate()), actionCollection(), "file_export_certificate" ); - mExportSecretKeyAction = new KAction( i18n("Export Secret Key..."), "export", 0, + mExportSecretKeyAction = new TDEAction( i18n("Export Secret Key..."), "export", 0, TQT_TQOBJECT(this), TQT_SLOT(slotExportSecretKey()), actionCollection(), "file_export_secret_keys" ); connectEnableOperationSignal( TQT_TQOBJECT(this), mExportSecretKeyAction ); - mViewCertDetailsAction = new KAction( i18n("Certificate Details..."), 0, 0, + mViewCertDetailsAction = new TDEAction( i18n("Certificate Details..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewDetails()), actionCollection(), "view_certificate_details" ); - mDownloadCertificateAction = new KAction( i18n( "Download"), 0, 0, + mDownloadCertificateAction = new TDEAction( i18n( "Download"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotDownloadCertificate()), actionCollection(), "download_certificate" ); const TQString dirmngr = TDEStandardDirs::findExe( "gpgsm" ); mDirMngrFound = !dirmngr.isEmpty(); - action = new KAction( i18n("Dump CRL Cache..."), 0, + action = new TDEAction( i18n("Dump CRL Cache..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewCRLs()), actionCollection(), "crl_dump_crl_cache" ); action->setEnabled( mDirMngrFound ); // we also need dirmngr for this - action = new KAction( i18n("Clear CRL Cache..."), 0, + action = new TDEAction( i18n("Clear CRL Cache..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotClearCRLs()), actionCollection(), "crl_clear_crl_cache" ); action->setEnabled( mDirMngrFound ); // we also need dirmngr for this - action = new KAction( i18n("GnuPG Log Viewer..."), "pgp-keys", 0, TQT_TQOBJECT(this), + action = new TDEAction( i18n("GnuPG Log Viewer..."), "pgp-keys", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStartWatchGnuPG()), actionCollection(), "tools_start_kwatchgnupg"); // disable action if no kwatchgnupg binary is around if (TDEStandardDirs::findExe("kwatchgnupg").isEmpty()) action->setEnabled(false); @@ -363,13 +363,13 @@ void CertManager::createActions() { mComboAction = new ComboAction( lst, actionCollection(), TQT_TQOBJECT(this), TQT_SLOT( slotToggleRemote(int) ), "location_combo_action", mNextFindRemote? 1 : 0 ); - mFindAction = new KAction( i18n("Find"), "find", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSearch()), + mFindAction = new TDEAction( i18n("Find"), "find", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSearch()), actionCollection(), "find" ); KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT(slotEditKeybindings()), actionCollection() ); KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT(slotShowConfigurationDialog()), actionCollection() ); - new KAction( i18n( "Configure &GpgME Backend" ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigureGpgME()), + new TDEAction( i18n( "Configure &GpgME Backend" ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigureGpgME()), actionCollection(), "configure_gpgme" ); createStandardStatusBarAction(); @@ -423,12 +423,12 @@ void CertManager::slotToggleHierarchicalView( bool hier ) { mHierarchicalView = hier; mKeyListView->setHierarchical( hier ); mKeyListView->setRootIsDecorated( hier ); - if ( KAction * act = action("view_expandall") ) + if ( TDEAction * act = action("view_expandall") ) act->setEnabled( hier ); - if ( KAction * act = action("view_collapseall" ) ) + if ( TDEAction * act = action("view_collapseall" ) ) act->setEnabled( hier ); - if ( KToggleAction * act = - static_cast<KToggleAction*>( action("view_hierarchical") ) ) + if ( TDEToggleAction * act = + static_cast<TDEToggleAction*>( action("view_hierarchical") ) ) act->setChecked( hier ); if ( hier && !mCurrentQuery.isEmpty() ) diff --git a/certmanager/certmanager.h b/certmanager/certmanager.h index 2ecc5e9d6..5ed440bd5 100644 --- a/certmanager/certmanager.h +++ b/certmanager/certmanager.h @@ -55,8 +55,8 @@ namespace TDEIO { class Job; } class TDEProcess; -class KToolBar; -class KAction; +class TDEToolBar; +class TDEAction; class CRLView; class HierarchyAnalyser; @@ -76,7 +76,7 @@ namespace GpgME { class Key; } -class KDE_EXPORT CertManager : public KMainWindow { +class KDE_EXPORT CertManager : public TDEMainWindow { Q_OBJECT public: @@ -192,19 +192,19 @@ private: LineEditAction * mLineEditAction; ComboAction * mComboAction; - KAction * mFindAction; - KAction * mImportCertFromFileAction; - KAction * mImportCRLFromFileAction; - KAction * mExportCertificateAction; - KAction * mViewCertDetailsAction; - KAction * mDeleteCertificateAction; + TDEAction * mFindAction; + TDEAction * mImportCertFromFileAction; + TDEAction * mImportCRLFromFileAction; + TDEAction * mExportCertificateAction; + TDEAction * mViewCertDetailsAction; + TDEAction * mDeleteCertificateAction; #ifdef NOT_IMPLEMENTED_ANYWAY - KAction * mRevokeCertificateAction; - KAction * mExtendCertificateAction; + TDEAction * mRevokeCertificateAction; + TDEAction * mExtendCertificateAction; #endif - KAction * mExportSecretKeyAction; - KAction * mDownloadCertificateAction; - KAction * mValidateCertificateAction; + TDEAction * mExportSecretKeyAction; + TDEAction * mDownloadCertificateAction; + TDEAction * mValidateCertificateAction; TQString mImportCRLTempFile; TQString mCurrentQuery; diff --git a/certmanager/conf/appearanceconfigwidget.cpp b/certmanager/conf/appearanceconfigwidget.cpp index 3c2c7c04a..432f2ce99 100644 --- a/certmanager/conf/appearanceconfigwidget.cpp +++ b/certmanager/conf/appearanceconfigwidget.cpp @@ -305,8 +305,8 @@ void AppearanceConfigWidget::slotFontClicked() { if( !item ) return; TQFont font = item->font(); - int result = KFontDialog::getFont( font ); - if ( result == KFontDialog::Accepted ) { + int result = TDEFontDialog::getFont( font ); + if ( result == TDEFontDialog::Accepted ) { item->setFont( font ); item->repaint(); emit changed(); diff --git a/certmanager/customactions.cpp b/certmanager/customactions.cpp index 1e08876d6..268b85eec 100644 --- a/certmanager/customactions.cpp +++ b/certmanager/customactions.cpp @@ -39,18 +39,18 @@ #include <tqlabel.h> -LabelAction::LabelAction( const TQString & text, KActionCollection * parent, +LabelAction::LabelAction( const TQString & text, TDEActionCollection * parent, const char* name ) - : KAction( text, TQIconSet(), KShortcut(), 0, 0, parent, name ) + : TDEAction( text, TQIconSet(), TDEShortcut(), 0, 0, parent, name ) { } int LabelAction::plug( TQWidget * widget, int index ) { - if ( kapp && !kapp->authorizeKAction( name() ) ) + if ( kapp && !kapp->authorizeTDEAction( name() ) ) return -1; - if ( widget->inherits( "KToolBar" ) ) { - KToolBar * bar = (KToolBar *)widget; + if ( widget->inherits( "TDEToolBar" ) ) { + TDEToolBar * bar = (TDEToolBar *)widget; int id_ = getToolButtonID(); TQLabel* label = new TQLabel( text(), bar, "kde toolbar widget" ); bar->insertWidget( id_, label->width(), label, index ); @@ -59,22 +59,22 @@ int LabelAction::plug( TQWidget * widget, int index ) { return containerCount() - 1; } - return KAction::plug( widget, index ); + return TDEAction::plug( widget, index ); } -LineEditAction::LineEditAction( const TQString & text, KActionCollection * parent, +LineEditAction::LineEditAction( const TQString & text, TDEActionCollection * parent, TQObject * receiver, const char * member, const char * name ) - : KAction( text, TQIconSet(), KShortcut(), 0, 0, parent, name ), + : TDEAction( text, TQIconSet(), TDEShortcut(), 0, 0, parent, name ), _le(0), _receiver(receiver), _member(member) { } int LineEditAction::plug( TQWidget * widget, int index ) { - if ( kapp && !kapp->authorizeKAction( name() ) ) + if ( kapp && !kapp->authorizeTDEAction( name() ) ) return -1; - if ( widget->inherits( "KToolBar" ) ) { - KToolBar *bar = (KToolBar *)widget; + if ( widget->inherits( "TDEToolBar" ) ) { + TDEToolBar *bar = (TDEToolBar *)widget; int id_ = getToolButtonID(); // The toolbar trick doesn't seem to work for lineedits //_le = new TQLineEdit( bar, "kde toolbar widget" ); @@ -87,7 +87,7 @@ int LineEditAction::plug( TQWidget * widget, int index ) { return containerCount() - 1; } - return KAction::plug( widget, index ); + return TDEAction::plug( widget, index ); } void LineEditAction::clear() { @@ -108,20 +108,20 @@ void LineEditAction::setText( const TQString & txt ) { } -ComboAction::ComboAction( const TQStringList & lst, KActionCollection * parent, +ComboAction::ComboAction( const TQStringList & lst, TDEActionCollection * parent, TQObject * receiver, const char * member, const char * name, int selectedID ) - : KAction( TQString(), TQIconSet(), KShortcut(), 0, 0, parent, name ), + : TDEAction( TQString(), TQIconSet(), TDEShortcut(), 0, 0, parent, name ), _lst(lst), _receiver(receiver), _member(member), _selectedId( selectedID ) { } int ComboAction::plug( TQWidget * widget, int index ) { - if ( kapp && !kapp->authorizeKAction( name() ) ) + if ( kapp && !kapp->authorizeTDEAction( name() ) ) return -1; - if ( widget->inherits( "KToolBar" ) ) { - KToolBar *bar = (KToolBar *)widget; + if ( widget->inherits( "TDEToolBar" ) ) { + TDEToolBar *bar = (TDEToolBar *)widget; int id_ = getToolButtonID(); bar->insertCombo( _lst, id_, false, TQT_SIGNAL( highlighted(int) ), _receiver, _member ); bar->setCurrentComboItem( id_,_selectedId ); @@ -130,7 +130,7 @@ int ComboAction::plug( TQWidget * widget, int index ) { return containerCount() - 1; } - return KAction::plug( widget, index ); + return TDEAction::plug( widget, index ); } #include "customactions.moc" diff --git a/certmanager/customactions.h b/certmanager/customactions.h index 7d8626d60..c07157bd1 100644 --- a/certmanager/customactions.h +++ b/certmanager/customactions.h @@ -39,21 +39,21 @@ class TQLineEdit; -class LabelAction : public KAction { +class LabelAction : public TDEAction { Q_OBJECT public: - LabelAction( const TQString & text, KActionCollection * parent, + LabelAction( const TQString & text, TDEActionCollection * parent, const char* name ); int plug( TQWidget * widget, int index=-1 ); }; -class LineEditAction : public KAction { +class LineEditAction : public TDEAction { Q_OBJECT public: - LineEditAction( const TQString & text, KActionCollection * parent, + LineEditAction( const TQString & text, TDEActionCollection * parent, TQObject * receiver, const char * member, const char * name ); int plug( TQWidget * widget, int index=-1 ); @@ -67,11 +67,11 @@ private: const char * _member; }; -class ComboAction : public KAction { +class ComboAction : public TDEAction { Q_OBJECT public: - ComboAction( const TQStringList & lst, KActionCollection * parent, + ComboAction( const TQStringList & lst, TDEActionCollection * parent, TQObject * receiver, const char * member, const char * name, int selectedID ); diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp index 6dbca9828..729492547 100644 --- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp +++ b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp @@ -59,7 +59,7 @@ #define WATCHGNUPGSOCKET ( TQDir::home().canonicalPath() + "/.gnupg/log-socket") KWatchGnuPGMainWindow::KWatchGnuPGMainWindow( TQWidget* parent, const char* name ) - : KMainWindow( parent, name, WType_TopLevel ), mConfig(0) + : TDEMainWindow( parent, name, WType_TopLevel ), mConfig(0) { createActions(); createGUI(); @@ -95,7 +95,7 @@ void KWatchGnuPGMainWindow::slotClear() void KWatchGnuPGMainWindow::createActions() { - (void)new KAction( 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() ), actionCollection(), "clear_log" ); (void)KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs()), actionCollection() ); @@ -106,7 +106,7 @@ void KWatchGnuPGMainWindow::createActions() (void)KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureToolbars()), actionCollection()); #if 0 - (void)new KAction( i18n("Configure KWatchGnuPG..."), TQString::fromLatin1("configure"), + (void)new TDEAction( i18n("Configure KWatchGnuPG..."), TQString::fromLatin1("configure"), 0, this, TQT_SLOT( slotConfigure() ), actionCollection(), "configure" ); #endif @@ -224,7 +224,7 @@ void KWatchGnuPGMainWindow::slotAckRead() { void KWatchGnuPGMainWindow::show() { mSysTray->setAttention(false); - KMainWindow::show(); + TDEMainWindow::show(); } void KWatchGnuPGMainWindow::slotSaveAs() @@ -286,7 +286,7 @@ bool KWatchGnuPGMainWindow::queryClose() hide(); return false; } - return KMainWindow::queryClose(); + return TDEMainWindow::queryClose(); } #include "kwatchgnupgmainwin.moc" diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.h b/certmanager/kwatchgnupg/kwatchgnupgmainwin.h index 01a5f1239..9b6b4cd5f 100644 --- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.h +++ b/certmanager/kwatchgnupg/kwatchgnupgmainwin.h @@ -40,7 +40,7 @@ class KWatchGnuPGConfig; class KProcIO; class TQTextEdit; -class KWatchGnuPGMainWindow : public KMainWindow { +class KWatchGnuPGMainWindow : public TDEMainWindow { Q_OBJECT public: diff --git a/certmanager/lib/ui/backendconfigwidget.cpp b/certmanager/lib/ui/backendconfigwidget.cpp index 47ca25d40..d2312c725 100644 --- a/certmanager/lib/ui/backendconfigwidget.cpp +++ b/certmanager/lib/ui/backendconfigwidget.cpp @@ -73,11 +73,11 @@ namespace Kleo { class ProtocolCheckListItem; } -class Kleo::BackendListView : public KListView +class Kleo::BackendListView : public TDEListView { public: BackendListView( BackendConfigWidget* parent, const char* name = 0 ) - : KListView( parent, name ) {} + : TDEListView( parent, name ) {} /// return backend for currently selected (/current) item. Used by Configure button. const Kleo::CryptoBackend* currentBackend() const; @@ -95,7 +95,7 @@ public: class Kleo::BackendListViewItem : public TQListViewItem { public: - BackendListViewItem( KListView* lv, TQListViewItem *prev, const CryptoBackend *cryptoBackend ) + BackendListViewItem( TDEListView* lv, TQListViewItem *prev, const CryptoBackend *cryptoBackend ) : TQListViewItem( lv, prev, cryptoBackend->displayName() ), mCryptoBackend( cryptoBackend ) {} diff --git a/certmanager/lib/ui/cryptoconfigdialog.cpp b/certmanager/lib/ui/cryptoconfigdialog.cpp index 65edb93ef..d6dc823e7 100644 --- a/certmanager/lib/ui/cryptoconfigdialog.cpp +++ b/certmanager/lib/ui/cryptoconfigdialog.cpp @@ -54,7 +54,7 @@ Kleo::CryptoConfigDialog::CryptoConfigDialog( Kleo::CryptoConfig* config, TQWidg } // Automatically assign accelerators - KAcceleratorManager::manage( this ); + TDEAcceleratorManager::manage( this ); } void Kleo::CryptoConfigDialog::slotOk() diff --git a/certmanager/lib/ui/keylistview.cpp b/certmanager/lib/ui/keylistview.cpp index 100334f20..8e81b9768 100644 --- a/certmanager/lib/ui/keylistview.cpp +++ b/certmanager/lib/ui/keylistview.cpp @@ -129,14 +129,14 @@ static const struct { TQT_SLOT(slotEmitReturnPressed(TQListViewItem*)) }, { TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotEmitSelectionChanged(TQListViewItem*)) }, - { TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*,const TQPoint&)), - TQT_SLOT(slotEmitContextMenu(KListView*, TQListViewItem*,const TQPoint&)) }, + { TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*,const TQPoint&)), + TQT_SLOT(slotEmitContextMenu(TDEListView*, TQListViewItem*,const TQPoint&)) }, }; static const int numSignalReplacements = sizeof signalReplacements / sizeof *signalReplacements; Kleo::KeyListView::KeyListView( const ColumnStrategy * columnStrategy, const DisplayStrategy * displayStrategy, TQWidget * parent, const char * name, WFlags f ) - : KListView( parent, name ), + : TDEListView( parent, name ), mColumnStrategy( columnStrategy ), mDisplayStrategy ( displayStrategy ), mHierarchical( false ) @@ -187,7 +187,7 @@ Kleo::KeyListView::~KeyListView() { void Kleo::KeyListView::insertItem( TQListViewItem * qlvi ) { //kdDebug() << "Kleo::KeyListView::insertItem( " << qlvi << " )" << endl; - KListView::insertItem( qlvi ); + TDEListView::insertItem( qlvi ); if ( KeyListViewItem * item = lvi_cast<KeyListViewItem>( qlvi ) ) registerItem( item ); } @@ -196,7 +196,7 @@ void Kleo::KeyListView::takeItem( TQListViewItem * qlvi ) { //kdDebug() << "Kleo::KeyListView::takeItem( " << qlvi << " )" << endl; if ( KeyListViewItem * item = lvi_cast<KeyListViewItem>( qlvi ) ) deregisterItem( item ); - KListView::takeItem( qlvi ); + TDEListView::takeItem( qlvi ); } @@ -244,7 +244,7 @@ void Kleo::KeyListView::slotUpdateTimeout() { void Kleo::KeyListView::clear() { d->updateTimer->stop(); d->keyBuffer.clear(); - KListView::clear(); + TDEListView::clear(); } void Kleo::KeyListView::registerItem( KeyListViewItem * item ) { @@ -359,7 +359,7 @@ void Kleo::KeyListView::slotEmitSelectionChanged( TQListViewItem * item ) { emit selectionChanged( static_cast<KeyListViewItem*>( item ) ); } -void Kleo::KeyListView::slotEmitContextMenu( KListView*, TQListViewItem * item, const TQPoint & p ) { +void Kleo::KeyListView::slotEmitContextMenu( TDEListView*, TQListViewItem * item, const TQPoint & p ) { if ( !item || lvi_cast<KeyListViewItem>( item ) ) emit contextMenu( static_cast<KeyListViewItem*>( item ), p ); } @@ -833,11 +833,11 @@ Kleo::KeyListViewItem * Kleo::KeyListViewItem::nextSibling() const { } Kleo::KeyListViewItem * Kleo::KeyListView::firstChild() const { - return static_cast<Kleo::KeyListViewItem*>( KListView::firstChild() ); + return static_cast<Kleo::KeyListViewItem*>( TDEListView::firstChild() ); } Kleo::KeyListViewItem * Kleo::KeyListView::selectedItem() const { - return static_cast<Kleo::KeyListViewItem*>( KListView::selectedItem() ); + return static_cast<Kleo::KeyListViewItem*>( TDEListView::selectedItem() ); } static void selectedItems( TQPtrList<Kleo::KeyListViewItem> & result, TQListViewItem * start ) { diff --git a/certmanager/lib/ui/keylistview.h b/certmanager/lib/ui/keylistview.h index 5c711a77c..2f383cc53 100644 --- a/certmanager/lib/ui/keylistview.h +++ b/certmanager/lib/ui/keylistview.h @@ -198,7 +198,7 @@ namespace Kleo { }; - class KDE_EXPORT KeyListView : public KListView { + class KDE_EXPORT KeyListView : public TDEListView { Q_OBJECT friend class KeyListViewItem; @@ -287,7 +287,7 @@ namespace Kleo { void slotEmitDoubleClicked( TQListViewItem*, const TQPoint&, int ); void slotEmitReturnPressed( TQListViewItem* ); void slotEmitSelectionChanged( TQListViewItem* ); - void slotEmitContextMenu( KListView*, TQListViewItem*, const TQPoint& ); + void slotEmitContextMenu( TDEListView*, TQListViewItem*, const TQPoint& ); void slotUpdateTimeout(); public: diff --git a/kaddressbook/addresseditwidget.cpp b/kaddressbook/addresseditwidget.cpp index 5d17f4ef9..bb4938b89 100644 --- a/kaddressbook/addresseditwidget.cpp +++ b/kaddressbook/addresseditwidget.cpp @@ -358,7 +358,7 @@ AddressEditDialog::AddressEditDialog( const KABC::Address::List &list, connect( mCountryCombo, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( modified() ) ); connect( mPreferredCheckBox, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) ); - KAcceleratorManager::manage( this ); + TDEAcceleratorManager::manage( this ); mChanged = false; diff --git a/kaddressbook/addresseditwidget.h b/kaddressbook/addresseditwidget.h index c6d5e8587..c5b2f597f 100644 --- a/kaddressbook/addresseditwidget.h +++ b/kaddressbook/addresseditwidget.h @@ -42,7 +42,7 @@ class TQToolButton; class KActiveLabel; class KComboBox; class KLineEdit; -class KListView; +class TDEListView; typedef TypeCombo<KABC::Address> AddressTypeCombo; diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp index c1173b377..a53d6c345 100644 --- a/kaddressbook/addresseeeditorwidget.cpp +++ b/kaddressbook/addresseeeditorwidget.cpp @@ -847,7 +847,7 @@ void AddresseeEditorWidget::invalidDate() void AddresseeEditorWidget::pageChanged( TQWidget *wdg ) { if ( wdg ) - KAcceleratorManager::manage( wdg ); + TDEAcceleratorManager::manage( wdg ); } void AddresseeEditorWidget::setInitialFocus() diff --git a/kaddressbook/customfieldswidget.cpp b/kaddressbook/customfieldswidget.cpp index 3212e8c0d..13536148a 100644 --- a/kaddressbook/customfieldswidget.cpp +++ b/kaddressbook/customfieldswidget.cpp @@ -72,7 +72,7 @@ AddFieldDialog::AddFieldDialog( TQWidget *parent, const char *name ) connect( mTitle, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( nameChanged( const TQString& ) ) ); - KAcceleratorManager::manage( this ); + TDEAcceleratorManager::manage( this ); mTypeList.append( "text" ); mTypeName.append( i18n( "Text" ) ); diff --git a/kaddressbook/distributionlistpicker.cpp b/kaddressbook/distributionlistpicker.cpp index d3aef15ee..354a24a20 100644 --- a/kaddressbook/distributionlistpicker.cpp +++ b/kaddressbook/distributionlistpicker.cpp @@ -52,7 +52,7 @@ KPIM::DistributionListPickerDialog::DistributionListPickerDialog( KABC::AddressB layout->setSpacing( KDialog::spacingHint() ); m_label = new TQLabel( main ); layout->addWidget( m_label, 0, 0 ); - m_listBox = new KListBox( main ); + m_listBox = new TDEListBox( main ); layout->addWidget( m_listBox, 1, 0 ); connect( m_listBox, TQT_SIGNAL( highlighted( const TQString& ) ), this, TQT_SLOT( entrySelected( const TQString& ) ) ); diff --git a/kaddressbook/distributionlistpicker.h b/kaddressbook/distributionlistpicker.h index c101a3a45..d38f936d7 100644 --- a/kaddressbook/distributionlistpicker.h +++ b/kaddressbook/distributionlistpicker.h @@ -27,7 +27,7 @@ #include <tqstring.h> -class KListBox; +class TDEListBox; namespace KABC { class AddressBook; @@ -61,7 +61,7 @@ private slots: private: KABC::AddressBook* m_book; TQLabel* m_label; - KListBox* m_listBox; + TDEListBox* m_listBox; TQString m_selectedDistributionList; }; diff --git a/kaddressbook/editors/imeditorbase.ui b/kaddressbook/editors/imeditorbase.ui index 40270b504..de9fff558 100644 --- a/kaddressbook/editors/imeditorbase.ui +++ b/kaddressbook/editors/imeditorbase.ui @@ -82,7 +82,7 @@ <string>&Add...</string> </property> </widget> - <widget class="KListView" row="0" column="0" rowspan="5" colspan="1"> + <widget class="TDEListView" row="0" column="0" rowspan="5" colspan="1"> <column> <property name="text"> <string>Protocol</string> diff --git a/kaddressbook/editors/imeditorwidget.cpp b/kaddressbook/editors/imeditorwidget.cpp index c8047d909..45523de54 100644 --- a/kaddressbook/editors/imeditorwidget.cpp +++ b/kaddressbook/editors/imeditorwidget.cpp @@ -43,9 +43,9 @@ #include "imeditorwidget.h" -IMAddressLVI::IMAddressLVI( KListView *parent, KPluginInfo *protocol, +IMAddressLVI::IMAddressLVI( TDEListView *parent, KPluginInfo *protocol, const TQString &address, const IMContext &context ) - : KListViewItem( parent ) + : TDEListViewItem( parent ) { setProtocol( protocol ); setAddress( address ); @@ -72,7 +72,7 @@ void IMAddressLVI::paintCell( TQPainter *p, const TQColorGroup &cg, p->setFont( font ); } - KListViewItem::paintCell( p, cg, column, width, alignment ); + TDEListViewItem::paintCell( p, cg, column, width, alignment ); } void IMAddressLVI::setAddress( const TQString &address ) diff --git a/kaddressbook/editors/imeditorwidget.h b/kaddressbook/editors/imeditorwidget.h index cca9b0643..62fb36dfc 100644 --- a/kaddressbook/editors/imeditorwidget.h +++ b/kaddressbook/editors/imeditorwidget.h @@ -97,10 +97,10 @@ class IMEditorWidget : public KDialogBase */ // VCard has been disabled as there is no standard VCard location to store IM addresses yet. -class IMAddressLVI : public KListViewItem +class IMAddressLVI : public TDEListViewItem { public: - IMAddressLVI( KListView *parent, KPluginInfo * protocol, + IMAddressLVI( TDEListView *parent, KPluginInfo * protocol, const TQString &address, const IMContext &context = Any ); void setAddress( const TQString &address ); diff --git a/kaddressbook/emaileditwidget.cpp b/kaddressbook/emaileditwidget.cpp index a04a88a9c..7b5fe4c98 100644 --- a/kaddressbook/emaileditwidget.cpp +++ b/kaddressbook/emaileditwidget.cpp @@ -224,7 +224,7 @@ EmailEditDialog::EmailEditDialog( const TQStringList &list, TQWidget *parent, // set default state selectionChanged( -1 ); - KAcceleratorManager::manage( this ); + TDEAcceleratorManager::manage( this ); setInitialSize( TQSize( 400, 200 ) ); } diff --git a/kaddressbook/emaileditwidget.h b/kaddressbook/emaileditwidget.h index c818ed380..f584023c7 100644 --- a/kaddressbook/emaileditwidget.h +++ b/kaddressbook/emaileditwidget.h @@ -35,7 +35,7 @@ class TQToolButton; class KComboBox; class KLineEdit; -class KListView; +class TDEListView; /** This widget displays a list box of the email addresses as well as buttons diff --git a/kaddressbook/extensionmanager.cpp b/kaddressbook/extensionmanager.cpp index bd565a846..c184adf07 100644 --- a/kaddressbook/extensionmanager.cpp +++ b/kaddressbook/extensionmanager.cpp @@ -57,7 +57,7 @@ ExtensionManager::ExtensionManager( TQWidget* extensionBar, TQWidgetStack* detai createExtensionWidgets(); - mActionCollection = new KActionCollection( this, "ActionCollection" ); + mActionCollection = new TDEActionCollection( this, "ActionCollection" ); extensionBar->setShown( false ); TQTimer::singleShot( 0, this, TQT_SLOT( createActions() ) ); @@ -75,7 +75,7 @@ void ExtensionManager::restoreSettings() typedef TQMap<TQString, ExtensionData>::ConstIterator ConstIterator; for ( ConstIterator it = mExtensionMap.begin(), end = mExtensionMap.end(); it != end; ++it ) { if ( activeExtensions.contains( it.data().identifier ) ) { - KToggleAction *action = static_cast<KToggleAction*>( it.data().action ); + TDEToggleAction *action = static_cast<TDEToggleAction*>( it.data().action ); if ( action ) action->setChecked( true ); setExtensionActive( it.data().identifier, true ); @@ -168,7 +168,7 @@ void ExtensionManager::createActions() ExtensionData::List::ConstIterator it; for ( TQMap<TQString, ExtensionData>::Iterator it = mExtensionMap.begin(), end = mExtensionMap.end(); it != end; ++it ) { ExtensionData& data = it.data(); - data.action = new KToggleAction( data.title, 0, mMapper, TQT_SLOT( map() ), + data.action = new TDEToggleAction( data.title, 0, mMapper, TQT_SLOT( map() ), mActionCollection, TQString( data.identifier + "_extension" ).latin1() ); mMapper->setMapping( data.action, data.identifier ); @@ -178,7 +178,7 @@ void ExtensionManager::createActions() data.action->setChecked( true ); } - mActionList.append( new KActionSeparator( mActionCollection ) ); + mActionList.append( new TDEActionSeparator( mActionCollection ) ); mCore->guiClient()->plugActionList( "extensions_list", mActionList ); } diff --git a/kaddressbook/extensionmanager.h b/kaddressbook/extensionmanager.h index ff2ce1a21..b80ec01cc 100644 --- a/kaddressbook/extensionmanager.h +++ b/kaddressbook/extensionmanager.h @@ -33,7 +33,7 @@ class TQSignalMapper; class TQWidgetStack; -class KActionCollection; +class TDEActionCollection; namespace KAB { class Core; @@ -45,7 +45,7 @@ class ExtensionData ExtensionData(); typedef TQValueList<ExtensionData> List; - KToggleAction* action; + TDEToggleAction* action; KAB::ExtensionWidget *widget; TQString identifier; TQString title; @@ -109,8 +109,8 @@ class ExtensionManager : public TQObject TQMap<TQString, ExtensionData> mExtensionMap; TQStringList mActiveExtensions; TQSignalMapper *mMapper; - TQPtrList<KAction> mActionList; - KActionCollection *mActionCollection; + TQPtrList<TDEAction> mActionList; + TDEActionCollection *mActionCollection; TQSplitter *mSplitter; TQWidgetStack *mDetailsStack; TQWidget *mActiveDetailsWidget; diff --git a/kaddressbook/features/distributionlistngwidget.cpp b/kaddressbook/features/distributionlistngwidget.cpp index f91142e89..6dda79de6 100644 --- a/kaddressbook/features/distributionlistngwidget.cpp +++ b/kaddressbook/features/distributionlistngwidget.cpp @@ -44,7 +44,7 @@ #include <tqpushbutton.h> #include <tqtooltip.h> -KAB::DistributionListNg::ListBox::ListBox( TQWidget* parent ) : KListBox( parent ) +KAB::DistributionListNg::ListBox::ListBox( TQWidget* parent ) : TDEListBox( parent ) { setAcceptDrops( true ); } @@ -62,7 +62,7 @@ void KAB::DistributionListNg::ListBox::dragMoveEvent( TQDragMoveEvent *event ) void KAB::DistributionListNg::ListBox::dragEnterEvent( TQDragEnterEvent *event ) { - KListBox::dragEnterEvent( event ); + TDEListBox::dragEnterEvent( event ); } void KAB::DistributionListNg::ListBox::dropEvent( TQDropEvent *event ) @@ -170,7 +170,7 @@ KAB::DistributionListNg::MainWidget::MainWidget( KAB::Core *core, TQWidget *pare void KAB::DistributionListNg::MainWidget::contextMenuRequested( TQListBoxItem *item, const TQPoint &point ) { - TQGuardedPtr<KPopupMenu> menu = new KPopupMenu( this ); + TQGuardedPtr<TDEPopupMenu> menu = new TDEPopupMenu( this ); menu->insertItem( i18n( "New Distribution List..." ), core(), TQT_SLOT( newDistributionList() ) ); if ( item && ( item->text() !=i18n( "All Contacts" ) ) ) { diff --git a/kaddressbook/features/distributionlistngwidget.h b/kaddressbook/features/distributionlistngwidget.h index 1121af458..dc4b036d2 100644 --- a/kaddressbook/features/distributionlistngwidget.h +++ b/kaddressbook/features/distributionlistngwidget.h @@ -44,7 +44,7 @@ namespace KABC { namespace KAB { namespace DistributionListNg { -class ListBox : public KListBox +class ListBox : public TDEListBox { Q_OBJECT diff --git a/kaddressbook/features/distributionlistwidget.cpp b/kaddressbook/features/distributionlistwidget.cpp index f48b5e966..e77e3fc3b 100644 --- a/kaddressbook/features/distributionlistwidget.cpp +++ b/kaddressbook/features/distributionlistwidget.cpp @@ -223,7 +223,7 @@ DistributionListWidget::DistributionListWidget( KAB::Core *core, TQWidget *paren mContactView->restoreLayout( TDEGlobal::config(), "DistributionListViewColumns" ); - KAcceleratorManager::manage( this ); + TDEAcceleratorManager::manage( this ); } DistributionListWidget::~DistributionListWidget() @@ -591,7 +591,7 @@ void DistributionListWidget::changed() #endif DistributionListView::DistributionListView( TQWidget *parent, const char* name ) - : KListView( parent, name ) + : TDEListView( parent, name ) { setDragEnabled( true ); setAcceptDrops( true ); diff --git a/kaddressbook/features/distributionlistwidget.h b/kaddressbook/features/distributionlistwidget.h index 5d0a50972..59a5d88bd 100644 --- a/kaddressbook/features/distributionlistwidget.h +++ b/kaddressbook/features/distributionlistwidget.h @@ -105,7 +105,7 @@ class DistributionListWidget : public KAB::ExtensionWidget /** @short Helper class */ -class DistributionListView : public KListView +class DistributionListView : public TDEListView { Q_OBJECT diff --git a/kaddressbook/features/resourceselection.cpp b/kaddressbook/features/resourceselection.cpp index 82d81de40..3534bcdb3 100644 --- a/kaddressbook/features/resourceselection.cpp +++ b/kaddressbook/features/resourceselection.cpp @@ -57,7 +57,7 @@ class AddressBookWrapper : public KABC::AddressBook class ResourceItem : public TQCheckListItem { public: - ResourceItem( KListView *parent, KABC::Resource *resource ) + ResourceItem( TDEListView *parent, KABC::Resource *resource ) : TQCheckListItem( parent, resource->resourceName(), CheckBox ), mResource( resource ), mChecked( false ), mIsSubresource( false ), mSubItemsCreated( false ), @@ -510,7 +510,7 @@ void ResourceSelection::initGUI() TQToolTip::add( mRemoveButton, i18n( "Remove addressbook" ) ); buttonLayout->addWidget( mRemoveButton ); - mListView = new KListView( this ); + mListView = new TDEListView( this ); mListView->header()->hide(); mListView->addColumn( i18n( "Address Books" ) ); mListView->setFullWidth( true ); diff --git a/kaddressbook/features/resourceselection.h b/kaddressbook/features/resourceselection.h index 4d2f513eb..c986c5fca 100644 --- a/kaddressbook/features/resourceselection.h +++ b/kaddressbook/features/resourceselection.h @@ -80,7 +80,7 @@ class ResourceSelection : public KAB::ExtensionWidget ResourceItem* selectedItem() const; ResourceItem* findSubResourceItem( KPIM::ResourceABC *resource, const TQString &subResource ); - KListView *mListView; + TDEListView *mListView; TQPushButton *mAddButton; TQPushButton *mEditButton; TQPushButton *mRemoveButton; diff --git a/kaddressbook/filtereditdialog.cpp b/kaddressbook/filtereditdialog.cpp index b1c5df433..3b3e37df1 100644 --- a/kaddressbook/filtereditdialog.cpp +++ b/kaddressbook/filtereditdialog.cpp @@ -127,7 +127,7 @@ void FilterEditDialog::initGUI() connect( mNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( filterNameTextChanged( const TQString&) ) ); - mCategoriesView = new KListView( page ); + mCategoriesView = new TDEListView( page ); mCategoriesView->addColumn( i18n( "Category" ) ); mCategoriesView->setFullWidth( true ); topLayout->addMultiCellWidget( mCategoriesView, 1, 1, 0, 1 ); @@ -258,7 +258,7 @@ void FilterDialog::initGUI() TQGridLayout *topLayout = new TQGridLayout( page, 1, 2, 0, spacingHint() ); - mFilterListBox = new KListBox( page ); + mFilterListBox = new TDEListBox( page ); topLayout->addWidget( mFilterListBox, 0, 0 ); connect( mFilterListBox, TQT_SIGNAL( selectionChanged( TQListBoxItem * ) ), TQT_SLOT( selectionChanged( TQListBoxItem * ) ) ); diff --git a/kaddressbook/filtereditdialog.h b/kaddressbook/filtereditdialog.h index 063c2d674..3e2c9acf3 100644 --- a/kaddressbook/filtereditdialog.h +++ b/kaddressbook/filtereditdialog.h @@ -30,8 +30,8 @@ class TQToolButton; class TQWidget; class KLineEdit; -class KListBox; -class KListView; +class TDEListBox; +class TDEListView; #include <kdialogbase.h> @@ -62,7 +62,7 @@ class FilterDialog : public KDialogBase Filter::List mFilterList; Filter::List mInternalFilterList; - KListBox *mFilterListBox; + TDEListBox *mFilterListBox; TQPushButton *mAddButton; TQPushButton *mEditButton; TQPushButton *mRemoveButton; @@ -89,7 +89,7 @@ class FilterEditDialog : public KDialogBase Filter mFilter; KLineEdit *mNameEdit; - KListView *mCategoriesView; + TDEListView *mCategoriesView; TQButtonGroup *mMatchRuleGroup; TQPushButton *mEditButton; TQPushButton *mRemoveButton; diff --git a/kaddressbook/geowidget.cpp b/kaddressbook/geowidget.cpp index 8a2751258..55714b368 100644 --- a/kaddressbook/geowidget.cpp +++ b/kaddressbook/geowidget.cpp @@ -246,7 +246,7 @@ GeoDialog::GeoDialog( TQWidget *parent, const char *name ) connect( mLongDirection, TQT_SIGNAL( activated( int ) ), TQT_SLOT( sexagesimalInputChanged() ) ); - KAcceleratorManager::manage( this ); + TDEAcceleratorManager::manage( this ); } GeoDialog::~GeoDialog() diff --git a/kaddressbook/imeditwidget.h b/kaddressbook/imeditwidget.h index a70ed062c..52f1ec267 100644 --- a/kaddressbook/imeditwidget.h +++ b/kaddressbook/imeditwidget.h @@ -35,7 +35,7 @@ class TQToolButton; class KComboBox; class KLineEdit; -class KListView; +class TDEListView; /** This widget displays a list box of the instant messaging addresses as well as buttons diff --git a/kaddressbook/interfaces/core.h b/kaddressbook/interfaces/core.h index c291f208c..3a5baba92 100644 --- a/kaddressbook/interfaces/core.h +++ b/kaddressbook/interfaces/core.h @@ -44,7 +44,7 @@ class Resource; class TQWidget; -class KActionCollection; +class TDEActionCollection; class TDEConfig; class KURL; @@ -71,10 +71,10 @@ class KDE_EXPORT Core : public TQObject virtual TDEConfig *config() const = 0; /** - Returns a pointer to the global KActionCollection object. So + Returns a pointer to the global TDEActionCollection object. So other classes can register their actions easily. */ - virtual KActionCollection *actionCollection() const = 0; + virtual TDEActionCollection *actionCollection() const = 0; /** Returns a pointer to the gui client. diff --git a/kaddressbook/interfaces/xxport.cpp b/kaddressbook/interfaces/xxport.cpp index 68b883125..a934bb976 100644 --- a/kaddressbook/interfaces/xxport.cpp +++ b/kaddressbook/interfaces/xxport.cpp @@ -77,7 +77,7 @@ KABC::AddresseeList XXPort::importContacts( const TQString& ) const void XXPort::createImportAction( const TQString &label, const TQString &data ) { TQString id = "file_import_" + identifier() + ( data.isEmpty() ? TQString( "" ) : "_" + data ); - KAction *action = new KAction( label, 0, d->mImportMapper, TQT_SLOT( map() ), actionCollection(), id.latin1() ); + TDEAction *action = new TDEAction( label, 0, d->mImportMapper, TQT_SLOT( map() ), actionCollection(), id.latin1() ); d->mImportMapper->setMapping( action, ( data.isEmpty() ? TQString( "<empty>" ) : data ) ); @@ -87,7 +87,7 @@ void XXPort::createImportAction( const TQString &label, const TQString &data ) void XXPort::createExportAction( const TQString &label, const TQString &data ) { TQString id = "file_export_" + identifier() + ( data.isEmpty() ? TQString( "" ) : "_" + data ); - KAction *action = new KAction( label, 0, d->mExportMapper, TQT_SLOT( map() ), actionCollection(), id.latin1() ); + TDEAction *action = new TDEAction( label, 0, d->mExportMapper, TQT_SLOT( map() ), actionCollection(), id.latin1() ); d->mExportMapper->setMapping( action, ( data.isEmpty() ? TQString( "<empty>" ) : data ) ); diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index f88be3c3c..a6f8a20b8 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -190,7 +190,7 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *parent, setModified( false ); - KAcceleratorManager::manage( mWidget ); + TDEAcceleratorManager::manage( mWidget ); mKIMProxy = ::KIMProxy::instance( kapp->dcopClient() ); } @@ -255,7 +255,7 @@ TDEConfig *KABCore::config() const return KABPrefs::instance()->config(); } -KActionCollection *KABCore::actionCollection() const +TDEActionCollection *KABCore::actionCollection() const { return guiClient()->actionCollection(); } @@ -1195,7 +1195,7 @@ void KABCore::slotEditorDestroyed( const TQString &uid ) void KABCore::initGUI() { TQVBoxLayout *topLayout = new TQVBoxLayout( mWidget, 0, 0 ); - KToolBar* searchTB = new KToolBar( mWidget, "search toolbar"); + TDEToolBar* searchTB = new TDEToolBar( mWidget, "search toolbar"); searchTB->boxLayout()->setSpacing( KDialog::spacingHint() ); mIncSearchWidget = new IncSearchWidget( searchTB, "kde toolbar widget"); searchTB->setStretchableWidget( mIncSearchWidget ); @@ -1314,10 +1314,10 @@ void KABCore::initActions() connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ), TQT_SLOT( clipboardDataChanged() ) ); - KAction *action; + TDEAction *action; // file menu - mActionMail = new KAction( i18n( "&Send Email to Contact..." ), "mail_send", 0, + mActionMail = new TDEAction( i18n( "&Send Email to Contact..." ), "mail_send", 0, this, TQT_SLOT( sendMail() ), actionCollection(), "file_mail" ); action = KStdAction::print( this, TQT_SLOT( print() ), actionCollection() ); mActionMail->setWhatsThis( i18n( "Send a mail to all selected contacts." ) ); @@ -1327,30 +1327,30 @@ void KABCore::initActions() TQT_SLOT( save() ), actionCollection(), "file_sync" ); mActionSave->setWhatsThis( i18n( "Save all changes of the address book to the storage backend." ) ); - action = new KAction( i18n( "&New Contact..." ), "identity", CTRL+Key_N, this, + action = new TDEAction( i18n( "&New Contact..." ), "identity", CTRL+Key_N, this, TQT_SLOT( newContact() ), actionCollection(), "file_new_contact" ); action->setWhatsThis( i18n( "Create a new contact<p>You will be presented with a dialog where you can add all data about a person, including addresses and phone numbers." ) ); - action = new KAction( i18n( "&New Distribution List..." ), "kontact_contacts", 0, this, + action = new TDEAction( i18n( "&New Distribution List..." ), "kontact_contacts", 0, this, TQT_SLOT( newDistributionList() ), actionCollection(), "file_new_distributionlist" ); action->setWhatsThis( i18n( "Create a new distribution list<p>You will be presented with a dialog where you can create a new distribution list." ) ); - mActionMailVCard = new KAction( i18n("Send &Contact..."), "mail_post_to", 0, + mActionMailVCard = new TDEAction( i18n("Send &Contact..."), "mail_post_to", 0, this, TQT_SLOT( mailVCard() ), actionCollection(), "file_mail_vcard" ); mActionMailVCard->setWhatsThis( i18n( "Send a mail with the selected contact as attachment." ) ); - mActionChat = new KAction( i18n("Chat &With..."), 0, + mActionChat = new TDEAction( i18n("Chat &With..."), 0, this, TQT_SLOT( startChat() ), actionCollection(), "file_chat" ); mActionChat->setWhatsThis( i18n( "Start a chat with the selected contact." ) ); - mActionEditAddressee = new KAction( i18n( "&Edit Contact..." ), "edit", 0, + mActionEditAddressee = new TDEAction( i18n( "&Edit Contact..." ), "edit", 0, this, TQT_SLOT( editContact() ), actionCollection(), "file_properties" ); mActionEditAddressee->setWhatsThis( i18n( "Edit a contact<p>You will be presented with a dialog where you can change all data about a person, including addresses and phone numbers." ) ); - mActionMerge = new KAction( i18n( "&Merge Contacts" ), "", 0, + mActionMerge = new TDEAction( i18n( "&Merge Contacts" ), "", 0, this, TQT_SLOT( mergeContacts() ), actionCollection(), "edit_merge" ); @@ -1366,38 +1366,38 @@ void KABCore::initActions() // mActionUndo->setWhatsThis( i18n( "Undoes the last <b>Cut</b>, <b>Copy</b> or <b>Paste</b>." ) ); // mActionRedo->setWhatsThis( i18n( "Redoes the last <b>Cut</b>, <b>Copy</b> or <b>Paste</b>." ) ); - mActionDelete = new KAction( i18n( "&Delete Contact" ), "editdelete", + mActionDelete = new TDEAction( i18n( "&Delete Contact" ), "editdelete", Key_Delete, this, TQT_SLOT( deleteContacts() ), actionCollection(), "edit_delete" ); mActionDelete->setWhatsThis( i18n( "Delete all selected contacts." ) ); - mActionCopyAddresseeTo = new KAction( i18n( "&Copy Contact To..." ), "", 0, + mActionCopyAddresseeTo = new TDEAction( i18n( "&Copy Contact To..." ), "", 0, this, TQT_SLOT( copySelectedContactToResource() ), actionCollection(), "copy_contact_to" ); const TQString copyMoveWhatsThis = i18n( "Store a contact in a different Addressbook<p>You will be presented with a dialog where you can select a new storage place for this contact." ); mActionCopyAddresseeTo->setWhatsThis( copyMoveWhatsThis ); - mActionMoveAddresseeTo = new KAction( i18n( "M&ove Contact To..." ), "", 0, + mActionMoveAddresseeTo = new TDEAction( i18n( "M&ove Contact To..." ), "", 0, this, TQT_SLOT( moveSelectedContactToResource() ), actionCollection(), "move_contact_to" ); mActionMoveAddresseeTo->setWhatsThis( copyMoveWhatsThis ); // settings menu - mActionJumpBar = new KToggleAction( i18n( "Show Jump Bar" ), "next", 0, + mActionJumpBar = new TDEToggleAction( i18n( "Show Jump Bar" ), "next", 0, actionCollection(), "options_show_jump_bar" ); mActionJumpBar->setWhatsThis( i18n( "Toggle whether the jump button bar shall be visible." ) ); mActionJumpBar->setCheckedState( i18n( "Hide Jump Bar") ); connect( mActionJumpBar, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( setJumpButtonBarVisible( bool ) ) ); - mActionDetails = new KToggleAction( i18n( "Show Details" ), 0, 0, + mActionDetails = new TDEToggleAction( i18n( "Show Details" ), 0, 0, actionCollection(), "options_show_details" ); mActionDetails->setWhatsThis( i18n( "Toggle whether the details page shall be visible." ) ); mActionDetails->setCheckedState( i18n( "Hide Details") ); connect( mActionDetails, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( setDetailsVisible( bool ) ) ); if ( mIsPart ) - action = new KAction( i18n( "&Configure Address Book..." ), "configure", 0, + action = new TDEAction( i18n( "&Configure Address Book..." ), "configure", 0, this, TQT_SLOT( configure() ), actionCollection(), "kaddressbook_configure" ); else @@ -1406,21 +1406,21 @@ void KABCore::initActions() action->setWhatsThis( i18n( "You will be presented with a dialog, that offers you all possibilities to configure KAddressBook." ) ); // misc - action = new KAction( i18n( "&Lookup Addresses in LDAP Directory..." ), "find", 0, + action = new TDEAction( i18n( "&Lookup Addresses in LDAP Directory..." ), "find", 0, this, TQT_SLOT( openLDAPDialog() ), actionCollection(), "ldap_lookup" ); action->setWhatsThis( i18n( "Search for contacts on a LDAP server<p>You will be presented with a dialog, where you can search for contacts and select the ones you want to add to your local address book." ) ); - mActionWhoAmI = new KAction( i18n( "Set as Personal Contact Data" ), "personal", 0, this, + mActionWhoAmI = new TDEAction( i18n( "Set as Personal Contact Data" ), "personal", 0, this, TQT_SLOT( setWhoAmI() ), actionCollection(), "edit_set_personal" ); mActionWhoAmI->setWhatsThis( i18n( "Set the personal contact<p>The data of this contact will be used in many other TDE applications, so you do not have to input your personal data several times." ) ); - mActionCategories = new KAction( i18n( "Select Categories..." ), 0, this, + mActionCategories = new TDEAction( i18n( "Select Categories..." ), 0, this, TQT_SLOT( setCategories() ), actionCollection(), "edit_set_categories" ); mActionCategories->setWhatsThis( i18n( "Set the categories for all selected contacts." ) ); - KAction *clearLocation = new KAction( i18n( "Clear Search Bar" ), + TDEAction *clearLocation = new TDEAction( i18n( "Clear Search Bar" ), TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", CTRL+Key_L, this, TQT_SLOT( slotClearSearchBar() ), actionCollection(), "clear_search" ); clearLocation->setWhatsThis( i18n( "Clear Search Bar<p>" diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h index c8d368722..a18692fa2 100644 --- a/kaddressbook/kabcore.h +++ b/kaddressbook/kabcore.h @@ -47,12 +47,12 @@ class CategorySelectDialog; } class TDEAboutData; -class KAction; -class KActionCollection; +class TDEAction; +class TDEActionCollection; class TDEConfig; class KPushButton; class KStatusBar; -class KToggleAction; +class TDEToggleAction; class KXMLGUIClient; class TQSplitter; @@ -111,10 +111,10 @@ class KDE_EXPORT KABCore : public KAB::Core TDEConfig *config() const; /** - Returns a pointer to the global KActionCollection object. So + Returns a pointer to the global TDEActionCollection object. So other classes can register their actions easily. */ - KActionCollection *actionCollection() const; + TDEActionCollection *actionCollection() const; /** Returns the current sort field of the view. @@ -477,23 +477,23 @@ class KDE_EXPORT KABCore : public KAB::Core TQTimer *mAddressBookChangedTimer; - KAction *mActionPaste; - KAction *mActionCut; - KAction *mActionDelete; - KAction *mActionCopy; - KAction *mActionEditAddressee; - KAction *mActionMoveAddresseeTo; - KAction *mActionCopyAddresseeTo; - KAction *mActionMerge; - KAction *mActionMail; - KAction *mActionMailVCard; - KAction *mActionChat; - KAction *mActionSave; - KAction *mActionDeleteView; - KAction *mActionWhoAmI; - KAction *mActionCategories; - KToggleAction *mActionJumpBar; - KToggleAction *mActionDetails; + TDEAction *mActionPaste; + TDEAction *mActionCut; + TDEAction *mActionDelete; + TDEAction *mActionCopy; + TDEAction *mActionEditAddressee; + TDEAction *mActionMoveAddresseeTo; + TDEAction *mActionCopyAddresseeTo; + TDEAction *mActionMerge; + TDEAction *mActionMail; + TDEAction *mActionMailVCard; + TDEAction *mActionChat; + TDEAction *mActionSave; + TDEAction *mActionDeleteView; + TDEAction *mActionWhoAmI; + TDEAction *mActionCategories; + TDEToggleAction *mActionJumpBar; + TDEToggleAction *mActionDetails; KCommandHistory *mCommandHistory; KAddressBookService *mAddressBookService; diff --git a/kaddressbook/kaddressbookmain.cpp b/kaddressbook/kaddressbookmain.cpp index 9c2d476e2..4e5cf8ff3 100644 --- a/kaddressbook/kaddressbookmain.cpp +++ b/kaddressbook/kaddressbookmain.cpp @@ -35,7 +35,7 @@ #include "kaddressbookmain.h" KAddressBookMain::KAddressBookMain( const TQString &file ) - : DCOPObject( "KAddressBookIface" ), KMainWindow( 0 ) + : DCOPObject( "KAddressBookIface" ), TDEMainWindow( 0 ) { // Set this to be the group leader for all subdialogs - this means // modal subdialogs will only affect this dialog, not the other windows @@ -152,7 +152,7 @@ void KAddressBookMain::initActions() { KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() ); - KAction *action; + TDEAction *action; action = KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( configureKeyBindings() ), actionCollection() ); action->setWhatsThis( i18n( "You will be presented with a dialog, where you can configure the application wide shortcuts." ) ); diff --git a/kaddressbook/kaddressbookmain.h b/kaddressbook/kaddressbookmain.h index 3e8ffb832..a8ac77e2d 100644 --- a/kaddressbook/kaddressbookmain.h +++ b/kaddressbook/kaddressbookmain.h @@ -42,7 +42,7 @@ class KABCore; @author Don Sanders <dsanders@kde.org> @version 0.1 */ -class KAddressBookMain : public KMainWindow, virtual public KAddressBookIface +class KAddressBookMain : public TDEMainWindow, virtual public KAddressBookIface { Q_OBJECT diff --git a/kaddressbook/kaddressbookview.h b/kaddressbook/kaddressbookview.h index 1f26ca71e..d6ba8d6ae 100644 --- a/kaddressbook/kaddressbookview.h +++ b/kaddressbook/kaddressbookview.h @@ -202,7 +202,7 @@ class KDE_EXPORT KAddressBookView : public TQWidget @param uid The uid of the selected addressee. - @see KListView + @see TDEListView */ void selected( const TQString &uid ); @@ -213,7 +213,7 @@ class KDE_EXPORT KAddressBookView : public TQWidget @param uid The uid of the selected addressee - @see KListView + @see TDEListView */ void executed( const TQString &uid ); diff --git a/kaddressbook/kcmconfigs/addhostdialog.cpp b/kaddressbook/kcmconfigs/addhostdialog.cpp index 53c06e2ac..21a24780c 100644 --- a/kaddressbook/kcmconfigs/addhostdialog.cpp +++ b/kaddressbook/kcmconfigs/addhostdialog.cpp @@ -90,7 +90,7 @@ AddHostDialog::AddHostDialog( KPIM::LdapServer *server, TQWidget* parent, const } mCfg->setMech( mServer->mech() ); - KAcceleratorManager::manage( this ); + TDEAcceleratorManager::manage( this ); } diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.h b/kaddressbook/kcmconfigs/kabconfigwidget.h index a37563208..5ee3c7890 100644 --- a/kaddressbook/kcmconfigs/kabconfigwidget.h +++ b/kaddressbook/kcmconfigs/kabconfigwidget.h @@ -32,7 +32,7 @@ class TQListViewItem; class TQPushButton; class TQComboBox; -class KListView; +class TDEListView; class AddresseeWidget; diff --git a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp index 12ff11043..981b33cc8 100644 --- a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp +++ b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp @@ -270,7 +270,7 @@ void LDAPOptionsWidget::initGUI() TQHBox* hBox = new TQHBox( groupBox ); hBox->setSpacing( 6 ); // Contents of the hbox: listview and up/down buttons on the right (vbox) - mHostListView = new KListView( hBox ); + mHostListView = new TDEListView( hBox ); TQVBox* upDownBox = new TQVBox( hBox ); upDownBox->setSpacing( 6 ); diff --git a/kaddressbook/kcmconfigs/ldapoptionswidget.h b/kaddressbook/kcmconfigs/ldapoptionswidget.h index 8be3b83a9..5471b0b6e 100644 --- a/kaddressbook/kcmconfigs/ldapoptionswidget.h +++ b/kaddressbook/kcmconfigs/ldapoptionswidget.h @@ -27,7 +27,7 @@ #include <tqwidget.h> class TQToolButton; -class KListView; +class TDEListView; class TQListViewItem; class TQPushButton; @@ -59,7 +59,7 @@ class LDAPOptionsWidget : public TQWidget private: void initGUI(); - KListView* mHostListView; + TDEListView* mHostListView; TQPushButton* mAddButton; TQPushButton* mEditButton; diff --git a/kaddressbook/main.cpp b/kaddressbook/main.cpp index fa2d03bf1..fd5a3149d 100644 --- a/kaddressbook/main.cpp +++ b/kaddressbook/main.cpp @@ -56,7 +56,7 @@ int KAddressBookApp::newInstance() { if ( isRestored() ) { // There can only be one main window - if ( KMainWindow::canBeRestored( 1 ) ) { + if ( TDEMainWindow::canBeRestored( 1 ) ) { mMainWin = new KAddressBookMain; setMainWidget( mMainWin ); mMainWin->show(); @@ -124,7 +124,7 @@ int main( int argc, char *argv[] ) TDEGlobal::locale()->insertCatalogue( "libtdepim" ); bool ret = app.exec(); - while (KMainWindow::memberList->first()) - delete KMainWindow::memberList->first(); + while (TDEMainWindow::memberList->first()) + delete TDEMainWindow::memberList->first(); return ret; } diff --git a/kaddressbook/nameeditdialog.cpp b/kaddressbook/nameeditdialog.cpp index 1bba99ff9..aa76fdefb 100644 --- a/kaddressbook/nameeditdialog.cpp +++ b/kaddressbook/nameeditdialog.cpp @@ -157,7 +157,7 @@ NameEditDialog::NameEditDialog( const KABC::Addressee &addr, int type, mAddresseeConfig.setAddressee( addr ); mParseBox->setChecked( mAddresseeConfig.automaticNameParsing() ); - KAcceleratorManager::manage( this ); + TDEAcceleratorManager::manage( this ); connect( mPrefixCombo, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( modified() ) ); diff --git a/kaddressbook/printing/ds_appearance.ui b/kaddressbook/printing/ds_appearance.ui index 9dc64b9e6..d33bc86ad 100644 --- a/kaddressbook/printing/ds_appearance.ui +++ b/kaddressbook/printing/ds_appearance.ui @@ -207,7 +207,7 @@ <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="KFontCombo" row="2" column="1"> + <widget class="TDEFontCombo" row="2" column="1"> <property name="name"> <cstring>kfcBodyFont</cstring> </property> @@ -220,7 +220,7 @@ </sizepolicy> </property> </widget> - <widget class="KFontCombo" row="3" column="1"> + <widget class="TDEFontCombo" row="3" column="1"> <property name="name"> <cstring>kfcDetailsFont</cstring> </property> @@ -233,7 +233,7 @@ </sizepolicy> </property> </widget> - <widget class="KFontCombo" row="4" column="1"> + <widget class="TDEFontCombo" row="4" column="1"> <property name="name"> <cstring>kfcFixedFont</cstring> </property> @@ -249,7 +249,7 @@ <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="KFontCombo" row="0" column="1"> + <widget class="TDEFontCombo" row="0" column="1"> <property name="name"> <cstring>kfcHeaderFont</cstring> </property> @@ -262,7 +262,7 @@ </sizepolicy> </property> </widget> - <widget class="KFontCombo" row="1" column="1"> + <widget class="TDEFontCombo" row="1" column="1"> <property name="name"> <cstring>kfcHeadlineFont</cstring> </property> diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp index 937f994cb..4ac23786f 100644 --- a/kaddressbook/viewmanager.cpp +++ b/kaddressbook/viewmanager.cpp @@ -564,36 +564,36 @@ int ViewManager::filterPosition( const TQString &name ) const void ViewManager::initActions() { - mActionSelectView = new KSelectAction( i18n( "Select View" ), 0, mCore->actionCollection(), "select_view" ); + mActionSelectView = new TDESelectAction( i18n( "Select View" ), 0, mCore->actionCollection(), "select_view" ); #if TDE_VERSION >= 309 mActionSelectView->setMenuAccelsEnabled( false ); #endif connect( mActionSelectView, TQT_SIGNAL( activated( const TQString& ) ), TQT_SLOT( setActiveView( const TQString& ) ) ); - KAction *action; + TDEAction *action; - action = new KAction( i18n( "Modify View..." ), "configure", 0, TQT_TQOBJECT(this), + action = new TDEAction( i18n( "Modify View..." ), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT( editView() ), mCore->actionCollection(), "view_modify" ); action->setWhatsThis( i18n( "By pressing this button a dialog opens that allows you to modify the view of the addressbook. There you can add or remove fields that you want to be shown or hidden in the addressbook like the name for example." ) ); - action = new KAction( i18n( "Add View..." ), "window_new", 0, TQT_TQOBJECT(this), + action = new TDEAction( i18n( "Add View..." ), "window_new", 0, TQT_TQOBJECT(this), TQT_SLOT( addView() ), mCore->actionCollection(), "view_add" ); action->setWhatsThis( i18n( "You can add a new view by choosing one from the dialog that appears after pressing the button. You have to give the view a name, so that you can distinguish between the different views." ) ); - mActionDeleteView = new KAction( i18n( "Delete View" ), "view_remove", 0, + mActionDeleteView = new TDEAction( i18n( "Delete View" ), "view_remove", 0, TQT_TQOBJECT(this), TQT_SLOT( deleteView() ), mCore->actionCollection(), "view_delete" ); mActionDeleteView->setWhatsThis( i18n( "By pressing this button you can delete the actual view, which you have added before." ) ); - action = new KAction( i18n( "Refresh View" ), "reload", 0, TQT_TQOBJECT(this), + action = new TDEAction( i18n( "Refresh View" ), "reload", 0, TQT_TQOBJECT(this), TQT_SLOT( refreshView() ), mCore->actionCollection(), "view_refresh" ); action->setWhatsThis( i18n( "The view will be refreshed by pressing this button." ) ); - action = new KAction( i18n( "Edit &Filters..." ), "filter", 0, TQT_TQOBJECT(this), + action = new TDEAction( i18n( "Edit &Filters..." ), "filter", 0, TQT_TQOBJECT(this), TQT_SLOT( configureFilters() ), mCore->actionCollection(), "options_edit_filters" ); action->setWhatsThis( i18n( "Edit the contact filters<p>You will be presented with a dialog, where you can add, remove and edit filters." ) ); diff --git a/kaddressbook/viewmanager.h b/kaddressbook/viewmanager.h index 699d1d17a..d248a6baa 100644 --- a/kaddressbook/viewmanager.h +++ b/kaddressbook/viewmanager.h @@ -31,8 +31,8 @@ class TQDropEvent; class TQWidgetStack; -class KAction; -class KSelectAction; +class TDEAction; +class TDESelectAction; class FilterSelectionWidget; @@ -154,8 +154,8 @@ class ViewManager : public TQWidget TQWidgetStack *mViewWidgetStack; KAddressBookView *mActiveView; - KAction *mActionDeleteView; - KSelectAction *mActionSelectView; + TDEAction *mActionDeleteView; + TDESelectAction *mActionSelectView; FilterSelectionWidget *mFilterSelectionWidget; }; diff --git a/kaddressbook/views/colorlistbox.cpp b/kaddressbook/views/colorlistbox.cpp index a003246f4..54ad38b34 100644 --- a/kaddressbook/views/colorlistbox.cpp +++ b/kaddressbook/views/colorlistbox.cpp @@ -26,7 +26,7 @@ #include "colorlistbox.h" ColorListBox::ColorListBox( TQWidget *parent, const char *name, WFlags f ) - :KListBox( parent, name, f ), mCurrentOnDragEnter(-1) + :TDEListBox( parent, name, f ), mCurrentOnDragEnter(-1) { connect( this, TQT_SIGNAL(selected(int)), this, TQT_SLOT(newColor(int)) ); setAcceptDrops( true); diff --git a/kaddressbook/views/colorlistbox.h b/kaddressbook/views/colorlistbox.h index 63495e93b..18c307aca 100644 --- a/kaddressbook/views/colorlistbox.h +++ b/kaddressbook/views/colorlistbox.h @@ -23,7 +23,7 @@ #include <klistbox.h> -class ColorListBox : public KListBox +class ColorListBox : public TDEListBox { Q_OBJECT diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp index b1e6233ed..4cfbf9586 100644 --- a/kaddressbook/views/configurecardviewdialog.cpp +++ b/kaddressbook/views/configurecardviewdialog.cpp @@ -167,14 +167,14 @@ void CardViewLookNFeelPage::saveSettings( TDEConfig *config ) void CardViewLookNFeelPage::setTextFont() { TQFont f( lTextFont->font() ); - if ( KFontDialog::getFont( f, false, this ) == TQDialog::Accepted ) + if ( TDEFontDialog::getFont( f, false, this ) == TQDialog::Accepted ) updateFontLabel( f, lTextFont ); } void CardViewLookNFeelPage::setHeaderFont() { TQFont f( lHeaderFont->font() ); - if ( KFontDialog::getFont( f,false, this ) == TQDialog::Accepted ) + if ( TDEFontDialog::getFont( f,false, this ) == TQDialog::Accepted ) updateFontLabel( f, lHeaderFont ); } diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp index 25c66ac45..a0aec1e90 100644 --- a/kaddressbook/views/contactlistview.cpp +++ b/kaddressbook/views/contactlistview.cpp @@ -151,7 +151,7 @@ ContactListViewItem::ContactListViewItem(const KABC::Addressee &a, KABC::AddressBook *doc, const KABC::Field::List &fields, KIMProxy *proxy ) - : KListViewItem(parent), mAddressee(a), mFields( fields ), + : TDEListViewItem(parent), mAddressee(a), mFields( fields ), parentListView( parent ), mDocument(doc), mIMProxy( proxy ) { if ( mIMProxy ) @@ -196,7 +196,7 @@ void ContactListViewItem::paintCell(TQPainter * p, int width, int align) { - KListViewItem::paintCell(p, cg, column, width, align); + TDEListViewItem::paintCell(p, cg, column, width, align); if ( !p ) return; @@ -260,7 +260,7 @@ ContactListView::ContactListView(KAddressBookTableView *view, KABC::AddressBook* /* doc */, TQWidget *parent, const char *name ) - : KListView( parent, name ), + : TDEListView( parent, name ), pabWidget( view ), oldColumn( 0 ) { @@ -275,7 +275,7 @@ ContactListView::ContactListView(KAddressBookTableView *view, viewport()->setAcceptDrops( true ); setAllColumnsShowFocus( true ); setShowSortIndicator(true); - setSelectionModeExt( KListView::Extended ); + setSelectionModeExt( TDEListView::Extended ); setDropVisualizer(false); connect(this, TQT_SIGNAL(dropped(TQDropEvent*)), @@ -300,14 +300,14 @@ void ContactListView::paintEmptyArea( TQPainter * p, const TQRect & rect ) else { // Do a normal paint - KListView::paintEmptyArea(p, rect); + TDEListView::paintEmptyArea(p, rect); } } void ContactListView::contentsMousePressEvent(TQMouseEvent* e) { presspos = e->pos(); - KListView::contentsMousePressEvent(e); + TDEListView::contentsMousePressEvent(e); } @@ -318,7 +318,7 @@ void ContactListView::contentsMouseMoveEvent( TQMouseEvent *e ) emit startAddresseeDrag(); } else - KListView::contentsMouseMoveEvent( e ); + TDEListView::contentsMouseMoveEvent( e ); } bool ContactListView::acceptDrag(TQDropEvent *e) const diff --git a/kaddressbook/views/contactlistview.h b/kaddressbook/views/contactlistview.h index 2da52d235..adfbc2dc8 100644 --- a/kaddressbook/views/contactlistview.h +++ b/kaddressbook/views/contactlistview.h @@ -52,7 +52,7 @@ class DynamicTip : public TQToolTip private: }; -class ContactListViewItem : public KListViewItem +class ContactListViewItem : public TDEListViewItem { public: @@ -82,7 +82,7 @@ private: ///////////////////////////////////////////// // ContactListView -class ContactListView : public KListView +class ContactListView : public TDEListView { Q_OBJECT diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp index 4c39c13ba..f0c4c594d 100644 --- a/kaddressbook/views/kaddressbooktableview.cpp +++ b/kaddressbook/views/kaddressbooktableview.cpp @@ -147,8 +147,8 @@ void KAddressBookTableView::reconstructListView() this, TQT_SIGNAL( startDrag() ) ); connect( mListView, TQT_SIGNAL( addresseeDropped( TQDropEvent* ) ), this, TQT_SIGNAL( dropped( TQDropEvent* ) ) ); - connect( mListView, TQT_SIGNAL( contextMenu( KListView*, TQListViewItem*, const TQPoint& ) ), - this, TQT_SLOT( rmbClicked( KListView*, TQListViewItem*, const TQPoint& ) ) ); + connect( mListView, TQT_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ), + this, TQT_SLOT( rmbClicked( TDEListView*, TQListViewItem*, const TQPoint& ) ) ); connect( mListView->header(), TQT_SIGNAL( clicked( int ) ), this, TQT_SIGNAL( sortFieldChanged() ) ); @@ -347,7 +347,7 @@ void KAddressBookTableView::addresseeExecuted( TQListViewItem *item ) } } -void KAddressBookTableView::rmbClicked( KListView*, TQListViewItem*, const TQPoint &point ) +void KAddressBookTableView::rmbClicked( TDEListView*, TQListViewItem*, const TQPoint &point ) { popup( point ); } diff --git a/kaddressbook/views/kaddressbooktableview.h b/kaddressbook/views/kaddressbooktableview.h index 4ebdfd938..acbfb08d4 100644 --- a/kaddressbook/views/kaddressbooktableview.h +++ b/kaddressbook/views/kaddressbooktableview.h @@ -50,7 +50,7 @@ class ContactListView; namespace KABC { class AddressBook; } /** - * This class is the table view for kaddressbook. This view is a KListView + * This class is the table view for kaddressbook. This view is a TDEListView * with multiple columns for the selected fields. * * @short Table View @@ -100,7 +100,7 @@ friend class ContactListView; /** RBM menu called. */ - void rmbClicked( KListView*, TQListViewItem*, const TQPoint& ); + void rmbClicked( TDEListView*, TQListViewItem*, const TQPoint& ); /** * Called to update the presence of a single item diff --git a/kalarm/birthdaydlg.cpp b/kalarm/birthdaydlg.cpp index 76b040daf..6928cc601 100644 --- a/kalarm/birthdaydlg.cpp +++ b/kalarm/birthdaydlg.cpp @@ -418,10 +418,10 @@ TQString AddresseeItem::key(int column, bool) const =============================================================================*/ BListView::BListView(TQWidget* parent, const char* name) - : KListView(parent, name) + : TDEListView(parent, name) { - KAccel* accel = new KAccel(this); - accel->insert(KStdAccel::SelectAll, TQT_TQOBJECT(this), TQT_SLOT(slotSelectAll())); - accel->insert(KStdAccel::Deselect, TQT_TQOBJECT(this), TQT_SLOT(slotDeselect())); + TDEAccel* accel = new TDEAccel(this); + accel->insert(TDEStdAccel::SelectAll, TQT_TQOBJECT(this), TQT_SLOT(slotSelectAll())); + accel->insert(TDEStdAccel::Deselect, TQT_TQOBJECT(this), TQT_SLOT(slotDeselect())); accel->readSettings(); } diff --git a/kalarm/birthdaydlg.h b/kalarm/birthdaydlg.h index c8851f1bf..e680880e8 100644 --- a/kalarm/birthdaydlg.h +++ b/kalarm/birthdaydlg.h @@ -27,7 +27,7 @@ #include "alarmevent.h" class TQCheckBox; -class KListView; +class TDEListView; class CheckBox; class FontColourButton; class SoundPicker; @@ -92,7 +92,7 @@ class BLineEdit : public TQLineEdit virtual void focusOutEvent(TQFocusEvent*) { emit focusLost(); } }; -class BListView : public KListView +class BListView : public TDEListView { Q_OBJECT diff --git a/kalarm/daemon.cpp b/kalarm/daemon.cpp index 1c37f9745..db9b3b04d 100644 --- a/kalarm/daemon.cpp +++ b/kalarm/daemon.cpp @@ -566,7 +566,7 @@ void Daemon::slotPreferencesChanged() /****************************************************************************** * Create an "Alarms Enabled/Enable Alarms" action. */ -AlarmEnableAction* Daemon::createAlarmEnableAction(KActionCollection* actions, const char* name) +AlarmEnableAction* Daemon::createAlarmEnableAction(TDEActionCollection* actions, const char* name) { AlarmEnableAction* a = new AlarmEnableAction(0, actions, name); connect(a, TQT_SIGNAL(userClicked(bool)), mInstance, TQT_SLOT(setAlarmsEnabled(bool))); @@ -724,7 +724,7 @@ void NotificationHandler::registered(bool reregister, int result, int version) =============================================================================*/ AlarmEnableAction::AlarmEnableAction(int accel, TQObject* parent, const char* name) - : KToggleAction(i18n("Enable &Alarms"), accel, parent, name), + : TDEToggleAction(i18n("Enable &Alarms"), accel, parent, name), mInitialised(false) { setCheckedState(i18n("Disable &Alarms")); @@ -740,7 +740,7 @@ void AlarmEnableAction::setCheckedActual(bool running) kdDebug(5950) << "AlarmEnableAction::setCheckedActual(" << running << ")\n"; if (running != isChecked() || !mInitialised) { - KToggleAction::setChecked(running); + TDEToggleAction::setChecked(running); emit switched(running); } } diff --git a/kalarm/daemon.h b/kalarm/daemon.h index 775833d33..80afd2739 100644 --- a/kalarm/daemon.h +++ b/kalarm/daemon.h @@ -28,7 +28,7 @@ #include <kalarmd/kalarmd.h> #include <kalarmd/alarmguiiface.h> -class KActionCollection; +class TDEActionCollection; class AlarmCalendar; class AlarmEnableAction; class NotificationHandler; @@ -42,7 +42,7 @@ class Daemon : public TQObject static void initialise(); static void createDcopHandler(); static bool isDcopHandlerReady() { return mDcopHandler; } - static AlarmEnableAction* createAlarmEnableAction(KActionCollection*, const char* name); + static AlarmEnableAction* createAlarmEnableAction(TDEActionCollection*, const char* name); static bool start(); static bool reregister() { return registerWith(true); } static bool reset(); @@ -117,7 +117,7 @@ class Daemon : public TQObject = Class: AlarmEnableAction =============================================================================*/ -class AlarmEnableAction : public KToggleAction +class AlarmEnableAction : public TDEToggleAction { Q_OBJECT @@ -127,7 +127,7 @@ class AlarmEnableAction : public KToggleAction void setCheckedActual(bool); // set state and emit switched() signal virtual void setChecked(bool); // request state change and emit userClicked() signal signals: - void switched(bool); // state has changed (KToggleAction::toggled() is only emitted when clicked by user) + void switched(bool); // state has changed (TDEToggleAction::toggled() is only emitted when clicked by user) void userClicked(bool); // user has clicked the control (param = desired state) private: bool mInitialised; diff --git a/kalarm/eventlistviewbase.cpp b/kalarm/eventlistviewbase.cpp index a8f5b4d18..f093fa87a 100644 --- a/kalarm/eventlistviewbase.cpp +++ b/kalarm/eventlistviewbase.cpp @@ -46,7 +46,7 @@ class EventListWhatsThisBase : public TQWhatsThis =============================================================================*/ EventListViewBase::EventListViewBase(TQWidget* parent, const char* name) - : KListView(parent, name), + : TDEListView(parent, name), mFind(0), mLastColumn(-1), mLastColumnHeaderWidth(0) @@ -237,7 +237,7 @@ void EventListViewBase::slotDeselect() */ bool EventListViewBase::anySelected() const { - for (TQListViewItem* item = KListView::firstChild(); item; item = item->nextSibling()) + for (TQListViewItem* item = TDEListView::firstChild(); item; item = item->nextSibling()) if (isSelected(item)) return true; return false; @@ -263,7 +263,7 @@ const KAEvent* EventListViewBase::selectedEvent() const EventListViewItemBase* EventListViewBase::selectedItem() const { if (selectionMode() == TQListView::Single) - return (EventListViewItemBase*)KListView::selectedItem(); + return (EventListViewItemBase*)TDEListView::selectedItem(); TQListViewItem* item = 0; for (TQListViewItem* it = firstChild(); it; it = it->nextSibling()) @@ -346,7 +346,7 @@ void EventListViewBase::resizeLastColumn() */ void EventListViewBase::resizeEvent(TQResizeEvent* re) { - KListView::resizeEvent(re); + TDEListView::resizeEvent(re); resizeLastColumn(); } @@ -357,7 +357,7 @@ void EventListViewBase::resizeEvent(TQResizeEvent* re) */ void EventListViewBase::showEvent(TQShowEvent* se) { - KListView::showEvent(se); + TDEListView::showEvent(se); resizeLastColumn(); } diff --git a/kalarm/eventlistviewbase.h b/kalarm/eventlistviewbase.h index 6024a4b5d..d733e19b2 100644 --- a/kalarm/eventlistviewbase.h +++ b/kalarm/eventlistviewbase.h @@ -33,7 +33,7 @@ class EventListViewItemBase; class Find; -class EventListViewBase : public KListView +class EventListViewBase : public TDEListView { Q_OBJECT @@ -60,8 +60,8 @@ class EventListViewBase : public KListView { modifyEvent(oldEventID, event, list, selectionView); } void resizeLastColumn(); int itemHeight(); - EventListViewItemBase* currentItem() const { return (EventListViewItemBase*)KListView::currentItem(); } - EventListViewItemBase* firstChild() const { return (EventListViewItemBase*)KListView::firstChild(); } + EventListViewItemBase* currentItem() const { return (EventListViewItemBase*)TDEListView::currentItem(); } + EventListViewItemBase* firstChild() const { return (EventListViewItemBase*)TDEListView::firstChild(); } bool anySelected() const; // are any items selected? const KAEvent* selectedEvent() const; EventListViewItemBase* selectedItem() const; diff --git a/kalarm/fontcolour.cpp b/kalarm/fontcolour.cpp index 4273125a3..e4b922431 100644 --- a/kalarm/fontcolour.cpp +++ b/kalarm/fontcolour.cpp @@ -116,7 +116,7 @@ FontColourChooser::FontColourChooser(TQWidget *parent, const char *name, else mDefaultFont = 0; - mFontChooser = new KFontChooser(page, name, onlyFixed, fontList, false, visibleListSize); + mFontChooser = new TDEFontChooser(page, name, onlyFixed, fontList, false, visibleListSize); mFontChooser->installEventFilter(this); // for read-only mode const TQObjectList* kids = mFontChooser->queryList(); for (TQObjectList::ConstIterator it = kids->constBegin(); it != kids->constEnd(); ++it) diff --git a/kalarm/fontcolour.h b/kalarm/fontcolour.h index 4c36113cd..188324d6b 100644 --- a/kalarm/fontcolour.h +++ b/kalarm/fontcolour.h @@ -70,7 +70,7 @@ private: ColourCombo* mFgColourButton; // or null ColourCombo* mBgColourButton; TQPushButton* mRemoveColourButton; - KFontChooser* mFontChooser; + TDEFontChooser* mFontChooser; CheckBox* mDefaultFont; // or null ColourList mColourList; bool mReadOnly; diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp index e637f22f5..1177d23c5 100644 --- a/kalarm/functions.cpp +++ b/kalarm/functions.cpp @@ -107,17 +107,17 @@ MainWindow* displayMainWindowSelected(const TQString& eventID) } /****************************************************************************** -* Create a New Alarm KAction. +* Create a New Alarm TDEAction. */ -KAction* createNewAlarmAction(const TQString& label, TQObject* receiver, const char* slot, KActionCollection* actions, const char* name) +TDEAction* createNewAlarmAction(const TQString& label, TQObject* receiver, const char* slot, TDEActionCollection* actions, const char* name) { - return new KAction(label, "filenew", KStdAccel::openNew(), receiver, slot, actions, name); + return new TDEAction(label, "filenew", TDEStdAccel::openNew(), receiver, slot, actions, name); } /****************************************************************************** -* Create a New From Template KAction. +* Create a New From Template TDEAction. */ -TemplateMenuAction* createNewFromTemplateAction(const TQString& label, TQObject* receiver, const char* slot, KActionCollection* actions, const char* name) +TemplateMenuAction* createNewFromTemplateAction(const TQString& label, TQObject* receiver, const char* slot, TDEActionCollection* actions, const char* name) { return new TemplateMenuAction(label, "new_from_template", receiver, slot, actions, name); } diff --git a/kalarm/functions.h b/kalarm/functions.h index 9d5b1900a..ab97c6ec9 100644 --- a/kalarm/functions.h +++ b/kalarm/functions.h @@ -31,8 +31,8 @@ class TQObject; class TQWidget; class TQString; -class KAction; -class KActionCollection; +class TDEAction; +class TDEActionCollection; namespace KCal { class Event; } class KAEvent; class MainWindow; @@ -80,10 +80,10 @@ TQString browseFile(const TQString& caption, TQString& defaultDir, c const TQString& filter = TQString(), int mode = 0, TQWidget* parent = 0, const char* name = 0); bool edit(const TQString& eventID); bool editNew(const TQString& templateName = TQString()); -/** Create a "New Alarm" KAction */ -KAction* createNewAlarmAction(const TQString& label, TQObject* receiver, const char* slot, KActionCollection*, const char* name); -/** Create a "New From Template" KAction */ -TemplateMenuAction* createNewFromTemplateAction(const TQString& label, TQObject* receiver, const char* slot, KActionCollection*, const char* name); +/** Create a "New Alarm" TDEAction */ +TDEAction* createNewAlarmAction(const TQString& label, TQObject* receiver, const char* slot, TDEActionCollection*, const char* name); +/** Create a "New From Template" TDEAction */ +TemplateMenuAction* createNewFromTemplateAction(const TQString& label, TQObject* receiver, const char* slot, TDEActionCollection*, const char* name); /** Returns a list of all alarm templates. * If shell commands are disabled, command alarm templates are omitted. */ diff --git a/kalarm/kalarmapp.cpp b/kalarm/kalarmapp.cpp index 2bf26d681..a971d98f6 100644 --- a/kalarm/kalarmapp.cpp +++ b/kalarm/kalarmapp.cpp @@ -202,9 +202,9 @@ bool KAlarmApp::restoreSession() return true; } MainWindow* trayParent = 0; - for (int i = 1; KMainWindow::canBeRestored(i); ++i) + for (int i = 1; TDEMainWindow::canBeRestored(i); ++i) { - TQString type = KMainWindow::classNameOfToplevel(i); + TQString type = TDEMainWindow::classNameOfToplevel(i); if (type == TQString::fromLatin1("MainWindow")) { MainWindow* win = MainWindow::create(true); diff --git a/kalarm/mainwindow.cpp b/kalarm/mainwindow.cpp index 08706246f..95a988ad9 100644 --- a/kalarm/mainwindow.cpp +++ b/kalarm/mainwindow.cpp @@ -80,11 +80,11 @@ static const TQString SHOW_RESOURCES_KEY = TQString::fromLatin1("ShowResources") static TQString undoText; static TQString undoTextStripped; static TQString undoIcon; -static KShortcut undoShortcut; +static TDEShortcut undoShortcut; static TQString redoText; static TQString redoTextStripped; static TQString redoIcon; -static KShortcut redoShortcut; +static TDEShortcut redoShortcut; /*============================================================================= @@ -188,7 +188,7 @@ MainWindow::~MainWindow() MainWindow* main = mainMainWindow(); if (main) KAlarm::writeConfigWindowSize(WINDOW_NAME, main->size()); - KToolBar* tb = toolBar(); + TDEToolBar* tb = toolBar(); if (tb) tb->saveSettings(TDEGlobal::config(), "Toolbars"); TDEGlobal::config()->sync(); // save any new window size to disc @@ -325,33 +325,33 @@ void MainWindow::columnsReordered() */ void MainWindow::initActions() { - KActionCollection* actions = actionCollection(); - mActionTemplates = new KAction(i18n("&Templates..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTemplates()), actions, "templates"); + TDEActionCollection* actions = actionCollection(); + mActionTemplates = new TDEAction(i18n("&Templates..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTemplates()), actions, "templates"); mActionNew = KAlarm::createNewAlarmAction(i18n("&New..."), TQT_TQOBJECT(this), TQT_SLOT(slotNew()), actions, "new"); mActionNewFromTemplate = KAlarm::createNewFromTemplateAction(i18n("New &From Template"), TQT_TQOBJECT(this), TQT_SLOT(slotNewFromTemplate(const KAEvent&)), actions, "newFromTempl"); - mActionCreateTemplate = new KAction(i18n("Create Tem&plate..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewTemplate()), actions, "createTemplate"); - mActionCopy = new KAction(i18n("&Copy..."), "editcopy", TQt::SHIFT+TQt::Key_Insert, TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), actions, "copy"); - mActionModify = new KAction(i18n("&Edit..."), "edit", TQt::CTRL+TQt::Key_E, TQT_TQOBJECT(this), TQT_SLOT(slotModify()), actions, "modify"); - mActionDelete = new KAction(i18n("&Delete"), "editdelete", TQt::Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotDelete()), actions, "delete"); - mActionReactivate = new KAction(i18n("Reac&tivate"), 0, TQt::CTRL+TQt::Key_R, TQT_TQOBJECT(this), TQT_SLOT(slotReactivate()), actions, "undelete"); - mActionEnable = new KAction(TQString(), 0, TQt::CTRL+TQt::Key_B, TQT_TQOBJECT(this), TQT_SLOT(slotEnable()), actions, "disable"); - mActionView = new KAction(i18n("&View"), "viewmag", TQt::CTRL+TQt::Key_W, TQT_TQOBJECT(this), TQT_SLOT(slotView()), actions, "view"); - mActionShowTime = new KToggleAction(i18n_a_ShowAlarmTimes(), TQt::CTRL+TQt::Key_M, TQT_TQOBJECT(this), TQT_SLOT(slotShowTime()), actions, "showAlarmTimes"); + mActionCreateTemplate = new TDEAction(i18n("Create Tem&plate..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewTemplate()), actions, "createTemplate"); + mActionCopy = new TDEAction(i18n("&Copy..."), "editcopy", TQt::SHIFT+TQt::Key_Insert, TQT_TQOBJECT(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"); + mActionDelete = new TDEAction(i18n("&Delete"), "editdelete", TQt::Key_Delete, TQT_TQOBJECT(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"); + mActionEnable = new TDEAction(TQString(), 0, TQt::CTRL+TQt::Key_B, TQT_TQOBJECT(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"); + mActionShowTime = new TDEToggleAction(i18n_a_ShowAlarmTimes(), TQt::CTRL+TQt::Key_M, TQT_TQOBJECT(this), TQT_SLOT(slotShowTime()), actions, "showAlarmTimes"); mActionShowTime->setCheckedState(i18n("Hide &Alarm Times")); - mActionShowTimeTo = new KToggleAction(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, TQT_TQOBJECT(this), TQT_SLOT(slotShowTimeTo()), actions, "showTimeToAlarms"); mActionShowTimeTo->setCheckedState(i18n("Hide Time t&o Alarms")); - mActionShowExpired = new KToggleAction(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, TQT_TQOBJECT(this), TQT_SLOT(slotShowExpired()), actions, "showExpiredAlarms"); mActionShowExpired->setCheckedState(i18n_e_HideExpiredAlarms()); - mActionToggleTrayIcon = new KToggleAction(i18n("Show in System &Tray"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleTrayIcon()), actions, "showInSystemTray"); + mActionToggleTrayIcon = new TDEToggleAction(i18n("Show in System &Tray"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleTrayIcon()), actions, "showInSystemTray"); mActionToggleTrayIcon->setCheckedState(i18n("Hide From System &Tray")); - new KAction(i18n("Import &Alarms..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotImportAlarms()), actions, "importAlarms"); - new KAction(i18n("Import &Birthdays..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotBirthdays()), actions, "importBirthdays"); - new KAction(i18n("&Refresh Alarms"), "reload", 0, TQT_TQOBJECT(this), TQT_SLOT(slotResetDaemon()), actions, "refreshAlarms"); + new TDEAction(i18n("Import &Alarms..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotImportAlarms()), actions, "importAlarms"); + new TDEAction(i18n("Import &Birthdays..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotBirthdays()), actions, "importBirthdays"); + new TDEAction(i18n("&Refresh Alarms"), "reload", 0, TQT_TQOBJECT(this), TQT_SLOT(slotResetDaemon()), actions, "refreshAlarms"); Daemon::createAlarmEnableAction(actions, "alarmEnable"); if (undoText.isNull()) { // Get standard texts, etc., for Undo and Redo actions - KAction* act = KStdAction::undo(TQT_TQOBJECT(this), 0, actions); + TDEAction* act = KStdAction::undo(TQT_TQOBJECT(this), 0, actions); undoIcon = act->icon(); undoShortcut = act->shortcut(); undoText = act->text(); @@ -364,8 +364,8 @@ void MainWindow::initActions() redoTextStripped = KAlarm::stripAccel(redoText); delete act; } - mActionUndo = new KToolBarPopupAction(undoText, undoIcon, undoShortcut, TQT_TQOBJECT(this), TQT_SLOT(slotUndo()), actions, "edit_undo"); - mActionRedo = new KToolBarPopupAction(redoText, redoIcon, redoShortcut, TQT_TQOBJECT(this), TQT_SLOT(slotRedo()), actions, "edit_redo"); + mActionUndo = new TDEToolBarPopupAction(undoText, undoIcon, undoShortcut, TQT_TQOBJECT(this), TQT_SLOT(slotUndo()), actions, "edit_undo"); + mActionRedo = new TDEToolBarPopupAction(redoText, redoIcon, redoShortcut, TQT_TQOBJECT(this), TQT_SLOT(slotRedo()), actions, "edit_redo"); KStdAction::find(TQT_TQOBJECT(mListView), TQT_SLOT(slotFind()), actions); mActionFindNext = KStdAction::findNext(TQT_TQOBJECT(mListView), TQT_SLOT(slotFindNext()), actions); mActionFindPrev = KStdAction::findPrev(TQT_TQOBJECT(mListView), TQT_SLOT(slotFindPrev()), actions); @@ -378,8 +378,8 @@ void MainWindow::initActions() setStandardToolBarMenuEnabled(true); createGUI(UI_FILE); - mContextMenu = static_cast<KPopupMenu*>(factory()->container("listContext", this)); - mActionsMenu = static_cast<KPopupMenu*>(factory()->container("actions", this)); + mContextMenu = static_cast<TDEPopupMenu*>(factory()->container("listContext", this)); + mActionsMenu = static_cast<TDEPopupMenu*>(factory()->container("actions", this)); mMenuError = (!mContextMenu || !mActionsMenu); connect(mActionsMenu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(updateActionsMenu())); connect(mActionUndo->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotInitUndoMenu())); @@ -410,7 +410,7 @@ void MainWindow::initActions() mActionEnable->setEnabled(false); mActionCreateTemplate->setEnabled(false); - KToolBar* tb = toolBar(); + TDEToolBar* tb = toolBar(); if (tb) tb->applySettings(TDEGlobal::config(), "Toolbars"); @@ -1012,7 +1012,7 @@ void MainWindow::slotInitRedoMenu() /****************************************************************************** * Populate the undo or redo menu. */ -void MainWindow::initUndoMenu(KPopupMenu* menu, Undo::Type type) +void MainWindow::initUndoMenu(TDEPopupMenu* menu, Undo::Type type) { menu->clear(); const TQString& action = (type == Undo::UNDO) ? undoTextStripped : redoTextStripped; diff --git a/kalarm/mainwindow.h b/kalarm/mainwindow.h index 47a02447d..2e39e027c 100644 --- a/kalarm/mainwindow.h +++ b/kalarm/mainwindow.h @@ -29,10 +29,10 @@ #include "undo.h" class TQListViewItem; -class KAction; -class KToggleAction; -class KToolBarPopupAction; -class KPopupMenu; +class TDEAction; +class TDEToggleAction; +class TDEToolBarPopupAction; +class TDEPopupMenu; class ActionAlarmsEnabled; class AlarmListView; class TemplateDlg; @@ -142,7 +142,7 @@ class MainWindow : public MainWindowBase void setEnableText(bool enable); static KAEvent::Action getDropAction(TQDropEvent*, TQString& text); static void executeNew(MainWindow*, const KAEvent*, KAEvent::Action = KAEvent::MESSAGE, const AlarmText& = AlarmText()); - static void initUndoMenu(KPopupMenu*, Undo::Type); + static void initUndoMenu(TDEPopupMenu*, Undo::Type); static void setUpdateTimer(); static void enableTemplateMenuItem(bool); @@ -150,26 +150,26 @@ class MainWindow : public MainWindowBase static TemplateDlg* mTemplateDlg; // the one and only template dialogue AlarmListView* mListView; - KAction* mActionTemplates; - KAction* mActionNew; + TDEAction* mActionTemplates; + TDEAction* mActionNew; TemplateMenuAction* mActionNewFromTemplate; - KAction* mActionCreateTemplate; - KAction* mActionCopy; - KAction* mActionModify; - KAction* mActionView; - KAction* mActionDelete; - KAction* mActionReactivate; - KAction* mActionEnable; - KAction* mActionFindNext; - KAction* mActionFindPrev; - KToolBarPopupAction* mActionUndo; - KToolBarPopupAction* mActionRedo; - KToggleAction* mActionToggleTrayIcon; - KToggleAction* mActionShowTime; - KToggleAction* mActionShowTimeTo; - KToggleAction* mActionShowExpired; - KPopupMenu* mActionsMenu; - KPopupMenu* mContextMenu; + TDEAction* mActionCreateTemplate; + TDEAction* mActionCopy; + TDEAction* mActionModify; + TDEAction* mActionView; + TDEAction* mActionDelete; + TDEAction* mActionReactivate; + TDEAction* mActionEnable; + TDEAction* mActionFindNext; + TDEAction* mActionFindPrev; + TDEToolBarPopupAction* mActionUndo; + TDEToolBarPopupAction* mActionRedo; + TDEToggleAction* mActionToggleTrayIcon; + TDEToggleAction* mActionShowTime; + TDEToggleAction* mActionShowTimeTo; + TDEToggleAction* mActionShowExpired; + TDEPopupMenu* mActionsMenu; + TDEPopupMenu* mContextMenu; bool mMinuteTimerActive; // minute timer is active bool mHiddenTrayParent; // on session restoration, hide this window bool mShowExpired; // include expired alarms in the displayed list diff --git a/kalarm/mainwindowbase.cpp b/kalarm/mainwindowbase.cpp index 16486e481..3d30a5ba1 100644 --- a/kalarm/mainwindowbase.cpp +++ b/kalarm/mainwindowbase.cpp @@ -31,7 +31,7 @@ void MainWindowBase::closeEvent(TQCloseEvent* ce) { disableQuit = theApp()->trayIconDisplayed(); - KMainWindow::closeEvent(ce); + TDEMainWindow::closeEvent(ce); disableQuit = false; ce->accept(); // allow window to close even if it's the last main window } @@ -46,5 +46,5 @@ bool MainWindowBase::queryExit() if (kapp->sessionSaving()) return true; #endif - return disableQuit ? false : KMainWindow::queryExit(); + return disableQuit ? false : TDEMainWindow::queryExit(); } diff --git a/kalarm/mainwindowbase.h b/kalarm/mainwindowbase.h index 80e4cad21..17f55ff8d 100644 --- a/kalarm/mainwindowbase.h +++ b/kalarm/mainwindowbase.h @@ -31,14 +31,14 @@ * * @author David Jarvie <software@astrojar.org.uk> */ -class MainWindowBase : public KMainWindow +class MainWindowBase : public TDEMainWindow { Q_OBJECT public: explicit MainWindowBase(TQWidget* parent = 0, const char* name = 0, WFlags f = WType_TopLevel | WDestructiveClose) - : KMainWindow(parent, name, f), disableQuit(false) { } + : TDEMainWindow(parent, name, f), disableQuit(false) { } protected: virtual void closeEvent(TQCloseEvent*); diff --git a/kalarm/templatedlg.cpp b/kalarm/templatedlg.cpp index 2841ce61b..fab155e34 100644 --- a/kalarm/templatedlg.cpp +++ b/kalarm/templatedlg.cpp @@ -79,9 +79,9 @@ TemplateDlg::TemplateDlg(TQWidget* parent, const char* name) TQWhatsThis::add(mDeleteButton, i18n("Delete the currently highlighted alarm template")); layout->addWidget(mDeleteButton); - KAccel* accel = new KAccel(this); - accel->insert(KStdAccel::SelectAll, TQT_TQOBJECT(mTemplateList), TQT_SLOT(slotSelectAll())); - accel->insert(KStdAccel::Deselect, TQT_TQOBJECT(mTemplateList), TQT_SLOT(slotDeselect())); + TDEAccel* accel = new TDEAccel(this); + accel->insert(TDEStdAccel::SelectAll, TQT_TQOBJECT(mTemplateList), TQT_SLOT(slotSelectAll())); + accel->insert(TDEStdAccel::Deselect, TQT_TQOBJECT(mTemplateList), TQT_SLOT(slotDeselect())); accel->readSettings(); mTemplateList->refresh(); diff --git a/kalarm/templatemenuaction.cpp b/kalarm/templatemenuaction.cpp index 7f61d6f9b..7500b4764 100644 --- a/kalarm/templatemenuaction.cpp +++ b/kalarm/templatemenuaction.cpp @@ -31,8 +31,8 @@ TemplateMenuAction::TemplateMenuAction(const TQString& label, const TQString& icon, TQObject* receiver, - const char* slot, KActionCollection* actions, const char* name) - : KActionMenu(label, icon, actions, name) + const char* slot, TDEActionCollection* actions, const char* name) + : TDEActionMenu(label, icon, actions, name) { setDelayed(false); connect(popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotInitMenu())); @@ -46,7 +46,7 @@ TemplateMenuAction::TemplateMenuAction(const TQString& label, const TQString& ic */ void TemplateMenuAction::slotInitMenu() { - KPopupMenu* menu = popupMenu(); + TDEPopupMenu* menu = popupMenu(); menu->clear(); mOriginalTexts.clear(); TQValueList<KAEvent> templates = KAlarm::templateList(); @@ -70,7 +70,7 @@ void TemplateMenuAction::slotInitMenu() */ void TemplateMenuAction::slotSelected(int id) { - KPopupMenu* menu = popupMenu(); + TDEPopupMenu* menu = popupMenu(); TQString item = mOriginalTexts[menu->indexOf(id)]; if (!item.isEmpty()) { diff --git a/kalarm/templatemenuaction.h b/kalarm/templatemenuaction.h index 7f86a4d0d..a5d7f1728 100644 --- a/kalarm/templatemenuaction.h +++ b/kalarm/templatemenuaction.h @@ -25,13 +25,13 @@ class KAEvent; -class TemplateMenuAction : public KActionMenu +class TemplateMenuAction : public TDEActionMenu { Q_OBJECT public: TemplateMenuAction(const TQString& label, const TQString& icon, TQObject* receiver, - const char* slot, KActionCollection* parent, const char* name = 0); + const char* slot, TDEActionCollection* parent, const char* name = 0); signals: void selected(const KAEvent&); diff --git a/kalarm/traywindow.cpp b/kalarm/traywindow.cpp index 8bcad17ed..3916ebdd2 100644 --- a/kalarm/traywindow.cpp +++ b/kalarm/traywindow.cpp @@ -84,7 +84,7 @@ TrayWindow::TrayWindow(MainWindow* parent, const char* name) setAcceptDrops(true); // allow drag-and-drop onto this window // Set up the context menu - KActionCollection* actcol = actionCollection(); + TDEActionCollection* actcol = actionCollection(); AlarmEnableAction* a = Daemon::createAlarmEnableAction(actcol, "tAlarmEnable"); a->plug(contextMenu()); connect(a, TQT_SIGNAL(switched(bool)), TQT_SLOT(setEnabledStatus(bool))); @@ -118,7 +118,7 @@ TrayWindow::~TrayWindow() * Called just before the context menu is displayed. * Update the Alarms Enabled item status. */ -void TrayWindow::contextMenuAboutToShow(KPopupMenu* menu) +void TrayWindow::contextMenuAboutToShow(TDEPopupMenu* menu) { KSystemTray::contextMenuAboutToShow(menu); // needed for KDE <= 3.1 compatibility Daemon::checkStatus(); diff --git a/kalarm/traywindow.h b/kalarm/traywindow.h index b5deb09ca..322df2381 100644 --- a/kalarm/traywindow.h +++ b/kalarm/traywindow.h @@ -23,7 +23,7 @@ #include <tqpixmap.h> #include <ksystemtray.h> -class KPopupMenu; +class TDEPopupMenu; class KAEvent; class MainWindow; @@ -49,7 +49,7 @@ class TrayWindow : public KSystemTray void deleted(); protected: - virtual void contextMenuAboutToShow(KPopupMenu*); + virtual void contextMenuAboutToShow(TDEPopupMenu*); virtual void mousePressEvent(TQMouseEvent*); virtual void mouseReleaseEvent(TQMouseEvent*); virtual void dragEnterEvent(TQDragEnterEvent*); diff --git a/kandy/src/kandy.cpp b/kandy/src/kandy.cpp index eeae6f2da..c46f96874 100644 --- a/kandy/src/kandy.cpp +++ b/kandy/src/kandy.cpp @@ -58,7 +58,7 @@ #include "kandy.moc" Kandy::Kandy(CommandScheduler *scheduler) - : KMainWindow( 0, "Kandy" ), + : TDEMainWindow( 0, "Kandy" ), mPrinter(0) { mScheduler = scheduler; @@ -70,7 +70,7 @@ Kandy::Kandy(CommandScheduler *scheduler) // accept dnd setAcceptDrops(true); - // tell the KMainWindow that this is indeed the main widget + // tell the TDEMainWindow that this is indeed the main widget setCentralWidget(mView); // then, setup our actions @@ -136,12 +136,12 @@ void Kandy::setupActions() KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection()); KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(optionsPreferences()), actionCollection()); - new KAction(i18n("Mobile GUI"),0,TQT_TQOBJECT(this),TQT_SLOT(showMobileGui()), + new TDEAction(i18n("Mobile GUI"),0,TQT_TQOBJECT(this),TQT_SLOT(showMobileGui()), actionCollection(),"show_mobilegui"); - mConnectAction = new KAction(i18n("Connect"),0,TQT_TQOBJECT(this),TQT_SLOT(modemConnect()), + mConnectAction = new TDEAction(i18n("Connect"),0,TQT_TQOBJECT(this),TQT_SLOT(modemConnect()), actionCollection(),"modem_connect"); - mDisconnectAction = new KAction(i18n("Disconnect"),0,TQT_TQOBJECT(this), + mDisconnectAction = new TDEAction(i18n("Disconnect"),0,TQT_TQOBJECT(this), TQT_SLOT(modemDisconnect()),actionCollection(), "modem_disconnect"); @@ -166,7 +166,7 @@ void Kandy::readProperties(TDEConfig */*config*/) void Kandy::dragEnterEvent(TQDragEnterEvent *event) { // do nothing - KMainWindow::dragEnterEvent(event); + TDEMainWindow::dragEnterEvent(event); // accept uri drops only // event->accept(KURLDrag::canDecode(event)); @@ -179,7 +179,7 @@ void Kandy::dropEvent(TQDropEvent *event) // much more, so please read the docs there // do nothing - KMainWindow::dropEvent(event); + TDEMainWindow::dropEvent(event); /* KURL::List list; diff --git a/kandy/src/kandy.h b/kandy/src/kandy.h index 05bd39b36..10147d772 100644 --- a/kandy/src/kandy.h +++ b/kandy/src/kandy.h @@ -45,7 +45,7 @@ class KandyPrefsDialog; * @author Cornelius Schumacher <schumacher@kde.org> * @version 0.1 */ -class Kandy : public KMainWindow +class Kandy : public TDEMainWindow { Q_OBJECT @@ -128,8 +128,8 @@ class Kandy : public KMainWindow TQPrinter *mPrinter; - KAction *mConnectAction; - KAction *mDisconnectAction; + TDEAction *mConnectAction; + TDEAction *mDisconnectAction; TQString mFilename; diff --git a/kandy/src/mobilemain.cpp b/kandy/src/mobilemain.cpp index 43210ba8f..e66909394 100644 --- a/kandy/src/mobilemain.cpp +++ b/kandy/src/mobilemain.cpp @@ -48,7 +48,7 @@ #include "mobilemain.moc" MobileMain::MobileMain(CommandScheduler *scheduler, KandyPrefs *prefs) - : KMainWindow( 0, "MobileMain" ) + : TDEMainWindow( 0, "MobileMain" ) { mView = new MobileGui(scheduler, prefs, this); setCentralWidget(mView); @@ -73,7 +73,7 @@ void MobileMain::setupActions() { KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); - new KAction(i18n("Terminal"),0,TQT_TQOBJECT(this),TQT_SLOT(showTerminal()), + new TDEAction(i18n("Terminal"),0,TQT_TQOBJECT(this),TQT_SLOT(showTerminal()), actionCollection(),"show_terminal"); createStandardStatusBarAction(); @@ -104,7 +104,7 @@ void MobileMain::readProperties(TDEConfig */*config*/) void MobileMain::dragEnterEvent(TQDragEnterEvent *event) { // do nothing - KMainWindow::dragEnterEvent(event); + TDEMainWindow::dragEnterEvent(event); // accept uri drops only // event->accept(KURLDrag::canDecode(event)); @@ -117,7 +117,7 @@ void MobileMain::dropEvent(TQDropEvent *event) // much more, so please read the docs there // do nothing - KMainWindow::dropEvent(event); + TDEMainWindow::dropEvent(event); } void MobileMain::optionsConfigureKeys() diff --git a/kandy/src/mobilemain.h b/kandy/src/mobilemain.h index eeff40bba..b27124c66 100644 --- a/kandy/src/mobilemain.h +++ b/kandy/src/mobilemain.h @@ -43,7 +43,7 @@ class CommandScheduler; * @author Cornelius Schumacher <schumacher@kde.org> * @version 0.1 */ -class MobileMain : public KMainWindow +class MobileMain : public TDEMainWindow { Q_OBJECT @@ -1,4 +1,4 @@ -* KarmWindow::makeMenus -> export KAction? KarmWindow::contextMenuRequest +* KarmWindow::makeMenus -> export TDEAction? KarmWindow::contextMenuRequest * QPopupMenu should be static! put connect( ..contextMenu at the right place * mainwindow: move tray Q_SIGNALS into tray.cpp add mouse double-click action * (start new timer, stop old) to "Configure diff --git a/karm/doc/Mainpage.dox b/karm/doc/Mainpage.dox index 4bb930f3f..44aae4eea 100644 --- a/karm/doc/Mainpage.dox +++ b/karm/doc/Mainpage.dox @@ -12,7 +12,7 @@ up the status bar, and handles many of the signal-to-slot connections. It holds a pointer to the TaskView and Preferences objects and implements the %Karm's DCOP interface (defined in KarmDCOPIface). -TaskView does most of the work in the application. This KListView subclass +TaskView does most of the work in the application. This TDEListView subclass sets up the columns in the list, the idle detection timer, the auto save timer, and the desktop tracker. It starts and stops timers, handles importing and exporting and displays the edit task dialog in response to user action. @@ -47,7 +47,7 @@ connections. See \see connections to get an index of what signal is connected to <tr><td>AddTaskDialog</td> <td> </td> <td> </td> <td> </td> <td>Y </td></tr> <tr><td>IdleTimer</td> <td>Y </td> <td>Y </td> <td>Y </td> <td> </td></tr> - <tr><td>KAccelMenuWatch</td> <td> </td> <td>Y </td> <td> </td> <td>Y </td></tr> + <tr><td>TDEAccelMenuWatch</td> <td> </td> <td>Y </td> <td> </td> <td>Y </td></tr> <tr><td>Karm</td> <td>Y </td> <td>Y </td> <td>Y </td> <td> </td></tr> <tr><td>KarmTray</td> <td> </td> <td>Y </td> <td>Y </td> <td> </td></tr> <tr><td>KarmWindow</td> <td> </td> <td> </td> <td>Y </td> <td> </td></tr> @@ -92,7 +92,7 @@ These are the Q_SIGNALS: <li>IdleTimer::startIdleDetection() <li>IdleTimer::stopIdleDetection() <li>IdleTimer::toggleOverAllIdleDetection(bool) - <li>KAccelMenuWatch::updateMenus() + <li>TDEAccelMenuWatch::updateMenus() <li>Karm::changeTimer(QListViewItem*) <li>Karm::deleteTask() <li>Karm::editTask() @@ -156,7 +156,7 @@ These are the Q_SIGNALS: <li>AddTaskDialog::enterWhatsThis() <li>AddTaskDialog::slotAbsolutePressed() <li>AddTaskDialog::slotRelativePressed() - <li>KAccelMenuWatch::removeDeadMenu() + <li>TDEAccelMenuWatch::removeDeadMenu() </ol> */ @@ -171,7 +171,7 @@ These are the Q_SIGNALS: <tr><td>AddTaskDialog</td> <td>_relativeRB</td> <td>QRadioButton</td> <td>clicked()</td> <td>this</td> <td>slotRelativePressed</td></tr> <tr><td>AddTaskDialog</td> <td>whatsThisBU</td> <td>QPushButton</td> <td>clicked()</td> <td>this</td> <td>enterWhatsThis</td></tr> <tr><td>IdleTimer</td> <td>_timer</td> <td>QTimer</td> <td>timeout()</td> <td>this</td> <td>check</td></tr> -<tr><td>KAccelMenuWatch</td> <td>menu</td> <td>QPopupMenu</td> <td>destroyed()</td> <td>this</td> <td>removeeDeadMenu</td></tr> +<tr><td>TDEAccelMenuWatch</td> <td>menu</td> <td>QPopupMenu</td> <td>destroyed()</td> <td>this</td> <td>removeeDeadMenu</td></tr> <tr><td>Karm</td> <td>this</td> <td>Karm__QListView</td> <td>doubleClicked()</td> <td>this</td> <td>changeTimer</td></tr> <tr><td>Karm</td> <td>_minuteTimer</td> <td>QTimer</td> <td>timeout()</td> <td>this</td> <td>minuteUpdate</td></tr> <tr><td>Karm</td> <td>_idleTimer</td> <td>IdleTimer</td> <td>extractTime()</td> <td>this</td> <td>extractTime</td></tr> @@ -195,18 +195,18 @@ These are the Q_SIGNALS: <tr><td>KarmWindow</td> <td>_karm</td> <td>Karm</td> <td>timerTick()</td> <td>this</td> <td>updateTime</td></tr> <tr><td>KarmWindow</td> <td>_karm</td> <td>Karm</td> <td>timerActive()</td> <td>this</td> <td>setActiveIcon</td></tr> <tr><td>KarmWindow</td> <td>_karm</td> <td>Karm</td> <td>timerInactive()</td> <td>this</td> <td>setInactiveIcon</td></tr> -<tr><td>KarmWindow</td> <td>KStdAction__quit</td> <td>KAction</td> <td>__()</td> <td>this</td> <td>quit</td></tr> -<tr><td>KarmWindow</td> <td>KStdAction__print</td> <td>KAction</td> <td>__()</td> <td>this</td> <td>print</td></tr> -<tr><td>KarmWindow</td> <td>KStdAction__keyBindings</td> <td>KAction</td> <td>__()</td> <td>this</td> <td>keyBindings</td></tr> -<tr><td>KarmWindow</td> <td>KStdAction__preferences</td> <td>KAction</td> <td>__()</td> <td>_preferences</td> <td>showDialog</td></tr> -<tr><td>KarmWindow</td> <td>KStdAction__save</td> <td>KAction</td> <td>__()</td> <td>_preferences</td> <td>save</td></tr> -<tr><td>KarmWindow</td> <td>actionResetSession</td> <td>KAction</td> <td>__()</td> <td>this</td> <td>resetSessionTime</td></tr> -<tr><td>KarmWindow</td> <td>actionStart</td> <td>KAction</td> <td>__()</td> <td>_karm</td> <td>startTimer</td></tr> -<tr><td>KarmWindow</td> <td>actionStop</td> <td>KAction</td> <td>__()</td> <td>_karm</td> <td>stopCurrentTimer</td></tr> -<tr><td>KarmWindow</td> <td>actionNew</td> <td>KAction</td> <td>__()</td> <td>_karm</td> <td>newTask</td></tr> -<tr><td>KarmWindow</td> <td>actionNewSub</td> <td>KAction</td> <td>__()</td> <td>_karm</td> <td>newSubTask</td></tr> -<tr><td>KarmWindow</td> <td>actionDelete</td> <td>KAction</td> <td>__()</td> <td>_karm</td> <td>deleteTask</td></tr> -<tr><td>KarmWindow</td> <td>actionEdit</td> <td>KAction</td> <td>__()</td> <td>_karm</td> <td>editTask</td></tr> +<tr><td>KarmWindow</td> <td>KStdAction__quit</td> <td>TDEAction</td> <td>__()</td> <td>this</td> <td>quit</td></tr> +<tr><td>KarmWindow</td> <td>KStdAction__print</td> <td>TDEAction</td> <td>__()</td> <td>this</td> <td>print</td></tr> +<tr><td>KarmWindow</td> <td>KStdAction__keyBindings</td> <td>TDEAction</td> <td>__()</td> <td>this</td> <td>keyBindings</td></tr> +<tr><td>KarmWindow</td> <td>KStdAction__preferences</td> <td>TDEAction</td> <td>__()</td> <td>_preferences</td> <td>showDialog</td></tr> +<tr><td>KarmWindow</td> <td>KStdAction__save</td> <td>TDEAction</td> <td>__()</td> <td>_preferences</td> <td>save</td></tr> +<tr><td>KarmWindow</td> <td>actionResetSession</td> <td>TDEAction</td> <td>__()</td> <td>this</td> <td>resetSessionTime</td></tr> +<tr><td>KarmWindow</td> <td>actionStart</td> <td>TDEAction</td> <td>__()</td> <td>_karm</td> <td>startTimer</td></tr> +<tr><td>KarmWindow</td> <td>actionStop</td> <td>TDEAction</td> <td>__()</td> <td>_karm</td> <td>stopCurrentTimer</td></tr> +<tr><td>KarmWindow</td> <td>actionNew</td> <td>TDEAction</td> <td>__()</td> <td>_karm</td> <td>newTask</td></tr> +<tr><td>KarmWindow</td> <td>actionNewSub</td> <td>TDEAction</td> <td>__()</td> <td>_karm</td> <td>newSubTask</td></tr> +<tr><td>KarmWindow</td> <td>actionDelete</td> <td>TDEAction</td> <td>__()</td> <td>_karm</td> <td>deleteTask</td></tr> +<tr><td>KarmWindow</td> <td>actionEdit</td> <td>TDEAction</td> <td>__()</td> <td>_karm</td> <td>editTask</td></tr> <tr><td>Task</td> <td>_timer</td> <td>QTimer</td> <td>timeout()</td> <td>this</td> <td>updateActiveIcon</td></tr> </table> diff --git a/karm/kaccelmenuwatch.cpp b/karm/kaccelmenuwatch.cpp index ddabb1d86..4b5952848 100644 --- a/karm/kaccelmenuwatch.cpp +++ b/karm/kaccelmenuwatch.cpp @@ -1,5 +1,5 @@ /* -* kaccelmenuwatch.cpp -- Implementation of class KAccelMenuWatch. +* kaccelmenuwatch.cpp -- Implementation of class TDEAccelMenuWatch. * Author: Sirtaj Singh Kang * Generated: Thu Jan 7 15:05:26 EST 1999 */ @@ -9,7 +9,7 @@ #include "kaccelmenuwatch.h" -KAccelMenuWatch::KAccelMenuWatch( KAccel *accel, TQObject *parent ) +TDEAccelMenuWatch::TDEAccelMenuWatch( TDEAccel *accel, TQObject *parent ) : TQObject( parent ), _accel( accel ), _menu ( 0 ) @@ -18,7 +18,7 @@ KAccelMenuWatch::KAccelMenuWatch( KAccel *accel, TQObject *parent ) _menuList.setAutoDelete( false ); } -void KAccelMenuWatch::setMenu( TQPopupMenu *menu ) +void TDEAccelMenuWatch::setMenu( TQPopupMenu *menu ) { assert( menu ); @@ -33,19 +33,19 @@ void KAccelMenuWatch::setMenu( TQPopupMenu *menu ) _menu = menu; } -void KAccelMenuWatch::connectAccel( int itemId, const char *action ) +void TDEAccelMenuWatch::connectAccel( int itemId, const char *action ) { AccelItem *item = newAccelItem( _menu, itemId, StringAccel ) ; item->action = TQString::fromLocal8Bit( action ); } -void KAccelMenuWatch::connectAccel( int itemId, KStdAccel::StdAccel accel ) +void TDEAccelMenuWatch::connectAccel( int itemId, TDEStdAccel::StdAccel accel ) { AccelItem *item = newAccelItem( _menu, itemId, StdAccel ) ; item->stdAction = accel; } -void KAccelMenuWatch::updateMenus() +void TDEAccelMenuWatch::updateMenus() { assert( _accel != 0 ); @@ -60,7 +60,7 @@ void KAccelMenuWatch::updateMenus() item->menu->setAccel( _accel->shortcut( item->action ).keyCodeQt(), item->itemId ); break; case StdAccel: - item->menu->setAccel( KStdAccel::shortcut( item->stdAction ).keyCodeQt(), item->itemId ); + item->menu->setAccel( TDEStdAccel::shortcut( item->stdAction ).keyCodeQt(), item->itemId ); break; default: break; @@ -69,7 +69,7 @@ void KAccelMenuWatch::updateMenus() } -void KAccelMenuWatch::removeDeadMenu() +void TDEAccelMenuWatch::removeDeadMenu() { TQPopupMenu *sdr = (TQPopupMenu *) sender(); assert( sdr ); @@ -96,7 +96,7 @@ loop: return; } -KAccelMenuWatch::AccelItem *KAccelMenuWatch::newAccelItem( TQPopupMenu *, +TDEAccelMenuWatch::AccelItem *TDEAccelMenuWatch::newAccelItem( TQPopupMenu *, int itemId, AccelType type ) { AccelItem *item = new AccelItem; diff --git a/karm/kaccelmenuwatch.h b/karm/kaccelmenuwatch.h index 010d7c46b..388cd06f5 100644 --- a/karm/kaccelmenuwatch.h +++ b/karm/kaccelmenuwatch.h @@ -1,5 +1,5 @@ /* -* kaccelmenuwatch.h -- Declaration of class KAccelMenuWatch. +* kaccelmenuwatch.h -- Declaration of class TDEAccelMenuWatch. * Generated by newclass on Thu Jan 7 15:05:26 EST 1999. */ #ifndef KARM_K_ACCEL_MENU_WATCH_H @@ -13,26 +13,26 @@ class TQPopupMenu; /** - * Easy updating of menu accels when changing a KAccel object. + * Easy updating of menu accels when changing a TDEAccel object. * - * Since a KAccel object does not keep track of menu items to which it + * Since a TDEAccel object does not keep track of menu items to which it * is connected, we normally have to manually call - * KAccel::changeMenuAccel() again for each update of the KAccel object. + * TDEAccel::changeMenuAccel() again for each update of the TDEAccel object. * - * With KAccelMenuWatch you provide the kaccel object and the menu + * With TDEAccelMenuWatch you provide the kaccel object and the menu * items to which it connects, and if you update the kaccel you just have - * to call KAccelMenuWatch::updateMenus() and the menu items will be updated. + * to call TDEAccelMenuWatch::updateMenus() and the menu items will be updated. * * It is safe to delete menus that have connections handled by this class. * On deletion of a menu, all associated accelerators will be deleted. * - * Note that you _have_ to call KAccelMenuWatch::updateMenus() after you + * Note that you _have_ to call TDEAccelMenuWatch::updateMenus() after you * connect the * accelerators, as they are not activated till then. * * @author Sirtaj Singh Kang (taj@kde.org) */ -class KAccelMenuWatch : public TQObject +class TDEAccelMenuWatch : public TQObject { Q_OBJECT @@ -48,28 +48,28 @@ class KAccelMenuWatch : public TQObject // only one of these is used at a time TQString action; - KStdAccel::StdAccel stdAction; + TDEStdAccel::StdAccel stdAction; } AccelItem; - KAccel *_accel; + TDEAccel *_accel; TQPtrList<AccelItem> _accList; TQPtrList<TQPopupMenu> _menuList; TQPopupMenu *_menu; - KAccelMenuWatch::AccelItem *newAccelItem( TQPopupMenu *menu, + TDEAccelMenuWatch::AccelItem *newAccelItem( TQPopupMenu *menu, int itemId, AccelType type ); public: /** - * KAccelMenuWatch Constructor + * TDEAccelMenuWatch Constructor */ - KAccelMenuWatch( KAccel *accel, TQObject *parent = 0 ); + TDEAccelMenuWatch( TDEAccel *accel, TQObject *parent = 0 ); /** - * KAccelMenuWatch Destructor + * TDEAccelMenuWatch Destructor */ - virtual ~KAccelMenuWatch() {} + virtual ~TDEAccelMenuWatch() {} /** * Set the menu on which connectAccel calls will operate. @@ -80,7 +80,7 @@ class KAccelMenuWatch : public TQObject void setMenu( TQPopupMenu *menu ); /** - * Return the last menu set with KAccelMenuWatch::setMenu(TQPopupMenu*), + * Return the last menu set with TDEAccelMenuWatch::setMenu(TQPopupMenu*), * or 0 if none has been set. */ TQPopupMenu *currentMenu() const { return _menu; } @@ -94,7 +94,7 @@ class KAccelMenuWatch : public TQObject /** * Same as above, but connects to standard accelerators. */ - void connectAccel( int itemId, KStdAccel::StdAccel ); + void connectAccel( int itemId, TDEStdAccel::StdAccel ); public slots: /** @@ -107,8 +107,8 @@ class KAccelMenuWatch : public TQObject void removeDeadMenu(); private: - KAccelMenuWatch& operator=( const KAccelMenuWatch& ); - KAccelMenuWatch( const KAccelMenuWatch& ); + TDEAccelMenuWatch& operator=( const TDEAccelMenuWatch& ); + TDEAccelMenuWatch( const TDEAccelMenuWatch& ); }; #endif // KARM_K_ACCEL_MENU_WATCH_H diff --git a/karm/karm_part.cpp b/karm/karm_part.cpp index 36a71043e..f56e02c17 100644 --- a/karm/karm_part.cpp +++ b/karm/karm_part.cpp @@ -24,8 +24,8 @@ karmPart::karmPart( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name ) : DCOPObject ( "KarmDCOPIface" ), KParts::ReadWritePart(parent, name), - _accel ( new KAccel( parentWidget ) ), - _watcher ( new KAccelMenuWatch( _accel, TQT_TQOBJECT(parentWidget) ) ) + _accel ( new TDEAccel( parentWidget ) ), + _watcher ( new TDEAccelMenuWatch( _accel, TQT_TQOBJECT(parentWidget) ) ) { // we need an instance setInstance( karmPartFactory::instance() ); @@ -108,7 +108,7 @@ void karmPart::slotSelectionChanged() void karmPart::makeMenus() { - KAction + TDEAction *actionKeyBindings, *actionNew, *actionNewSub; @@ -121,84 +121,84 @@ void karmPart::makeMenus() TQT_SLOT(showDialog()), actionCollection() ); (void) KStdAction::save( this, TQT_SLOT( save() ), actionCollection() ); - KAction* actionStartNewSession = new KAction( i18n("Start &New Session"), + TDEAction* actionStartNewSession = new TDEAction( i18n("Start &New Session"), 0, TQT_TQOBJECT(this), TQT_SLOT( startNewSession() ), actionCollection(), "start_new_session"); - KAction* actionResetAll = new KAction( i18n("&Reset All Times"), + TDEAction* actionResetAll = new TDEAction( i18n("&Reset All Times"), 0, TQT_TQOBJECT(this), TQT_SLOT( resetAllTimes() ), actionCollection(), "reset_all_times"); - actionStart = new KAction( i18n("&Start"), + actionStart = new TDEAction( i18n("&Start"), TQString::fromLatin1("1rightarrow"), Key_S, TQT_TQOBJECT(_taskView), TQT_SLOT( startCurrentTimer() ), actionCollection(), "start"); - actionStop = new KAction( i18n("S&top"), + actionStop = new TDEAction( i18n("S&top"), TQString::fromLatin1("stop"), 0, TQT_TQOBJECT(_taskView), TQT_SLOT( stopCurrentTimer() ), actionCollection(), "stop"); - actionStopAll = new KAction( i18n("Stop &All Timers"), + actionStopAll = new TDEAction( i18n("Stop &All Timers"), Key_Escape, TQT_TQOBJECT(_taskView), TQT_SLOT( stopAllTimers() ), actionCollection(), "stopAll"); actionStopAll->setEnabled(false); - actionNew = new KAction( i18n("&New..."), + actionNew = new TDEAction( i18n("&New..."), TQString::fromLatin1("filenew"), CTRL+Key_N, TQT_TQOBJECT(_taskView), TQT_SLOT( newTask() ), actionCollection(), "new_task"); - actionNewSub = new KAction( i18n("New &Subtask..."), + actionNewSub = new TDEAction( i18n("New &Subtask..."), TQString::fromLatin1("tdemultiple"), CTRL+ALT+Key_N, TQT_TQOBJECT(_taskView), TQT_SLOT( newSubTask() ), actionCollection(), "new_sub_task"); - actionDelete = new KAction( i18n("&Delete"), + actionDelete = new TDEAction( i18n("&Delete"), TQString::fromLatin1("editdelete"), Key_Delete, TQT_TQOBJECT(_taskView), TQT_SLOT( deleteTask() ), actionCollection(), "delete_task"); - actionEdit = new KAction( i18n("&Edit..."), + actionEdit = new TDEAction( i18n("&Edit..."), TQString::fromLatin1("edit"), CTRL + Key_E, TQT_TQOBJECT(_taskView), TQT_SLOT( editTask() ), actionCollection(), "edit_task"); -// actionAddComment = new KAction( i18n("&Add Comment..."), +// actionAddComment = new TDEAction( i18n("&Add Comment..."), // TQString::fromLatin1("document"), // CTRL+ALT+Key_E, // TQT_TQOBJECT(_taskView), // TQT_SLOT( addCommentToTask() ), // actionCollection(), // "add_comment_to_task"); - actionMarkAsComplete = new KAction( i18n("&Mark as Complete"), + actionMarkAsComplete = new TDEAction( i18n("&Mark as Complete"), TQString::fromLatin1("document"), CTRL+Key_M, TQT_TQOBJECT(_taskView), TQT_SLOT( markTaskAsComplete() ), actionCollection(), "mark_as_complete"); - actionMarkAsIncomplete = new KAction( i18n("&Mark as Incomplete"), + actionMarkAsIncomplete = new TDEAction( i18n("&Mark as Incomplete"), TQString::fromLatin1("document"), CTRL+Key_M, TQT_TQOBJECT(_taskView), TQT_SLOT( markTaskAsIncomplete() ), actionCollection(), "mark_as_incomplete"); - actionClipTotals = new KAction( i18n("&Copy Totals to Clipboard"), + actionClipTotals = new TDEAction( i18n("&Copy Totals to Clipboard"), TQString::fromLatin1("klipper"), CTRL+Key_C, TQT_TQOBJECT(_taskView), TQT_SLOT( clipTotals() ), actionCollection(), "clip_totals"); - actionClipHistory = new KAction( i18n("Copy &History to Clipboard"), + actionClipHistory = new TDEAction( i18n("Copy &History to Clipboard"), TQString::fromLatin1("klipper"), CTRL+ALT+Key_C, TQT_TQOBJECT(_taskView), @@ -206,24 +206,24 @@ void karmPart::makeMenus() actionCollection(), "clip_history"); - new KAction( i18n("Import &Legacy Flat File..."), 0, + new TDEAction( i18n("Import &Legacy Flat File..."), 0, TQT_TQOBJECT(_taskView), TQT_SLOT(loadFromFlatFile()), actionCollection(), "import_flatfile"); - new KAction( i18n("&Export to CSV File..."), 0, + new TDEAction( i18n("&Export to CSV File..."), 0, TQT_TQOBJECT(_taskView), TQT_SLOT(exportcsvFile()), actionCollection(), "export_csvfile"); - new KAction( i18n("Export &History to CSV File..."), 0, + new TDEAction( i18n("Export &History to CSV File..."), 0, TQT_TQOBJECT(this), TQT_SLOT(exportcsvHistory()), actionCollection(), "export_csvhistory"); - new KAction( i18n("Import Tasks From &Planner..."), 0, + new TDEAction( i18n("Import Tasks From &Planner..."), 0, TQT_TQOBJECT(_taskView), TQT_SLOT(importPlanner()), actionCollection(), "import_planner"); - new KAction( i18n("Configure KArm..."), 0, + new TDEAction( i18n("Configure KArm..."), 0, TQT_TQOBJECT(_preferences), TQT_SLOT(showDialog()), actionCollection(), "configure_karm"); /* - new KAction( i18n("Import E&vents"), 0, + new TDEAction( i18n("Import E&vents"), 0, _taskView, TQT_SLOT( loadFromKOrgEvents() ), actionCollection(), "import_korg_events"); @@ -301,7 +301,7 @@ void karmPart::setReadWrite(bool rw) void karmPart::setModified(bool modified) { // get a handle on our Save action and make sure it is valid - KAction *save = actionCollection()->action(KStdAction::stdName(KStdAction::Save)); + TDEAction *save = actionCollection()->action(KStdAction::stdName(KStdAction::Save)); if (!save) return; diff --git a/karm/karm_part.h b/karm/karm_part.h index 444b6f428..22a63cff1 100644 --- a/karm/karm_part.h +++ b/karm/karm_part.h @@ -8,8 +8,8 @@ #include "reportcriteria.h" #include <tqlistview.h> -class KAccel; -class KAccelMenuWatch; +class TDEAccel; +class TDEAccelMenuWatch; class KarmTray; class TQWidget; class TQPainter; @@ -38,22 +38,22 @@ class karmPart : public KParts::ReadWritePart, virtual public KarmDCOPIface TQString _hasTask( Task* task, const TQString &taskname ) const; Task* _hasUid( Task* task, const TQString &uid ) const; - KAccel* _accel; - KAccelMenuWatch* _watcher; + TDEAccel* _accel; + TDEAccelMenuWatch* _watcher; TaskView* _taskView; Preferences* _preferences; KarmTray* _tray; - KAction* actionStart; - KAction* actionStop; - KAction* actionStopAll; - KAction* actionDelete; - KAction* actionEdit; -// KAction* actionAddComment; - KAction* actionMarkAsComplete; - KAction* actionMarkAsIncomplete; - KAction* actionPreferences; - KAction* actionClipTotals; - KAction* actionClipHistory; + TDEAction* actionStart; + TDEAction* actionStop; + TDEAction* actionStopAll; + TDEAction* actionDelete; + TDEAction* actionEdit; +// TDEAction* actionAddComment; + TDEAction* actionMarkAsComplete; + TDEAction* actionMarkAsIncomplete; + TDEAction* actionPreferences; + TDEAction* actionClipTotals; + TDEAction* actionClipHistory; TQString m_error[ KARM_MAX_ERROR_NO + 1 ]; friend class KarmTray; diff --git a/karm/main.cpp b/karm/main.cpp index a40b7e396..fd81d5a7e 100644 --- a/karm/main.cpp +++ b/karm/main.cpp @@ -79,7 +79,7 @@ int main( int argc, char *argv[] ) myApp.setMainWidget( mainWindow ); - if (kapp->isRestored() && KMainWindow::canBeRestored( 1 )) + if (kapp->isRestored() && TDEMainWindow::canBeRestored( 1 )) mainWindow->restore( 1, false ); else mainWindow->show(); diff --git a/karm/mainwindow.cpp b/karm/mainwindow.cpp index dc9b3344a..6bfbcc32c 100644 --- a/karm/mainwindow.cpp +++ b/karm/mainwindow.cpp @@ -37,8 +37,8 @@ MainWindow::MainWindow( const TQString &icsfile ) : DCOPObject ( "KarmDCOPIface" ), KParts::MainWindow(0,TQt::WStyle_ContextHelp), - _accel ( new KAccel( this ) ), - _watcher ( new KAccelMenuWatch( _accel, TQT_TQOBJECT(this) ) ), + _accel ( new TDEAccel( this ) ), + _watcher ( new TDEAccelMenuWatch( _accel, TQT_TQOBJECT(this) ) ), _totalSum ( 0 ), _sessionSum( 0 ) { @@ -246,7 +246,7 @@ void MainWindow::resetAllTimes() void MainWindow::makeMenus() { - KAction + TDEAction *actionKeyBindings, *actionNew, *actionNewSub; @@ -259,77 +259,77 @@ void MainWindow::makeMenus() TQT_SLOT(showDialog()), actionCollection() ); (void) KStdAction::save( TQT_TQOBJECT(this), TQT_SLOT( save() ), actionCollection() ); - KAction* actionStartNewSession = new KAction( i18n("Start &New Session"), + TDEAction* actionStartNewSession = new TDEAction( i18n("Start &New Session"), 0, TQT_TQOBJECT(this), TQT_SLOT( startNewSession() ), actionCollection(), "start_new_session"); - KAction* actionResetAll = new KAction( i18n("&Reset All Times"), + TDEAction* actionResetAll = new TDEAction( i18n("&Reset All Times"), 0, TQT_TQOBJECT(this), TQT_SLOT( resetAllTimes() ), actionCollection(), "reset_all_times"); - actionStart = new KAction( i18n("&Start"), + actionStart = new TDEAction( i18n("&Start"), TQString::fromLatin1("1rightarrow"), Key_S, TQT_TQOBJECT(_taskView), TQT_SLOT( startCurrentTimer() ), actionCollection(), "start"); - actionStop = new KAction( i18n("S&top"), + actionStop = new TDEAction( i18n("S&top"), TQString::fromLatin1("stop"), Key_S, TQT_TQOBJECT(_taskView), TQT_SLOT( stopCurrentTimer() ), actionCollection(), "stop"); - actionStopAll = new KAction( i18n("Stop &All Timers"), + actionStopAll = new TDEAction( i18n("Stop &All Timers"), Key_Escape, TQT_TQOBJECT(_taskView), TQT_SLOT( stopAllTimers() ), actionCollection(), "stopAll"); actionStopAll->setEnabled(false); - actionNew = new KAction( i18n("&New..."), + actionNew = new TDEAction( i18n("&New..."), TQString::fromLatin1("filenew"), CTRL+Key_N, TQT_TQOBJECT(_taskView), TQT_SLOT( newTask() ), actionCollection(), "new_task"); - actionNewSub = new KAction( i18n("New &Subtask..."), + actionNewSub = new TDEAction( i18n("New &Subtask..."), TQString::fromLatin1("tdemultiple"), CTRL+ALT+Key_N, TQT_TQOBJECT(_taskView), TQT_SLOT( newSubTask() ), actionCollection(), "new_sub_task"); - actionDelete = new KAction( i18n("&Delete"), + actionDelete = new TDEAction( i18n("&Delete"), TQString::fromLatin1("editdelete"), Key_Delete, TQT_TQOBJECT(_taskView), TQT_SLOT( deleteTask() ), actionCollection(), "delete_task"); - actionEdit = new KAction( i18n("&Edit..."), + actionEdit = new TDEAction( i18n("&Edit..."), TQString::fromLatin1("edit"), CTRL + Key_E, TQT_TQOBJECT(_taskView), TQT_SLOT( editTask() ), actionCollection(), "edit_task"); -// actionAddComment = new KAction( i18n("&Add Comment..."), +// actionAddComment = new TDEAction( i18n("&Add Comment..."), // TQString::fromLatin1("document"), // CTRL+ALT+Key_E, // TQT_TQOBJECT(_taskView), // TQT_SLOT( addCommentToTask() ), // actionCollection(), // "add_comment_to_task"); - actionMarkAsComplete = new KAction( i18n("&Mark as Complete"), + actionMarkAsComplete = new TDEAction( i18n("&Mark as Complete"), TQString::fromLatin1("document"), CTRL+Key_M, TQT_TQOBJECT(_taskView), TQT_SLOT( markTaskAsComplete() ), actionCollection(), "mark_as_complete"); - actionMarkAsIncomplete = new KAction( i18n("&Mark as Incomplete"), + actionMarkAsIncomplete = new TDEAction( i18n("&Mark as Incomplete"), TQString::fromLatin1("document"), CTRL+Key_M, TQT_TQOBJECT(_taskView), TQT_SLOT( markTaskAsIncomplete() ), actionCollection(), "mark_as_incomplete"); - actionClipTotals = new KAction( i18n("&Copy Totals to Clipboard"), + actionClipTotals = new TDEAction( i18n("&Copy Totals to Clipboard"), TQString::fromLatin1("klipper"), CTRL+Key_C, TQT_TQOBJECT(_taskView), @@ -337,14 +337,14 @@ void MainWindow::makeMenus() actionCollection(), "clip_totals"); // actionClipTotals will never be used again, overwrite it - actionClipTotals = new KAction( i18n("&Copy Session Time to Clipboard"), + actionClipTotals = new TDEAction( i18n("&Copy Session Time to Clipboard"), TQString::fromLatin1("klipper"), 0, TQT_TQOBJECT(_taskView), TQT_SLOT( clipSession() ), actionCollection(), "clip_session"); - actionClipHistory = new KAction( i18n("Copy &History to Clipboard"), + actionClipHistory = new TDEAction( i18n("Copy &History to Clipboard"), TQString::fromLatin1("klipper"), CTRL+ALT+Key_C, TQT_TQOBJECT(_taskView), @@ -352,21 +352,21 @@ void MainWindow::makeMenus() actionCollection(), "clip_history"); - new KAction( i18n("Import &Legacy Flat File..."), 0, + new TDEAction( i18n("Import &Legacy Flat File..."), 0, TQT_TQOBJECT(_taskView), TQT_SLOT(loadFromFlatFile()), actionCollection(), "import_flatfile"); - new KAction( i18n("&Export to CSV File..."), 0, + new TDEAction( i18n("&Export to CSV File..."), 0, TQT_TQOBJECT(_taskView), TQT_SLOT(exportcsvFile()), actionCollection(), "export_csvfile"); - new KAction( i18n("Export &History to CSV File..."), 0, + new TDEAction( i18n("Export &History to CSV File..."), 0, TQT_TQOBJECT(this), TQT_SLOT(exportcsvHistory()), actionCollection(), "export_csvhistory"); - new KAction( i18n("Import Tasks From &Planner..."), 0, + new TDEAction( i18n("Import Tasks From &Planner..."), 0, TQT_TQOBJECT(_taskView), TQT_SLOT(importPlanner()), actionCollection(), "import_planner"); /* - new KAction( i18n("Import E&vents"), 0, + new TDEAction( i18n("Import E&vents"), 0, _taskView, TQT_SLOT( loadFromKOrgEvents() ), actionCollection(), "import_korg_events"); @@ -467,7 +467,7 @@ bool MainWindow::queryClose() hide(); return false; } - return KMainWindow::queryClose(); + return TDEMainWindow::queryClose(); } void MainWindow::contextMenuRequest( TQListViewItem*, const TQPoint& point, int ) diff --git a/karm/mainwindow.h b/karm/mainwindow.h index ba1194f4a..c1504e98f 100644 --- a/karm/mainwindow.h +++ b/karm/mainwindow.h @@ -7,8 +7,8 @@ #include <karmdcopiface.h> #include "reportcriteria.h" -class KAccel; -class KAccelMenuWatch; +class TDEAccel; +class TDEAccelMenuWatch; class KarmTray; class TQListViewItem; class TQPoint; @@ -33,23 +33,23 @@ class MainWindow : public KParts::MainWindow, virtual public KarmDCOPIface TQString _hasTask( Task* task, const TQString &taskname ) const; Task* _hasUid( Task* task, const TQString &uid ) const; - KAccel* _accel; - KAccelMenuWatch* _watcher; + TDEAccel* _accel; + TDEAccelMenuWatch* _watcher; TaskView* _taskView; long _totalSum; long _sessionSum; Preferences* _preferences; KarmTray* _tray; - KAction* actionStart; - KAction* actionStop; - KAction* actionStopAll; - KAction* actionDelete; - KAction* actionEdit; - KAction* actionMarkAsComplete; - KAction* actionMarkAsIncomplete; - KAction* actionPreferences; - KAction* actionClipTotals; - KAction* actionClipHistory; + TDEAction* actionStart; + TDEAction* actionStop; + TDEAction* actionStopAll; + TDEAction* actionDelete; + TDEAction* actionEdit; + TDEAction* actionMarkAsComplete; + TDEAction* actionMarkAsIncomplete; + TDEAction* actionPreferences; + TDEAction* actionClipTotals; + TDEAction* actionClipHistory; TQString m_error[ KARM_MAX_ERROR_NO + 1 ]; friend class KarmTray; diff --git a/karm/taskview.cpp b/karm/taskview.cpp index bcabad37f..14477cf51 100644 --- a/karm/taskview.cpp +++ b/karm/taskview.cpp @@ -37,7 +37,7 @@ class DesktopTracker; -TaskView::TaskView(TQWidget *parent, const char *name, const TQString &icsfile ):KListView(parent,name) +TaskView::TaskView(TQWidget *parent, const char *name, const TQString &icsfile ):TDEListView(parent,name) { _preferences = Preferences::instance( icsfile ); _storage = KarmStorage::instance(); @@ -119,10 +119,10 @@ KarmStorage* TaskView::storage() void TaskView::contentsMousePressEvent ( TQMouseEvent * e ) { kdDebug(5970) << "entering contentsMousePressEvent" << endl; - KListView::contentsMousePressEvent(e); + TDEListView::contentsMousePressEvent(e); Task* task = current_item(); // This checks that there has been a click onto an item, - // not into an empty part of the KListView. + // not into an empty part of the TDEListView. if ( task != 0 && // zero can happen if there is no task e->pos().y() >= current_item()->itemPos() && e->pos().y() < current_item()->itemPos()+current_item()->height() ) @@ -145,7 +145,7 @@ void TaskView::contentsMouseDoubleClickEvent ( TQMouseEvent * e ) // not in the blank space, if yes, stop all other tasks and start the new timer. { kdDebug(5970) << "entering contentsMouseDoubleClickEvent" << endl; - KListView::contentsMouseDoubleClickEvent(e); + TDEListView::contentsMouseDoubleClickEvent(e); Task *task = current_item(); diff --git a/karm/taskview.h b/karm/taskview.h index 64b4d3de2..db00f5b16 100644 --- a/karm/taskview.h +++ b/karm/taskview.h @@ -23,7 +23,7 @@ class TQTextStream; class TQTimer; class KMenuBar; -class KToolBar; +class TDEToolBar; class DesktopTracker; class EditTaskDialog; @@ -39,7 +39,7 @@ using namespace KCal; * Container and interface for the tasks. */ -class TaskView : public KListView +class TaskView : public TDEListView { Q_OBJECT diff --git a/karm/taskviewwhatsthis.cpp b/karm/taskviewwhatsthis.cpp index 164023f2a..4cc9f7513 100644 --- a/karm/taskviewwhatsthis.cpp +++ b/karm/taskviewwhatsthis.cpp @@ -17,7 +17,7 @@ TaskViewWhatsThis::TaskViewWhatsThis( TQWidget* qw ) : TQWhatsThis( qw ) { - _listView=(KListView *) qw; + _listView=(TDEListView *) qw; } TaskViewWhatsThis::~TaskViewWhatsThis() diff --git a/karm/taskviewwhatsthis.h b/karm/taskviewwhatsthis.h index 1742c58db..1bea3497c 100644 --- a/karm/taskviewwhatsthis.h +++ b/karm/taskviewwhatsthis.h @@ -27,6 +27,6 @@ public: TQString text ( const TQPoint & ); private: - KListView* _listView; // stores the associated listview for column widths + TDEListView* _listView; // stores the associated listview for column widths }; #endif diff --git a/karm/tray.h b/karm/tray.h index e9b537b9b..134e34fa6 100644 --- a/karm/tray.h +++ b/karm/tray.h @@ -19,7 +19,7 @@ class TQTimer; class KSystemTray; class MainWindow; // experiment -// class KPopupMenu; +// class TDEPopupMenu; class KarmTray : public KSystemTray { @@ -51,7 +51,7 @@ class KarmTray : public KSystemTray void insertTitle(TQString title); private: - KPopupMenu *trayPopupMenu; + TDEPopupMenu *trayPopupMenu; TQPopupMenu *trayPopupMenu2; */ }; diff --git a/kgantt/kgantt/KGantt.h b/kgantt/kgantt/KGantt.h index 200b5a434..950bd7c7e 100644 --- a/kgantt/kgantt/KGantt.h +++ b/kgantt/kgantt/KGantt.h @@ -179,7 +179,7 @@ public: /*! * */ - KPopupMenu* menu() { + TDEPopupMenu* menu() { return _ganttbar->viewport()->menu(); } @@ -195,7 +195,7 @@ public: * you want to access the pointer to a already created toolbar you * can invoke this method without any parameter. */ - KToolBar* toolbar(TQMainWindow* mw = 0) { + TDEToolBar* toolbar(TQMainWindow* mw = 0) { return _ganttbar->viewport()->toolbar(mw); } diff --git a/kgantt/kgantt/xQGanttBarViewPort.cpp b/kgantt/kgantt/xQGanttBarViewPort.cpp index 536761eaa..e27140c0e 100644 --- a/kgantt/kgantt/xQGanttBarViewPort.cpp +++ b/kgantt/kgantt/xQGanttBarViewPort.cpp @@ -102,12 +102,12 @@ xQGanttBarViewPort::~xQGanttBarViewPort() -KToolBar* +TDEToolBar* xQGanttBarViewPort::toolbar(TQMainWindow* mw) { if(_toolbar || mw == 0) return _toolbar; - _toolbar = new KToolBar(mw,TQMainWindow::TQt::DockTop); + _toolbar = new TDEToolBar(mw,TQMainWindow::TQt::DockTop); mw->addToolBar(_toolbar); @@ -120,7 +120,7 @@ xQGanttBarViewPort::toolbar(TQMainWindow* mw) TQT_TQOBJECT(this), TQT_SLOT(setSelect()), true, i18n("Select") ); - KPopupMenu *selectMenu = new KPopupMenu(_toolbar); + TDEPopupMenu *selectMenu = new TDEPopupMenu(_toolbar); /* @@ -139,7 +139,7 @@ xQGanttBarViewPort::toolbar(TQMainWindow* mw) selectMenu->insertItem(pix, i18n("Unselect All"), TQT_TQOBJECT(this), TQT_SLOT(unselectAll()) ); - KToolBarButton* b = _toolbar->getButton(0); + TDEToolBarButton* b = _toolbar->getButton(0); b->setDelayedPopup(selectMenu); @@ -148,7 +148,7 @@ xQGanttBarViewPort::toolbar(TQMainWindow* mw) TQT_TQOBJECT(this), TQT_SLOT(setZoom()), true, i18n("Zoom") ); - KPopupMenu* zoomMenu = new KPopupMenu(_toolbar); + TDEPopupMenu* zoomMenu = new TDEPopupMenu(_toolbar); pix = _iconloader->loadIcon("viewmag.png", KIcon::Toolbar , 16 ); if(pix.isNull()) printf("viewmag.png not found !\n"); @@ -181,13 +181,13 @@ void xQGanttBarViewPort::initMenu() ///////////////////////////////// { - _menu = new KPopupMenu(this); + _menu = new TDEPopupMenu(this); /* select */ - _selectMenu = new KPopupMenu(_menu); + _selectMenu = new TDEPopupMenu(_menu); TQPixmap pix = _iconloader->loadIcon("ganttSelect.png", KIcon::Toolbar , 16 ); if(pix.isNull()) printf("ganttSelect.png not found !\n"); @@ -210,7 +210,7 @@ xQGanttBarViewPort::initMenu() zoom */ - KPopupMenu* _zoomMenu = new KPopupMenu(_menu); + TDEPopupMenu* _zoomMenu = new TDEPopupMenu(_menu); pix = _iconloader->loadIcon("viewmag.png", KIcon::Toolbar , 16 ); if(pix.isNull()) printf("viewmag.png not found !\n"); diff --git a/kgantt/kgantt/xQGanttBarViewPort.h b/kgantt/kgantt/xQGanttBarViewPort.h index 52244ea43..ec6beeffa 100644 --- a/kgantt/kgantt/xQGanttBarViewPort.h +++ b/kgantt/kgantt/xQGanttBarViewPort.h @@ -145,7 +145,7 @@ public: - KPopupMenu* menu() { + TDEPopupMenu* menu() { return _menu; } @@ -155,7 +155,7 @@ public: /*! * */ - KToolBar* toolbar(TQMainWindow* mw = 0); + TDEToolBar* toolbar(TQMainWindow* mw = 0); // zoom by factor sfactor and move wx,wy to the center @@ -269,12 +269,12 @@ private: static KGanttItem* _currentItem; - KPopupMenu* _menu; - KPopupMenu* _selectMenu; + TDEPopupMenu* _menu; + TDEPopupMenu* _selectMenu; KIconLoader* _iconloader; - KToolBar* _toolbar; + TDEToolBar* _toolbar; TQPoint* _startPoint, *_endPoint; diff --git a/kitchensync/src/mainwidget.cpp b/kitchensync/src/mainwidget.cpp index a277e1892..40a80e62f 100644 --- a/kitchensync/src/mainwidget.cpp +++ b/kitchensync/src/mainwidget.cpp @@ -102,13 +102,13 @@ void MainWidget::initGUI() void MainWidget::initActions() { - mActionSynchronize = new KAction( i18n("Synchronize"), "hotsync", 0, TQT_TQOBJECT(this), TQT_SLOT( sync() ), + mActionSynchronize = new TDEAction( i18n("Synchronize"), "hotsync", 0, TQT_TQOBJECT(this), TQT_SLOT( sync() ), mGUIClient->actionCollection(), "sync" ); - mActionAddGroup = new KAction( i18n("Add Group..."), "filenew", 0, TQT_TQOBJECT(this), TQT_SLOT( addGroup() ), + mActionAddGroup = new TDEAction( i18n("Add Group..."), "filenew", 0, TQT_TQOBJECT(this), TQT_SLOT( addGroup() ), mGUIClient->actionCollection(), "add_group" ); - mActionDeleteGroup = new KAction( i18n("Delete Group..."), "editdelete", 0, TQT_TQOBJECT(this), TQT_SLOT( deleteGroup() ), + mActionDeleteGroup = new TDEAction( i18n("Delete Group..."), "editdelete", 0, TQT_TQOBJECT(this), TQT_SLOT( deleteGroup() ), mGUIClient->actionCollection(), "delete_group" ); - mActionEditGroup = new KAction( i18n("Edit Group..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT( editGroup() ), + mActionEditGroup = new TDEAction( i18n("Edit Group..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT( editGroup() ), mGUIClient->actionCollection(), "edit_group" ); } diff --git a/kitchensync/src/mainwidget.h b/kitchensync/src/mainwidget.h index 0963aff4b..879394503 100644 --- a/kitchensync/src/mainwidget.h +++ b/kitchensync/src/mainwidget.h @@ -26,7 +26,7 @@ #include <tqwidget.h> class TDEAboutData; -class KAction; +class TDEAction; class KXMLGUIClient; class GroupView; class SyncProcess; @@ -63,10 +63,10 @@ class KDE_EXPORT MainWidget : public TQWidget void enableActions(); KXMLGUIClient *mGUIClient; - KAction *mActionSynchronize; - KAction *mActionAddGroup; - KAction *mActionDeleteGroup; - KAction *mActionEditGroup; + TDEAction *mActionSynchronize; + TDEAction *mActionAddGroup; + TDEAction *mActionDeleteGroup; + TDEAction *mActionEditGroup; GroupView *mGroupView; }; diff --git a/kitchensync/src/mainwindow.cpp b/kitchensync/src/mainwindow.cpp index 7a0aa0653..e67261277 100644 --- a/kitchensync/src/mainwindow.cpp +++ b/kitchensync/src/mainwindow.cpp @@ -28,7 +28,7 @@ #include "mainwindow.h" MainWindow::MainWindow() - : KMainWindow( 0 ) + : TDEMainWindow( 0 ) { setWFlags( getWFlags() | WGroupLeader ); @@ -43,7 +43,7 @@ MainWindow::MainWindow() createGUI( "kitchensyncui.rc", false ); createGUI( 0 ); - toolBar()->setIconText( KToolBar::IconTextBottom ); + toolBar()->setIconText( TDEToolBar::IconTextBottom ); resize( 760, 530 ); // initial size setAutoSaveSettings(); diff --git a/kitchensync/src/mainwindow.h b/kitchensync/src/mainwindow.h index 61bff1555..4453878b5 100644 --- a/kitchensync/src/mainwindow.h +++ b/kitchensync/src/mainwindow.h @@ -29,7 +29,7 @@ class MainWidget; This class serves as the main window for Kitchensync. It handles the menus, toolbars, and status bars. */ -class MainWindow : public KMainWindow +class MainWindow : public TDEMainWindow { Q_OBJECT diff --git a/kmail/ChangeLog b/kmail/ChangeLog index 2f263c27e..066b3489b 100644 --- a/kmail/ChangeLog +++ b/kmail/ChangeLog @@ -583,7 +583,7 @@ Sun Sep 6 18:28:45 1998 Markus Wuebben <markus@kde.org> * Warnings: changed warning messages of QPixmap and QPainter to debug messages to avoid lots of message - boxes from broken KToolbar code when changing color + boxes from broken TDEToolbar code when changing color scheme. * Composer (email-address-completion) diff --git a/kmail/accountwizard.cpp b/kmail/accountwizard.cpp index 68ba83b91..dc76ac7d2 100644 --- a/kmail/accountwizard.cpp +++ b/kmail/accountwizard.cpp @@ -76,13 +76,13 @@ enum Capabilities AllCapa = 0xffffffff }; -class AccountTypeBox : public KListBox +class AccountTypeBox : public TDEListBox { public: enum Type { Local, POP3, IMAP, dIMAP, Maildir }; AccountTypeBox( TQWidget *parent ) - : KListBox( parent, "AccountTypeBox" ) + : TDEListBox( parent, "AccountTypeBox" ) { mTypeList << i18n( "Local mailbox" ); mTypeList << i18n( "POP3" ); diff --git a/kmail/antispamwizard.cpp b/kmail/antispamwizard.cpp index d83a19e1f..92f6e7f13 100644 --- a/kmail/antispamwizard.cpp +++ b/kmail/antispamwizard.cpp @@ -885,7 +885,7 @@ ASWizInfoPage::ASWizInfoPage( AntiSpamWizard::WizardMode mode, mScanProgressText->setText( "" ) ; layout->addWidget( mScanProgressText ); - mToolsList = new KListBox( this ); + mToolsList = new TDEListBox( this ); mToolsList->hide(); mToolsList->setSelectionMode( TQListBox::Multi ); mToolsList->setRowMode( TQListBox::FixedNumber ); diff --git a/kmail/antispamwizard.h b/kmail/antispamwizard.h index 031a995af..8f28ea5c8 100644 --- a/kmail/antispamwizard.h +++ b/kmail/antispamwizard.h @@ -39,7 +39,7 @@ #include <tqdict.h> #include <tqlayout.h> -class KActionCollection; +class TDEActionCollection; class KMFolder; class KMFolderTree; class TQLabel; @@ -319,7 +319,7 @@ namespace KMail { TQLabel *mIntroText; TQLabel *mScanProgressText; TQLabel *mSelectionHint; - KListBox *mToolsList; + TDEListBox *mToolsList; }; //--------------------------------------------------------------------------- diff --git a/kmail/attachmentlistview.cpp b/kmail/attachmentlistview.cpp index 18e8ddafa..a03cd32f7 100644 --- a/kmail/attachmentlistview.cpp +++ b/kmail/attachmentlistview.cpp @@ -49,7 +49,7 @@ namespace KMail { AttachmentListView::AttachmentListView( KMail::Composer * composer, TQWidget* parent, const char* name ) - : KListView( parent, name ), + : TDEListView( parent, name ), mComposer( composer ) { setAcceptDrops( true ); @@ -69,7 +69,7 @@ void AttachmentListView::contentsDragEnterEvent( TQDragEnterEvent* e ) if( e->provides( MailListDrag::format() ) || KURLDrag::canDecode( e ) ) e->accept( true ); else - KListView::dragEnterEvent( e ); + TDEListView::dragEnterEvent( e ); } //----------------------------------------------------------------------------- @@ -79,7 +79,7 @@ void AttachmentListView::contentsDragMoveEvent( TQDragMoveEvent* e ) if( e->provides( MailListDrag::format() ) || KURLDrag::canDecode( e ) ) e->accept( true ); else - KListView::dragMoveEvent( e ); + TDEListView::dragMoveEvent( e ); } //----------------------------------------------------------------------------- @@ -122,7 +122,7 @@ void AttachmentListView::contentsDropEvent( TQDropEvent* e ) } } else { - KListView::dropEvent( e ); + TDEListView::dropEvent( e ); } } diff --git a/kmail/attachmentlistview.h b/kmail/attachmentlistview.h index 68e39c2dd..e01fb4ab8 100644 --- a/kmail/attachmentlistview.h +++ b/kmail/attachmentlistview.h @@ -27,7 +27,7 @@ namespace KMail { class Composer; -class AttachmentListView : public KListView +class AttachmentListView : public TDEListView { Q_OBJECT diff --git a/kmail/chiasmuskeyselector.cpp b/kmail/chiasmuskeyselector.cpp index ea21ca019..e83463a43 100644 --- a/kmail/chiasmuskeyselector.cpp +++ b/kmail/chiasmuskeyselector.cpp @@ -19,7 +19,7 @@ ChiasmusKeySelector::ChiasmusKeySelector( TQWidget* parent, const TQString& capt mLabel = new TQLabel( i18n( "Please select the Chiasmus key file to use:" ), page ); layout->addWidget( mLabel ); - mListBox = new KListBox( page ); + mListBox = new TDEListBox( page ); mListBox->insertStringList( keys ); const int current = keys.findIndex( currentKey ); mListBox->setSelected( TQMAX( 0, current ), true ); diff --git a/kmail/chiasmuskeyselector.h b/kmail/chiasmuskeyselector.h index 463497968..7e0d36fb0 100644 --- a/kmail/chiasmuskeyselector.h +++ b/kmail/chiasmuskeyselector.h @@ -2,7 +2,7 @@ #define CHIASMUSKEYSELECTOR_H #include <kdialogbase.h> -class KListBox; +class TDEListBox; class KLineEdit; class TQLabel; @@ -21,7 +21,7 @@ public: private: TQLabel* mLabel; - KListBox* mListBox; + TDEListBox* mListBox; KLineEdit* mOptions; }; diff --git a/kmail/colorlistbox.cpp b/kmail/colorlistbox.cpp index a813a910d..c74819248 100644 --- a/kmail/colorlistbox.cpp +++ b/kmail/colorlistbox.cpp @@ -30,7 +30,7 @@ #include "colorlistbox.h" ColorListBox::ColorListBox( TQWidget *parent, const char *name, WFlags f ) - :KListBox( parent, name, f ), mCurrentOnDragEnter(-1) + :TDEListBox( parent, name, f ), mCurrentOnDragEnter(-1) { connect( this, TQT_SIGNAL(selected(int)), this, TQT_SLOT(newColor(int)) ); setAcceptDrops( true); diff --git a/kmail/colorlistbox.h b/kmail/colorlistbox.h index dd4cee7cf..1e1f48b0f 100644 --- a/kmail/colorlistbox.h +++ b/kmail/colorlistbox.h @@ -23,7 +23,7 @@ #include <klistbox.h> -class ColorListBox : public KListBox +class ColorListBox : public TDEListBox { Q_OBJECT diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp index 6c9615185..bf8c82fae 100644 --- a/kmail/configuredialog.cpp +++ b/kmail/configuredialog.cpp @@ -61,7 +61,7 @@ using KMail::ImapAccountBase; #include "kmfolder.h" #include "kmmainwidget.h" #include "recentaddresses.h" -using KRecentAddress::RecentAddresses; +using TDERecentAddress::RecentAddresses; #include "completionordereditor.h" #include "ldapclient.h" #include "index.h" @@ -297,8 +297,8 @@ IdentityPage::IdentityPage( TQWidget * parent, const char * name ) TQT_SLOT(slotRenameIdentity(TQListViewItem*,const TQString&,int)) ); connect( mIdentityList, TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)), TQT_SLOT(slotModifyIdentity()) ); - connect( mIdentityList, TQT_SIGNAL(contextMenu(KListView*,TQListViewItem*,const TQPoint&)), - TQT_SLOT(slotContextMenu(KListView*,TQListViewItem*,const TQPoint&)) ); + connect( mIdentityList, TQT_SIGNAL(contextMenu(TDEListView*,TQListViewItem*,const TQPoint&)), + TQT_SLOT(slotContextMenu(TDEListView*,TQListViewItem*,const TQPoint&)) ); // ### connect dragged(...), ... hlay->addWidget( mIdentityList, 1 ); @@ -488,7 +488,7 @@ void IdentityPage::slotRenameIdentity( TQListViewItem * i, item->redisplay(); } -void IdentityPage::slotContextMenu( KListView *, TQListViewItem * i, +void IdentityPage::slotContextMenu( TDEListView *, TQListViewItem * i, const TQPoint & pos ) { IdentityListViewItem * item = dynamic_cast<IdentityListViewItem*>( i ); @@ -1585,7 +1585,7 @@ AppearancePageFontsTab::AppearancePageFontsTab( TQWidget * parent, const char * hlay->addWidget( mFontLocationCombo ); hlay->addStretch( 10 ); vlay->addSpacing( KDialog::spacingHint() ); - mFontChooser = new KFontChooser( this, "font", false, TQStringList(), + mFontChooser = new TDEFontChooser( this, "font", false, TQStringList(), false, 4 ); mFontChooser->setEnabled( false ); // since !mCustomFontCheck->isChecked() vlay->addWidget( mFontChooser ); @@ -1639,7 +1639,7 @@ void AppearancePage::FontsTab::slotFontSelectorChanged( int index ) this, TQT_SLOT( slotEmitChanged( void ) ) ); // Disable Family and Size list if we have selected a quote font: - mFontChooser->enableColumn( KFontChooser::FamilyList|KFontChooser::SizeList, + mFontChooser->enableColumn( TDEFontChooser::FamilyList|TDEFontChooser::SizeList, fontNames[ index ].enableFamilyAndSize ); } @@ -2891,7 +2891,7 @@ void ComposerPage::GeneralTab::save() { void ComposerPage::GeneralTab::slotConfigureRecentAddresses( ) { - KRecentAddress::RecentAddressDialog dlg( this ); + TDERecentAddress::RecentAddressDialog dlg( this ); dlg.setAddresses( RecentAddresses::self( KMKernel::config() )->addresses() ); if ( dlg.exec() ) { RecentAddresses::self( KMKernel::config() )->clear(); diff --git a/kmail/configuredialog_p.cpp b/kmail/configuredialog_p.cpp index c430171ef..37819739d 100644 --- a/kmail/configuredialog_p.cpp +++ b/kmail/configuredialog_p.cpp @@ -124,7 +124,7 @@ void NewIdentityDialog::slotEnableOK( const TQString & proposedIdentityName ) { ListView::ListView( TQWidget *parent, const char *name, int visibleItem ) - : KListView( parent, name ) + : TDEListView( parent, name ) { setVisibleItem(visibleItem); } @@ -132,14 +132,14 @@ ListView::ListView( TQWidget *parent, const char *name, void ListView::resizeEvent( TQResizeEvent *e ) { - KListView::resizeEvent(e); + TDEListView::resizeEvent(e); resizeColums(); } void ListView::showEvent( TQShowEvent *e ) { - KListView::showEvent(e); + TDEListView::showEvent(e); resizeColums(); } @@ -291,7 +291,7 @@ ProfileDialog::ProfileDialog( TQWidget * parent, const char * name, bool modal ) TQWidget * page = makeMainWidget(); TQVBoxLayout * vlay = new TQVBoxLayout( page, 0, spacingHint() ); - mListView = new KListView( page, "mListView" ); + mListView = new TDEListView( page, "mListView" ); mListView->addColumn( i18n("Available Profiles") ); mListView->addColumn( i18n("Description") ); mListView->setFullWidth( true ); diff --git a/kmail/configuredialog_p.h b/kmail/configuredialog_p.h index 71f044204..1f7d6f58f 100644 --- a/kmail/configuredialog_p.h +++ b/kmail/configuredialog_p.h @@ -24,7 +24,7 @@ class TQPushButton; class TQLabel; class TQCheckBox; class KURLRequester; -class KFontChooser; +class TDEFontChooser; class TQRadioButton; class ColorListBox; class TQFont; @@ -52,9 +52,9 @@ class TQVGroupBox; #include <tqdict.h> class TQLineEdit; class KMMsgTagDesc; -class KListBox; +class TDEListBox; class KColorCombo; -class KFontRequester; +class TDEFontRequester; class KIconButton; class KKeyButton; class TQSpinBox; @@ -171,7 +171,7 @@ private: void setup(); private: - KListView *mListView; + TDEListView *mListView; TQStringList mProfileList; }; @@ -287,12 +287,12 @@ private slots: void slotModifyIdentity(); void slotRemoveIdentity(); /** Connected to @p mRenameButton's clicked() signal. Just does a - KListView::rename on the selected item */ + TDEListView::rename on the selected item */ void slotRenameIdentity(); /** connected to @p mIdentityList's renamed() signal. Validates the new name and sets it in the KPIM::IdentityManager */ void slotRenameIdentity( TQListViewItem *, const TQString &, int ); - void slotContextMenu( KListView*, TQListViewItem *, const TQPoint & ); + void slotContextMenu( TDEListView*, TQListViewItem *, const TQPoint & ); void slotSetAsDefault(); void slotIdentitySelectionChanged(); @@ -451,7 +451,7 @@ private: private: TQCheckBox *mCustomFontCheck; TQComboBox *mFontLocationCombo; - KFontChooser *mFontChooser; + TDEFontChooser *mFontChooser; int mActiveFontIndex; TQFont mFont[14]; @@ -1086,7 +1086,7 @@ private: // // -class ListView : public KListView { +class ListView : public TDEListView { Q_OBJECT public: diff --git a/kmail/customtemplates.cpp b/kmail/customtemplates.cpp index 14bed9cfe..00d14cc8b 100644 --- a/kmail/customtemplates.cpp +++ b/kmail/customtemplates.cpp @@ -89,8 +89,8 @@ CustomTemplates::CustomTemplates( TQWidget *parent, const char *name ) connect( mType, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotTypeActivated( int ) ) ); - connect( mKeyButton, TQT_SIGNAL( capturedShortcut( const KShortcut& ) ), - this, TQT_SLOT( slotShortcutCaptured( const KShortcut& ) ) ); + connect( mKeyButton, TQT_SIGNAL( capturedShortcut( const TDEShortcut& ) ), + this, TQT_SLOT( slotShortcutCaptured( const TDEShortcut& ) ) ); mReplyPix = KIconLoader().loadIcon( "mail_reply", KIcon::Small ); mReplyAllPix = KIconLoader().loadIcon( "mail_replyall", KIcon::Small ); @@ -201,7 +201,7 @@ void CustomTemplates::load() CTemplates t(*it); // TQString typeStr = indexToType( t.type() ); TQString typeStr; - KShortcut shortcut( t.shortcut() ); + TDEShortcut shortcut( t.shortcut() ); CustomTemplateItem *vitem = new CustomTemplateItem( *it, t.content(), shortcut, @@ -291,7 +291,7 @@ void CustomTemplates::slotAddClicked() if ( !str.isEmpty() ) { CustomTemplateItem *vitem = mItemList[ str ]; if ( !vitem ) { - vitem = new CustomTemplateItem( str, "", KShortcut::null(), TUniversal, + vitem = new CustomTemplateItem( str, "", TDEShortcut::null(), TUniversal, TQString(), TQString() ); mItemList.insert( str, vitem ); TQListViewItem *item = @@ -357,7 +357,7 @@ void CustomTemplates::slotListSelectionChanged() mEdit->clear(); mToEdit->clear(); mCCEdit->clear(); - mKeyButton->setShortcut( KShortcut::null(), false ); + mKeyButton->setShortcut( TDEShortcut::null(), false ); mType->setCurrentItem( 0 ); } } @@ -401,9 +401,9 @@ void CustomTemplates::slotTypeActivated( int index ) setRecipientsEditsEnabled( false ); } -void CustomTemplates::slotShortcutCaptured( const KShortcut &shortcut ) +void CustomTemplates::slotShortcutCaptured( const TDEShortcut &shortcut ) { - KShortcut sc( shortcut ); + TDEShortcut sc( shortcut ); if ( sc == mKeyButton->shortcut() ) return; if ( sc.isNull() || sc.toString().isEmpty() ) @@ -425,7 +425,7 @@ void CustomTemplates::slotShortcutCaptured( const KShortcut &shortcut ) == KMessageBox::Yes ); if ( assign ) { - (*it)->mShortcut = KShortcut::null(); + (*it)->mShortcut = TDEShortcut::null(); } customused = true; } diff --git a/kmail/customtemplates.h b/kmail/customtemplates.h index 09c8c8fb6..9b8da9943 100644 --- a/kmail/customtemplates.h +++ b/kmail/customtemplates.h @@ -30,7 +30,7 @@ struct CustomTemplateItem; typedef TQDict<CustomTemplateItem> CustomTemplateItemList; -class KShortcut; +class TDEShortcut; class CustomTemplates : public CustomTemplatesBase { @@ -61,7 +61,7 @@ class CustomTemplates : public CustomTemplatesBase void slotRemoveClicked(); void slotListSelectionChanged(); void slotTypeActivated( int index ); - void slotShortcutCaptured( const KShortcut &shortcut ); + void slotShortcutCaptured( const TDEShortcut &shortcut ); void slotNameChanged( const TQString& ); signals: @@ -92,14 +92,14 @@ struct CustomTemplateItem CustomTemplateItem() {} CustomTemplateItem( const TQString &name, const TQString &content, - KShortcut &shortcut, + TDEShortcut &shortcut, CustomTemplates::Type type, TQString to, TQString cc ) : mName( name ), mContent( content ), mShortcut(shortcut), mType( type ), mTo( to ), mCC( cc ) {} TQString mName, mContent; - KShortcut mShortcut; + TDEShortcut mShortcut; CustomTemplates::Type mType; TQString mTo, mCC; }; diff --git a/kmail/distributionlistdialog.cpp b/kmail/distributionlistdialog.cpp index 5dcb81d20..6f367fd1a 100644 --- a/kmail/distributionlistdialog.cpp +++ b/kmail/distributionlistdialog.cpp @@ -111,7 +111,7 @@ DistributionListDialog::DistributionListDialog( TQWidget *parent ) titleLayout->addWidget( mTitleEdit ); mTitleEdit->setFocus(); - mRecipientsList = new KListView( topFrame ); + mRecipientsList = new TDEListView( topFrame ); mRecipientsList->addColumn( TQString() ); mRecipientsList->addColumn( i18n("Name") ); mRecipientsList->addColumn( i18n("Email") ); diff --git a/kmail/distributionlistdialog.h b/kmail/distributionlistdialog.h index 6643557c4..08e4cc074 100644 --- a/kmail/distributionlistdialog.h +++ b/kmail/distributionlistdialog.h @@ -26,7 +26,7 @@ #include "recipientseditor.h" class TQLineEdit; -class KListView; +class TDEListView; class DistributionListDialog : public KDialogBase { @@ -40,7 +40,7 @@ class DistributionListDialog : public KDialogBase private: TQLineEdit *mTitleEdit; - KListView *mRecipientsList; + TDEListView *mRecipientsList; }; #endif diff --git a/kmail/favoritefolderview.cpp b/kmail/favoritefolderview.cpp index 24a32bb00..a09c19533 100644 --- a/kmail/favoritefolderview.cpp +++ b/kmail/favoritefolderview.cpp @@ -93,7 +93,7 @@ FavoriteFolderView::FavoriteFolderView( KMMainWidget *mainWidget, TQWidget * par setDragEnabled( true ); setAcceptDrops( true ); setRootIsDecorated( false ); - setSelectionModeExt( KListView::Single ); + setSelectionModeExt( TDEListView::Single ); setSorting( -1 ); setShowSortIndicator( false ); @@ -277,8 +277,8 @@ void FavoriteFolderView::folderTreeSelectionChanged(KMFolder * folder) blockSignals( false ); if ( !found ) { clearSelection(); - setSelectionModeExt( KListView::NoSelection ); - setSelectionModeExt( KListView::Single ); + setSelectionModeExt( TDEListView::NoSelection ); + setSelectionModeExt( TDEListView::Single ); } } @@ -322,7 +322,7 @@ void FavoriteFolderView::contextMenu(TQListViewItem * item, const TQPoint & poin assert( ft ); KMFolderTreeItem *fti = static_cast<KMFolderTreeItem*>( item ); mContextMenuItem = fti; - KPopupMenu contextMenu; + TDEPopupMenu contextMenu; if ( fti && fti->folder() ) { mainWidget()->action("mark_all_as_read")->plug( &contextMenu ); if ( fti->folder()->folderType() == KMFolderTypeImap || fti->folder()->folderType() == KMFolderTypeCachedImap ) diff --git a/kmail/filterimporterexporter.cpp b/kmail/filterimporterexporter.cpp index 1aee8fa97..c15e9247d 100644 --- a/kmail/filterimporterexporter.cpp +++ b/kmail/filterimporterexporter.cpp @@ -53,7 +53,7 @@ FilterSelectionDialog::FilterSelectionDialog( TQWidget * parent ) TQWidget *w = new TQWidget( this ); TQVBoxLayout *top = new TQVBoxLayout( w ); - filtersListView = new KListView( w ); + filtersListView = new TDEListView( w ); top->addWidget( filtersListView ); setMainWidget(w); filtersListView->setSorting( -1 ); diff --git a/kmail/filterimporterexporter.h b/kmail/filterimporterexporter.h index 051288f55..37f4aab99 100644 --- a/kmail/filterimporterexporter.h +++ b/kmail/filterimporterexporter.h @@ -82,7 +82,7 @@ public slots: void slotUnselectAllButton(); void slotSelectAllButton(); private: - KListView *filtersListView; + TDEListView *filtersListView; TQValueList<KMFilter*> originalFilters; bool wasCancelled; KPushButton *selectAllButton; diff --git a/kmail/folderdiaacltab.cpp b/kmail/folderdiaacltab.cpp index 65f656001..27d2f0c7a 100644 --- a/kmail/folderdiaacltab.cpp +++ b/kmail/folderdiaacltab.cpp @@ -189,17 +189,17 @@ unsigned int KMail::ACLEntryDialog::permissions() const return mButtonGroup->selectedId(); } -// class KMail::FolderDiaACLTab::ListView : public KListView +// class KMail::FolderDiaACLTab::ListView : public TDEListView // { // public: -// ListView( TQWidget* parent, const char* name = 0 ) : KListView( parent, name ) {} +// ListView( TQWidget* parent, const char* name = 0 ) : TDEListView( parent, name ) {} // }; -class KMail::FolderDiaACLTab::ListViewItem : public KListViewItem +class KMail::FolderDiaACLTab::ListViewItem : public TDEListViewItem { public: ListViewItem( TQListView* listview ) - : KListViewItem( listview, listview->lastItem() ), + : TDEListViewItem( listview, listview->lastItem() ), mModified( false ), mNew( false ) {} void load( const ACLListEntry& entry ); @@ -333,7 +333,7 @@ KMail::FolderDiaACLTab::FolderDiaACLTab( KMFolderDialog* dlg, TQWidget* parent, mACLWidget = new TQHBox( mStack ); mACLWidget->setSpacing( KDialog::spacingHint() ); - mListView = new KListView( mACLWidget ); + mListView = new TDEListView( mACLWidget ); mListView->setAllColumnsShowFocus( true ); mStack->addWidget( mACLWidget ); mListView->addColumn( i18n( "User Id" ) ); diff --git a/kmail/folderdiaacltab.h b/kmail/folderdiaacltab.h index 4f7f3ab4f..6ae09fec9 100644 --- a/kmail/folderdiaacltab.h +++ b/kmail/folderdiaacltab.h @@ -41,7 +41,7 @@ class KPushButton; class TQWidgetStack; class TQHBox; class TQVButtonGroup; -class KListView; +class TDEListView; namespace TDEIO { class Job; } namespace KMail { @@ -107,7 +107,7 @@ private slots: void slotReceivedUserRights( KMFolder* folder ); void slotDirectoryListingFinished(KMFolderImap*); - // User (KListView) slots + // User (TDEListView) slots void slotEditACL(TQListViewItem*); void slotSelectionChanged(TQListViewItem*); @@ -131,7 +131,7 @@ private: TQHBox* mACLWidget; //class ListView; class ListViewItem; - KListView* mListView; + TDEListView* mListView; KPushButton* mAddACL; KPushButton* mEditACL; KPushButton* mRemoveACL; diff --git a/kmail/foldersetselector.h b/kmail/foldersetselector.h index bd4fce70e..0173327b7 100644 --- a/kmail/foldersetselector.h +++ b/kmail/foldersetselector.h @@ -21,7 +21,7 @@ #include <kdialogbase.h> -class KListView; +class TDEListView; class KMFolderTree; namespace KMail { @@ -38,7 +38,7 @@ class FolderSetSelector : public KDialogBase void setSelectedFolders( const TQValueList<int> &folderIds ); private: - KListView *mTreeView; + TDEListView *mTreeView; }; } diff --git a/kmail/foldershortcutdialog.cpp b/kmail/foldershortcutdialog.cpp index 770b6cfc6..169af7aa1 100644 --- a/kmail/foldershortcutdialog.cpp +++ b/kmail/foldershortcutdialog.cpp @@ -71,8 +71,8 @@ FolderShortcutDialog::FolderShortcutDialog( KMFolder *folder, mKeyButton = new KKeyButton( hb, "FolderShortcutSelector" ); new TQWidget(hb); - connect( mKeyButton, TQT_SIGNAL( capturedShortcut( const KShortcut& ) ), - this, TQT_SLOT( slotCapturedShortcut( const KShortcut& ) ) ); + connect( mKeyButton, TQT_SIGNAL( capturedShortcut( const TDEShortcut& ) ), + this, TQT_SLOT( slotCapturedShortcut( const TDEShortcut& ) ) ); mKeyButton->setShortcut( folder->shortcut(), false ); } @@ -80,12 +80,12 @@ FolderShortcutDialog::~FolderShortcutDialog() { } -void FolderShortcutDialog::slotCapturedShortcut( const KShortcut& sc ) +void FolderShortcutDialog::slotCapturedShortcut( const TDEShortcut& sc ) { if ( sc == mKeyButton->shortcut() ) return; if ( sc.toString().isNull() ) { // null is fine, that's reset, but sc.Ñ–sNull() will be false :/ - mKeyButton->setShortcut( KShortcut::null(), false ); + mKeyButton->setShortcut( TDEShortcut::null(), false ); } else { if( !mMainWidget->shortcutIsValid( sc ) ) { TQString msg( i18n( "The selected shortcut is already used, " diff --git a/kmail/foldershortcutdialog.h b/kmail/foldershortcutdialog.h index c94bce17e..930ac36f6 100644 --- a/kmail/foldershortcutdialog.h +++ b/kmail/foldershortcutdialog.h @@ -40,7 +40,7 @@ #define FOLDERSHORTCUTDIALOG_H #include <kdialogbase.h> // include for the base class -class KShortcut; +class TDEShortcut; class KMFolder; class KKeyButton; class KMMainWidget; @@ -60,7 +60,7 @@ public: protected slots: void slotOk(); - void slotCapturedShortcut( const KShortcut& ); + void slotCapturedShortcut( const TDEShortcut& ); private: KMFolder *mFolder; diff --git a/kmail/foldertreebase.cpp b/kmail/foldertreebase.cpp index e51eaecf4..5679c8c9e 100644 --- a/kmail/foldertreebase.cpp +++ b/kmail/foldertreebase.cpp @@ -81,7 +81,7 @@ int FolderTreeBase::dndMode(bool alwaysAsk) action = DRAG_MOVE; } else { if ( GlobalSettings::self()->showPopupAfterDnD() || alwaysAsk ) { - KPopupMenu menu; + TDEPopupMenu menu; menu.insertItem( i18n("&Move Here"), DRAG_MOVE, 0 ); menu.insertItem( SmallIcon("editcopy"), i18n("&Copy Here"), DRAG_COPY, 1 ); menu.insertSeparator(); diff --git a/kmail/headeritem.cpp b/kmail/headeritem.cpp index 26f5957cc..806fba35f 100644 --- a/kmail/headeritem.cpp +++ b/kmail/headeritem.cpp @@ -43,7 +43,7 @@ using namespace KMail; // Constuction a new list view item with the given colors and pixmap HeaderItem::HeaderItem( TQListView* parent, int msgId, const TQString& key ) - : KListViewItem( parent ), + : TDEListViewItem( parent ), mMsgId( msgId ), mKey( key ), mAboutToBeDeleted( false ), @@ -54,7 +54,7 @@ HeaderItem::HeaderItem( TQListView* parent, int msgId, const TQString& key ) // Constuction a new list view item with the given parent, colors, & pixmap HeaderItem::HeaderItem( TQListViewItem* parent, int msgId, const TQString& key ) - : KListViewItem( parent ), + : TDEListViewItem( parent ), mMsgId( msgId ), mKey( key ), mAboutToBeDeleted( false ), @@ -435,7 +435,7 @@ void HeaderItem::paintCell( TQPainter * p, const TQColorGroup & cg, font.setWeight( weight ); p->setFont( font ); - KListViewItem::paintCell( p, _cg, column, width, align ); + TDEListViewItem::paintCell( p, _cg, column, width, align ); if (aboutToBeDeleted()) { // strike through diff --git a/kmail/headeritem.h b/kmail/headeritem.h index 34dee4de0..7dd3a6434 100644 --- a/kmail/headeritem.h +++ b/kmail/headeritem.h @@ -160,7 +160,7 @@ private: * the current folder). Each item is paired with a KMail::SortCacheItem. See there as to * how they are meant to cooperate. This should be about the visual aspects of * displaying an entry only. */ -class HeaderItem : public KListViewItem +class HeaderItem : public TDEListViewItem { public: HeaderItem( TQListView* parent, int msgId, const TQString& key = TQString() ); diff --git a/kmail/headerlistquicksearch.cpp b/kmail/headerlistquicksearch.cpp index 9d6c37e55..d626b966b 100644 --- a/kmail/headerlistquicksearch.cpp +++ b/kmail/headerlistquicksearch.cpp @@ -48,12 +48,12 @@ namespace KMail { HeaderListQuickSearch::HeaderListQuickSearch( TQWidget *parent, - KListView *listView, - KActionCollection *actionCollection, + TDEListView *listView, + TDEActionCollection *actionCollection, const char *name ) - : KListViewSearchLine(parent, listView, name), mStatusCombo(0), mStatus(0), statusList() + : TDEListViewSearchLine(parent, listView, name), mStatusCombo(0), mStatus(0), statusList() { - KAction *resetQuickSearch = new KAction( i18n( "Reset Quick Search" ), + TDEAction *resetQuickSearch = new TDEAction( i18n( "Reset Quick Search" ), TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", @@ -89,11 +89,11 @@ HeaderListQuickSearch::HeaderListQuickSearch( TQWidget *parent, label->setBuddy( mStatusCombo ); - KToolBarButton * btn = new KToolBarButton( "mail_find", 0, parent, + TDEToolBarButton * btn = new TDEToolBarButton( "mail_find", 0, parent, 0, i18n( "Open Full Search" ) ); connect( btn, TQT_SIGNAL( clicked() ), TQT_SIGNAL( requestFullSearch() ) ); - /* Disable the signal connected by KListViewSearchLine since it will call + /* Disable the signal connected by TDEListViewSearchLine since it will call * itemAdded during KMHeaders::readSortOrder() which will in turn result * in getMsgBaseForItem( item ) wanting to access items which are no longer * there. Rather rely on KMHeaders::msgAdded and its signal. */ @@ -153,7 +153,7 @@ bool HeaderListQuickSearch::itemMatches(const TQListViewItem *item, const TQStri } // The full email address is not visible, but we still want it to be searchable. - // KListViewSearchLine::itemMatches() only searches in visible columns. + // TDEListViewSearchLine::itemMatches() only searches in visible columns. const HeaderItem *headerItem = static_cast<const HeaderItem*>( item ); if ( headerItem->from().lower().contains( s.lower() ) ) { return true; @@ -162,7 +162,7 @@ bool HeaderListQuickSearch::itemMatches(const TQListViewItem *item, const TQStri return true; } - return KListViewSearchLine::itemMatches(item, s); + return TDEListViewSearchLine::itemMatches(item, s); } //----------------------------------------------------------------------------- diff --git a/kmail/headerlistquicksearch.h b/kmail/headerlistquicksearch.h index d4ae8163e..71fb86c2e 100644 --- a/kmail/headerlistquicksearch.h +++ b/kmail/headerlistquicksearch.h @@ -37,19 +37,19 @@ #include <tqvaluevector.h> class TQComboBox; class TQLabel; -class KListView; -class KActionCollection; +class TDEListView; +class TDEActionCollection; namespace KMail { -class HeaderListQuickSearch : public KListViewSearchLine +class HeaderListQuickSearch : public TDEListViewSearchLine { Q_OBJECT public: HeaderListQuickSearch( TQWidget *parent, - KListView *listView, - KActionCollection *actionCollection, + TDEListView *listView, + TDEActionCollection *actionCollection, const char *name = 0 ); virtual ~HeaderListQuickSearch(); diff --git a/kmail/identitylistview.cpp b/kmail/identitylistview.cpp index 7a5134457..c5c9c0597 100644 --- a/kmail/identitylistview.cpp +++ b/kmail/identitylistview.cpp @@ -53,12 +53,12 @@ namespace KMail { // IdentityListViewItem::IdentityListViewItem( IdentityListView * parent, const KPIM::Identity & ident ) - : KListViewItem( parent ), mUOID( ident.uoid() ) { + : TDEListViewItem( parent ), mUOID( ident.uoid() ) { init( ident ); } IdentityListViewItem::IdentityListViewItem( IdentityListView * parent, TQListViewItem * after, const KPIM::Identity & ident ) - : KListViewItem( parent, after ), mUOID( ident.uoid() ) { + : TDEListViewItem( parent, after ), mUOID( ident.uoid() ) { init( ident ); } @@ -96,7 +96,7 @@ namespace KMail { // IdentityListView::IdentityListView( TQWidget * parent, const char * name ) - : KListView( parent, name ) + : TDEListView( parent, name ) { setFullWidth( true ); setDragEnabled( true ); @@ -123,7 +123,7 @@ namespace KMail { item->setText( 0, ident.identityName() ); } } - KListView::rename( i, col ); + TDEListView::rename( i, col ); } bool IdentityListView::acceptDrag( TQDropEvent * e ) const { diff --git a/kmail/identitylistview.h b/kmail/identitylistview.h index aa203727a..7d4ebbf6c 100644 --- a/kmail/identitylistview.h +++ b/kmail/identitylistview.h @@ -45,7 +45,7 @@ namespace KMail { /** @short A TQListViewItem for use in IdentityListView @author Marc Mutz <mutz@kde.org> **/ - class IdentityListViewItem : public KListViewItem { + class IdentityListViewItem : public TDEListViewItem { public: IdentityListViewItem( IdentityListView * parent, const KPIM::Identity & ident ); @@ -66,7 +66,7 @@ namespace KMail { /** @short A listview for KPIM::Identity @author Marc Mutz <mutz@kde.org> **/ - class IdentityListView : public KListView { + class IdentityListView : public TDEListView { Q_OBJECT public: diff --git a/kmail/klistboxdialog.cpp b/kmail/klistboxdialog.cpp index 7027edd6d..eaa627bb7 100644 --- a/kmail/klistboxdialog.cpp +++ b/kmail/klistboxdialog.cpp @@ -8,7 +8,7 @@ #include <tqlabel.h> #include <tqlayout.h> -KListBoxDialog::KListBoxDialog( TQString& _selectedString, +TDEListBoxDialog::TDEListBoxDialog( TQString& _selectedString, const TQString& caption, const TQString& labelText, TQWidget* parent, @@ -19,7 +19,7 @@ KListBoxDialog::KListBoxDialog( TQString& _selectedString, { if ( !name ) - setName( "KListBoxDialog" ); + setName( "TDEListBoxDialog" ); resize( 400, 180 ); TQFrame *page = makeMainWidget(); @@ -50,12 +50,12 @@ KListBoxDialog::KListBoxDialog( TQString& _selectedString, /* * Destroys the object and frees any allocated resources */ -KListBoxDialog::~KListBoxDialog() +TDEListBoxDialog::~TDEListBoxDialog() { // no need to delete child widgets, TQt does it all for us } -void KListBoxDialog::setLabelAbove(const TQString& label) +void TDEListBoxDialog::setLabelAbove(const TQString& label) { labelAboveLA->setText( label ); if( label.isEmpty() ) @@ -64,7 +64,7 @@ void KListBoxDialog::setLabelAbove(const TQString& label) labelAboveLA->show(); } -void KListBoxDialog::setCommentBelow(const TQString& comment) +void TDEListBoxDialog::setCommentBelow(const TQString& comment) { commentBelowLA->setText( comment ); if( comment.isEmpty() ) @@ -75,7 +75,7 @@ void KListBoxDialog::setCommentBelow(const TQString& comment) -void KListBoxDialog::highlighted( const TQString& txt ) +void TDEListBoxDialog::highlighted( const TQString& txt ) { selectedString = txt; } diff --git a/kmail/klistboxdialog.h b/kmail/klistboxdialog.h index 1ef8ce28d..30a672860 100644 --- a/kmail/klistboxdialog.h +++ b/kmail/klistboxdialog.h @@ -6,19 +6,19 @@ class TQLabel; class TQListBox; -class KListBoxDialog : public KDialogBase +class TDEListBoxDialog : public KDialogBase { Q_OBJECT public: - KListBoxDialog( TQString& _selectedString, + TDEListBoxDialog( TQString& _selectedString, const TQString& caption, const TQString& labelText, TQWidget* parent = 0, const char* name = 0, bool modal = true ); - ~KListBoxDialog(); + ~TDEListBoxDialog(); void setLabelAbove( const TQString& label ); void setCommentBelow(const TQString& comment); diff --git a/kmail/klistviewindexedsearchline.cpp b/kmail/klistviewindexedsearchline.cpp index 9f0e26356..b8895ff08 100644 --- a/kmail/klistviewindexedsearchline.cpp +++ b/kmail/klistviewindexedsearchline.cpp @@ -38,17 +38,17 @@ using KMail::HeaderListQuickSearch; -KListViewIndexedSearchLine::KListViewIndexedSearchLine( TQWidget* parent, KListView* listView, KActionCollection* actionCollection, const char* name ): +TDEListViewIndexedSearchLine::TDEListViewIndexedSearchLine( TQWidget* parent, TDEListView* listView, TDEActionCollection* actionCollection, const char* name ): HeaderListQuickSearch( parent, listView, actionCollection, name ), mFiltering( false ) { } -KListViewIndexedSearchLine::~KListViewIndexedSearchLine() { +TDEListViewIndexedSearchLine::~TDEListViewIndexedSearchLine() { } -void KListViewIndexedSearchLine::updateSearch( const TQString& s ) { +void TDEListViewIndexedSearchLine::updateSearch( const TQString& s ) { kdDebug( 5006 ) << "updateSearch( -" << s << "- )" << endl; mFiltering = false; if ( !s.isNull() && !s.isEmpty() ) { @@ -60,10 +60,10 @@ void KListViewIndexedSearchLine::updateSearch( const TQString& s ) { mFiltering = ok; } } - KListViewSearchLine::updateSearch( s ); + TDEListViewSearchLine::updateSearch( s ); } -bool KListViewIndexedSearchLine::itemMatches( const TQListViewItem* item, const TQString& s ) const { +bool TDEListViewIndexedSearchLine::itemMatches( const TQListViewItem* item, const TQString& s ) const { if ( mFiltering && std::binary_search( mResults.begin(), mResults.end(), static_cast<const KMail::HeaderItem*>( item )->msgSerNum() ) ) return true; diff --git a/kmail/klistviewindexedsearchline.h b/kmail/klistviewindexedsearchline.h index 9dfd227ba..abd6e817f 100644 --- a/kmail/klistviewindexedsearchline.h +++ b/kmail/klistviewindexedsearchline.h @@ -37,24 +37,24 @@ #include <vector> -class KListView; +class TDEListView; class TQListViewItem; class TQToolButton; -class KListViewSearchLine; +class TDEListViewSearchLine; /** * Extends HeaderListQuickSearch to also search inside message bodies using KMMsgIndex */ -class TDEUI_EXPORT KListViewIndexedSearchLine: public KMail::HeaderListQuickSearch +class TDEUI_EXPORT TDEListViewIndexedSearchLine: public KMail::HeaderListQuickSearch { Q_OBJECT public: - explicit KListViewIndexedSearchLine(TQWidget *parent, KListView *listView, KActionCollection* action, const char *name = 0); - ~KListViewIndexedSearchLine(); + explicit TDEListViewIndexedSearchLine(TQWidget *parent, TDEListView *listView, TDEActionCollection* action, const char *name = 0); + ~TDEListViewIndexedSearchLine(); public slots: /** diff --git a/kmail/kmail_part.cpp b/kmail/kmail_part.cpp index b7857493b..ff0e0f0c9 100644 --- a/kmail/kmail_part.cpp +++ b/kmail/kmail_part.cpp @@ -41,7 +41,7 @@ using KMail::AccountManager; #include "sidebarextension.h" #include "infoextension.h" #include "recentaddresses.h" -using KRecentAddress::RecentAddresses; +using TDERecentAddress::RecentAddresses; #include <kapplication.h> #include <tdeparts/mainwindow.h> @@ -242,9 +242,9 @@ KMailStatusBarExtension::KMailStatusBarExtension( KMailPart *parent ) { } -KMainWindow * KMailStatusBarExtension::mainWindow() const +TDEMainWindow * KMailStatusBarExtension::mainWindow() const { - return static_cast<KMainWindow*>( mParent->parentWidget() ); + return static_cast<TDEMainWindow*>( mParent->parentWidget() ); } #include "kmail_part.moc" diff --git a/kmail/kmail_part.h b/kmail/kmail_part.h index 46f08f68b..34a6e8d55 100644 --- a/kmail/kmail_part.h +++ b/kmail/kmail_part.h @@ -91,7 +91,7 @@ class KMailStatusBarExtension : public KParts::StatusBarExtension public: KMailStatusBarExtension( KMailPart *parent ); - KMainWindow *mainWindow() const; + TDEMainWindow *mainWindow() const; private: KMailPart *mParent; diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp index 95d6108b8..0b029cdcc 100644 --- a/kmail/kmcommands.cpp +++ b/kmail/kmcommands.cpp @@ -1816,7 +1816,7 @@ void FolderShortcutCommand::start() mMainWidget->slotSelectFolder( mFolder ); } -void FolderShortcutCommand::setAction( KAction* action ) +void FolderShortcutCommand::setAction( TDEAction* action ) { mAction = action; } diff --git a/kmail/kmcommands.h b/kmail/kmcommands.h index dab733cc8..5e8bf9c3c 100644 --- a/kmail/kmcommands.h +++ b/kmail/kmcommands.h @@ -18,8 +18,8 @@ #include <ktempfile.h> class TQPopupMenu; -class KMainWindow; -class KAction; +class TDEMainWindow; +class TDEAction; class KProgressDialog; class TDEProcess; class KMFilter; @@ -740,12 +740,12 @@ public slots: /** Assign a KActio to the command which is used to trigger it. This * action will be deleted along with the command, so you don't need to * keep track of it separately. */ - void setAction( KAction* ); + void setAction( TDEAction* ); private: KMMainWidget *mMainWidget; KMFolder *mFolder; - KAction *mAction; + TDEAction *mAction; }; diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp index 636da6d37..ba8d1615b 100644 --- a/kmail/kmcomposewin.cpp +++ b/kmail/kmcomposewin.cpp @@ -44,7 +44,7 @@ using KPIM::AddresseeSelectorDialog; #include <maillistdrag.h> using KPIM::MailListDrag; #include "recentaddresses.h" -using KRecentAddress::RecentAddresses; +using TDERecentAddress::RecentAddresses; #include "kleo_util.h" #include "stl_util.h" #include "recipientseditor.h" @@ -888,9 +888,9 @@ void KMComposeWin::slotView(void) //This sucks awfully, but no, I cannot get an activated(int id) from // actionContainer() - if (!TQT_TQOBJECT_CONST(sender())->isA("KToggleAction")) + if (!TQT_TQOBJECT_CONST(sender())->isA("TDEToggleAction")) return; - KToggleAction *act = (KToggleAction *) sender(); + TDEToggleAction *act = (TDEToggleAction *) sender(); if (act == mAllFieldsAction) id = 0; @@ -1228,38 +1228,38 @@ void KMComposeWin::getTransportMenu() //----------------------------------------------------------------------------- void KMComposeWin::setupActions(void) { - KActionMenu *actActionNowMenu, *actActionLaterMenu; + TDEActionMenu *actActionNowMenu, *actActionLaterMenu; if (kmkernel->msgSender()->sendImmediate()) //default == send now? { //default = send now, alternative = queue - ( void ) new KAction( 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"); // FIXME: change to mail_send_via icon when this exits. - actActionNowMenu = new KActionMenu (i18n("&Send Mail Via"), "mail_send", + actActionNowMenu = new TDEActionMenu (i18n("&Send Mail Via"), "mail_send", actionCollection(), "send_default_via" ); - (void) new KAction (i18n("Send &Later"), "queue", 0, TQT_TQOBJECT(this), + (void) new TDEAction (i18n("Send &Later"), "queue", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSendLater()), actionCollection(),"send_alternative"); - actActionLaterMenu = new KActionMenu (i18n("Send &Later Via"), "queue", + actActionLaterMenu = new TDEActionMenu (i18n("Send &Later Via"), "queue", actionCollection(), "send_alternative_via" ); } else //no, default = send later { //default = queue, alternative = send now - (void) new KAction (i18n("Send &Later"), "queue", + (void) new TDEAction (i18n("Send &Later"), "queue", CTRL+Key_Return, TQT_TQOBJECT(this), TQT_SLOT(slotSendLater()), actionCollection(),"send_default"); - actActionLaterMenu = new KActionMenu (i18n("Send &Later Via"), "queue", + actActionLaterMenu = new TDEActionMenu (i18n("Send &Later Via"), "queue", actionCollection(), "send_default_via" ); - ( void ) new KAction( i18n("&Send Mail"), "mail_send", 0, + ( void ) new TDEAction( i18n("&Send Mail"), "mail_send", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSendNow()), actionCollection(),"send_alternative"); // FIXME: change to mail_send_via icon when this exits. - actActionNowMenu = new KActionMenu (i18n("&Send Mail Via"), "mail_send", + actActionNowMenu = new TDEActionMenu (i18n("&Send Mail Via"), "mail_send", actionCollection(), "send_alternative_via" ); } @@ -1290,37 +1290,37 @@ void KMComposeWin::setupActions(void) - (void) new KAction (i18n("Save as &Draft"), "filesave", 0, + (void) new TDEAction (i18n("Save as &Draft"), "filesave", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveDraft()), actionCollection(), "save_in_drafts"); - (void) new KAction (i18n("Save as &Template"), "filesave", 0, + (void) new TDEAction (i18n("Save as &Template"), "filesave", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveTemplate()), actionCollection(), "save_in_templates"); - (void) new KAction (i18n("&Insert File..."), "fileopen", 0, + (void) new TDEAction (i18n("&Insert File..."), "fileopen", 0, TQT_TQOBJECT(this), TQT_SLOT(slotInsertFile()), actionCollection(), "insert_file"); - mRecentAction = new KRecentFilesAction (i18n("&Insert File Recent"), + mRecentAction = new TDERecentFilesAction (i18n("&Insert File Recent"), "fileopen", 0, TQT_TQOBJECT(this), TQT_SLOT(slotInsertRecentFile(const KURL&)), actionCollection(), "insert_file_recent"); mRecentAction->loadEntries( KMKernel::config() ); - (void) new KAction (i18n("&Address Book"), "contents",0, + (void) new TDEAction (i18n("&Address Book"), "contents",0, TQT_TQOBJECT(this), TQT_SLOT(slotAddrBook()), actionCollection(), "addressbook"); - (void) new KAction (i18n("&New Composer"), "mail_new", - KStdAccel::shortcut(KStdAccel::New), + (void) new TDEAction (i18n("&New Composer"), "mail_new", + TDEStdAccel::shortcut(TDEStdAccel::New), TQT_TQOBJECT(this), TQT_SLOT(slotNewComposer()), actionCollection(), "new_composer"); - (void) new KAction (i18n("New Main &Window"), "window_new", 0, + (void) new TDEAction (i18n("New Main &Window"), "window_new", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewMailReader()), actionCollection(), "open_mailreader"); if ( !mClassicalRecipients ) { - new KAction( i18n("Select &Recipients..."), CTRL + Key_L, TQT_TQOBJECT(mRecipientsEditor), + new TDEAction( i18n("Select &Recipients..."), CTRL + Key_L, TQT_TQOBJECT(mRecipientsEditor), TQT_SLOT( selectRecipients() ), actionCollection(), "select_recipients" ); - new KAction( i18n("Save &Distribution List..."), 0, TQT_TQOBJECT(mRecipientsEditor), + new TDEAction( i18n("Save &Distribution List..."), 0, TQT_TQOBJECT(mRecipientsEditor), TQT_SLOT( saveDistributionList() ), actionCollection(), "save_distribution_list" ); } @@ -1342,54 +1342,54 @@ void KMComposeWin::setupActions(void) KStdAction::replace (TQT_TQOBJECT(this), TQT_SLOT(slotReplace()), actionCollection()); KStdAction::spelling (TQT_TQOBJECT(this), TQT_SLOT(slotSpellcheck()), actionCollection(), "spellcheck"); - mPasteQuotation = new KAction (i18n("Pa&ste as Quotation"),0,TQT_TQOBJECT(this),TQT_SLOT( slotPasteClipboardAsQuotation()), + mPasteQuotation = new TDEAction (i18n("Pa&ste as Quotation"),0,TQT_TQOBJECT(this),TQT_SLOT( slotPasteClipboardAsQuotation()), actionCollection(), "paste_quoted"); - (void) new KAction (i18n("Paste as Attac&hment"),0,TQT_TQOBJECT(this),TQT_SLOT( slotPasteClipboardAsAttachment()), + (void) new TDEAction (i18n("Paste as Attac&hment"),0,TQT_TQOBJECT(this),TQT_SLOT( slotPasteClipboardAsAttachment()), actionCollection(), "paste_att"); - KAction * addq = new KAction(i18n("Add &Quote Characters"), 0, TQT_TQOBJECT(this), + TDEAction * addq = new TDEAction(i18n("Add &Quote Characters"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddQuotes()), actionCollection(), "tools_quote"); connect( mEditor, TQT_SIGNAL(selectionAvailable(bool)), addq, TQT_SLOT(setEnabled(bool)) ); - KAction * remq = new KAction(i18n("Re&move Quote Characters"), 0, TQT_TQOBJECT(this), + TDEAction * remq = new TDEAction(i18n("Re&move Quote Characters"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveQuotes()), actionCollection(), "tools_unquote"); connect( mEditor, TQT_SIGNAL(selectionAvailable(bool)), remq, TQT_SLOT(setEnabled(bool)) ); - (void) new KAction (i18n("Cl&ean Spaces"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCleanSpace()), + (void) new TDEAction (i18n("Cl&ean Spaces"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCleanSpace()), actionCollection(), "clean_spaces"); - mFixedFontAction = new KToggleAction( i18n("Use Fi&xed Font"), 0, TQT_TQOBJECT(this), + mFixedFontAction = new TDEToggleAction( i18n("Use Fi&xed Font"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotUpdateFont()), actionCollection(), "toggle_fixedfont" ); mFixedFontAction->setChecked( GlobalSettings::self()->useFixedFont() ); //these are checkable!!! - mUrgentAction = new KToggleAction (i18n("&Urgent"), 0, + mUrgentAction = new TDEToggleAction (i18n("&Urgent"), 0, actionCollection(), "urgent"); - mRequestMDNAction = new KToggleAction ( i18n("&Request Disposition Notification"), 0, + mRequestMDNAction = new TDEToggleAction ( i18n("&Request Disposition Notification"), 0, actionCollection(), "options_request_mdn"); mRequestMDNAction->setChecked(GlobalSettings::self()->requestMDN()); //----- Message-Encoding Submenu - mEncodingAction = new KSelectAction( i18n( "Se&t Encoding" ), "charset", + mEncodingAction = new TDESelectAction( i18n( "Se&t Encoding" ), "charset", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetCharset() ), actionCollection(), "charsets" ); - mWordWrapAction = new KToggleAction (i18n("&Wordwrap"), 0, + mWordWrapAction = new TDEToggleAction (i18n("&Wordwrap"), 0, actionCollection(), "wordwrap"); mWordWrapAction->setChecked(GlobalSettings::self()->wordWrap()); connect(mWordWrapAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotWordWrapToggled(bool))); - mSnippetAction = new KToggleAction ( i18n("&Snippets"), 0, + mSnippetAction = new TDEToggleAction ( i18n("&Snippets"), 0, actionCollection(), "snippets"); connect(mSnippetAction, TQT_SIGNAL(toggled(bool)), mSnippetWidget, TQT_SLOT(setShown(bool)) ); mSnippetAction->setChecked( GlobalSettings::self()->showSnippetManager() ); mAutoSpellCheckingAction = - new KToggleAction( i18n( "&Automatic Spellchecking" ), "spellcheck", 0, + new TDEToggleAction( i18n( "&Automatic Spellchecking" ), "spellcheck", 0, actionCollection(), "options_auto_spellchecking" ); const bool spellChecking = GlobalSettings::self()->autoSpellChecking(); mAutoSpellCheckingAction->setEnabled( !GlobalSettings::self()->useExternalEditor() ); @@ -1404,74 +1404,74 @@ void KMComposeWin::setupActions(void) mEncodingAction->setCurrentItem( -1 ); //these are checkable!!! - markupAction = new KToggleAction (i18n("Formatting (HTML)"), 0, TQT_TQOBJECT(this), + markupAction = new TDEToggleAction (i18n("Formatting (HTML)"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleMarkup()), actionCollection(), "html"); - mAllFieldsAction = new KToggleAction (i18n("&All Fields"), 0, TQT_TQOBJECT(this), + mAllFieldsAction = new TDEToggleAction (i18n("&All Fields"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotView()), actionCollection(), "show_all_fields"); - mIdentityAction = new KToggleAction (i18n("&Identity"), 0, TQT_TQOBJECT(this), + mIdentityAction = new TDEToggleAction (i18n("&Identity"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotView()), actionCollection(), "show_identity"); - mDictionaryAction = new KToggleAction (i18n("&Dictionary"), 0, TQT_TQOBJECT(this), + mDictionaryAction = new TDEToggleAction (i18n("&Dictionary"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotView()), actionCollection(), "show_dictionary"); - mFccAction = new KToggleAction (i18n("&Sent-Mail Folder"), 0, TQT_TQOBJECT(this), + mFccAction = new TDEToggleAction (i18n("&Sent-Mail Folder"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotView()), actionCollection(), "show_fcc"); - mTransportAction = new KToggleAction (i18n("&Mail Transport"), 0, TQT_TQOBJECT(this), + mTransportAction = new TDEToggleAction (i18n("&Mail Transport"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotView()), actionCollection(), "show_transport"); - mFromAction = new KToggleAction (i18n("&From"), 0, TQT_TQOBJECT(this), + mFromAction = new TDEToggleAction (i18n("&From"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotView()), actionCollection(), "show_from"); - mReplyToAction = new KToggleAction (i18n("&Reply To"), 0, TQT_TQOBJECT(this), + mReplyToAction = new TDEToggleAction (i18n("&Reply To"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotView()), actionCollection(), "show_reply_to"); if ( mClassicalRecipients ) { - mToAction = new KToggleAction (i18n("&To"), 0, TQT_TQOBJECT(this), + mToAction = new TDEToggleAction (i18n("&To"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotView()), actionCollection(), "show_to"); - mCcAction = new KToggleAction (i18n("&CC"), 0, TQT_TQOBJECT(this), + mCcAction = new TDEToggleAction (i18n("&CC"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotView()), actionCollection(), "show_cc"); - mBccAction = new KToggleAction (i18n("&BCC"), 0, TQT_TQOBJECT(this), + mBccAction = new TDEToggleAction (i18n("&BCC"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotView()), actionCollection(), "show_bcc"); } - mSubjectAction = new KToggleAction (i18n("S&ubject"), 0, TQT_TQOBJECT(this), + mSubjectAction = new TDEToggleAction (i18n("S&ubject"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotView()), actionCollection(), "show_subject"); //end of checkable - mAppendSignatureAction = new KAction (i18n("Append S&ignature"), 0, TQT_TQOBJECT(this), + mAppendSignatureAction = new TDEAction (i18n("Append S&ignature"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAppendSignature()), actionCollection(), "append_signature"); - mPrependSignatureAction = new KAction (i18n("Prepend S&ignature"), 0, TQT_TQOBJECT(this), + mPrependSignatureAction = new TDEAction (i18n("Prepend S&ignature"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotPrependSignature()), actionCollection(), "prepend_signature"); - mInsertSignatureAction = new KAction (i18n("Insert Signature At C&ursor Position"), "edit", 0, TQT_TQOBJECT(this), + mInsertSignatureAction = new TDEAction (i18n("Insert Signature At C&ursor Position"), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotInsertSignatureAtCursor()), actionCollection(), "insert_signature_at_cursor_position"); - mAttachPK = new KAction (i18n("Attach &Public Key..."), 0, TQT_TQOBJECT(this), + mAttachPK = new TDEAction (i18n("Attach &Public Key..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInsertPublicKey()), actionCollection(), "attach_public_key"); - mAttachMPK = new KAction (i18n("Attach &My Public Key"), 0, TQT_TQOBJECT(this), + mAttachMPK = new TDEAction (i18n("Attach &My Public Key"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInsertMyPublicKey()), actionCollection(), "attach_my_public_key"); - (void) new KAction (i18n("&Attach File..."), "attach", + (void) new TDEAction (i18n("&Attach File..."), "attach", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAttachFile()), actionCollection(), "attach"); - mAttachRemoveAction = new KAction (i18n("&Remove Attachment"), 0, TQT_TQOBJECT(this), + mAttachRemoveAction = new TDEAction (i18n("&Remove Attachment"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAttachRemove()), actionCollection(), "remove"); - mAttachSaveAction = new KAction (i18n("&Save Attachment As..."), "filesave",0, + mAttachSaveAction = new TDEAction (i18n("&Save Attachment As..."), "filesave",0, TQT_TQOBJECT(this), TQT_SLOT(slotAttachSave()), actionCollection(), "attach_save"); - mAttachPropertiesAction = new KAction (i18n("Attachment Pr&operties"), 0, TQT_TQOBJECT(this), + mAttachPropertiesAction = new TDEAction (i18n("Attachment Pr&operties"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAttachProperties()), actionCollection(), "attach_properties"); @@ -1481,11 +1481,11 @@ void KMComposeWin::setupActions(void) KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotEditToolbars()), actionCollection()); KStdAction::preferences(kmkernel, TQT_SLOT(slotShowConfigurationDialog()), actionCollection()); - (void) new KAction (i18n("&Spellchecker..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSpellcheckConfig()), + (void) new TDEAction (i18n("&Spellchecker..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSpellcheckConfig()), actionCollection(), "setup_spellchecker"); if ( Kleo::CryptoBackendFactory::instance()->protocol( "Chiasmus" ) ) { - KToggleAction * a = new KToggleAction( i18n( "Encrypt Message with Chiasmus..." ), + TDEToggleAction * a = new TDEToggleAction( i18n( "Encrypt Message with Chiasmus..." ), "chidecrypted", 0, actionCollection(), "encrypt_message_chiasmus" ); a->setCheckedState( KGuiItem( i18n( "Encrypt Message with Chiasmus..." ), "chiencrypted" ) ); @@ -1496,10 +1496,10 @@ void KMComposeWin::setupActions(void) mEncryptChiasmusAction = 0; } - mEncryptAction = new KToggleAction (i18n("&Encrypt Message"), + mEncryptAction = new TDEToggleAction (i18n("&Encrypt Message"), "decrypted", 0, actionCollection(), "encrypt_message"); - mSignAction = new KToggleAction (i18n("&Sign Message"), + mSignAction = new TDEToggleAction (i18n("&Sign Message"), "signature", 0, actionCollection(), "sign_message"); // get PGP user id for the chosen identity @@ -1546,7 +1546,7 @@ void KMComposeWin::setupActions(void) for ( int i = 0 ; i < numCryptoMessageFormats ; ++i ) l.push_back( Kleo::cryptoMessageFormatToLabel( cryptoMessageFormats[i] ) ); - mCryptoModuleAction = new KSelectAction( i18n( "&Cryptographic Message Format" ), 0, + mCryptoModuleAction = new TDESelectAction( i18n( "&Cryptographic Message Format" ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSelectCryptoModule()), actionCollection(), "options_select_crypto" ); mCryptoModuleAction->setItems( l ); @@ -1563,46 +1563,46 @@ void KMComposeWin::setupActions(void) styleItems << i18n( "Ordered List (Alpha lower)" ); styleItems << i18n( "Ordered List (Alpha upper)" ); - listAction = new KSelectAction( i18n( "Select Style" ), 0, actionCollection(), + listAction = new TDESelectAction( i18n( "Select Style" ), 0, actionCollection(), "text_list" ); listAction->setItems( styleItems ); listAction->setToolTip( i18n( "Select a list style" ) ); connect( listAction, TQT_SIGNAL( activated( const TQString& ) ), TQT_SLOT( slotListAction( const TQString& ) ) ); - fontAction = new KFontAction( "Select Font", 0, actionCollection(), + fontAction = new TDEFontAction( "Select Font", 0, actionCollection(), "text_font" ); fontAction->setToolTip( i18n( "Select a font" ) ); connect( fontAction, TQT_SIGNAL( activated( const TQString& ) ), TQT_SLOT( slotFontAction( const TQString& ) ) ); - fontSizeAction = new KFontSizeAction( "Select Size", 0, actionCollection(), + fontSizeAction = new TDEFontSizeAction( "Select Size", 0, actionCollection(), "text_size" ); fontSizeAction->setToolTip( i18n( "Select a font size" ) ); connect( fontSizeAction, TQT_SIGNAL( fontSizeChanged( int ) ), TQT_SLOT( slotSizeAction( int ) ) ); - alignLeftAction = new KToggleAction (i18n("Align Left"), "text_left", 0, + alignLeftAction = new TDEToggleAction (i18n("Align Left"), "text_left", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAlignLeft()), actionCollection(), "align_left"); alignLeftAction->setChecked( true ); - alignRightAction = new KToggleAction (i18n("Align Right"), "text_right", 0, + alignRightAction = new TDEToggleAction (i18n("Align Right"), "text_right", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAlignRight()), actionCollection(), "align_right"); - alignCenterAction = new KToggleAction (i18n("Align Center"), "text_center", 0, + alignCenterAction = new TDEToggleAction (i18n("Align Center"), "text_center", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAlignCenter()), actionCollection(), "align_center"); - textBoldAction = new KToggleAction( i18n("&Bold"), "text_bold", CTRL+Key_B, + textBoldAction = new TDEToggleAction( i18n("&Bold"), "text_bold", CTRL+Key_B, TQT_TQOBJECT(this), TQT_SLOT(slotTextBold()), actionCollection(), "text_bold"); - textItalicAction = new KToggleAction( i18n("&Italic"), "text_italic", CTRL+Key_I, + textItalicAction = new TDEToggleAction( i18n("&Italic"), "text_italic", CTRL+Key_I, TQT_TQOBJECT(this), TQT_SLOT(slotTextItalic()), actionCollection(), "text_italic"); - textUnderAction = new KToggleAction( i18n("&Underline"), "text_under", CTRL+Key_U, + textUnderAction = new TDEToggleAction( i18n("&Underline"), "text_under", CTRL+Key_U, TQT_TQOBJECT(this), TQT_SLOT(slotTextUnder()), actionCollection(), "text_under"); - actionFormatReset = new KAction( i18n( "Reset Font Settings" ), "eraser", 0, + actionFormatReset = new TDEAction( i18n( "Reset Font Settings" ), "eraser", 0, TQT_TQOBJECT(this), TQT_SLOT( slotFormatReset() ), actionCollection(), "format_reset"); - actionFormatColor = new KAction( i18n( "Text Color..." ), "colorize", 0, + actionFormatColor = new TDEAction( i18n( "Text Color..." ), "colorize", 0, TQT_TQOBJECT(this), TQT_SLOT( slotTextColor() ), actionCollection(), "format_color"); @@ -1614,7 +1614,7 @@ void KMComposeWin::setupActions(void) // In Kontact, this entry would read "Configure Kontact", but bring // up KMail's config dialog. That's sensible, though, so fix the label. - KAction* configureAction = actionCollection()->action("options_configure" ); + TDEAction* configureAction = actionCollection()->action("options_configure" ); if ( configureAction ) configureAction->setText( i18n("Configure KMail..." ) ); } @@ -1664,9 +1664,9 @@ void KMComposeWin::setupEditor(void) menu = new TQPopupMenu(this); //#ifdef BROKEN menu->insertItem(i18n("Undo"),mEditor, - TQT_SLOT(undo()), KStdAccel::shortcut(KStdAccel::Undo)); + TQT_SLOT(undo()), TDEStdAccel::shortcut(TDEStdAccel::Undo)); menu->insertItem(i18n("Redo"),mEditor, - TQT_SLOT(redo()), KStdAccel::shortcut(KStdAccel::Redo)); + TQT_SLOT(redo()), TDEStdAccel::shortcut(TDEStdAccel::Redo)); menu->insertSeparator(); //#endif //BROKEN menu->insertItem(i18n("Cut"), this, TQT_SLOT(slotCut())); @@ -2961,7 +2961,7 @@ void KMComposeWin::slotInsertFile() TQStringList urls = config->readListEntry( "recent-urls" ); TQStringList encodings = config->readListEntry( "recent-encodings" ); // Prevent config file from growing without bound - // Would be nicer to get this constant from KRecentFilesAction + // Would be nicer to get this constant from TDERecentFilesAction uint mMaxRecentFiles = 30; while (urls.count() > mMaxRecentFiles) urls.erase( urls.fromLast() ); @@ -5259,13 +5259,13 @@ void KMComposeWin::alignmentChanged( int a ) } namespace { - class KToggleActionResetter { - KToggleAction * mAction; + class TDEToggleActionResetter { + TDEToggleAction * mAction; bool mOn; public: - KToggleActionResetter( KToggleAction * action, bool on ) + TDEToggleActionResetter( TDEToggleAction * action, bool on ) : mAction( action ), mOn( on ) {} - ~KToggleActionResetter() { + ~TDEToggleActionResetter() { if ( mAction ) mAction->setChecked( mOn ); } @@ -5279,7 +5279,7 @@ void KMComposeWin::slotEncryptChiasmusToggled( bool on ) { if ( !on ) return; - KToggleActionResetter resetter( mEncryptChiasmusAction, false ); + TDEToggleActionResetter resetter( mEncryptChiasmusAction, false ); const Kleo::CryptoBackend::Protocol * chiasmus = Kleo::CryptoBackendFactory::instance()->protocol( "Chiasmus" ); diff --git a/kmail/kmcomposewin.h b/kmail/kmcomposewin.h index eb108b062..35964268d 100644 --- a/kmail/kmcomposewin.h +++ b/kmail/kmcomposewin.h @@ -59,19 +59,19 @@ class KMMessage; class KMMessagePart; class TDEProcess; class KDirWatch; -class KSelectAction; -class KFontAction; -class KFontSizeAction; -class KSelectAction; +class TDESelectAction; +class TDEFontAction; +class TDEFontSizeAction; +class TDESelectAction; class KStatusBar; -class KAction; -class KToggleAction; +class TDEAction; +class TDEToggleAction; class KTempFile; -class KToolBar; -class KToggleAction; -class KSelectColorAction; +class TDEToolBar; +class TDEToggleAction; +class TDESelectColorAction; class KURL; -class KRecentFilesAction; +class TDERecentFilesAction; class SpellingFilter; class MessageComposer; class RecipientsEditor; @@ -793,32 +793,32 @@ private: uint mId; TQString mOldSigText; - KAction *mAttachPK, *mAttachMPK, + TDEAction *mAttachPK, *mAttachMPK, *mAttachRemoveAction, *mAttachSaveAction, *mAttachPropertiesAction, *mPasteQuotation, *mAddQuoteChars, *mRemQuoteChars; - KRecentFilesAction *mRecentAction; - - KAction *mAppendSignatureAction, *mPrependSignatureAction, *mInsertSignatureAction; - - KToggleAction *mSignAction, *mEncryptAction, *mRequestMDNAction; - KToggleAction *mUrgentAction, *mAllFieldsAction, *mFromAction; - KToggleAction *mReplyToAction, *mToAction, *mCcAction, *mBccAction; - KToggleAction *mSubjectAction; - KToggleAction *mIdentityAction, *mTransportAction, *mFccAction; - KToggleAction *mWordWrapAction, *mFixedFontAction, *mAutoSpellCheckingAction; - KToggleAction *mDictionaryAction, *mSnippetAction; - - KSelectAction *listAction; - KFontAction *fontAction; - KFontSizeAction *fontSizeAction; - KToggleAction *alignLeftAction, *alignCenterAction, *alignRightAction; - KToggleAction *textBoldAction, *textItalicAction, *textUnderAction; - KToggleAction *plainTextAction, *markupAction; - KAction *actionFormatColor, *actionFormatReset; - KAction *mHtmlToolbar; - - KSelectAction *mEncodingAction; - KSelectAction *mCryptoModuleAction; + TDERecentFilesAction *mRecentAction; + + TDEAction *mAppendSignatureAction, *mPrependSignatureAction, *mInsertSignatureAction; + + TDEToggleAction *mSignAction, *mEncryptAction, *mRequestMDNAction; + TDEToggleAction *mUrgentAction, *mAllFieldsAction, *mFromAction; + TDEToggleAction *mReplyToAction, *mToAction, *mCcAction, *mBccAction; + TDEToggleAction *mSubjectAction; + TDEToggleAction *mIdentityAction, *mTransportAction, *mFccAction; + TDEToggleAction *mWordWrapAction, *mFixedFontAction, *mAutoSpellCheckingAction; + TDEToggleAction *mDictionaryAction, *mSnippetAction; + + TDESelectAction *listAction; + TDEFontAction *fontAction; + TDEFontSizeAction *fontSizeAction; + TDEToggleAction *alignLeftAction, *alignCenterAction, *alignRightAction; + TDEToggleAction *textBoldAction, *textItalicAction, *textUnderAction; + TDEToggleAction *plainTextAction, *markupAction; + TDEAction *actionFormatColor, *actionFormatReset; + TDEAction *mHtmlToolbar; + + TDESelectAction *mEncodingAction; + TDESelectAction *mCryptoModuleAction; TQCString mCharset; TQCString mDefCharset; @@ -899,7 +899,7 @@ private: KMail::MessageSender::SendMethod mSendMethod; KMComposeWin::SaveIn mSaveIn; - KToggleAction *mEncryptChiasmusAction; + TDEToggleAction *mEncryptChiasmusAction; bool mEncryptWithChiasmus; // This is the temporary object that constructs the message out of the diff --git a/kmail/kmedit.cpp b/kmail/kmedit.cpp index 6f03e87dc..83ed78d56 100644 --- a/kmail/kmedit.cpp +++ b/kmail/kmedit.cpp @@ -174,7 +174,7 @@ void KMEdit::contentsDropEvent(TQDropEvent *e) else if( KURLDrag::canDecode( e ) ) { KURL::List urlList; if( KURLDrag::decode( e, urlList ) ) { - KPopupMenu p; + TDEPopupMenu p; p.insertItem( i18n("Add as Text"), 0 ); p.insertItem( i18n("Add as Attachment"), 1 ); int id = p.exec( mapToGlobal( e->pos() ) ); @@ -505,7 +505,7 @@ bool KMEdit::eventFilter(TQObject*o, TQEvent* e) //Continue if this word was misspelled if( !word.isEmpty() && mReplacements.contains( word ) ) { - KPopupMenu p; + TDEPopupMenu p; //Add the suggestions to the popup menu TQStringList reps = mReplacements[word]; diff --git a/kmail/kmfilter.cpp b/kmail/kmfilter.cpp index 2898990d3..1a98963e2 100644 --- a/kmail/kmfilter.cpp +++ b/kmail/kmfilter.cpp @@ -246,7 +246,7 @@ void KMFilter::readConfig(TDEConfig* config) bConfigureShortcut = config->readBoolEntry("ConfigureShortcut", false); TQString shortcut( config->readEntry( "Shortcut" ) ); if ( !shortcut.isEmpty() ) { - KShortcut sc( shortcut ); + TDEShortcut sc( shortcut ); setShortcut( sc ); } bConfigureToolbar = config->readBoolEntry("ConfigureToolbar", false); diff --git a/kmail/kmfilter.h b/kmail/kmfilter.h index 109e491eb..87c59528f 100644 --- a/kmail/kmfilter.h +++ b/kmail/kmfilter.h @@ -240,12 +240,12 @@ public: or toolbar. Default is no shortcut. @see setConfigureShortcut setConfigureToolbar */ - void setShortcut( const KShortcut & shortcut ) { mShortcut = shortcut; }; + void setShortcut( const TDEShortcut & shortcut ) { mShortcut = shortcut; }; /** @return The shortcut assigned to the filter. @see setShortcut */ - const KShortcut & shortcut() const { return mShortcut; } + const TDEShortcut & shortcut() const { return mShortcut; } /** Set the icon to be used if plugged into the filter menu or toolbar. Default is the gear icon. @@ -297,7 +297,7 @@ private: TQValueList<int> mAccounts; KMPopFilterAction mAction; TQString mIcon; - KShortcut mShortcut; + TDEShortcut mShortcut; bool bPopFilter : 1; bool bApplyOnInbound : 1; bool bApplyOnOutbound : 1; diff --git a/kmail/kmfilterdlg.cpp b/kmail/kmfilterdlg.cpp index b5010cc31..83342d43d 100644 --- a/kmail/kmfilterdlg.cpp +++ b/kmail/kmfilterdlg.cpp @@ -213,7 +213,7 @@ KMFilterDlg::KMFilterDlg(TQWidget* parent, const char* name, bool popFilter, boo vbl3->addWidget( mApplyOnForChecked ); vbl3->addStretch( 2 ); - mAccountList = new KListView( adv_w, "accountList" ); + mAccountList = new TDEListView( adv_w, "accountList" ); mAccountList->addColumn( i18n("Account Name") ); mAccountList->addColumn( i18n("Type") ); mAccountList->setAllColumnsShowFocus( true ); @@ -302,8 +302,8 @@ KMFilterDlg::KMFilterDlg(TQWidget* parent, const char* name, bool popFilter, boo connect( mConfigureShortcut, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotConfigureShortcutButtonToggled(bool)) ); - connect( mKeyButton, TQT_SIGNAL( capturedShortcut( const KShortcut& ) ), - this, TQT_SLOT( slotCapturedShortcutChanged( const KShortcut& ) ) ); + connect( mKeyButton, TQT_SIGNAL( capturedShortcut( const TDEShortcut& ) ), + this, TQT_SLOT( slotCapturedShortcutChanged( const TDEShortcut& ) ) ); connect( mConfigureToolbar, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotConfigureToolbarButtonToggled(bool)) ); @@ -403,7 +403,7 @@ void KMFilterDlg::slotFilterSelected( KMFilter* aFilter ) const bool configureShortcut = aFilter->configureShortcut(); const bool configureToolbar = aFilter->configureToolbar(); const TQString icon = aFilter->icon(); - const KShortcut shortcut( aFilter->shortcut() ); + const TDEShortcut shortcut( aFilter->shortcut() ); mApplyOnIn->setChecked( applyOnIn ); mApplyOnForAll->setEnabled( applyOnIn ); @@ -517,12 +517,12 @@ void KMFilterDlg::slotConfigureShortcutButtonToggled( bool aChecked ) } } -void KMFilterDlg::slotCapturedShortcutChanged( const KShortcut& sc ) +void KMFilterDlg::slotCapturedShortcutChanged( const TDEShortcut& sc ) { - KShortcut mySc(sc); + TDEShortcut mySc(sc); if ( mySc == mKeyButton->shortcut() ) return; // FIXME work around a problem when reseting the shortcut via the shortcut dialog - // somehow the returned shortcut does not evaluate to true in KShortcut::isNull(), + // somehow the returned shortcut does not evaluate to true in TDEShortcut::isNull(), // so we additionally have to check for an empty string if ( mySc.isNull() || mySc.toString().isEmpty() ) mySc.clear(); diff --git a/kmail/kmfilterdlg.h b/kmail/kmfilterdlg.h index 4742ff40b..3801d8be9 100644 --- a/kmail/kmfilterdlg.h +++ b/kmail/kmfilterdlg.h @@ -30,7 +30,7 @@ class TQWidgetStack; class TQCheckBox; class KIconButton; class KKeyButton; -class KListView; +class TDEListView; /** This is a complex widget that is used to manipulate KMail's filter @@ -368,7 +368,7 @@ protected slots: void slotApplicableAccountsChanged(); void slotStopProcessingButtonToggled( bool aChecked ); void slotConfigureShortcutButtonToggled( bool aChecked ); - void slotCapturedShortcutChanged( const KShortcut& ); + void slotCapturedShortcutChanged( const TDEShortcut& ); void slotConfigureToolbarButtonToggled( bool aChecked ); void slotFilterActionIconChanged( TQString icon ); void slotReset(); @@ -408,7 +408,7 @@ protected: this filter to all accounts or to selected accounts only. */ TQRadioButton *mApplyOnForAll, *mApplyOnForTraditional, *mApplyOnForChecked; /** ListView that shows the accounts in the advanced tab */ - KListView *mAccountList; + TDEListView *mAccountList; TQCheckBox *mStopProcessingHere; TQCheckBox *mConfigureShortcut; diff --git a/kmail/kmfolder.cpp b/kmail/kmfolder.cpp index 88338a057..33118ca4b 100644 --- a/kmail/kmfolder.cpp +++ b/kmail/kmfolder.cpp @@ -192,7 +192,7 @@ void KMFolder::readConfig( TDEConfig* config ) TQString shortcut( config->readEntry( "Shortcut" ) ); if ( !shortcut.isEmpty() ) { - KShortcut sc( shortcut ); + TDEShortcut sc( shortcut ); setShortcut( sc ); } } @@ -868,7 +868,7 @@ void KMFolder::reallyAddCopyOfMsg( KMMessage* aMsg ) mStorage->reallyAddCopyOfMsg( aMsg ); } -void KMFolder::setShortcut( const KShortcut &sc ) +void KMFolder::setShortcut( const TDEShortcut &sc ) { if ( mShortcut != sc ) { mShortcut = sc; diff --git a/kmail/kmfolder.h b/kmail/kmfolder.h index 87be58407..da406e3bf 100644 --- a/kmail/kmfolder.h +++ b/kmail/kmfolder.h @@ -526,8 +526,8 @@ public: bool ignoreNewMail() const { return mIgnoreNewMail; } void setIgnoreNewMail( bool b ) { mIgnoreNewMail = b; } - const KShortcut &shortcut() const { return mShortcut; } - void setShortcut( const KShortcut& ); + const TDEShortcut &shortcut() const { return mShortcut; } + void setShortcut( const TDEShortcut& ); /** Returns true if this folder can be moved */ bool isMoveable() const; @@ -676,7 +676,7 @@ private: bool mIgnoreNewMail; /** shortcut associated with this folder or null, if none is configured. */ - KShortcut mShortcut; + TDEShortcut mShortcut; }; diff --git a/kmail/kmfoldermgr.cpp b/kmail/kmfoldermgr.cpp index 44d2a1530..321ed3158 100644 --- a/kmail/kmfoldermgr.cpp +++ b/kmail/kmfoldermgr.cpp @@ -64,7 +64,7 @@ void KMFolderMgr::expireAll() { int ret = KMessageBox::Continue; if (config->readBoolEntry("warn-before-expire", true)) { - ret = KMessageBox::warningContinueCancel(KMainWindow::memberList->first(), + ret = KMessageBox::warningContinueCancel(TDEMainWindow::memberList->first(), i18n("Are you sure you want to expire old messages?"), i18n("Expire Old Messages?"), i18n("Expire")); } diff --git a/kmail/kmfoldertree.cpp b/kmail/kmfoldertree.cpp index 9a7cd4771..9d18e4c02 100644 --- a/kmail/kmfoldertree.cpp +++ b/kmail/kmfoldertree.cpp @@ -403,7 +403,7 @@ KMFolderTree::KMFolderTree( KMMainWidget *mainWidget, TQWidget *parent, // popup to switch columns header()->setClickEnabled(true); header()->installEventFilter(this); - mPopup = new KPopupMenu(this); + mPopup = new TDEPopupMenu(this); mPopup->insertTitle(i18n("View Columns")); mPopup->setCheckable(true); mUnreadPop = mPopup->insertItem(i18n("Unread Column"), this, TQT_SLOT(slotToggleUnreadColumn())); @@ -1050,7 +1050,7 @@ void KMFolderTree::resizeEvent(TQResizeEvent* e) TDEConfigGroupSaver saver(conf, "Geometry"); conf->writeEntry(name(), size().width()); - KListView::resizeEvent(e); + TDEListView::resizeEvent(e); } //----------------------------------------------------------------------------- @@ -1073,7 +1073,7 @@ void KMFolderTree::slotContextMenuRequested( TQListViewItem *lvi, if (!fti ) return; - KPopupMenu *folderMenu = new KPopupMenu; + TDEPopupMenu *folderMenu = new TDEPopupMenu; bool multiFolder = selectedFolders().count() > 1; if (fti->folder()) folderMenu->insertTitle(fti->folder()->label()); @@ -1211,7 +1211,7 @@ void KMFolderTree::slotContextMenuRequested( TQListViewItem *lvi, void KMFolderTree::contentsMousePressEvent(TQMouseEvent * e) { // KFolderTree messes around with the selection mode - KListView::contentsMousePressEvent( e ); + TDEListView::contentsMousePressEvent( e ); } // If middle button and folder holds mailing-list, create a message to that list @@ -1695,7 +1695,7 @@ void KMFolderTree::toggleColumn(int column, bool openFolders) addUnreadColumn( i18n("Unread"), 70 ); reload(); } - // toggle KPopupMenu + // toggle TDEPopupMenu mPopup->setItemChecked( mUnreadPop, isUnreadActive() ); } else if (column == total) { @@ -1719,7 +1719,7 @@ void KMFolderTree::toggleColumn(int column, bool openFolders) addSizeColumn( i18n("Size"), 70 ); reload( openFolders ); } - // toggle KPopupMenu + // toggle TDEPopupMenu mPopup->setItemChecked( mSizePop, isSizeActive() ); } else kdDebug(5006) << "unknown column:" << column << endl; @@ -2128,9 +2128,9 @@ void KMFolderTree::pasteFolder() void KMFolderTree::updateCopyActions() { - KAction *copy = mMainWidget->action("copy_folder"); - KAction *cut = mMainWidget->action("cut_folder"); - KAction *paste = mMainWidget->action("paste_folder"); + TDEAction *copy = mMainWidget->action("copy_folder"); + TDEAction *cut = mMainWidget->action("cut_folder"); + TDEAction *paste = mMainWidget->action("paste_folder"); KMFolderTreeItem *item = static_cast<KMFolderTreeItem*>( currentItem() ); if ( !item || !item->folder() ) { diff --git a/kmail/kmfoldertree.h b/kmail/kmfoldertree.h index 696c7cca0..1c6b6b6a1 100644 --- a/kmail/kmfoldertree.h +++ b/kmail/kmfoldertree.h @@ -32,7 +32,7 @@ class TQDropEvent; class TQPixmap; class TQPainter; class TQPopupMenu; -class KPopupMenu; +class TDEPopupMenu; class KMFolder; class KMFolderDir; class KMFolderImap; @@ -342,7 +342,7 @@ private: TQListViewItemIterator mUpdateIterator; /** popup for unread/total */ - KPopupMenu* mPopup; + TDEPopupMenu* mPopup; int mUnreadPop; int mTotalPop; int mSizePop; diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp index 6910ad6ef..740dde839 100644 --- a/kmail/kmheaders.cpp +++ b/kmail/kmheaders.cpp @@ -94,7 +94,7 @@ TQPixmap* KMHeaders::pixReadFwdReplied = 0; //----------------------------------------------------------------------------- KMHeaders::KMHeaders(KMMainWidget *aOwner, TQWidget *parent, const char *name) : - KListView( parent, name ), + TDEListView( parent, name ), mIgnoreSortOrderChanges( false ) { static bool pixmapsLoaded = false; @@ -126,7 +126,7 @@ KMHeaders::KMHeaders(KMMainWidget *aOwner, TQWidget *parent, // popup-menu header()->setClickEnabled(true); header()->installEventFilter(this); - mPopup = new KPopupMenu(this); + mPopup = new TDEPopupMenu(this); mPopup->insertTitle(i18n("View Columns")); mPopup->setCheckable(true); mPopup->insertItem(i18n("Status"), KPaintInfo::COL_STATUS); @@ -252,7 +252,7 @@ bool KMHeaders::eventFilter ( TQObject *o, TQEvent *e ) mPopup->popup( TQT_TQMOUSEEVENT(e)->globalPos() ); return true; } - return KListView::eventFilter(o, e); + return TDEListView::eventFilter(o, e); } //----------------------------------------------------------------------------- @@ -414,7 +414,7 @@ void KMHeaders::paintEmptyArea( TQPainter * p, const TQRect & rect ) bool KMHeaders::event(TQEvent *e) { - bool result = KListView::event(e); + bool result = TDEListView::event(e); if (e->type() == TQEvent::ApplicationPaletteChange) { readColorConfig(); @@ -559,7 +559,7 @@ void KMHeaders::readConfig (void) //----------------------------------------------------------------------------- void KMHeaders::restoreColumnLayout( TDEConfig *config, const TQString &group ) { - // KListView::restoreLayout() will call setSorting(), which is reimplemented by us. + // TDEListView::restoreLayout() will call setSorting(), which is reimplemented by us. // We don't want to change the sort order, so we set a flag here that is checked in // setSorting(). mIgnoreSortOrderChanges = true; @@ -1054,7 +1054,7 @@ void KMHeaders::msgAdded(int id) } if (mSortInfo.fakeSort) { TQObject::disconnect(header(), TQT_SIGNAL(clicked(int)), this, TQT_SLOT(dirtySortOrder(int))); - KListView::setSorting(mSortCol, !mSortDescending ); + TDEListView::setSorting(mSortCol, !mSortDescending ); mSortInfo.fakeSort = 0; } appendItemToSortFile(hi); //inserted into sorted list @@ -1139,7 +1139,7 @@ void KMHeaders::msgRemoved(int id, TQString msgId ) item->setTempKey( key + item->key( mSortCol, !mSortDescending )); if (mSortInfo.fakeSort) { TQObject::disconnect(header(), TQT_SIGNAL(clicked(int)), this, TQT_SLOT(dirtySortOrder(int))); - KListView::setSorting(mSortCol, !mSortDescending ); + TDEListView::setSorting(mSortCol, !mSortDescending ); mSortInfo.fakeSort = 0; } } @@ -1385,7 +1385,7 @@ void KMHeaders::setStyleDependantFrameWidth() void KMHeaders::styleChange( TQStyle& oldStyle ) { setStyleDependantFrameWidth(); - KListView::styleChange( oldStyle ); + TDEListView::styleChange( oldStyle ); } //----------------------------------------------------------------------------- @@ -1711,7 +1711,7 @@ void KMHeaders::setSelected( TQListViewItem *item, bool selected ) return; if ( item->isVisible() ) - KListView::setSelected( item, selected ); + TDEListView::setSelected( item, selected ); // If the item is the parent of a closed thread recursively select // children . @@ -2190,7 +2190,7 @@ void KMHeaders::updateMessageList( bool set_selection, bool forceJumpToUnread ) clear(); mItems.resize(0); // will contain deleted pointers noRepaint = false; - KListView::setSorting( mSortCol, !mSortDescending ); + TDEListView::setSorting( mSortCol, !mSortDescending ); if (!mFolder) { repaint(); return; @@ -2251,7 +2251,7 @@ void KMHeaders::keyPressEvent( TQKeyEvent * e ) case Key_Next: case Key_Prior: case Key_Escape: - KListView::keyPressEvent( e ); + TDEListView::keyPressEvent( e ); } if (!shft) connect(this,TQT_SIGNAL(currentChanged(TQListViewItem*)), @@ -2302,7 +2302,7 @@ void KMHeaders::contentsMousePressEvent(TQMouseEvent* e) } // let klistview do it's thing, expanding/collapsing, selection/deselection - KListView::contentsMousePressEvent(e); + TDEListView::contentsMousePressEvent(e); /* TQListView's shift-select selects also invisible items. Until that is fixed, we have to deselect hidden items here manually, so the quick search doesn't mess things up. */ @@ -2367,7 +2367,7 @@ void KMHeaders::contentsMousePressEvent(TQMouseEvent* e) void KMHeaders::contentsMouseReleaseEvent(TQMouseEvent* e) { if (e->button() != Qt::RightButton) - KListView::contentsMouseReleaseEvent(e); + TDEListView::contentsMouseReleaseEvent(e); mMousePressed = false; } @@ -2507,7 +2507,7 @@ void KMHeaders::slotRMB() menu->insertSeparator(); mOwner->messageActions()->createTodoAction()->plug( menu ); - KAcceleratorManager::manage(menu); + TDEAcceleratorManager::manage(menu); kmkernel->setContextMenuShown( true ); menu->exec(TQCursor::pos(), 0); kmkernel->setContextMenuShown( false ); @@ -2648,7 +2648,7 @@ void KMHeaders::setSorting( int column, bool ascending ) colText = colText + i18n( " (Status)" ); setColumnText( mPaintInfo.subCol, colText); } - KListView::setSorting( column, ascending ); + TDEListView::setSorting( column, ascending ); ensureCurrentItemVisible(); // Make sure the config and .sorted file are updated, otherwise stale info // is read on new imap mail. ( folder->folderComplete() -> readSortOrder() ). @@ -3108,7 +3108,7 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread ) fread(&sorted_count, sizeof(sorted_count), 1, sortStream); //Hackyness to work around qlistview problems - KListView::setSorting(-1); + TDEListView::setSorting(-1); header()->setSortIndicator(column, ascending); TQObject::connect(header(), TQT_SIGNAL(clicked(int)), this, TQT_SLOT(dirtySortOrder(int))); //setup mSortInfo here now, as above may change it @@ -3228,7 +3228,7 @@ bool KMHeaders::readSortOrder( bool set_selection, bool forceJumpToUnread ) mSortInfo.ascending = ascending = !mSortDescending; threaded = (isThreaded()); sorted_count = discovered_count = appended = 0; - KListView::setSorting( mSortCol, !mSortDescending ); + TDEListView::setSorting( mSortCol, !mSortDescending ); } //fill in empty holes if((sorted_count + discovered_count - deleted_count) < mFolder->count()) { @@ -3566,9 +3566,9 @@ void KMHeaders::pasteMessages() void KMHeaders::updateActions() { - KAction *copy = owner()->action( "copy_messages" ); - KAction *cut = owner()->action( "cut_messages" ); - KAction *paste = owner()->action( "paste_messages" ); + TDEAction *copy = owner()->action( "copy_messages" ); + TDEAction *cut = owner()->action( "cut_messages" ); + TDEAction *paste = owner()->action( "paste_messages" ); if ( selectedItems().isEmpty() ) { copy->setEnabled( false ); diff --git a/kmail/kmheaders.h b/kmail/kmheaders.h index b894b0c7f..7312189fe 100644 --- a/kmail/kmheaders.h +++ b/kmail/kmheaders.h @@ -25,7 +25,7 @@ class KMMessage; class KMMsgBase; class KMCommand; class KMMainWidget; -class KPopupMenu; +class TDEPopupMenu; class TQPalette; class TQPixmap; class TQIconSet; @@ -45,7 +45,7 @@ enum NestingPolicy { AlwaysOpen = 0, DefaultOpen, DefaultClosed, OpenUnread }; #define KMAIL_RESERVED 3 /** The widget that shows the contents of folders */ -class KMHeaders : public KListView +class KMHeaders : public TDEListView { Q_OBJECT @@ -135,9 +135,9 @@ public: virtual void readColorConfig(void); /** - * Same as KListView::restoreLayout(), only that this does _not_ restore the sort order. + * Same as TDEListView::restoreLayout(), only that this does _not_ restore the sort order. * This is useful since restoreLayout() doesn't restore the sort order correctly, as - * KListView doesn't know about our extended sort order like date of arrival. + * TDEListView doesn't know about our extended sort order like date of arrival. * * Note that if you want to restore the sort order correctly, call readConfig(). */ @@ -223,7 +223,7 @@ signals: void messageListUpdated(); /** emitted after a new item has been fully built and added to the - * list view. We can't use KListView::itemAdded, as that is emitted + * list view. We can't use TDEListView::itemAdded, as that is emitted * from the ctor of the item, at which point the building of the item * is not yet far enough along to update the quick search, which is * what is connected to this signal. */ @@ -467,7 +467,7 @@ private: bool mReaderWindowActive; /** popup to switch columns */ - KPopupMenu* mPopup; + TDEPopupMenu* mPopup; // copied messages TQValueList<TQ_UINT32> mCopiedMessages; diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp index 423c04a70..05571bf3c 100644 --- a/kmail/kmkernel.cpp +++ b/kmail/kmkernel.cpp @@ -36,7 +36,7 @@ using KMail::AccountManager; #include "kmmainwidget.h" #include "kmfoldertree.h" #include "recentaddresses.h" -using KRecentAddress::RecentAddresses; +using TDERecentAddress::RecentAddresses; #include "kmmsgdict.h" #include <libkpimidentities/identity.h> #include <libkpimidentities/identitymanager.h> @@ -351,12 +351,12 @@ void KMKernel::saveToProfile( const TQString& ) const void KMKernel::openReader( bool onlyCheck ) { mWin = 0; - KMainWindow *ktmw = 0; + TDEMainWindow *ktmw = 0; kdDebug(5006) << "KMKernel::openReader called" << endl; - if (KMainWindow::memberList) - for (ktmw = KMainWindow::memberList->first(); ktmw; - ktmw = KMainWindow::memberList->next()) + if (TDEMainWindow::memberList) + for (ktmw = TDEMainWindow::memberList->first(); ktmw; + ktmw = TDEMainWindow::memberList->next()) if (ktmw->isA("KMMainWin")) break; @@ -1124,13 +1124,13 @@ void KMKernel::raise() bool KMKernel::showMail( TQ_UINT32 serialNumber, TQString /* messageId */ ) { KMMainWidget *mainWidget = 0; - if (KMainWindow::memberList) { - KMainWindow *win = 0; + if (TDEMainWindow::memberList) { + TDEMainWindow *win = 0; TQObjectList *l; - // First look for a KMainWindow. - for (win = KMainWindow::memberList->first(); win; - win = KMainWindow::memberList->next()) { + // First look for a TDEMainWindow. + for (win = TDEMainWindow::memberList->first(); win; + win = TDEMainWindow::memberList->next()) { // Then look for a KMMainWidget. l = win->queryList("KMMainWidget"); if (l && l->first()) { @@ -1745,9 +1745,9 @@ bool KMKernel::doSessionManagement() void KMKernel::closeAllKMailWindows() { - if (!KMainWindow::memberList) return; - TQPtrListIterator<KMainWindow> it(*KMainWindow::memberList); - KMainWindow *window = 0; + if (!TDEMainWindow::memberList) return; + TQPtrListIterator<TDEMainWindow> it(*TDEMainWindow::memberList); + TDEMainWindow *window = 0; while ((window = it.current()) != 0) { ++it; if (window->isA("KMMainWindow") || @@ -1921,8 +1921,8 @@ bool KMKernel::transferMail( TQString & destinationDir ) void KMKernel::ungrabPtrKb(void) { - if(!KMainWindow::memberList) return; - TQWidget* widg = KMainWindow::memberList->first(); + if(!TDEMainWindow::memberList) return; + TQWidget* widg = TDEMainWindow::memberList->first(); Display* dpy; if (!widg) return; @@ -1964,10 +1964,10 @@ void KMKernel::dumpDeadLetters() return; //All documents should be saved before shutting down is set! // make all composer windows autosave their contents - if ( !KMainWindow::memberList ) + if ( !TDEMainWindow::memberList ) return; - for ( TQPtrListIterator<KMainWindow> it(*KMainWindow::memberList) ; it.current() != 0; ++it ) { + for ( TQPtrListIterator<TDEMainWindow> it(*TDEMainWindow::memberList) ; it.current() != 0; ++it ) { if ( KMail::Composer * win = ::tqqt_cast<KMail::Composer*>( it.current() ) ) { win->autoSaveMessage(); // saving the message has to be finished right here, we are called from a dtor, @@ -2234,29 +2234,29 @@ KMMsgIndex *KMKernel::msgIndex() return the_msgIndex; } -KMainWindow* KMKernel::mainWin() +TDEMainWindow* KMKernel::mainWin() { - if (KMainWindow::memberList) { - KMainWindow *kmWin = 0; + if (TDEMainWindow::memberList) { + TDEMainWindow *kmWin = 0; // First look for a KMMainWin. - for (kmWin = KMainWindow::memberList->first(); kmWin; - kmWin = KMainWindow::memberList->next()) + for (kmWin = TDEMainWindow::memberList->first(); kmWin; + kmWin = TDEMainWindow::memberList->next()) if (kmWin->isA("KMMainWin")) return kmWin; - // There is no KMMainWin. Use any other KMainWindow instead (e.g. in + // There is no KMMainWin. Use any other TDEMainWindow instead (e.g. in // case we are running inside Kontact) because we anyway only need // it for modal message boxes and for KNotify events. - kmWin = KMainWindow::memberList->first(); + kmWin = TDEMainWindow::memberList->first(); if ( kmWin ) return kmWin; } - // There's not a single KMainWindow. Create a KMMainWin. + // There's not a single TDEMainWindow. Create a KMMainWin. // This could happen if we want to pop up an error message // while we are still doing the startup wizard and no other - // KMainWindow is running. + // TDEMainWindow is running. mWin = new KMMainWin; return mWin; } diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h index 748ec6809..0a3c4a9e7 100644 --- a/kmail/kmkernel.h +++ b/kmail/kmkernel.h @@ -64,7 +64,7 @@ class TQTimer; class KProgress; class KPassivePopup; class KMMainWin; -class KMainWindow; +class TDEMainWindow; class KMailICalIfaceImpl; class KMReaderWin; class KSystemTray; @@ -357,7 +357,7 @@ public: TQTextCodec *networkCodec() { return netCodec; } /** returns a reference to the first Mainwin or a temporary Mainwin */ - KMainWindow* mainWin(); + TDEMainWindow* mainWin(); // ### The mContextMenuShown flag is necessary to work around bug# 56693 // ### (kmail freeze with the complete desktop while pinentry-qt appears) diff --git a/kmail/kmlineeditspell.cpp b/kmail/kmlineeditspell.cpp index 7916c1be7..9d07a9c6b 100644 --- a/kmail/kmlineeditspell.cpp +++ b/kmail/kmlineeditspell.cpp @@ -75,7 +75,7 @@ void KMLineEdit::insertEmails( const TQStringList & emails ) return; } //multiple emails, let the user choose one - KPopupMenu menu( this, "Addresschooser" ); + TDEPopupMenu menu( this, "Addresschooser" ); for ( TQStringList::const_iterator it = emails.begin(), end = emails.end() ; it != end; ++it ) menu.insertItem( *it ); const int result = menu.exec( TQCursor::pos() ); @@ -164,14 +164,14 @@ TQPopupMenu *KMLineEdit::createPopupMenu() void KMLineEdit::editRecentAddresses() { - KRecentAddress::RecentAddressDialog dlg( this ); - dlg.setAddresses( KRecentAddress::RecentAddresses::self( KMKernel::config() )->addresses() ); + TDERecentAddress::RecentAddressDialog dlg( this ); + dlg.setAddresses( TDERecentAddress::RecentAddresses::self( KMKernel::config() )->addresses() ); if ( !dlg.exec() ) return; - KRecentAddress::RecentAddresses::self( KMKernel::config() )->clear(); + TDERecentAddress::RecentAddresses::self( KMKernel::config() )->clear(); const TQStringList addrList = dlg.addresses(); for ( TQStringList::const_iterator it = addrList.begin(), end = addrList.end() ; it != end ; ++it ) - KRecentAddress::RecentAddresses::self( KMKernel::config() )->add( *it ); + TDERecentAddress::RecentAddresses::self( KMKernel::config() )->add( *it ); loadContacts(); } @@ -184,7 +184,7 @@ void KMLineEdit::loadContacts() if ( GlobalSettings::self()->showRecentAddressesInComposer() ){ if ( KMKernel::self() ) { TQStringList recent = - KRecentAddress::RecentAddresses::self( KMKernel::config() )->addresses(); + TDERecentAddress::RecentAddresses::self( KMKernel::config() )->addresses(); TQStringList::Iterator it = recent.begin(); TQString name, email; diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp index bf63dab28..94d0e6741 100644 --- a/kmail/kmmainwidget.cpp +++ b/kmail/kmmainwidget.cpp @@ -137,7 +137,7 @@ static KStaticDeleter<TQValueList<KMMainWidget*> > mwlsd; //----------------------------------------------------------------------------- KMMainWidget::KMMainWidget(TQWidget *parent, const char *name, KXMLGUIClient *aGUIClient, - KActionCollection *actionCollection, TDEConfig* config ) : + TDEActionCollection *actionCollection, TDEConfig* config ) : TQWidget(parent, name), mFavoritesCheckMailAction( 0 ), mFavoriteFolderView( 0 ), @@ -184,7 +184,7 @@ KMMainWidget::KMMainWidget(TQWidget *parent, const char *name, // FIXME This should become a line separator as soon as the API // is extended in tdelibs. - mToolbarActionSeparator = new KActionSeparator( actionCollection ); + mToolbarActionSeparator = new TDEActionSeparator( actionCollection ); if( !s_mainWidgetList ) mwlsd.setObject( s_mainWidgetList, new TQValueList<KMMainWidget*>() ); @@ -246,7 +246,7 @@ KMMainWidget::KMMainWidget(TQWidget *parent, const char *name, mStartupDone = true; - KMainWindow *mainWin = dynamic_cast<KMainWindow*>(topLevelWidget()); + TDEMainWindow *mainWin = dynamic_cast<TDEMainWindow*>(topLevelWidget()); KStatusBar *sb = mainWin ? mainWin->statusBar() : 0; mVacationScriptIndicator = new KStatusBarLabel( TQString(), 0, sb ); mVacationScriptIndicator->hide(); @@ -595,7 +595,7 @@ void KMMainWidget::createWidgets(void) headerParent->dumpObjectTree(); #endif mSearchAndHeaders = new TQVBox( headerParent ); - mSearchToolBar = new KToolBar( mSearchAndHeaders, "search toolbar"); + mSearchToolBar = new TDEToolBar( mSearchAndHeaders, "search toolbar"); mSearchToolBar->setMovingEnabled(false); mSearchToolBar->boxLayout()->setSpacing( KDialog::spacingHint() ); TQLabel *label = new TQLabel( i18n("S&earch:"), mSearchToolBar, "kde toolbar widget" ); @@ -603,7 +603,7 @@ void KMMainWidget::createWidgets(void) mHeaders = new KMHeaders(this, mSearchAndHeaders, "headers"); #ifdef HAVE_INDEXLIB - mQuickSearchLine = new KListViewIndexedSearchLine( mSearchToolBar, mHeaders, + mQuickSearchLine = new TDEListViewIndexedSearchLine( mSearchToolBar, mHeaders, actionCollection(), "headers quick search line" ); #else mQuickSearchLine = new HeaderListQuickSearch( mSearchToolBar, mHeaders, @@ -659,19 +659,19 @@ void KMMainWidget::createWidgets(void) mMsgView = NULL; } - KAction *action; + TDEAction *action; - mMoveMsgToFolderAction = new KAction( i18n("Move Message to Folder"), Key_M, TQT_TQOBJECT(this), + mMoveMsgToFolderAction = new TDEAction( i18n("Move Message to Folder"), Key_M, TQT_TQOBJECT(this), TQT_SLOT(slotMoveMsg()), actionCollection(), "move_message_to_folder" ); mMoveMsgToFolderAction->plugAccel( actionCollection()->kaccel() ); - action = new KAction( i18n("Copy Message to Folder"), Key_C, TQT_TQOBJECT(this), + action = new TDEAction( i18n("Copy Message to Folder"), Key_C, TQT_TQOBJECT(this), TQT_SLOT(slotCopyMsg()), actionCollection(), "copy_message_to_folder" ); action->plugAccel( actionCollection()->kaccel() ); - action = new KAction( i18n("Jump to Folder"), Key_J, TQT_TQOBJECT(this), + action = new TDEAction( i18n("Jump to Folder"), Key_J, TQT_TQOBJECT(this), TQT_SLOT(slotJumpToFolder()), actionCollection(), "jump_to_folder" ); action->plugAccel( actionCollection()->kaccel() ); @@ -713,42 +713,42 @@ void KMMainWidget::createWidgets(void) } //Commands not worthy of menu items, but that deserve configurable keybindings - mRemoveDuplicatesAction = new KAction( + mRemoveDuplicatesAction = new TDEAction( i18n("Remove Duplicate Messages"), CTRL+Key_Asterisk, TQT_TQOBJECT(this), TQT_SLOT(removeDuplicates()), actionCollection(), "remove_duplicate_messages"); action->plugAccel( actionCollection()->kaccel() ); - action = new KAction( + action = new TDEAction( i18n("Abort Current Operation"), Key_Escape, ProgressManager::instance(), TQT_SLOT(slotAbortAll()), actionCollection(), "cancel" ); action->plugAccel( actionCollection()->kaccel() ); - action = new KAction( + action = new TDEAction( i18n("Focus on Next Folder"), CTRL+Key_Right, TQT_TQOBJECT(mFolderTree), TQT_SLOT(incCurrentFolder()), actionCollection(), "inc_current_folder"); action->plugAccel( actionCollection()->kaccel() ); - action = new KAction( + action = new TDEAction( i18n("Focus on Previous Folder"), CTRL+Key_Left, TQT_TQOBJECT(mFolderTree), TQT_SLOT(decCurrentFolder()), actionCollection(), "dec_current_folder"); action->plugAccel( actionCollection()->kaccel() ); - action = new KAction( + action = new TDEAction( i18n("Select Folder with Focus"), CTRL+Key_Space, TQT_TQOBJECT(mFolderTree), TQT_SLOT(selectCurrentFolder()), actionCollection(), "select_current_folder"); action->plugAccel( actionCollection()->kaccel() ); - action = new KAction( + action = new TDEAction( i18n("Focus on Next Message"), ALT+Key_Right, TQT_TQOBJECT(mHeaders), TQT_SLOT(incCurrentMessage()), actionCollection(), "inc_current_message"); action->plugAccel( actionCollection()->kaccel() ); - action = new KAction( + action = new TDEAction( i18n("Focus on Previous Message"), ALT+Key_Left, TQT_TQOBJECT(mHeaders), TQT_SLOT(decCurrentMessage()), actionCollection(), "dec_current_message"); action->plugAccel( actionCollection()->kaccel() ); - action = new KAction( + action = new TDEAction( i18n("Select Message with Focus"), ALT+Key_Space, TQT_TQOBJECT(mHeaders), TQT_SLOT( selectCurrentMessage() ), actionCollection(), "select_current_message"); action->plugAccel( actionCollection()->kaccel() ); @@ -1325,7 +1325,7 @@ void KMMainWidget::slotExpireAll() { TDEConfigGroupSaver saver(config, "General"); if (config->readBoolEntry("warn-before-expire", true)) { - ret = KMessageBox::warningContinueCancel(KMainWindow::memberList->first(), + ret = KMessageBox::warningContinueCancel(TDEMainWindow::memberList->first(), i18n("Are you sure you want to expire all old messages?"), i18n("Expire Old Messages?"), i18n("Expire")); if (ret != KMessageBox::Continue) { @@ -2356,7 +2356,7 @@ void KMMainWidget::slotMarkAll() //----------------------------------------------------------------------------- void KMMainWidget::slotMsgPopup(KMMessage&, const KURL &aUrl, const TQPoint& aPoint) { - KPopupMenu * menu = new KPopupMenu; + TDEPopupMenu * menu = new TDEPopupMenu; updateMessageMenu(); mUrlCurrent = aUrl; @@ -2453,7 +2453,7 @@ void KMMainWidget::slotMsgPopup(KMMessage&, const KURL &aUrl, const TQPoint& aPo menu->insertSeparator(); mMsgActions->createTodoAction()->plug( menu ); } - KAcceleratorManager::manage(menu); + TDEAcceleratorManager::manage(menu); menu->exec(aPoint, 0); delete menu; } @@ -2488,7 +2488,7 @@ void KMMainWidget::getTransportMenu() void KMMainWidget::updateCustomTemplateMenus() { if ( !mCustomTemplateActions.isEmpty() ) { - TQPtrList<KAction>::iterator ait = mCustomTemplateActions.begin(); + TQPtrList<TDEAction>::iterator ait = mCustomTemplateActions.begin(); for ( ; ait != mCustomTemplateActions.end() ; ++ait ) { (*ait)->unplugAll(); delete (*ait); @@ -2505,7 +2505,7 @@ void KMMainWidget::updateCustomTemplateMenus() delete mCustomForwardMapper; mCustomForwardActionMenu = - new KActionMenu( i18n("Forward With Custom Template"), + new TDEActionMenu( i18n("Forward With Custom Template"), "mail_custom_forward", actionCollection(), "custom_forward" ); TQSignalMapper *mCustomForwardMapper = new TQSignalMapper( TQT_TQOBJECT(this) ); @@ -2514,7 +2514,7 @@ void KMMainWidget::updateCustomTemplateMenus() mForwardActionMenu->insert( mCustomForwardActionMenu ); mCustomReplyActionMenu = - new KActionMenu( i18n("Reply With Custom Template"), "mail_custom_reply", + new TDEActionMenu( i18n("Reply With Custom Template"), "mail_custom_reply", actionCollection(), "custom_reply" ); TQSignalMapper *mCustomReplyMapper = new TQSignalMapper( TQT_TQOBJECT(this) ); connect( mCustomReplyMapper, TQT_SIGNAL( mapped( int ) ), @@ -2522,7 +2522,7 @@ void KMMainWidget::updateCustomTemplateMenus() mMsgActions->replyMenu()->insert( mCustomReplyActionMenu ); mCustomReplyAllActionMenu = - new KActionMenu( i18n("Reply to All With Custom Template"), + new TDEActionMenu( i18n("Reply to All With Custom Template"), "mail_custom_reply_all", actionCollection(), "custom_reply_all" ); TQSignalMapper *mCustomReplyAllMapper = new TQSignalMapper( TQT_TQOBJECT(this) ); @@ -2542,11 +2542,11 @@ void KMMainWidget::updateCustomTemplateMenus() CTemplates t( *it ); mCustomTemplates.append( *it ); - KAction *action; + TDEAction *action; switch ( t.type() ) { case CustomTemplates::TReply: - action = new KAction( (*it).replace( "&", "&&" ), - KShortcut( t.shortcut() ), + action = new TDEAction( (*it).replace( "&", "&&" ), + TDEShortcut( t.shortcut() ), mCustomReplyMapper, TQT_SLOT( map() ), actionCollection(), @@ -2557,8 +2557,8 @@ void KMMainWidget::updateCustomTemplateMenus() ++replyc; break; case CustomTemplates::TReplyAll: - action = new KAction( (*it).replace( "&", "&&" ), - KShortcut( t.shortcut() ), + action = new TDEAction( (*it).replace( "&", "&&" ), + TDEShortcut( t.shortcut() ), mCustomReplyAllMapper, TQT_SLOT( map() ), actionCollection(), @@ -2569,8 +2569,8 @@ void KMMainWidget::updateCustomTemplateMenus() ++replyallc; break; case CustomTemplates::TForward: - action = new KAction( (*it).replace( "&", "&&" ), - KShortcut( t.shortcut() ), + action = new TDEAction( (*it).replace( "&", "&&" ), + TDEShortcut( t.shortcut() ), mCustomForwardMapper, TQT_SLOT( map() ), actionCollection(), @@ -2581,8 +2581,8 @@ void KMMainWidget::updateCustomTemplateMenus() ++forwardc; break; case CustomTemplates::TUniversal: - action = new KAction( (*it).replace( "&", "&&" ), - KShortcut::null(), + action = new TDEAction( (*it).replace( "&", "&&" ), + TDEShortcut::null(), mCustomReplyMapper, TQT_SLOT( map() ), actionCollection(), @@ -2591,8 +2591,8 @@ void KMMainWidget::updateCustomTemplateMenus() mCustomReplyActionMenu->insert( action, idx ); mCustomTemplateActions.append( action ); ++replyc; - action = new KAction( (*it).replace( "&", "&&" ), - KShortcut::null(), + action = new TDEAction( (*it).replace( "&", "&&" ), + TDEShortcut::null(), mCustomReplyAllMapper, TQT_SLOT( map() ), actionCollection(), @@ -2601,8 +2601,8 @@ void KMMainWidget::updateCustomTemplateMenus() mCustomReplyAllActionMenu->insert( action, idx ); mCustomTemplateActions.append( action ); ++replyallc; - action = new KAction( (*it).replace( "&", "&&" ), - KShortcut::null(), + action = new TDEAction( (*it).replace( "&", "&&" ), + TDEShortcut::null(), mCustomForwardMapper, TQT_SLOT( map() ), actionCollection(), @@ -2642,41 +2642,41 @@ void KMMainWidget::setupActions() mMsgActions->setMessageView( mMsgView ); //----- File Menu - mSaveAsAction = new KAction( i18n("Save &As..."), "filesave", - KStdAccel::shortcut(KStdAccel::Save), + mSaveAsAction = new TDEAction( i18n("Save &As..."), "filesave", + TDEStdAccel::shortcut(TDEStdAccel::Save), TQT_TQOBJECT(this), TQT_SLOT(slotSaveMsg()), actionCollection(), "file_save_as" ); mOpenAction = KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( slotOpenMsg() ), actionCollection() ); - (void) new KAction( i18n("&Compact All Folders"), 0, + (void) new TDEAction( i18n("&Compact All Folders"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCompactAll()), actionCollection(), "compact_all_folders" ); - (void) new KAction( i18n("&Expire All Folders"), 0, + (void) new TDEAction( i18n("&Expire All Folders"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotExpireAll()), actionCollection(), "expire_all_folders" ); - (void) new KAction( i18n("&Refresh Local IMAP Cache"), "refresh", + (void) new TDEAction( i18n("&Refresh Local IMAP Cache"), "refresh", TQT_TQOBJECT(this), TQT_SLOT(slotInvalidateIMAPFolders()), actionCollection(), "file_invalidate_imap_cache" ); - (void) new KAction( i18n("Empty All &Trash Folders"), 0, + (void) new TDEAction( i18n("Empty All &Trash Folders"), 0, KMKernel::self(), TQT_SLOT(slotEmptyTrash()), actionCollection(), "empty_trash" ); - (void) new KAction( 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()), actionCollection(), "check_mail" ); - mFavoritesCheckMailAction = new KAction( i18n("Check Mail in Favorite Folders"), + mFavoritesCheckMailAction = new TDEAction( i18n("Check Mail in Favorite Folders"), "mail_get", CTRL+SHIFT+Key_L, 0, 0, actionCollection(), "favorite_check_mail" ); if ( mFavoriteFolderView ) connect( mFavoritesCheckMailAction, TQT_SIGNAL(activated()), mFavoriteFolderView, TQT_SLOT(checkMail()) ); - KActionMenu *actActionMenu = new - KActionMenu( i18n("Check Mail &In"), "mail_get", actionCollection(), + TDEActionMenu *actActionMenu = new + TDEActionMenu( i18n("Check Mail &In"), "mail_get", actionCollection(), "check_mail_in" ); actActionMenu->setDelayed(true); //needed for checking "all accounts" @@ -2686,14 +2686,14 @@ void KMMainWidget::setupActions() connect(mActMenu,TQT_SIGNAL(activated(int)),this,TQT_SLOT(slotCheckOneAccount(int))); connect(mActMenu,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(getAccountMenu())); - (void) new KAction( i18n("&Send Queued Messages"), "mail_send", 0, TQT_TQOBJECT(this), + (void) new TDEAction( i18n("&Send Queued Messages"), "mail_send", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSendQueued()), actionCollection(), "send_queued"); - (void) new KAction( i18n("Online Status (unknown)"), "online_status", 0, TQT_TQOBJECT(this), + (void) new TDEAction( i18n("Online Status (unknown)"), "online_status", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOnlineStatus()), actionCollection(), "online_status"); - KActionMenu *sendActionMenu = new - KActionMenu( i18n("Send Queued Messages Via"), "mail_send_via", actionCollection(), + TDEActionMenu *sendActionMenu = new + TDEActionMenu( i18n("Send Queued Messages Via"), "mail_send_via", actionCollection(), "send_queued_via" ); sendActionMenu->setDelayed(true); @@ -2701,153 +2701,153 @@ void KMMainWidget::setupActions() connect(mSendMenu,TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSendQueuedVia(int))); connect(mSendMenu,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(getTransportMenu())); - KAction *act; + TDEAction *act; //----- Tools menu if (parent()->inherits("KMMainWin")) { - act = new KAction( i18n("&Address Book..."), "contents", 0, TQT_TQOBJECT(this), + act = new TDEAction( i18n("&Address Book..."), "contents", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddrBook()), actionCollection(), "addressbook" ); if (TDEStandardDirs::findExe("kaddressbook").isEmpty()) act->setEnabled(false); } - act = new KAction( i18n("Certificate Manager..."), "pgp-keys", 0, TQT_TQOBJECT(this), + act = new TDEAction( i18n("Certificate Manager..."), "pgp-keys", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStartCertManager()), actionCollection(), "tools_start_certman"); // disable action if no certman binary is around if (TDEStandardDirs::findExe("kleopatra").isEmpty()) act->setEnabled(false); - act = new KAction( i18n("GnuPG Log Viewer..."), "pgp-keys", 0, TQT_TQOBJECT(this), + act = new TDEAction( i18n("GnuPG Log Viewer..."), "pgp-keys", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStartWatchGnuPG()), actionCollection(), "tools_start_kwatchgnupg"); // disable action if no kwatchgnupg binary is around if (TDEStandardDirs::findExe("kwatchgnupg").isEmpty()) act->setEnabled(false); - act = new KAction( i18n("&Import Messages..."), "fileopen", 0, TQT_TQOBJECT(this), + act = new TDEAction( i18n("&Import Messages..."), "fileopen", 0, TQT_TQOBJECT(this), TQT_SLOT(slotImport()), actionCollection(), "import" ); if (TDEStandardDirs::findExe("kmailcvt").isEmpty()) act->setEnabled(false); #if !defined(NDEBUG) - (void) new KAction( i18n("&Debug Sieve..."), + (void) new TDEAction( i18n("&Debug Sieve..."), "idea", 0, TQT_TQOBJECT(this), TQT_SLOT(slotDebugSieve()), actionCollection(), "tools_debug_sieve" ); #endif if ( GlobalSettings::allowOutOfOfficeSettings() ) { - (void) new KAction( i18n("Edit \"Out of Office\" Replies..."), + (void) new TDEAction( i18n("Edit \"Out of Office\" Replies..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditVacation()), actionCollection(), "tools_edit_vacation" ); } - (void) new KAction( i18n("Filter &Log Viewer..."), 0, TQT_TQOBJECT(this), + (void) new TDEAction( i18n("Filter &Log Viewer..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFilterLogViewer()), actionCollection(), "filter_log_viewer" ); - (void) new KAction( i18n("&Anti-Spam Wizard..."), 0, TQT_TQOBJECT(this), + (void) new TDEAction( i18n("&Anti-Spam Wizard..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAntiSpamWizard()), actionCollection(), "antiSpamWizard" ); - (void) new KAction( i18n("&Anti-Virus Wizard..."), 0, TQT_TQOBJECT(this), + (void) new TDEAction( i18n("&Anti-Virus Wizard..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAntiVirusWizard()), actionCollection(), "antiVirusWizard" ); //----- Edit Menu - mTrashAction = new KAction( KGuiItem( i18n("&Move to Trash"), "edittrash", + mTrashAction = new TDEAction( KGuiItem( i18n("&Move to Trash"), "edittrash", i18n("Move message to trashcan") ), Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotTrashMsg()), actionCollection(), "move_to_trash" ); /* The delete action is nowhere in the gui, by default, so we need to make - * sure it is plugged into the KAccel 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 * as a part, though. */ - mDeleteAction = new KAction( i18n("&Delete"), "editdelete", SHIFT+Key_Delete, TQT_TQOBJECT(this), + mDeleteAction = new TDEAction( i18n("&Delete"), "editdelete", SHIFT+Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotDeleteMsg()), actionCollection(), "delete" ); mDeleteAction->plugAccel( actionCollection()->kaccel() ); - mTrashThreadAction = new KAction( KGuiItem( i18n("M&ove Thread to Trash"), "edittrash", + mTrashThreadAction = new TDEAction( KGuiItem( i18n("M&ove Thread to Trash"), "edittrash", i18n("Move thread to trashcan") ), CTRL+Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotTrashThread()), actionCollection(), "move_thread_to_trash" ); - mDeleteThreadAction = new KAction( i18n("Delete T&hread"), "editdelete", CTRL+SHIFT+Key_Delete, TQT_TQOBJECT(this), + mDeleteThreadAction = new TDEAction( i18n("Delete T&hread"), "editdelete", CTRL+SHIFT+Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotDeleteThread()), actionCollection(), "delete_thread" ); - (void) new KAction( i18n("&Find Messages..."), "mail_find", Key_S, TQT_TQOBJECT(this), + (void) new TDEAction( i18n("&Find Messages..."), "mail_find", Key_S, TQT_TQOBJECT(this), TQT_SLOT(slotRequestFullSearchFromQuickSearch()), actionCollection(), "search_messages" ); - mFindInMessageAction = new KAction( i18n("&Find in Message..."), "find", KStdAccel::shortcut(KStdAccel::Find), TQT_TQOBJECT(this), + mFindInMessageAction = new TDEAction( i18n("&Find in Message..."), "find", TDEStdAccel::shortcut(TDEStdAccel::Find), TQT_TQOBJECT(this), TQT_SLOT(slotFind()), actionCollection(), "find_in_messages" ); - (void) new KAction( i18n("Select &All Messages"), KStdAccel::selectAll(), TQT_TQOBJECT(this), + (void) new TDEAction( i18n("Select &All Messages"), TDEStdAccel::selectAll(), TQT_TQOBJECT(this), TQT_SLOT(slotMarkAll()), actionCollection(), "mark_all_messages" ); //----- Folder Menu - mNewFolderAction = new KAction( i18n("&New Folder..."), "folder_new", 0, TQT_TQOBJECT(mFolderTree), + mNewFolderAction = new TDEAction( i18n("&New Folder..."), "folder_new", 0, TQT_TQOBJECT(mFolderTree), TQT_SLOT(addChildFolder()), actionCollection(), "new_folder" ); - mModifyFolderAction = new KAction( i18n("&Properties"), "configure", 0, TQT_TQOBJECT(this), + mModifyFolderAction = new TDEAction( i18n("&Properties"), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(slotModifyFolder()), actionCollection(), "modify" ); - mFolderMailingListPropertiesAction = new KAction( i18n("&Mailing List Management..."), + mFolderMailingListPropertiesAction = new TDEAction( i18n("&Mailing List Management..."), /*"folder_mailinglist_properties",*/ 0, TQT_TQOBJECT(this), TQT_SLOT( slotFolderMailingListProperties() ), actionCollection(), "folder_mailinglist_properties" ); - mFolderShortCutCommandAction = new KAction( i18n("&Assign Shortcut..."), "configure_shortcuts", + mFolderShortCutCommandAction = new TDEAction( i18n("&Assign Shortcut..."), "configure_shortcuts", 0, TQT_TQOBJECT(this), TQT_SLOT( slotFolderShortcutCommand() ), actionCollection(), "folder_shortcut_command" ); - mMarkAllAsReadAction = new KAction( i18n("Mark All Messages as &Read"), "goto", 0, TQT_TQOBJECT(this), + mMarkAllAsReadAction = new TDEAction( i18n("Mark All Messages as &Read"), "goto", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMarkAllAsRead()), actionCollection(), "mark_all_as_read" ); - mExpireFolderAction = new KAction(i18n("&Expiration Settings"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotExpireFolder()), + mExpireFolderAction = new TDEAction(i18n("&Expiration Settings"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotExpireFolder()), actionCollection(), "expire"); - mCompactFolderAction = new KAction( i18n("&Compact Folder"), 0, TQT_TQOBJECT(this), + mCompactFolderAction = new TDEAction( i18n("&Compact Folder"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCompactFolder()), actionCollection(), "compact" ); - mRefreshFolderAction = new KAction( i18n("Check Mail &in This Folder"), "reload", - KStdAccel::shortcut( KStdAccel::Reload ), TQT_TQOBJECT(this), + mRefreshFolderAction = new TDEAction( i18n("Check Mail &in This Folder"), "reload", + TDEStdAccel::shortcut( TDEStdAccel::Reload ), TQT_TQOBJECT(this), TQT_SLOT(slotRefreshFolder()), actionCollection(), "refresh_folder" ); mTroubleshootFolderAction = 0; // set in initializeIMAPActions - mEmptyFolderAction = new KAction( "foo" /*set in updateFolderMenu*/, "edittrash", 0, TQT_TQOBJECT(this), + mEmptyFolderAction = new TDEAction( "foo" /*set in updateFolderMenu*/, "edittrash", 0, TQT_TQOBJECT(this), TQT_SLOT(slotEmptyFolder()), actionCollection(), "empty" ); - mRemoveFolderAction = new KAction( "foo" /*set in updateFolderMenu*/, "editdelete", 0, TQT_TQOBJECT(this), + mRemoveFolderAction = new TDEAction( "foo" /*set in updateFolderMenu*/, "editdelete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveFolder()), actionCollection(), "delete_folder" ); - mArchiveFolderAction = new KAction( i18n( "&Archive Folder..." ), "filesave", 0, TQT_TQOBJECT(this), + mArchiveFolderAction = new TDEAction( i18n( "&Archive Folder..." ), "filesave", 0, TQT_TQOBJECT(this), TQT_SLOT( slotArchiveFolder() ), actionCollection(), "archive_folder" ); - mPreferHtmlAction = new KToggleAction( i18n("Prefer &HTML to Plain Text"), 0, TQT_TQOBJECT(this), + mPreferHtmlAction = new TDEToggleAction( i18n("Prefer &HTML to Plain Text"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotOverrideHtml()), actionCollection(), "prefer_html" ); - mPreferHtmlLoadExtAction = new KToggleAction( i18n("Load E&xternal References"), 0, TQT_TQOBJECT(this), + mPreferHtmlLoadExtAction = new TDEToggleAction( i18n("Load E&xternal References"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotOverrideHtmlLoadExt()), actionCollection(), "prefer_html_external_refs" ); - mThreadMessagesAction = new KToggleAction( i18n("&Thread Messages"), 0, TQT_TQOBJECT(this), + mThreadMessagesAction = new TDEToggleAction( i18n("&Thread Messages"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotOverrideThread()), actionCollection(), "thread_messages" ); - mThreadBySubjectAction = new KToggleAction( i18n("Thread Messages also by &Subject"), 0, TQT_TQOBJECT(this), + mThreadBySubjectAction = new TDEToggleAction( i18n("Thread Messages also by &Subject"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleSubjectThreading()), actionCollection(), "thread_messages_by_subject" ); - new KAction( i18n("Copy Folder"), "editcopy", SHIFT+CTRL+Key_C, TQT_TQOBJECT(folderTree()), + new TDEAction( i18n("Copy Folder"), "editcopy", SHIFT+CTRL+Key_C, TQT_TQOBJECT(folderTree()), TQT_SLOT(copyFolder()), actionCollection(), "copy_folder" ); - new KAction( i18n("Cut Folder"), "editcut", SHIFT+CTRL+Key_X, TQT_TQOBJECT(folderTree()), + new TDEAction( i18n("Cut Folder"), "editcut", SHIFT+CTRL+Key_X, TQT_TQOBJECT(folderTree()), TQT_SLOT(cutFolder()), actionCollection(), "cut_folder" ); - new KAction( i18n("Paste Folder"), "editpaste", SHIFT+CTRL+Key_V, TQT_TQOBJECT(folderTree()), + new TDEAction( i18n("Paste Folder"), "editpaste", SHIFT+CTRL+Key_V, TQT_TQOBJECT(folderTree()), TQT_SLOT(pasteFolder()), actionCollection(), "paste_folder" ); - new KAction( i18n("Copy Messages"), "editcopy", ALT+CTRL+Key_C, TQT_TQOBJECT(headers()), + new TDEAction( i18n("Copy Messages"), "editcopy", ALT+CTRL+Key_C, TQT_TQOBJECT(headers()), TQT_SLOT(copyMessages()), actionCollection(), "copy_messages" ); - new KAction( i18n("Cut Messages"), "editcut", ALT+CTRL+Key_X, TQT_TQOBJECT(headers()), + new TDEAction( i18n("Cut Messages"), "editcut", ALT+CTRL+Key_X, TQT_TQOBJECT(headers()), TQT_SLOT(cutMessages()), actionCollection(), "cut_messages" ); - new KAction( i18n("Paste Messages"), "editpaste", ALT+CTRL+Key_V, TQT_TQOBJECT(headers()), + new TDEAction( i18n("Paste Messages"), "editpaste", ALT+CTRL+Key_V, TQT_TQOBJECT(headers()), TQT_SLOT(pasteMessages()), actionCollection(), "paste_messages" ); //----- Message Menu - (void) new KAction( i18n("&New Message..."), "mail_new", KStdAccel::shortcut(KStdAccel::New), TQT_TQOBJECT(this), + (void) new TDEAction( i18n("&New Message..."), "mail_new", TDEStdAccel::shortcut(TDEStdAccel::New), TQT_TQOBJECT(this), TQT_SLOT(slotCompose()), actionCollection(), "new_message" ); mTemplateMenu = - new KActionMenu( i18n("New Message From &Template"), "filenew", + new TDEActionMenu( i18n("New Message From &Template"), "filenew", actionCollection(), "new_from_template" ); mTemplateMenu->setDelayed( true ); connect( mTemplateMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_TQOBJECT(this), @@ -2855,34 +2855,34 @@ void KMMainWidget::setupActions() connect( mTemplateMenu->popupMenu(), TQT_SIGNAL( activated(int) ), TQT_TQOBJECT(this), TQT_SLOT( slotNewFromTemplate(int) ) ); - KAction* newToML = new KAction( 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), TQT_SLOT(slotPostToML()), actionCollection(), "post_message" ); newToML->plugAccel( actionCollection()->kaccel() ); - mForwardActionMenu = new KActionMenu( i18n("Message->","&Forward"), + mForwardActionMenu = new TDEActionMenu( i18n("Message->","&Forward"), "mail_forward", actionCollection(), "message_forward" ); - mForwardInlineAction = new KAction( i18n("&Inline..."), + mForwardInlineAction = new TDEAction( i18n("&Inline..."), "mail_forward", 0, TQT_TQOBJECT(this), TQT_SLOT(slotForwardInlineMsg()), actionCollection(), "message_forward_inline" ); - mForwardAttachedAction = new KAction( i18n("Message->Forward->","As &Attachment..."), + mForwardAttachedAction = new TDEAction( i18n("Message->Forward->","As &Attachment..."), "mail_forward", 0, TQT_TQOBJECT(this), TQT_SLOT(slotForwardAttachedMsg()), actionCollection(), "message_forward_as_attachment" ); - mForwardDigestAction = new KAction( i18n("Message->Forward->","As Di&gest..."), + mForwardDigestAction = new TDEAction( i18n("Message->Forward->","As Di&gest..."), "mail_forward", 0, TQT_TQOBJECT(this), TQT_SLOT(slotForwardDigestMsg()), actionCollection(), "message_forward_as_digest" ); - mRedirectAction = new KAction( i18n("Message->Forward->","&Redirect..."), + mRedirectAction = new TDEAction( i18n("Message->Forward->","&Redirect..."), "mail_forward", Key_E, TQT_TQOBJECT(this), TQT_SLOT(slotRedirectMsg()), actionCollection(), @@ -2894,222 +2894,222 @@ void KMMainWidget::setupActions() mForwardActionMenu->insert( mForwardDigestAction ); mForwardActionMenu->insert( mRedirectAction ); - mSendAgainAction = new KAction( i18n("Send A&gain..."), 0, TQT_TQOBJECT(this), + mSendAgainAction = new TDEAction( i18n("Send A&gain..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotResendMsg()), actionCollection(), "send_again" ); //----- Create filter actions - mFilterMenu = new KActionMenu( 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), TQT_SLOT(slotFilter()) ); - mSubjectFilterAction = new KAction( i18n("Filter on &Subject..."), 0, TQT_TQOBJECT(this), + mSubjectFilterAction = new TDEAction( i18n("Filter on &Subject..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSubjectFilter()), actionCollection(), "subject_filter"); mFilterMenu->insert( mSubjectFilterAction ); - mFromFilterAction = new KAction( i18n("Filter on &From..."), 0, TQT_TQOBJECT(this), + mFromFilterAction = new TDEAction( i18n("Filter on &From..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFromFilter()), actionCollection(), "from_filter"); mFilterMenu->insert( mFromFilterAction ); - mToFilterAction = new KAction( i18n("Filter on &To..."), 0, TQT_TQOBJECT(this), + mToFilterAction = new TDEAction( i18n("Filter on &To..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToFilter()), actionCollection(), "to_filter"); mFilterMenu->insert( mToFilterAction ); - mListFilterAction = new KAction( i18n("Filter on Mailing-&List..."), 0, TQT_TQOBJECT(this), + mListFilterAction = new TDEAction( i18n("Filter on Mailing-&List..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotMailingListFilter()), actionCollection(), "mlist_filter"); mFilterMenu->insert( mListFilterAction ); mPrintAction = KStdAction::print (TQT_TQOBJECT(this), TQT_SLOT(slotPrintMsg()), actionCollection()); - mUseAction = new KAction( i18n("New Message From &Template"), "filenew", + mUseAction = new TDEAction( i18n("New Message From &Template"), "filenew", Key_N, TQT_TQOBJECT(this), TQT_SLOT( slotUseTemplate() ), actionCollection(), "use_template" ); mUseAction->plugAccel( actionCollection()->kaccel() ); //----- "Mark Thread" submenu - mThreadStatusMenu = new KActionMenu ( i18n( "Mark &Thread" ), + mThreadStatusMenu = new TDEActionMenu ( i18n( "Mark &Thread" ), actionCollection(), "thread_status" ); - mMarkThreadAsReadAction = new KAction(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")), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusRead()), actionCollection(), "thread_read"); mThreadStatusMenu->insert( mMarkThreadAsReadAction ); - mMarkThreadAsNewAction = new KAction(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")), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusNew()), actionCollection(), "thread_new"); mThreadStatusMenu->insert( mMarkThreadAsNewAction ); - mMarkThreadAsUnreadAction = new KAction(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")), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusUnread()), actionCollection(), "thread_unread"); mThreadStatusMenu->insert( mMarkThreadAsUnreadAction ); - mThreadStatusMenu->insert( new KActionSeparator( TQT_TQOBJECT(this) ) ); + mThreadStatusMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) ); //----- "Mark Thread" toggle actions - mToggleThreadFlagAction = new KToggleAction(i18n("Mark Thread as &Important"), "mail_flag", + mToggleThreadFlagAction = new TDEToggleAction(i18n("Mark Thread as &Important"), "mail_flag", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusFlag()), actionCollection(), "thread_flag"); mToggleThreadFlagAction->setCheckedState( i18n("Remove &Important Thread Mark") ); mThreadStatusMenu->insert( mToggleThreadFlagAction ); - mToggleThreadTodoAction = new KToggleAction(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()), actionCollection(), "thread_todo"); mToggleThreadTodoAction->setCheckedState( i18n("Remove &Action Item Thread Mark") ); mThreadStatusMenu->insert( mToggleThreadTodoAction ); //------- "Watch and ignore thread" actions - mWatchThreadAction = new KToggleAction(i18n("&Watch Thread"), "kmmsgwatched", + mWatchThreadAction = new TDEToggleAction(i18n("&Watch Thread"), "kmmsgwatched", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusWatched()), actionCollection(), "thread_watched"); - mIgnoreThreadAction = new KToggleAction(i18n("&Ignore Thread"), "mail_ignore", + mIgnoreThreadAction = new TDEToggleAction(i18n("&Ignore Thread"), "mail_ignore", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetThreadStatusIgnored()), actionCollection(), "thread_ignored"); - mThreadStatusMenu->insert( new KActionSeparator( TQT_TQOBJECT(this) ) ); + mThreadStatusMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) ); mThreadStatusMenu->insert( mWatchThreadAction ); mThreadStatusMenu->insert( mIgnoreThreadAction ); - mSaveAttachmentsAction = new KAction( i18n("Save A&ttachments..."), "attach", + mSaveAttachmentsAction = new TDEAction( i18n("Save A&ttachments..."), "attach", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveAttachments()), actionCollection(), "file_save_attachments" ); - mMoveActionMenu = new KActionMenu( i18n("&Move To" ), + mMoveActionMenu = new TDEActionMenu( i18n("&Move To" ), actionCollection(), "move_to" ); - mCopyActionMenu = new KActionMenu( i18n("&Copy To" ), + mCopyActionMenu = new TDEActionMenu( i18n("&Copy To" ), actionCollection(), "copy_to" ); - mApplyAllFiltersAction = new KAction( i18n("Appl&y All Filters"), "filter", + mApplyAllFiltersAction = new TDEAction( i18n("Appl&y All Filters"), "filter", CTRL+Key_J, TQT_TQOBJECT(this), TQT_SLOT(slotApplyFilters()), actionCollection(), "apply_filters" ); - mApplyFilterActionsMenu = new KActionMenu( i18n("A&pply Filter" ), + mApplyFilterActionsMenu = new TDEActionMenu( i18n("A&pply Filter" ), actionCollection(), "apply_filter_actions" ); //----- View Menu // Unread Submenu - KActionMenu * unreadMenu = - new KActionMenu( i18n("View->", "&Unread Count"), + TDEActionMenu * unreadMenu = + new TDEActionMenu( i18n("View->", "&Unread Count"), actionCollection(), "view_unread" ); unreadMenu->setToolTip( i18n("Choose how to display the count of unread messages") ); - mUnreadColumnToggle = new KRadioAction( i18n("View->Unread Count", "View in &Separate Column"), 0, TQT_TQOBJECT(this), + mUnreadColumnToggle = new TDERadioAction( i18n("View->Unread Count", "View in &Separate Column"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleUnread()), actionCollection(), "view_unread_column" ); mUnreadColumnToggle->setExclusiveGroup( "view_unread_group" ); unreadMenu->insert( mUnreadColumnToggle ); - mUnreadTextToggle = new KRadioAction( i18n("View->Unread Count", "View After &Folder Name"), 0, TQT_TQOBJECT(this), + mUnreadTextToggle = new TDERadioAction( i18n("View->Unread Count", "View After &Folder Name"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleUnread()), actionCollection(), "view_unread_text" ); mUnreadTextToggle->setExclusiveGroup( "view_unread_group" ); unreadMenu->insert( mUnreadTextToggle ); // toggle for total column - mTotalColumnToggle = new KToggleAction( i18n("View->", "&Total Column"), 0, TQT_TQOBJECT(this), + mTotalColumnToggle = new TDEToggleAction( i18n("View->", "&Total Column"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleTotalColumn()), actionCollection(), "view_columns_total" ); mTotalColumnToggle->setToolTip( i18n("Toggle display of column showing the " "total number of messages in folders.") ); - mSizeColumnToggle = new KToggleAction( i18n("View->", "&Size Column"), 0, TQT_TQOBJECT(this), + mSizeColumnToggle = new TDEToggleAction( i18n("View->", "&Size Column"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleSizeColumn()), actionCollection(), "view_columns_size" ); mSizeColumnToggle->setToolTip( i18n("Toggle display of column showing the " "total size of messages in folders.") ); - (void)new KAction( KGuiItem( i18n("View->","&Expand Thread"), TQString(), + (void)new TDEAction( KGuiItem( i18n("View->","&Expand Thread"), TQString(), i18n("Expand the current thread") ), Key_Period, TQT_TQOBJECT(this), TQT_SLOT(slotExpandThread()), actionCollection(), "expand_thread" ); - (void)new KAction( KGuiItem( i18n("View->","&Collapse Thread"), TQString(), + (void)new TDEAction( KGuiItem( i18n("View->","&Collapse Thread"), TQString(), i18n("Collapse the current thread") ), Key_Comma, TQT_TQOBJECT(this), TQT_SLOT(slotCollapseThread()), actionCollection(), "collapse_thread" ); - (void)new KAction( 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") ), CTRL+Key_Period, TQT_TQOBJECT(this), TQT_SLOT(slotExpandAllThreads()), actionCollection(), "expand_all_threads" ); - (void)new KAction( 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") ), CTRL+Key_Comma, TQT_TQOBJECT(this), TQT_SLOT(slotCollapseAllThreads()), actionCollection(), "collapse_all_threads" ); - mViewSourceAction = new KAction( i18n("&View Source"), Key_V, TQT_TQOBJECT(this), + mViewSourceAction = new TDEAction( i18n("&View Source"), Key_V, TQT_TQOBJECT(this), TQT_SLOT(slotShowMsgSrc()), actionCollection(), "view_source" ); - KAction* dukeOfMonmoth = new KAction( i18n("&Display Message"), Key_Return, TQT_TQOBJECT(this), + TDEAction* dukeOfMonmoth = new TDEAction( i18n("&Display Message"), Key_Return, TQT_TQOBJECT(this), TQT_SLOT( slotDisplayCurrentMessage() ), actionCollection(), "display_message" ); dukeOfMonmoth->plugAccel( actionCollection()->kaccel() ); //----- Go Menu - new KAction( KGuiItem( i18n("&Next Message"), TQString(), + new TDEAction( KGuiItem( i18n("&Next Message"), TQString(), i18n("Go to the next message") ), "N;Right", TQT_TQOBJECT(this), TQT_SLOT(slotNextMessage()), actionCollection(), "go_next_message" ); - new KAction( KGuiItem( i18n("Next &Unread Message"), + new TDEAction( KGuiItem( i18n("Next &Unread Message"), TQApplication::reverseLayout() ? "previous" : "next", i18n("Go to the next unread message") ), Key_Plus, TQT_TQOBJECT(this), TQT_SLOT(slotNextUnreadMessage()), actionCollection(), "go_next_unread_message" ); /* ### needs better support from folders: - new KAction( KGuiItem( i18n("Next &Important Message"), TQString(), + new TDEAction( KGuiItem( i18n("Next &Important Message"), TQString(), i18n("Go to the next important message") ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotNextImportantMessage()), actionCollection(), "go_next_important_message" ); */ - new KAction( KGuiItem( i18n("&Previous Message"), TQString(), + new TDEAction( KGuiItem( i18n("&Previous Message"), TQString(), i18n("Go to the previous message") ), "P;Left", TQT_TQOBJECT(this), TQT_SLOT(slotPrevMessage()), actionCollection(), "go_prev_message" ); - new KAction( KGuiItem( i18n("Previous Unread &Message"), + new TDEAction( KGuiItem( i18n("Previous Unread &Message"), TQApplication::reverseLayout() ? "next" : "previous", i18n("Go to the previous unread message") ), Key_Minus, TQT_TQOBJECT(this), TQT_SLOT(slotPrevUnreadMessage()), actionCollection(), "go_prev_unread_message" ); /* needs better support from folders: - new KAction( KGuiItem( i18n("Previous I&mportant Message"), TQString(), + new TDEAction( KGuiItem( i18n("Previous I&mportant Message"), TQString(), i18n("Go to the previous important message") ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotPrevImportantMessage()), actionCollection(), "go_prev_important_message" ); */ - KAction *action = - new KAction( KGuiItem( i18n("Next Unread &Folder"), TQString(), + TDEAction *action = + new TDEAction( KGuiItem( i18n("Next Unread &Folder"), TQString(), i18n("Go to the next folder with unread messages") ), ALT+Key_Plus, TQT_TQOBJECT(this), TQT_SLOT(slotNextUnreadFolder()), actionCollection(), "go_next_unread_folder" ); - KShortcut shortcut = action->shortcut(); + TDEShortcut shortcut = action->shortcut(); shortcut.append( KKey( CTRL+Key_Plus ) ); action->setShortcut( shortcut ); action = - new KAction( 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") ), ALT+Key_Minus, TQT_TQOBJECT(this), TQT_SLOT(slotPrevUnreadFolder()), actionCollection(), "go_prev_unread_folder" ); @@ -3117,7 +3117,7 @@ void KMMainWidget::setupActions() shortcut.append( KKey( CTRL+Key_Minus ) ); action->setShortcut( shortcut ); - new KAction( KGuiItem( i18n("Go->","Next Unread &Text"), TQString(), + new TDEAction( KGuiItem( i18n("Go->","Next Unread &Text"), TQString(), i18n("Go to the next unread text"), i18n("Scroll down current message. " "If at end of current message, " @@ -3126,33 +3126,33 @@ void KMMainWidget::setupActions() actionCollection(), "go_next_unread_text" ); //----- Settings Menu - mToggleShowQuickSearchAction = new KToggleAction(i18n("Show Quick Search"), TQString(), + mToggleShowQuickSearchAction = new TDEToggleAction(i18n("Show Quick Search"), TQString(), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleShowQuickSearch()), actionCollection(), "show_quick_search"); mToggleShowQuickSearchAction->setChecked( GlobalSettings::self()->quickSearchActive() ); mToggleShowQuickSearchAction->setWhatsThis( i18n( GlobalSettings::self()->quickSearchActiveItem()->whatsThis().utf8() ) ); - (void) new KAction( i18n("Configure &Filters..."), 0, TQT_TQOBJECT(this), + (void) new TDEAction( i18n("Configure &Filters..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFilter()), actionCollection(), "filter" ); - (void) new KAction( i18n("Configure &POP Filters..."), 0, TQT_TQOBJECT(this), + (void) new TDEAction( i18n("Configure &POP Filters..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotPopFilter()), actionCollection(), "popFilter" ); - (void) new KAction( i18n("Manage &Sieve Scripts..."), 0, TQT_TQOBJECT(this), + (void) new TDEAction( i18n("Manage &Sieve Scripts..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotManageSieveScripts()), actionCollection(), "sieveFilters" ); - (void) new KAction( KGuiItem( i18n("KMail &Introduction"), 0, + (void) new TDEAction( KGuiItem( i18n("KMail &Introduction"), 0, i18n("Display KMail's Welcome Page") ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotIntro()), actionCollection(), "help_kmail_welcomepage" ); // ----- Standard Actions // KStdAction::configureNotifications(this, TQT_SLOT(slotEditNotifications()), actionCollection()); - (void) new KAction( i18n("Configure &Notifications..."), + (void) new TDEAction( i18n("Configure &Notifications..."), "knotify", 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditNotifications()), actionCollection(), "kmail_configure_notifications" ); // KStdAction::preferences(this, TQT_SLOT(slotSettings()), actionCollection()); - (void) new KAction( i18n("&Configure KMail..."), + (void) new TDEAction( i18n("&Configure KMail..."), "configure", 0, kmkernel, TQT_SLOT(slotShowConfigurationDialog()), actionCollection(), "kmail_configure_kmail" ); @@ -3174,7 +3174,7 @@ void KMMainWidget::setupActions() void KMMainWidget::setupForwardingActionsList() { - TQPtrList<KAction> mForwardActionList; + TQPtrList<TDEAction> mForwardActionList; if ( GlobalSettings::self()->forwardingInlineByDefault() ) { mGUIClient->unplugActionList( "forward_action_list" ); mForwardActionList.append( mForwardInlineAction ); @@ -3704,7 +3704,7 @@ void KMMainWidget::initializeFilterActions() { TQString filterName, normalizedName; KMMetaFilterActionCommand *filterCommand; - KAction *filterAction = 0; + TDEAction *filterAction = 0; clearFilterActions(); mApplyAllFiltersAction->plug(mApplyFilterActionsMenu->popupMenu()); @@ -3722,13 +3722,13 @@ void KMMainWidget::initializeFilterActions() TQString icon = (*it)->icon(); if ( icon.isEmpty() ) icon = "gear"; - filterAction = new KAction(as, icon, (*it)->shortcut(), filterCommand, + filterAction = new TDEAction(as, icon, (*it)->shortcut(), filterCommand, TQT_SLOT(start()), actionCollection(), normalizedName.local8Bit()); if(!addedSeparator) { mApplyFilterActionsMenu->popupMenu()->insertSeparator(); addedSeparator = !addedSeparator; - mFilterMenuActions.append( new KActionSeparator()); + mFilterMenuActions.append( new TDEActionSeparator()); } filterAction->plug( mApplyFilterActionsMenu->popupMenu() ); mFilterMenuActions.append(filterAction); @@ -3768,7 +3768,7 @@ void KMMainWidget::initializeIMAPActions( bool setState /* false the first time, factory->removeClient( mGUIClient ); if ( !mTroubleshootFolderAction ) { - mTroubleshootFolderAction = new KAction( i18n("&Troubleshoot IMAP Cache..."), "wizard", 0, + mTroubleshootFolderAction = new TDEAction( i18n("&Troubleshoot IMAP Cache..."), "wizard", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTroubleshootFolder()), actionCollection(), "troubleshoot_folder" ); if ( setState ) updateFolderMenu(); // set initial state of the action @@ -3781,10 +3781,10 @@ void KMMainWidget::initializeIMAPActions( bool setState /* false the first time, factory->addClient( mGUIClient ); } -bool KMMainWidget::shortcutIsValid( const KShortcut &sc ) const +bool KMMainWidget::shortcutIsValid( const TDEShortcut &sc ) const { - KActionPtrList actions = actionCollection()->actions(); - KActionPtrList::Iterator it( actions.begin() ); + TDEActionPtrList actions = actionCollection()->actions(); + TDEActionPtrList::Iterator it( actions.begin() ); for ( ; it != actions.end(); it++ ) { if ( (*it)->shortcut() == sc ) return false; } @@ -3804,8 +3804,8 @@ void KMMainWidget::slotShortcutChanged( KMFolder *folder ) TQString actionlabel = TQString( "FolderShortcut %1").arg( folder->prettyURL() ); TQString actionname = TQString( "FolderShortcut %1").arg( folder->idString() ); TQString normalizedName = actionname.replace(" ", "_"); - KAction* action = - new KAction(actionlabel, folder->shortcut(), c, TQT_SLOT(start()), + TDEAction* action = + new TDEAction(actionlabel, folder->shortcut(), c, TQT_SLOT(start()), actionCollection(), normalizedName.local8Bit()); action->setIcon( folder->unreadIconPath() ); c->setAction( action ); // will be deleted along with the command diff --git a/kmail/kmmainwidget.h b/kmail/kmmainwidget.h index 959d581dc..67290cf36 100644 --- a/kmail/kmmainwidget.h +++ b/kmail/kmmainwidget.h @@ -37,11 +37,11 @@ class TQVBoxLayout; class TQSplitter; class TQSignalMapper; -class KActionMenu; -class KActionCollection; +class TDEActionMenu; +class TDEActionCollection; class TDEConfig; -class KRadioAction; -class KToggleAction; +class TDERadioAction; +class TDEToggleAction; class KMenuBar; class KStatusBarLabel; @@ -87,7 +87,7 @@ class KDE_EXPORT KMMainWidget : public TQWidget public: KMMainWidget(TQWidget *parent, const char *name, KXMLGUIClient *aGUIClient, - KActionCollection *actionCollection, + TDEActionCollection *actionCollection, TDEConfig*config = KMKernel::config() ); virtual ~KMMainWidget(); void destruct(); @@ -114,40 +114,40 @@ public: static void cleanup(); - KAction *action( const char *name ) { return mActionCollection->action( name ); } - KActionMenu *customReplyAction() const { return mCustomReplyActionMenu; } - KActionMenu *customReplyAllAction() const { return mCustomReplyAllActionMenu; } - KActionMenu *forwardMenu() const { return mForwardActionMenu; } - KAction *forwardInlineAction() const { return mForwardInlineAction; } - KAction *forwardAttachedAction() const { return mForwardAttachedAction; } - KAction *forwardDigestAction() const { return mForwardDigestAction; } - KAction *redirectAction() const { return mRedirectAction; } - KActionMenu *customForwardAction() const { return mCustomForwardActionMenu; } - KActionMenu *filterMenu() const { return mFilterMenu; } - KAction *printAction() const { return mPrintAction; } - KAction *trashAction() const { return mTrashAction; } - KAction *deleteAction() const { return mDeleteAction; } - KAction *trashThreadAction() const { return mTrashThreadAction; } - KAction *deleteThreadAction() const { return mDeleteThreadAction; } - KAction *saveAsAction() const { return mSaveAsAction; } - KAction *editAction() const { return mMsgActions->editAction(); } - KAction *useAction() const { return mUseAction; } - KAction *sendAgainAction() const { return mSendAgainAction; } - KAction *applyAllFiltersAction() const { return mApplyAllFiltersAction; } - KAction *findInMessageAction() const { return mFindInMessageAction; } - KAction *saveAttachmentsAction() const { return mSaveAttachmentsAction; } - KAction *openAction() const { return mOpenAction; } - KAction *viewSourceAction() const { return mViewSourceAction; } + TDEAction *action( const char *name ) { return mActionCollection->action( name ); } + TDEActionMenu *customReplyAction() const { return mCustomReplyActionMenu; } + TDEActionMenu *customReplyAllAction() const { return mCustomReplyAllActionMenu; } + TDEActionMenu *forwardMenu() const { return mForwardActionMenu; } + TDEAction *forwardInlineAction() const { return mForwardInlineAction; } + TDEAction *forwardAttachedAction() const { return mForwardAttachedAction; } + TDEAction *forwardDigestAction() const { return mForwardDigestAction; } + TDEAction *redirectAction() const { return mRedirectAction; } + TDEActionMenu *customForwardAction() const { return mCustomForwardActionMenu; } + TDEActionMenu *filterMenu() const { return mFilterMenu; } + TDEAction *printAction() const { return mPrintAction; } + TDEAction *trashAction() const { return mTrashAction; } + TDEAction *deleteAction() const { return mDeleteAction; } + TDEAction *trashThreadAction() const { return mTrashThreadAction; } + TDEAction *deleteThreadAction() const { return mDeleteThreadAction; } + TDEAction *saveAsAction() const { return mSaveAsAction; } + TDEAction *editAction() const { return mMsgActions->editAction(); } + TDEAction *useAction() const { return mUseAction; } + TDEAction *sendAgainAction() const { return mSendAgainAction; } + TDEAction *applyAllFiltersAction() const { return mApplyAllFiltersAction; } + TDEAction *findInMessageAction() const { return mFindInMessageAction; } + TDEAction *saveAttachmentsAction() const { return mSaveAttachmentsAction; } + TDEAction *openAction() const { return mOpenAction; } + TDEAction *viewSourceAction() const { return mViewSourceAction; } KMail::MessageActions *messageActions() const { return mMsgActions; } - KActionMenu *statusMenu() const{ return mMsgActions->messageStatusMenu(); } - KActionMenu *threadStatusMenu() const { return mThreadStatusMenu; } - KActionMenu *moveActionMenu() const{ return mMoveActionMenu; } - KActionMenu *mopyActionMenu() const { return mCopyActionMenu; } - KActionMenu *applyFilterActionsMenu() const { return mApplyFilterActionsMenu; } + TDEActionMenu *statusMenu() const{ return mMsgActions->messageStatusMenu(); } + TDEActionMenu *threadStatusMenu() const { return mThreadStatusMenu; } + TDEActionMenu *moveActionMenu() const{ return mMoveActionMenu; } + TDEActionMenu *mopyActionMenu() const { return mCopyActionMenu; } + TDEActionMenu *applyFilterActionsMenu() const { return mApplyFilterActionsMenu; } - KToggleAction *watchThreadAction() const { return mWatchThreadAction; } - KToggleAction *ignoreThreadAction() const { return mIgnoreThreadAction; } + TDEToggleAction *watchThreadAction() const { return mWatchThreadAction; } + TDEToggleAction *ignoreThreadAction() const { return mIgnoreThreadAction; } KMHeaders *headers() const { return mHeaders; } void toggleSystemTray(); @@ -162,7 +162,7 @@ public: /** Checks a shortcut against the actioncollection and returns whether it * is already used and therefor not valid or not. */ - bool shortcutIsValid( const KShortcut& ) const; + bool shortcutIsValid( const TDEShortcut& ) const; void modifyFolder( KMFolderTreeItem* folderItem ); @@ -260,7 +260,7 @@ protected: void updateFileMenu(); void newFromTemplate( KMMessage *msg ); - KActionCollection * actionCollection() const { return mActionCollection; } + TDEActionCollection * actionCollection() const { return mActionCollection; } /** @return the correct config dialog depending on whether the parent of the mainWidget * is a KPart or a KMMainWindow. When dealing with geometries, use this pointer @@ -451,25 +451,25 @@ private slots: private: // Message actions - KAction *mTrashAction, *mDeleteAction, *mTrashThreadAction, + TDEAction *mTrashAction, *mDeleteAction, *mTrashThreadAction, *mDeleteThreadAction, *mSaveAsAction, *mUseAction, *mSendAgainAction, *mApplyAllFiltersAction, *mFindInMessageAction, *mSaveAttachmentsAction, *mOpenAction, *mViewSourceAction, *mFavoritesCheckMailAction, *mMoveMsgToFolderAction; // Composition actions - KAction *mPrintAction, + TDEAction *mPrintAction, *mForwardInlineAction, *mForwardAttachedAction, *mForwardDigestAction, *mRedirectAction; - KActionMenu *mForwardActionMenu; + TDEActionMenu *mForwardActionMenu; // Filter actions - KActionMenu *mFilterMenu; - KAction *mSubjectFilterAction, *mFromFilterAction, *mToFilterAction, + TDEActionMenu *mFilterMenu; + TDEAction *mSubjectFilterAction, *mFromFilterAction, *mToFilterAction, *mListFilterAction; - KActionMenu *mTemplateMenu; + TDEActionMenu *mTemplateMenu; // Custom template actions menu - KActionMenu *mCustomReplyActionMenu, + TDEActionMenu *mCustomReplyActionMenu, *mCustomReplyAllActionMenu, *mCustomForwardActionMenu; // Signal mappers for custom template actions @@ -477,23 +477,23 @@ private: *mCustomReplyAllMapper, *mCustomForwardMapper; - KActionMenu *mThreadStatusMenu, + TDEActionMenu *mThreadStatusMenu, *mMoveActionMenu, *mCopyActionMenu, *mApplyFilterActionsMenu; - KAction *mMarkThreadAsNewAction; - KAction *mMarkThreadAsReadAction; - KAction *mMarkThreadAsUnreadAction; - KToggleAction *mToggleThreadTodoAction; - KToggleAction *mToggleThreadFlagAction; + TDEAction *mMarkThreadAsNewAction; + TDEAction *mMarkThreadAsReadAction; + TDEAction *mMarkThreadAsUnreadAction; + TDEToggleAction *mToggleThreadTodoAction; + TDEToggleAction *mToggleThreadFlagAction; - KToggleAction *mWatchThreadAction, *mIgnoreThreadAction; + TDEToggleAction *mWatchThreadAction, *mIgnoreThreadAction; - /** we need to access those KToggleActions from the foldertree-popup */ - KRadioAction* mUnreadColumnToggle; - KRadioAction* mUnreadTextToggle; - KToggleAction* mTotalColumnToggle; - KToggleAction* mSizeColumnToggle; + /** we need to access those TDEToggleActions from the foldertree-popup */ + TDERadioAction* mUnreadColumnToggle; + TDERadioAction* mUnreadTextToggle; + TDEToggleAction* mTotalColumnToggle; + TDEToggleAction* mSizeColumnToggle; - KToggleAction *mToggleShowQuickSearchAction; + TDEToggleAction *mToggleShowQuickSearchAction; KMFolderTree *mFolderTree; KMail::FavoriteFolderView *mFavoriteFolderView; @@ -504,12 +504,12 @@ private: TQSplitter *mFolderViewSplitter; KMHeaders *mHeaders; TQVBox *mSearchAndHeaders; - KToolBar *mSearchToolBar; + TDEToolBar *mSearchToolBar; KMail::HeaderListQuickSearch *mQuickSearchLine; TQGuardedPtr<KMFolder> mFolder; KMFolder *mTemplateFolder; TQPopupMenu *mViewMenu, *mBodyPartsMenu; - KAction *mlistFilterAction; + TDEAction *mlistFilterAction; bool mIntegrated; bool mBeepOnNew; bool mConfirmEmpty; @@ -534,14 +534,14 @@ private: // TQPopupMenu *mMessageMenu; KMail::SearchWindow *mSearchWin; - KAction *mNewFolderAction, *mModifyFolderAction, *mRemoveFolderAction, *mExpireFolderAction, + TDEAction *mNewFolderAction, *mModifyFolderAction, *mRemoveFolderAction, *mExpireFolderAction, *mCompactFolderAction, *mRefreshFolderAction, *mEmptyFolderAction, *mMarkAllAsReadAction, *mFolderMailingListPropertiesAction, *mFolderShortCutCommandAction, *mTroubleshootFolderAction, *mRemoveDuplicatesAction, *mArchiveFolderAction; - KToggleAction *mPreferHtmlAction, *mPreferHtmlLoadExtAction, *mThreadMessagesAction; - KToggleAction *mThreadBySubjectAction; - KToggleAction *mFolderAction, *mHeaderAction, *mMimeAction; + TDEToggleAction *mPreferHtmlAction, *mPreferHtmlLoadExtAction, *mThreadMessagesAction; + TDEToggleAction *mThreadBySubjectAction; + TDEToggleAction *mFolderAction, *mHeaderAction, *mMimeAction; TQTimer *menutimer; TQTimer *mShowBusySplashTimer; @@ -550,18 +550,18 @@ private: #if !defined(NDEBUG) TQGuardedPtr<KMail::SieveDebugDialog> mSieveDebugDialog; #endif - KActionCollection *mActionCollection; - KActionSeparator *mToolbarActionSeparator; + TDEActionCollection *mActionCollection; + TDEActionSeparator *mToolbarActionSeparator; TQVBoxLayout *mTopLayout; bool mDestructed, mForceJumpToUnread, mShowingOfflineScreen; - TQPtrList<KAction> mFilterMenuActions; - TQPtrList<KAction> mFilterTBarActions; + TQPtrList<TDEAction> mFilterMenuActions; + TQPtrList<TDEAction> mFilterTBarActions; TQPtrList<KMMetaFilterActionCommand> mFilterCommands; TQDict<FolderShortcutCommand> mFolderShortcutCommands; TQGuardedPtr <KMail::FolderJob> mJob; TQValueVector<TQString> mCustomTemplates; - TQPtrList<KAction> mCustomTemplateActions; + TQPtrList<TDEAction> mCustomTemplateActions; KMSystemTray *mSystemTray; TDEConfig *mConfig; diff --git a/kmail/kmmainwin.cpp b/kmail/kmmainwin.cpp index ee7858017..9f6f497aa 100644 --- a/kmail/kmmainwin.cpp +++ b/kmail/kmmainwin.cpp @@ -26,7 +26,7 @@ #include "kmmainwin.moc" KMMainWin::KMMainWin(TQWidget *) - : KMainWindow( 0, "kmail-mainwindow#" ), + : TDEMainWindow( 0, "kmail-mainwindow#" ), mReallyClose( false ) { // Set this to be the group leader for all subdialogs - this means @@ -35,7 +35,7 @@ KMMainWin::KMMainWin(TQWidget *) kapp->ref(); - (void) new KAction( i18n("New &Window"), "window_new", 0, + (void) new TDEAction( i18n("New &Window"), "window_new", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewMailReader()), actionCollection(), "new_mail_client" ); @@ -91,7 +91,7 @@ KMMainWin::~KMMainWin() if ( !kmkernel->haveSystemTrayApplet() ) { // Check if this was the last KMMainWin int not_withdrawn = 0; - TQPtrListIterator<KMainWindow> it(*KMainWindow::memberList); + TQPtrListIterator<TDEMainWindow> it(*TDEMainWindow::memberList); for (it.toFirst(); it.current(); ++it){ if ( !it.current()->isHidden() && it.current()->isTopLevel() && diff --git a/kmail/kmmainwin.h b/kmail/kmmainwin.h index aa5452441..ae930b55f 100644 --- a/kmail/kmmainwin.h +++ b/kmail/kmmainwin.h @@ -32,7 +32,7 @@ namespace KPIM { using KPIM::StatusbarProgressWidget; using KPIM::ProgressDialog; -class KMMainWin : public KMainWindow +class KMMainWin : public TDEMainWindow { Q_OBJECT diff --git a/kmail/kmmimeparttree.cpp b/kmail/kmmimeparttree.cpp index 484568249..3b17b16dd 100644 --- a/kmail/kmmimeparttree.cpp +++ b/kmail/kmmimeparttree.cpp @@ -57,7 +57,7 @@ KMMimePartTree::KMMimePartTree( KMReaderWin* readerWin, TQWidget* parent, const char* name ) - : KListView( parent, name ), + : TDEListView( parent, name ), mReaderWin( readerWin ), mSizeColumn(0) { setStyleDependantFrameWidth(); @@ -228,7 +228,7 @@ void KMMimePartTree::setStyleDependantFrameWidth() void KMMimePartTree::styleChange( TQStyle& oldStyle ) { setStyleDependantFrameWidth(); - KListView::styleChange( oldStyle ); + TDEListView::styleChange( oldStyle ); } //----------------------------------------------------------------------------- diff --git a/kmail/kmmimeparttree.h b/kmail/kmmimeparttree.h index 606c515f6..182f2689a 100644 --- a/kmail/kmmimeparttree.h +++ b/kmail/kmmimeparttree.h @@ -44,7 +44,7 @@ class partNode; class KMReaderWin; class KMMimePartTreeItem; -class KMMimePartTree : public KListView +class KMMimePartTree : public TDEListView { Q_OBJECT diff --git a/kmail/kmpopfiltercnfrmdlg.cpp b/kmail/kmpopfiltercnfrmdlg.cpp index fa9faafb0..e07c77081 100644 --- a/kmail/kmpopfiltercnfrmdlg.cpp +++ b/kmail/kmpopfiltercnfrmdlg.cpp @@ -27,7 +27,7 @@ //////////////////////////////////////// /// view KMPopHeadersView::KMPopHeadersView(TQWidget *aParent, KMPopFilterCnfrmDlg *aDialog) - : KListView(aParent) + : TDEListView(aParent) { mDialog=aDialog; int mDownIndex=addColumn(TQIconSet(TQPixmap(mDown)), TQString(), 24); @@ -233,7 +233,7 @@ const char *KMPopHeadersView::mDel[19] = { ///////////////////////////////////////// ///////////////////////////////////////// KMPopHeadersViewItem::KMPopHeadersViewItem(KMPopHeadersView *aParent, KMPopFilterAction aAction) - : KListViewItem(aParent) + : TDEListViewItem(aParent) { mParent = aParent; mAction = NoAction; diff --git a/kmail/kmpopfiltercnfrmdlg.h b/kmail/kmpopfiltercnfrmdlg.h index 98a277e58..1bb3c9466 100644 --- a/kmail/kmpopfiltercnfrmdlg.h +++ b/kmail/kmpopfiltercnfrmdlg.h @@ -33,7 +33,7 @@ class KMPopFilterCnfrmDlg; /** * @author Heiko Hund */ -class KMPopHeadersView : public KListView +class KMPopHeadersView : public TDEListView { Q_OBJECT @@ -60,7 +60,7 @@ private: -class KMPopHeadersViewItem : public KListViewItem +class KMPopHeadersViewItem : public TDEListViewItem { public: KMPopHeadersViewItem(KMPopHeadersView *aParent, KMPopFilterAction aAction); diff --git a/kmail/kmreadermainwin.cpp b/kmail/kmreadermainwin.cpp index 92ab049ca..8cef9ce36 100644 --- a/kmail/kmreadermainwin.cpp +++ b/kmail/kmreadermainwin.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ // -// A toplevel KMainWindow derived class for displaying +// A toplevel TDEMainWindow derived class for displaying // single messages or single message parts. // // Could be extended to include support for normal main window @@ -109,7 +109,7 @@ void KMReaderMainWin::initKMReaderMainWin() { void KMReaderMainWin::setupForwardingActionsList() { - TQPtrList<KAction> mForwardActionList; + TQPtrList<TDEAction> mForwardActionList; if ( GlobalSettings::self()->forwardingInlineByDefault() ) { unplugActionList( "forward_action_list" ); mForwardActionList.append( mForwardInlineAction ); @@ -343,19 +343,19 @@ void KMReaderMainWin::setupAccel() //mOpenAction = KStdAction::open( this, TQT_SLOT( slotOpenMsg() ), // actionCollection() ); - //mSaveAsAction = new KAction( i18n("Save &As..."), "filesave", - // KStdAccel::shortcut( KStdAccel::Save ), + //mSaveAsAction = new TDEAction( i18n("Save &As..."), "filesave", + // TDEStdAccel::shortcut( TDEStdAccel::Save ), // this, TQT_SLOT( slotSaveMsg() ), // actionCollection(), "file_save_as" ); mSaveAsAction = KStdAction::saveAs( TQT_TQOBJECT(mReaderWin), TQT_SLOT( slotSaveMsg() ), actionCollection() ); - mSaveAsAction->setShortcut( KStdAccel::shortcut( KStdAccel::Save ) ); + mSaveAsAction->setShortcut( TDEStdAccel::shortcut( TDEStdAccel::Save ) ); mPrintAction = KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT( slotPrintMsg() ), actionCollection() ); - KAction *closeAction = KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() ); - KShortcut closeShortcut = closeAction->shortcut(); + TDEAction *closeAction = KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() ); + TDEShortcut closeShortcut = closeAction->shortcut(); closeShortcut.append( KKey(Key_Escape)); closeAction->setShortcut(closeShortcut); @@ -364,39 +364,39 @@ void KMReaderMainWin::setupAccel() KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( slotMarkAll() ), actionCollection() ); KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT(slotFind()), actionCollection() ); KStdAction::findNext( TQT_TQOBJECT(this), TQT_SLOT( slotFindNext() ), actionCollection() ); - mTrashAction = new KAction( KGuiItem( i18n( "&Move to Trash" ), "edittrash", + mTrashAction = new TDEAction( KGuiItem( i18n( "&Move to Trash" ), "edittrash", i18n( "Move message to trashcan" ) ), Key_Delete, TQT_TQOBJECT(this), TQT_SLOT( slotTrashMsg() ), actionCollection(), "move_to_trash" ); //----- View Menu - mViewSourceAction = new KAction( i18n("&View Source"), Key_V, TQT_TQOBJECT(this), + mViewSourceAction = new TDEAction( i18n("&View Source"), Key_V, TQT_TQOBJECT(this), TQT_SLOT(slotShowMsgSrc()), actionCollection(), "view_source" ); - mForwardActionMenu = new KActionMenu( i18n("Message->","&Forward"), + mForwardActionMenu = new TDEActionMenu( i18n("Message->","&Forward"), "mail_forward", actionCollection(), "message_forward" ); - mForwardInlineAction = new KAction( i18n("&Inline..."), + mForwardInlineAction = new TDEAction( i18n("&Inline..."), "mail_forward", SHIFT+Key_F, TQT_TQOBJECT(this), TQT_SLOT(slotForwardInlineMsg()), actionCollection(), "message_forward_inline" ); - mForwardAttachedAction = new KAction( i18n("Message->Forward->","As &Attachment..."), + mForwardAttachedAction = new TDEAction( i18n("Message->Forward->","As &Attachment..."), "mail_forward", Key_F, TQT_TQOBJECT(this), TQT_SLOT(slotForwardAttachedMsg()), actionCollection(), "message_forward_as_attachment" ); - mForwardDigestAction = new KAction( i18n("Message->Forward->","As Di&gest..."), + mForwardDigestAction = new TDEAction( i18n("Message->Forward->","As Di&gest..."), "mail_forward", 0, TQT_TQOBJECT(this), TQT_SLOT(slotForwardDigestMsg()), actionCollection(), "message_forward_as_digest" ); - mRedirectAction = new KAction( i18n("Message->Forward->","&Redirect..."), + mRedirectAction = new TDEAction( i18n("Message->Forward->","&Redirect..."), "mail_forward", Key_E, TQT_TQOBJECT(this), TQT_SLOT(slotRedirectMsg()), actionCollection(), @@ -407,12 +407,12 @@ void KMReaderMainWin::setupAccel() mForwardActionMenu->insert( mForwardDigestAction ); mForwardActionMenu->insert( mRedirectAction ); - fontAction = new KFontAction( "Select Font", 0, actionCollection(), + fontAction = new TDEFontAction( "Select Font", 0, actionCollection(), "text_font" ); fontAction->setFont( mReaderWin->cssHelper()->bodyFont().family() ); connect( fontAction, TQT_SIGNAL( activated( const TQString& ) ), TQT_SLOT( slotFontAction( const TQString& ) ) ); - fontSizeAction = new KFontSizeAction( "Select Size", 0, actionCollection(), + fontSizeAction = new TDEFontSizeAction( "Select Size", 0, actionCollection(), "text_size" ); fontSizeAction->setFontSize( mReaderWin->cssHelper()->bodyFont().pointSize() ); connect( fontSizeAction, TQT_SIGNAL( fontSizeChanged( int ) ), @@ -427,7 +427,7 @@ void KMReaderMainWin::setupAccel() mReaderWin, TQT_SLOT(slotScrollPrior())); accel->connectItem(accel->insertItem(Key_Next), mReaderWin, TQT_SLOT(slotScrollNext())); - accel->connectItem(accel->insertItem(KStdAccel::shortcut(KStdAccel::Copy)), + accel->connectItem(accel->insertItem(TDEStdAccel::shortcut(TDEStdAccel::Copy)), mReaderWin, TQT_SLOT(slotCopySelectedText())); connect( mReaderWin, TQT_SIGNAL(popupMenu(KMMessage&,const KURL&,const TQPoint&)), this, TQT_SLOT(slotMsgPopup(KMMessage&,const KURL&,const TQPoint&))); @@ -441,7 +441,7 @@ void KMReaderMainWin::setupAccel() void KMReaderMainWin::slotMsgPopup(KMMessage &aMsg, const KURL &aUrl, const TQPoint& aPoint) { - KPopupMenu * menu = new KPopupMenu; + TDEPopupMenu * menu = new TDEPopupMenu; mUrl = aUrl; mMsg = &aMsg; bool urlMenuAdded=false; diff --git a/kmail/kmreadermainwin.h b/kmail/kmreadermainwin.h index ca4f29e73..2fa3462f6 100644 --- a/kmail/kmreadermainwin.h +++ b/kmail/kmreadermainwin.h @@ -10,12 +10,12 @@ class KMReaderWin; class KMMessage; class KMMessagePart; -class KAction; -class KActionMenu; +class TDEAction; +class TDEActionMenu; class KMFolderIndex; class KMFolder; -class KFontAction; -class KFontSizeAction; +class TDEFontAction; +class TDEFontSizeAction; template <typename T, typename S> class TQMap; namespace KMail { @@ -97,12 +97,12 @@ private: KURL mUrl; TQMap<int,KMFolder*> mMenuToFolder; // a few actions duplicated from kmmainwidget - KAction *mTrashAction, *mPrintAction, *mSaveAsAction, *mForwardInlineAction, + TDEAction *mTrashAction, *mPrintAction, *mSaveAsAction, *mForwardInlineAction, *mForwardAttachedAction, *mForwardDigestAction, *mRedirectAction, *mViewSourceAction; - KActionMenu *mForwardActionMenu; - KFontAction *fontAction; - KFontSizeAction *fontSizeAction; + TDEActionMenu *mForwardActionMenu; + TDEFontAction *fontAction; + TDEFontSizeAction *fontSizeAction; KMail::MessageActions *mMsgActions; }; diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp index d1c6c0a12..31f7356b6 100644 --- a/kmail/kmreaderwin.cpp +++ b/kmail/kmreaderwin.cpp @@ -403,7 +403,7 @@ const int KMReaderWin::delay = 150; //----------------------------------------------------------------------------- KMReaderWin::KMReaderWin(TQWidget *aParent, TQWidget *mainWindow, - KActionCollection* actionCollection, + TDEActionCollection* actionCollection, const char *aName, int aFlags ) : TQWidget(aParent, aName, aFlags | TQt::WDestructiveClose), @@ -475,56 +475,56 @@ KMReaderWin::KMReaderWin(TQWidget *aParent, } -void KMReaderWin::createActions( KActionCollection * ac ) { +void KMReaderWin::createActions( TDEActionCollection * ac ) { if ( !ac ) return; - KRadioAction *raction = 0; + TDERadioAction *raction = 0; // header style - KActionMenu *headerMenu = - new KActionMenu( i18n("View->", "&Headers"), ac, "view_headers" ); + TDEActionMenu *headerMenu = + new TDEActionMenu( i18n("View->", "&Headers"), ac, "view_headers" ); headerMenu->setToolTip( i18n("Choose display style of message headers") ); connect( headerMenu, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(slotCycleHeaderStyles()) ); - raction = new KRadioAction( i18n("View->headers->", "&Enterprise Headers"), 0, + raction = new TDERadioAction( i18n("View->headers->", "&Enterprise Headers"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotEnterpriseHeaders()), ac, "view_headers_enterprise" ); raction->setToolTip( i18n("Show the list of headers in Enterprise style") ); raction->setExclusiveGroup( "view_headers_group" ); headerMenu->insert(raction); - raction = new KRadioAction( i18n("View->headers->", "&Fancy Headers"), 0, + raction = new TDERadioAction( i18n("View->headers->", "&Fancy Headers"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFancyHeaders()), ac, "view_headers_fancy" ); raction->setToolTip( i18n("Show the list of headers in a fancy format") ); raction->setExclusiveGroup( "view_headers_group" ); headerMenu->insert( raction ); - raction = new KRadioAction( i18n("View->headers->", "&Brief Headers"), 0, + raction = new TDERadioAction( i18n("View->headers->", "&Brief Headers"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotBriefHeaders()), ac, "view_headers_brief" ); raction->setToolTip( i18n("Show brief list of message headers") ); raction->setExclusiveGroup( "view_headers_group" ); headerMenu->insert( raction ); - raction = new KRadioAction( i18n("View->headers->", "&Standard Headers"), 0, + raction = new TDERadioAction( i18n("View->headers->", "&Standard Headers"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotStandardHeaders()), ac, "view_headers_standard" ); raction->setToolTip( i18n("Show standard list of message headers") ); raction->setExclusiveGroup( "view_headers_group" ); headerMenu->insert( raction ); - raction = new KRadioAction( i18n("View->headers->", "&Long Headers"), 0, + raction = new TDERadioAction( i18n("View->headers->", "&Long Headers"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotLongHeaders()), ac, "view_headers_long" ); raction->setToolTip( i18n("Show long list of message headers") ); raction->setExclusiveGroup( "view_headers_group" ); headerMenu->insert( raction ); - raction = new KRadioAction( i18n("View->headers->", "&All Headers"), 0, + raction = new TDERadioAction( i18n("View->headers->", "&All Headers"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAllHeaders()), ac, "view_headers_all" ); raction->setToolTip( i18n("Show all message headers") ); @@ -532,41 +532,41 @@ void KMReaderWin::createActions( KActionCollection * ac ) { headerMenu->insert( raction ); // attachment style - KActionMenu *attachmentMenu = - new KActionMenu( i18n("View->", "&Attachments"), ac, "view_attachments" ); + TDEActionMenu *attachmentMenu = + new TDEActionMenu( i18n("View->", "&Attachments"), ac, "view_attachments" ); attachmentMenu->setToolTip( i18n("Choose display style of attachments") ); connect( attachmentMenu, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(slotCycleAttachmentStrategy()) ); - raction = new KRadioAction( i18n("View->attachments->", "&As Icons"), 0, + raction = new TDERadioAction( i18n("View->attachments->", "&As Icons"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotIconicAttachments()), ac, "view_attachments_as_icons" ); raction->setToolTip( i18n("Show all attachments as icons. Click to see them.") ); raction->setExclusiveGroup( "view_attachments_group" ); attachmentMenu->insert( raction ); - raction = new KRadioAction( i18n("View->attachments->", "&Smart"), 0, + raction = new TDERadioAction( i18n("View->attachments->", "&Smart"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSmartAttachments()), ac, "view_attachments_smart" ); raction->setToolTip( i18n("Show attachments as suggested by sender.") ); raction->setExclusiveGroup( "view_attachments_group" ); attachmentMenu->insert( raction ); - raction = new KRadioAction( i18n("View->attachments->", "&Inline"), 0, + raction = new TDERadioAction( i18n("View->attachments->", "&Inline"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInlineAttachments()), ac, "view_attachments_inline" ); raction->setToolTip( i18n("Show all attachments inline (if possible)") ); raction->setExclusiveGroup( "view_attachments_group" ); attachmentMenu->insert( raction ); - raction = new KRadioAction( i18n("View->attachments->", "&Hide"), 0, + raction = new TDERadioAction( i18n("View->attachments->", "&Hide"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotHideAttachments()), ac, "view_attachments_hide" ); raction->setToolTip( i18n("Do not show attachments in the message viewer") ); raction->setExclusiveGroup( "view_attachments_group" ); attachmentMenu->insert( raction ); - mHeaderOnlyAttachmentsAction = new KRadioAction( i18n( "View->attachments->", "In Header &Only" ), 0, + mHeaderOnlyAttachmentsAction = new TDERadioAction( i18n( "View->attachments->", "In Header &Only" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotHeaderOnlyAttachments() ), ac, "view_attachments_headeronly" ); mHeaderOnlyAttachmentsAction->setToolTip( i18n( "Show Attachments only in the header of the mail" ) ); @@ -574,7 +574,7 @@ void KMReaderWin::createActions( KActionCollection * ac ) { attachmentMenu->insert( mHeaderOnlyAttachmentsAction ); // Set Encoding submenu - mSelectEncodingAction = new KSelectAction( i18n( "&Set Encoding" ), "charset", 0, + mSelectEncodingAction = new TDESelectAction( i18n( "&Set Encoding" ), "charset", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetEncoding() ), ac, "encoding" ); TQStringList encodings = KMMsgBase::supportedEncodings( false ); @@ -582,45 +582,45 @@ void KMReaderWin::createActions( KActionCollection * ac ) { mSelectEncodingAction->setItems( encodings ); mSelectEncodingAction->setCurrentItem( 0 ); - mMailToComposeAction = new KAction( i18n("New Message To..."), "mail_new", + mMailToComposeAction = new TDEAction( i18n("New Message To..."), "mail_new", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMailtoCompose()), ac, "mailto_compose" ); - mMailToReplyAction = new KAction( i18n("Reply To..."), "mail_reply", + mMailToReplyAction = new TDEAction( i18n("Reply To..."), "mail_reply", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMailtoReply()), ac, "mailto_reply" ); - mMailToForwardAction = new KAction( i18n("Forward To..."), "mail_forward", + mMailToForwardAction = new TDEAction( i18n("Forward To..."), "mail_forward", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMailtoForward()), ac, "mailto_forward" ); - mAddAddrBookAction = new KAction( i18n("Add to Address Book"), + mAddAddrBookAction = new TDEAction( i18n("Add to Address Book"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotMailtoAddAddrBook()), ac, "add_addr_book" ); - mOpenAddrBookAction = new KAction( i18n("Open in Address Book"), + mOpenAddrBookAction = new TDEAction( i18n("Open in Address Book"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotMailtoOpenAddrBook()), ac, "openin_addr_book" ); mCopyAction = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopySelectedText()), ac, "kmail_copy"); - mSelectAllAction = new KAction( i18n("Select All Text"), CTRL+SHIFT+Key_A, TQT_TQOBJECT(this), + mSelectAllAction = new TDEAction( i18n("Select All Text"), CTRL+SHIFT+Key_A, TQT_TQOBJECT(this), TQT_SLOT(selectAll()), ac, "mark_all_text" ); - mCopyURLAction = new KAction( i18n("Copy Link Address"), 0, TQT_TQOBJECT(this), + mCopyURLAction = new TDEAction( i18n("Copy Link Address"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotUrlCopy()), ac, "copy_url" ); - mUrlOpenAction = new KAction( i18n("Open URL"), 0, TQT_TQOBJECT(this), + mUrlOpenAction = new TDEAction( i18n("Open URL"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotUrlOpen()), ac, "open_url" ); - mAddBookmarksAction = new KAction( i18n("Bookmark This Link"), + mAddBookmarksAction = new TDEAction( i18n("Bookmark This Link"), "bookmark_add", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddBookmarks()), ac, "add_bookmarks" ); - mUrlSaveAsAction = new KAction( i18n("Save Link As..."), 0, TQT_TQOBJECT(this), + mUrlSaveAsAction = new TDEAction( i18n("Save Link As..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotUrlSave()), ac, "saveas_url" ); - mToggleFixFontAction = new KToggleAction( i18n("Use Fi&xed Font"), + mToggleFixFontAction = new TDEToggleAction( i18n("Use Fi&xed Font"), Key_X, TQT_TQOBJECT(this), TQT_SLOT(slotToggleFixedFont()), ac, "toggle_fixedfont" ); - mStartIMChatAction = new KAction( i18n("Chat &With..."), 0, TQT_TQOBJECT(this), + mStartIMChatAction = new TDEAction( i18n("Chat &With..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotIMChat()), ac, "start_im_chat" ); } // little helper function -KRadioAction *KMReaderWin::actionForHeaderStyle( const HeaderStyle * style, const HeaderStrategy * strategy ) { +TDERadioAction *KMReaderWin::actionForHeaderStyle( const HeaderStyle * style, const HeaderStrategy * strategy ) { if ( !mActionCollection ) return 0; const char * actionName = 0; @@ -639,12 +639,12 @@ KRadioAction *KMReaderWin::actionForHeaderStyle( const HeaderStyle * style, cons actionName = "view_headers_all"; } if ( actionName ) - return static_cast<KRadioAction*>(mActionCollection->action(actionName)); + return static_cast<TDERadioAction*>(mActionCollection->action(actionName)); else return 0; } -KRadioAction *KMReaderWin::actionForAttachmentStrategy( const AttachmentStrategy * as ) { +TDERadioAction *KMReaderWin::actionForAttachmentStrategy( const AttachmentStrategy * as ) { if ( !mActionCollection ) return 0; const char * actionName = 0; @@ -660,7 +660,7 @@ KRadioAction *KMReaderWin::actionForAttachmentStrategy( const AttachmentStrategy actionName = "view_attachments_headeronly"; if ( actionName ) - return static_cast<KRadioAction*>(mActionCollection->action(actionName)); + return static_cast<TDERadioAction*>(mActionCollection->action(actionName)); else return 0; } @@ -742,7 +742,7 @@ void KMReaderWin::slotCycleHeaderStyles() { } if ( actionName ) - static_cast<KRadioAction*>( mActionCollection->action( actionName ) )->setChecked( true ); + static_cast<TDERadioAction*>( mActionCollection->action( actionName ) )->setChecked( true ); } @@ -768,7 +768,7 @@ void KMReaderWin::slotHeaderOnlyAttachments() { void KMReaderWin::slotCycleAttachmentStrategy() { setAttachmentStrategy( attachmentStrategy()->next() ); - KRadioAction * action = actionForAttachmentStrategy( attachmentStrategy() ); + TDERadioAction * action = actionForAttachmentStrategy( attachmentStrategy() ); assert( action ); action->setChecked( true ); } @@ -894,7 +894,7 @@ void KMReaderWin::readConfig(void) setHeaderStyleAndStrategy( HeaderStyle::create( reader.readEntry( "header-style", "fancy" ) ), HeaderStrategy::create( reader.readEntry( "header-set-displayed", "rich" ) ) ); - KRadioAction *raction = actionForHeaderStyle( headerStyle(), headerStrategy() ); + TDERadioAction *raction = actionForHeaderStyle( headerStyle(), headerStrategy() ); if ( raction ) raction->setChecked( true ); @@ -1965,7 +1965,7 @@ void KMReaderWin::showAttachmentPopup( int id, const TQString & name, const TQPo { mAtmCurrent = id; mAtmCurrentName = name; - KPopupMenu *menu = new KPopupMenu(); + TDEPopupMenu *menu = new TDEPopupMenu(); menu->insertItem(SmallIcon("fileopen"),i18n("to open", "Open"), 1); menu->insertItem(i18n("Open With..."), 2); menu->insertItem(i18n("to view something", "View"), 3); diff --git a/kmail/kmreaderwin.h b/kmail/kmreaderwin.h index 961994526..6251a4849 100644 --- a/kmail/kmreaderwin.h +++ b/kmail/kmreaderwin.h @@ -28,12 +28,12 @@ class TQTextCodec; class DwHeaders; class DwMediaType; -class KActionCollection; -class KAction; -class KActionMenu; -class KSelectAction; -class KRadioAction; -class KToggleAction; +class TDEActionCollection; +class TDEAction; +class TDEActionMenu; +class TDESelectAction; +class TDERadioAction; +class TDEToggleAction; class TDEConfigBase; class TDEHTMLPart; class KURL; @@ -88,7 +88,7 @@ class KMReaderWin: public TQWidget, public KMail::Interface::Observer { public: KMReaderWin( TQWidget *parent, TQWidget *mainWindow, - KActionCollection *actionCollection, + TDEActionCollection *actionCollection, const char *name=0, int f=0 ); virtual ~KMReaderWin(); @@ -244,19 +244,19 @@ public: // Action to reply to a message // but action( "some_name" ) some name could be used instead. - KToggleAction *toggleFixFontAction() { return mToggleFixFontAction; } - KAction *mailToComposeAction() { return mMailToComposeAction; } - KAction *mailToReplyAction() { return mMailToReplyAction; } - KAction *mailToForwardAction() { return mMailToForwardAction; } - KAction *addAddrBookAction() { return mAddAddrBookAction; } - KAction *openAddrBookAction() { return mOpenAddrBookAction; } - KAction *copyAction() { return mCopyAction; } - KAction *selectAllAction() { return mSelectAllAction; } - KAction *copyURLAction() { return mCopyURLAction; } - KAction *urlOpenAction() { return mUrlOpenAction; } - KAction *urlSaveAsAction() { return mUrlSaveAsAction; } - KAction *addBookmarksAction() { return mAddBookmarksAction;} - KAction *startImChatAction() { return mStartIMChatAction; } + TDEToggleAction *toggleFixFontAction() { return mToggleFixFontAction; } + TDEAction *mailToComposeAction() { return mMailToComposeAction; } + TDEAction *mailToReplyAction() { return mMailToReplyAction; } + TDEAction *mailToForwardAction() { return mMailToForwardAction; } + TDEAction *addAddrBookAction() { return mAddAddrBookAction; } + TDEAction *openAddrBookAction() { return mOpenAddrBookAction; } + TDEAction *copyAction() { return mCopyAction; } + TDEAction *selectAllAction() { return mSelectAllAction; } + TDEAction *copyURLAction() { return mCopyURLAction; } + TDEAction *urlOpenAction() { return mUrlOpenAction; } + TDEAction *urlSaveAsAction() { return mUrlSaveAsAction; } + TDEAction *addBookmarksAction() { return mAddBookmarksAction;} + TDEAction *startImChatAction() { return mStartIMChatAction; } // This function returns the complete data that were in this // message parts - *after* all encryption has been removed that // could be removed. @@ -528,12 +528,12 @@ private slots: private: void adjustLayout(); void createWidgets(); - void createActions( KActionCollection * ac ); + void createActions( TDEActionCollection * ac ); void saveSplitterSizes( TDEConfigBase & c ) const; - KRadioAction * actionForHeaderStyle( const KMail::HeaderStyle *, + TDERadioAction * actionForHeaderStyle( const KMail::HeaderStyle *, const KMail::HeaderStrategy * ); - KRadioAction * actionForAttachmentStrategy( const KMail::AttachmentStrategy * ); + TDERadioAction * actionForAttachmentStrategy( const KMail::AttachmentStrategy * ); /** Read override codec from configuration */ void readGlobalOverrideCodec(); @@ -585,13 +585,13 @@ private: partNode* mRootNode; TQString mIdOfLastViewedMessage; TQWidget *mMainWindow; - KActionCollection *mActionCollection; - KAction *mMailToComposeAction, *mMailToReplyAction, *mMailToForwardAction, + TDEActionCollection *mActionCollection; + TDEAction *mMailToComposeAction, *mMailToReplyAction, *mMailToForwardAction, *mAddAddrBookAction, *mOpenAddrBookAction, *mCopyAction, *mCopyURLAction, *mUrlOpenAction, *mUrlSaveAsAction, *mAddBookmarksAction, *mStartIMChatAction, *mSelectAllAction; - KToggleAction *mHeaderOnlyAttachmentsAction; - KSelectAction *mSelectEncodingAction; - KToggleAction *mToggleFixFontAction; + TDEToggleAction *mHeaderOnlyAttachmentsAction; + TDESelectAction *mSelectEncodingAction; + TDEToggleAction *mToggleFixFontAction; KURL mHoveredUrl; KURL mClickedUrl; diff --git a/kmail/kmsystemtray.cpp b/kmail/kmsystemtray.cpp index 4c432a514..f75b53a07 100644 --- a/kmail/kmsystemtray.cpp +++ b/kmail/kmsystemtray.cpp @@ -111,13 +111,13 @@ void KMSystemTray::buildPopupMenu() // Delete any previously created popup menu delete mPopupMenu; - mPopupMenu = new KPopupMenu(); + mPopupMenu = new TDEPopupMenu(); KMMainWidget * mainWidget = kmkernel->getKMMainWidget(); if ( !mainWidget ) return; mPopupMenu->insertTitle(*(this->pixmap()), "KMail"); - KAction * action; + TDEAction * action; if ( ( action = mainWidget->action("check_mail") ) ) action->plug( mPopupMenu ); if ( ( action = mainWidget->action("check_mail_in") ) ) @@ -133,7 +133,7 @@ void KMSystemTray::buildPopupMenu() action->plug( mPopupMenu ); mPopupMenu->insertSeparator(); - KMainWindow *mainWin = ::tqqt_cast<KMainWindow*>(kmkernel->getKMMainWidget()->topLevelWidget()); + TDEMainWindow *mainWin = ::tqqt_cast<TDEMainWindow*>(kmkernel->getKMMainWidget()->topLevelWidget()); mPopupMenu->insertItem( SmallIcon("exit"), i18n("&Quit"), this, TQT_SLOT(maybeQuit()) ); } @@ -320,7 +320,7 @@ void KMSystemTray::mousePressEvent(TQMouseEvent *e) mPopupFolders.reserve( mFoldersWithUnread.count() ); // Rebuild popup menu at click time to minimize race condition if - // the base KMainWidget is closed. + // the base TDEMainWidget is closed. buildPopupMenu(); if(mNewMessagePopupId != -1) @@ -330,7 +330,7 @@ void KMSystemTray::mousePressEvent(TQMouseEvent *e) if(mFoldersWithUnread.count() > 0) { - KPopupMenu *newMessagesPopup = new KPopupMenu(); + TDEPopupMenu *newMessagesPopup = new TDEPopupMenu(); TQMap<TQGuardedPtr<KMFolder>, int>::Iterator it = mFoldersWithUnread.begin(); for(uint i=0; it != mFoldersWithUnread.end(); ++i) diff --git a/kmail/kmsystemtray.h b/kmail/kmsystemtray.h index 208dd0c7e..c63fdd1df 100644 --- a/kmail/kmsystemtray.h +++ b/kmail/kmsystemtray.h @@ -31,7 +31,7 @@ class KMFolder; class KMMainWidget; class TQMouseEvent; -class KPopupMenu; +class TDEPopupMenu; class TQPoint; /** @@ -82,7 +82,7 @@ private: int mCount; int mNewMessagePopupId; - KPopupMenu * mPopupMenu; + TDEPopupMenu * mPopupMenu; TQPixmap mDefaultIcon; TQImage mLightIconImage; diff --git a/kmail/mailinglistpropertiesdialog.cpp b/kmail/mailinglistpropertiesdialog.cpp index b60ada927..1bb2b1448 100644 --- a/kmail/mailinglistpropertiesdialog.cpp +++ b/kmail/mailinglistpropertiesdialog.cpp @@ -112,7 +112,7 @@ MailingListFolderPropertiesDialog::MailingListFolderPropertiesDialog( TQWidget* groupLayout->addWidget( mAddressCombo, 6, 1 ); mAddressCombo->setEnabled( false ); - //FIXME: if the mailing list actions have either KAction's or toolbar buttons + //FIXME: if the mailing list actions have either TDEAction's or toolbar buttons // associated with them - remove this button since it's really silly // here TQPushButton *handleButton = new TQPushButton( i18n( "Invoke Handler" ), mlGroup ); diff --git a/kmail/messageactions.cpp b/kmail/messageactions.cpp index c1f569925..2e1aac7f6 100644 --- a/kmail/messageactions.cpp +++ b/kmail/messageactions.cpp @@ -32,82 +32,82 @@ using namespace KMail; -MessageActions::MessageActions( KActionCollection *ac, TQWidget * parent ) : +MessageActions::MessageActions( TDEActionCollection *ac, TQWidget * parent ) : TQObject( parent ), mParent( parent ), mActionCollection( ac ), mCurrentMessage( 0 ), mMessageView( 0 ) { - mReplyActionMenu = new KActionMenu( i18n("Message->","&Reply"), + mReplyActionMenu = new TDEActionMenu( i18n("Message->","&Reply"), "mail_reply", mActionCollection, "message_reply_menu" ); connect( mReplyActionMenu, TQT_SIGNAL(activated()), this, TQT_SLOT(slotReplyToMsg()) ); - mReplyAction = new KAction( i18n("&Reply..."), "mail_reply", Key_R, this, + mReplyAction = new TDEAction( i18n("&Reply..."), "mail_reply", Key_R, this, TQT_SLOT(slotReplyToMsg()), mActionCollection, "reply" ); mReplyActionMenu->insert( mReplyAction ); - mReplyAuthorAction = new KAction( i18n("Reply to A&uthor..."), "mail_reply", + mReplyAuthorAction = new TDEAction( i18n("Reply to A&uthor..."), "mail_reply", SHIFT+Key_A, this, TQT_SLOT(slotReplyAuthorToMsg()), mActionCollection, "reply_author" ); mReplyActionMenu->insert( mReplyAuthorAction ); - mReplyAllAction = new KAction( i18n("Reply to &All..."), "mail_replyall", + mReplyAllAction = new TDEAction( i18n("Reply to &All..."), "mail_replyall", Key_A, this, TQT_SLOT(slotReplyAllToMsg()), mActionCollection, "reply_all" ); mReplyActionMenu->insert( mReplyAllAction ); - mReplyListAction = new KAction( i18n("Reply to Mailing-&List..."), + mReplyListAction = new TDEAction( i18n("Reply to Mailing-&List..."), "mail_replylist", Key_L, this, TQT_SLOT(slotReplyListToMsg()), mActionCollection, "reply_list" ); mReplyActionMenu->insert( mReplyListAction ); - mNoQuoteReplyAction = new KAction( i18n("Reply Without &Quote..."), SHIFT+Key_R, + mNoQuoteReplyAction = new TDEAction( i18n("Reply Without &Quote..."), SHIFT+Key_R, this, TQT_SLOT(slotNoQuoteReplyToMsg()), mActionCollection, "noquotereply" ); - mCreateTodoAction = new KAction( i18n("Create Task/Reminder..."), "mail_todo", + mCreateTodoAction = new TDEAction( i18n("Create Task/Reminder..."), "mail_todo", 0, this, TQT_SLOT(slotCreateTodo()), mActionCollection, "create_todo" ); - mStatusMenu = new KActionMenu ( i18n( "Mar&k Message" ), + mStatusMenu = new TDEActionMenu ( i18n( "Mar&k Message" ), mActionCollection, "set_status" ); - mStatusMenu->insert(new KAction(KGuiItem(i18n("Mark Message as &Read"), "kmmsgread", + mStatusMenu->insert(new TDEAction(KGuiItem(i18n("Mark Message as &Read"), "kmmsgread", i18n("Mark selected messages as read")), 0, this, TQT_SLOT(slotSetMsgStatusRead()), mActionCollection, "status_read")); - mStatusMenu->insert(new KAction(KGuiItem(i18n("Mark Message as &New"), "kmmsgnew", + mStatusMenu->insert(new TDEAction(KGuiItem(i18n("Mark Message as &New"), "kmmsgnew", i18n("Mark selected messages as new")), 0, this, TQT_SLOT(slotSetMsgStatusNew()), mActionCollection, "status_new" )); - mStatusMenu->insert(new KAction(KGuiItem(i18n("Mark Message as &Unread"), "kmmsgunseen", + mStatusMenu->insert(new TDEAction(KGuiItem(i18n("Mark Message as &Unread"), "kmmsgunseen", i18n("Mark selected messages as unread")), 0, this, TQT_SLOT(slotSetMsgStatusUnread()), mActionCollection, "status_unread")); - mStatusMenu->insert( new KActionSeparator( this ) ); + mStatusMenu->insert( new TDEActionSeparator( this ) ); - mToggleFlagAction = new KToggleAction(i18n("Mark Message as &Important"), "mail_flag", + mToggleFlagAction = new TDEToggleAction(i18n("Mark Message as &Important"), "mail_flag", 0, this, TQT_SLOT(slotSetMsgStatusFlag()), mActionCollection, "status_flag"); mToggleFlagAction->setCheckedState( i18n("Remove &Important Message Mark") ); mStatusMenu->insert( mToggleFlagAction ); - mToggleTodoAction = new KToggleAction(i18n("Mark Message as &Action Item"), "mail_todo", + mToggleTodoAction = new TDEToggleAction(i18n("Mark Message as &Action Item"), "mail_todo", 0, this, TQT_SLOT(slotSetMsgStatusTodo()), mActionCollection, "status_todo"); mToggleTodoAction->setCheckedState( i18n("Remove &Action Item Message Mark") ); mStatusMenu->insert( mToggleTodoAction ); - mEditAction = new KAction( i18n("&Edit Message"), "edit", Key_T, this, + mEditAction = new TDEAction( i18n("&Edit Message"), "edit", Key_T, this, TQT_SLOT(editCurrentMessage()), mActionCollection, "edit" ); mEditAction->plugAccel( mActionCollection->kaccel() ); diff --git a/kmail/messageactions.h b/kmail/messageactions.h index e2256123b..5e46489b3 100644 --- a/kmail/messageactions.h +++ b/kmail/messageactions.h @@ -26,9 +26,9 @@ #include <tqvaluelist.h> class TQWidget; -class KAction; -class KActionMenu; -class KActionCollection; +class TDEAction; +class TDEActionMenu; +class TDEActionCollection; class KMMessage; namespace KMail { @@ -41,20 +41,20 @@ class MessageActions : public TQObject Q_OBJECT public: - MessageActions( KActionCollection* ac, TQWidget *parent ); + MessageActions( TDEActionCollection* ac, TQWidget *parent ); void setMessageView( KMReaderWin *msgView ); void setCurrentMessage( KMMessage *msg ); void setSelectedSernums( const TQValueList<TQ_UINT32> &sernums ); void setSelectedVisibleSernums( const TQValueList<TQ_UINT32> &sernums ); - KActionMenu* replyMenu() const { return mReplyActionMenu; } - KAction* replyListAction() const { return mReplyListAction; } - KAction* createTodoAction() const { return mCreateTodoAction; } + TDEActionMenu* replyMenu() const { return mReplyActionMenu; } + TDEAction* replyListAction() const { return mReplyListAction; } + TDEAction* createTodoAction() const { return mCreateTodoAction; } - KActionMenu* messageStatusMenu() const { return mStatusMenu; } + TDEActionMenu* messageStatusMenu() const { return mStatusMenu; } - KAction* editAction() const { return mEditAction; } + TDEAction* editAction() const { return mEditAction; } signals: @@ -87,19 +87,19 @@ class MessageActions : public TQObject private: TQWidget *mParent; - KActionCollection *mActionCollection; + TDEActionCollection *mActionCollection; KMMessage* mCurrentMessage; TQValueList<TQ_UINT32> mSelectedSernums; TQValueList<TQ_UINT32> mVisibleSernums; KMReaderWin *mMessageView; - KActionMenu *mReplyActionMenu; - KAction *mReplyAction, *mReplyAllAction, *mReplyAuthorAction, + TDEActionMenu *mReplyActionMenu; + TDEAction *mReplyAction, *mReplyAllAction, *mReplyAuthorAction, *mReplyListAction, *mNoQuoteReplyAction; - KAction *mCreateTodoAction; - KActionMenu *mStatusMenu; - KToggleAction *mToggleFlagAction, *mToggleTodoAction; - KAction *mEditAction; + TDEAction *mCreateTodoAction; + TDEActionMenu *mStatusMenu; + TDEToggleAction *mToggleFlagAction, *mToggleTodoAction; + TDEAction *mEditAction; }; } diff --git a/kmail/recipientspicker.cpp b/kmail/recipientspicker.cpp index 0d938bde2..8b320d720 100644 --- a/kmail/recipientspicker.cpp +++ b/kmail/recipientspicker.cpp @@ -211,8 +211,8 @@ TQString RecipientItem::recipientType() const } -RecipientViewItem::RecipientViewItem( RecipientItem *item, KListView *listView ) - : KListViewItem( listView ), mRecipientItem( item ) +RecipientViewItem::RecipientViewItem( RecipientItem *item, TDEListView *listView ) + : TDEListViewItem( listView ), mRecipientItem( item ) { setText( 0, item->recipientType() ); setText( 1, item->name() ); @@ -228,7 +228,7 @@ RecipientItem *RecipientViewItem::recipientItem() const RecipientsListToolTip::RecipientsListToolTip( TQWidget *parent, - KListView *listView ) + TDEListView *listView ) : TQToolTip( parent ) { mListView = listView; @@ -327,8 +327,8 @@ TQString RecipientsCollection::id() const return mId; } -SearchLine::SearchLine( TQWidget *parent, KListView *listView ) - : KListViewSearchLine( parent, listView ) +SearchLine::SearchLine( TQWidget *parent, TDEListView *listView ) + : TDEListViewSearchLine( parent, listView ) { } @@ -336,7 +336,7 @@ void SearchLine::keyPressEvent( TQKeyEvent *ev ) { if ( ev->key() == Key_Down ) emit downPressed(); - KListViewSearchLine::keyPressEvent( ev ); + TDEListViewSearchLine::keyPressEvent( ev ); } @@ -380,7 +380,7 @@ RecipientsPicker::RecipientsPicker( TQWidget *parent ) label = new TQLabel( i18n("&Search:"), this ); searchLayout->addWidget( label ); - mRecipientList = new KListView( this ); + mRecipientList = new TDEListView( this ); mRecipientList->setSelectionMode( TQListView::Extended ); mRecipientList->setAllColumnsShowFocus( true ); mRecipientList->setFullWidth( true ); @@ -579,7 +579,7 @@ void RecipientsPicker::insertRecentAddresses() TDEConfig config( "kmailrc" ); KABC::Addressee::List recents = - KRecentAddress::RecentAddresses::self( &config )->kabcAddresses(); + TDERecentAddress::RecentAddresses::self( &config )->kabcAddresses(); KABC::Addressee::List::ConstIterator it; for( it = recents.begin(); it != recents.end(); ++it ) { diff --git a/kmail/recipientspicker.h b/kmail/recipientspicker.h index 85f7432a4..ede82ba85 100644 --- a/kmail/recipientspicker.h +++ b/kmail/recipientspicker.h @@ -103,10 +103,10 @@ class RecipientItem TQString mKey; }; -class RecipientViewItem : public KListViewItem +class RecipientViewItem : public TDEListViewItem { public: - RecipientViewItem( RecipientItem *, KListView * ); + RecipientViewItem( RecipientItem *, TDEListView * ); RecipientItem *recipientItem() const; @@ -117,13 +117,13 @@ class RecipientViewItem : public KListViewItem class RecipientsListToolTip : public TQToolTip { public: - RecipientsListToolTip( TQWidget *parent, KListView * ); + RecipientsListToolTip( TQWidget *parent, TDEListView * ); protected: void maybeTip( const TQPoint &pos ); private: - KListView *mListView; + TDEListView *mListView; }; class RecipientsCollection @@ -160,12 +160,12 @@ class RecipientsCollection TQMap<TQString, RecipientItem *> mKeyMap; }; -class SearchLine : public KListViewSearchLine +class SearchLine : public TDEListViewSearchLine { Q_OBJECT public: - SearchLine( TQWidget *parent, KListView *listView ); + SearchLine( TQWidget *parent, TDEListView *listView ); signals: void downPressed(); @@ -225,8 +225,8 @@ class RecipientsPicker : public TQDialog KABC::StdAddressBook *mAddressBook; TQComboBox *mCollectionCombo; - KListView *mRecipientList; - KListViewSearchLine *mSearchLine; + TDEListView *mRecipientList; + TDEListViewSearchLine *mSearchLine; TQPushButton *mToButton; TQPushButton *mCcButton; diff --git a/kmail/redirectdialog.cpp b/kmail/redirectdialog.cpp index 88951fcf7..4cd26be0c 100644 --- a/kmail/redirectdialog.cpp +++ b/kmail/redirectdialog.cpp @@ -36,7 +36,7 @@ #include <addressesdialog.h> using KPIM::AddressesDialog; #include "recentaddresses.h" -using KRecentAddress::RecentAddresses; +using TDERecentAddress::RecentAddresses; #include <kiconloader.h> #include <klocale.h> diff --git a/kmail/searchwindow.cpp b/kmail/searchwindow.cpp index 849cba8b1..e5c009516 100644 --- a/kmail/searchwindow.cpp +++ b/kmail/searchwindow.cpp @@ -67,12 +67,12 @@ namespace KMail { const int SearchWindow::MSGID_COLUMN = 4; -// KListView sub-class for dnd support -class MatchListView : public KListView +// TDEListView sub-class for dnd support +class MatchListView : public TDEListView { public: MatchListView( TQWidget *parent, SearchWindow* sw, const char* name = 0 ) : - KListView( parent, name ), + TDEListView( parent, name ), mSearchWindow( sw ) {} @@ -213,13 +213,13 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name, solves the above problem, but speeds searches with many hits up considerably. - till - TODO: subclass KListViewItem and do proper (and performant) + TODO: subclass TDEListViewItem and do proper (and performant) comapare functions */ mLbxMatches->setSorting(2, false); mLbxMatches->setShowSortIndicator(true); mLbxMatches->setAllColumnsShowFocus(true); - mLbxMatches->setSelectionModeExt(KListView::Extended); + mLbxMatches->setSelectionModeExt(TDEListView::Extended); mLbxMatches->addColumn(i18n("Subject"), config->readNumEntry("SubjectWidth", 150)); mLbxMatches->addColumn(i18n("Sender/Receiver"), @@ -307,27 +307,27 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name, kdDebug(5006) << "SearchWindow: regExpLineEdit not found" << endl; //set up actions - KActionCollection *ac = actionCollection(); + TDEActionCollection *ac = actionCollection(); ac->setWidget( this ); - mReplyAction = new KAction( i18n("&Reply..."), "mail_reply", 0, TQT_TQOBJECT(this), + mReplyAction = new TDEAction( i18n("&Reply..."), "mail_reply", 0, TQT_TQOBJECT(this), TQT_SLOT(slotReplyToMsg()), ac, "search_reply" ); - mReplyAllAction = new KAction( i18n("Reply to &All..."), "mail_replyall", + mReplyAllAction = new TDEAction( i18n("Reply to &All..."), "mail_replyall", 0, TQT_TQOBJECT(this), TQT_SLOT(slotReplyAllToMsg()), ac, "search_reply_all" ); - mReplyListAction = new KAction( i18n("Reply to Mailing-&List..."), + mReplyListAction = new TDEAction( i18n("Reply to Mailing-&List..."), "mail_replylist", 0, TQT_TQOBJECT(this), TQT_SLOT(slotReplyListToMsg()), ac, "search_reply_list" ); - mForwardActionMenu = new KActionMenu( i18n("Message->","&Forward"), + mForwardActionMenu = new TDEActionMenu( i18n("Message->","&Forward"), "mail_forward", ac, "search_message_forward" ); connect( mForwardActionMenu, TQT_SIGNAL(activated()), this, TQT_SLOT(slotForwardInlineMsg()) ); - mForwardAttachedAction = new KAction( i18n("Message->Forward->","As &Attachment..."), + mForwardAttachedAction = new TDEAction( i18n("Message->Forward->","As &Attachment..."), "mail_forward", 0, TQT_TQOBJECT(this), TQT_SLOT(slotForwardAttachedMsg()), ac, "search_message_forward_as_attachment" ); - mForwardInlineAction = new KAction( i18n("&Inline..."), + mForwardInlineAction = new TDEAction( i18n("&Inline..."), "mail_forward", 0, TQT_TQOBJECT(this), TQT_SLOT(slotForwardInlineMsg()), ac, "search_message_forward_inline" ); @@ -339,22 +339,22 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name, mForwardActionMenu->insert( mForwardInlineAction ); } - mForwardDigestAction = new KAction( i18n("Message->Forward->","As Di&gest..."), + mForwardDigestAction = new TDEAction( i18n("Message->Forward->","As Di&gest..."), "mail_forward", 0, TQT_TQOBJECT(this), TQT_SLOT(slotForwardDigestMsg()), ac, "search_message_forward_as_digest" ); mForwardActionMenu->insert( mForwardDigestAction ); - mRedirectAction = new KAction( i18n("Message->Forward->","&Redirect..."), + mRedirectAction = new TDEAction( i18n("Message->Forward->","&Redirect..."), "mail_forward", 0, TQT_TQOBJECT(this), TQT_SLOT(slotRedirectMsg()), ac, "search_message_forward_redirect" ); mForwardActionMenu->insert( mRedirectAction ); mSaveAsAction = KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT(slotSaveMsg()), ac, "search_file_save_as" ); - mSaveAtchAction = new KAction( i18n("Save Attachments..."), "attach", 0, + mSaveAtchAction = new TDEAction( i18n("Save Attachments..."), "attach", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveAttachments()), ac, "search_save_attachments" ); mPrintAction = KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT(slotPrintMsg()), ac, "search_print" ); - mClearAction = new KAction( i18n("Clear Selection"), 0, 0, TQT_TQOBJECT(this), + mClearAction = new TDEAction( i18n("Clear Selection"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotClearSelection()), ac, "search_clear_selection" ); mCopyAction = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopyMsgs()), ac, "search_copy_messages" ); @@ -576,7 +576,7 @@ void SearchWindow::slotAddMsg(int idx) else fName = pFolder->name(); - (void)new KListViewItem(mLbxMatches, mLbxMatches->lastItem(), + (void)new TDEListViewItem(mLbxMatches, mLbxMatches->lastItem(), msg->subject(), from, msg->dateIsoStr(), fName, TQString::number(mFolder->serNum(idx))); diff --git a/kmail/searchwindow.h b/kmail/searchwindow.h index 0cd5303aa..84684c849 100644 --- a/kmail/searchwindow.h +++ b/kmail/searchwindow.h @@ -35,12 +35,12 @@ class TQComboBox; class TQGridLayout; class TQLabel; class TQLineEdit; -class KListView; +class TDEListView; class TQListViewItem; class TQPushButton; class TQRadioButton; -class KAction; -class KActionMenu; +class TDEAction; +class TDEActionMenu; class KMFolder; class KMFolderSearch; class KMFolderImap; @@ -169,7 +169,7 @@ protected: TQPushButton *mBtnSearch; TQPushButton *mBtnStop; TQCheckBox *mChkSubFolders; - KListView* mLbxMatches; + TDEListView* mLbxMatches; TQLabel *mSearchFolderLbl; TQLineEdit *mSearchFolderEdt; TQPushButton *mSearchFolderOpenBtn; @@ -177,11 +177,11 @@ protected: KStatusBar* mStatusBar; TQWidget* mLastFocus; // to remember the position of the focus TQMap<int,KMFolder*> mMenuToFolder; - KAction *mReplyAction, *mReplyAllAction, *mReplyListAction, *mSaveAsAction, + TDEAction *mReplyAction, *mReplyAllAction, *mReplyListAction, *mSaveAsAction, *mForwardInlineAction, *mForwardAttachedAction, *mForwardDigestAction, *mRedirectAction, *mPrintAction, *mClearAction, *mSaveAtchAction, *mCopyAction, *mCutAction; - KActionMenu *mForwardActionMenu; + TDEActionMenu *mForwardActionMenu; TQValueList<TQGuardedPtr<KMFolder> > mFolders; TQTimer mRenameTimer; diff --git a/kmail/secondarywindow.cpp b/kmail/secondarywindow.cpp index d2296f435..38f6b32dc 100644 --- a/kmail/secondarywindow.cpp +++ b/kmail/secondarywindow.cpp @@ -39,7 +39,7 @@ namespace KMail { //--------------------------------------------------------------------------- SecondaryWindow::SecondaryWindow( const char * name ) - : KMainWindow( 0, name ) + : TDEMainWindow( 0, name ) { // Set this to be the group leader for all subdialogs - this means // modal subdialogs will only affect this window, not the other windows @@ -62,7 +62,7 @@ namespace KMail { // if there's a system tray applet then just do what needs to be done if a // window is closed. if ( kmkernel->haveSystemTrayApplet() ) { - // BEGIN of code borrowed from KMainWindow::closeEvent + // BEGIN of code borrowed from TDEMainWindow::closeEvent // Save settings if auto-save is enabled, and settings have changed if ( settingsDirty() && autoSaveSettings() ) saveAutoSaveSettings(); @@ -70,10 +70,10 @@ namespace KMail { if ( queryClose() ) { e->accept(); } - // END of code borrowed from KMainWindow::closeEvent + // END of code borrowed from TDEMainWindow::closeEvent } else - KMainWindow::closeEvent( e ); + TDEMainWindow::closeEvent( e ); } } // namespace KMail diff --git a/kmail/secondarywindow.h b/kmail/secondarywindow.h index 11d6cbae9..fa37523a1 100644 --- a/kmail/secondarywindow.h +++ b/kmail/secondarywindow.h @@ -41,7 +41,7 @@ namespace KMail { * Window class for secondary KMail window like the composer window and * the separate message window. */ - class SecondaryWindow : public KMainWindow + class SecondaryWindow : public TDEMainWindow { Q_OBJECT diff --git a/kmail/simplefoldertree.h b/kmail/simplefoldertree.h index 6bfc3eb33..308ef4b98 100644 --- a/kmail/simplefoldertree.h +++ b/kmail/simplefoldertree.h @@ -179,7 +179,7 @@ template <class T> class SimpleFolderTreeBase : public TreeBase } else if ( !e->text().isEmpty() && e->text().length() == 1 && e->text().at( 0 ).isPrint() ) { applyFilter( mFilter + e->text() ); } else { - KListView::keyPressEvent( e ); + TDEListView::keyPressEvent( e ); } } @@ -242,7 +242,7 @@ template <class T> class SimpleFolderTreeBase : public TreeBase }; -typedef SimpleFolderTreeBase<KListViewItem> SimpleFolderTree; +typedef SimpleFolderTreeBase<TDEListViewItem> SimpleFolderTree; } diff --git a/kmail/snippetdlg.cpp b/kmail/snippetdlg.cpp index d2b5c19d3..1c3e40c87 100644 --- a/kmail/snippetdlg.cpp +++ b/kmail/snippetdlg.cpp @@ -32,7 +32,7 @@ * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -SnippetDlg::SnippetDlg( KActionCollection* ac, TQWidget* parent, const char* name, bool modal, WFlags fl ) +SnippetDlg::SnippetDlg( TDEActionCollection* ac, TQWidget* parent, const char* name, bool modal, WFlags fl ) : SnippetDlgBase( parent, name, modal, fl ), actionCollection( ac ) { if ( !name ) @@ -40,8 +40,8 @@ SnippetDlg::SnippetDlg( KActionCollection* ac, TQWidget* parent, const char* nam textLabel3 = new TQLabel( this, "textLabel3" ); keyButton = new KKeyButton( this ); - connect( keyButton, TQT_SIGNAL( capturedShortcut( const KShortcut& ) ), - this, TQT_SLOT( slotCapturedShortcut( const KShortcut& ) ) ); + connect( keyButton, TQT_SIGNAL( capturedShortcut( const TDEShortcut& ) ), + this, TQT_SLOT( slotCapturedShortcut( const TDEShortcut& ) ) ); btnAdd->setEnabled( false ); connect( snippetName, TQT_SIGNAL(textChanged(const TQString &)), @@ -78,23 +78,23 @@ void SnippetDlg::languageChange() textLabel3->setText( i18n( "Sh&ortcut:" ) ); } -static bool shortcutIsValid( const KActionCollection* actionCollection, const KShortcut &sc ) +static bool shortcutIsValid( const TDEActionCollection* actionCollection, const TDEShortcut &sc ) { - KActionPtrList actions = actionCollection->actions(); - KActionPtrList::Iterator it( actions.begin() ); + TDEActionPtrList actions = actionCollection->actions(); + TDEActionPtrList::Iterator it( actions.begin() ); for ( ; it != actions.end(); it++ ) { if ( (*it)->shortcut() == sc ) return false; } return true; } -void SnippetDlg::slotCapturedShortcut( const KShortcut& sc ) +void SnippetDlg::slotCapturedShortcut( const TDEShortcut& sc ) { if ( sc == keyButton->shortcut() ) return; if ( sc.toString().isNull() ) { // null is fine, that's reset, but sc.Ñ–sNull() will be false :/ - keyButton->setShortcut( KShortcut::null(), false ); + keyButton->setShortcut( TDEShortcut::null(), false ); } else { if( !shortcutIsValid( actionCollection, sc ) ) { TQString msg( i18n( "The selected shortcut is already used, " diff --git a/kmail/snippetdlg.h b/kmail/snippetdlg.h index 4aa89c1de..c46e23991 100644 --- a/kmail/snippetdlg.h +++ b/kmail/snippetdlg.h @@ -13,8 +13,8 @@ #include "snippetdlgbase.h" class KKeyButton; -class KActionCollection; -class KShortcut; +class TDEActionCollection; +class TDEShortcut; class SnippetDlg : public SnippetDlgBase { @@ -22,7 +22,7 @@ class SnippetDlg : public SnippetDlgBase public: - SnippetDlg( KActionCollection* ac, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + SnippetDlg( TDEActionCollection* ac, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~SnippetDlg(); void setShowShortcut( bool show ); @@ -30,7 +30,7 @@ class SnippetDlg : public SnippetDlgBase TQLabel* textLabel3; TQLabel* textLabelGroup; KKeyButton* keyButton; - KActionCollection* actionCollection; + TDEActionCollection* actionCollection; protected slots: void slotTextChanged( const TQString& ); @@ -38,7 +38,7 @@ class SnippetDlg : public SnippetDlgBase virtual void languageChange(); private slots: - void slotCapturedShortcut( const KShortcut& ); + void slotCapturedShortcut( const TDEShortcut& ); }; #endif // SNIPPETDLG_H diff --git a/kmail/snippetitem.cpp b/kmail/snippetitem.cpp index 7839511ae..dc62333cb 100644 --- a/kmail/snippetitem.cpp +++ b/kmail/snippetitem.cpp @@ -87,12 +87,12 @@ void SnippetItem::resetParent() } -KAction* SnippetItem::getAction() +TDEAction* SnippetItem::getAction() { return action; } -void SnippetItem::setAction(KAction * anAction) +void SnippetItem::setAction(TDEAction * anAction) { action = anAction; } diff --git a/kmail/snippetitem.h b/kmail/snippetitem.h index 3222449a7..395b62cb4 100644 --- a/kmail/snippetitem.h +++ b/kmail/snippetitem.h @@ -20,7 +20,7 @@ #include <tqobject.h> class TQString; -class KAction; +class TDEAction; class SnippetGroup; @@ -45,8 +45,8 @@ public: void resetParent(); void setText(TQString text); void setName(TQString name); - void setAction( KAction* ); - KAction* getAction(); + void setAction( TDEAction* ); + TDEAction* getAction(); static SnippetItem * findItemByName(TQString name, TQPtrList<SnippetItem> &list); static SnippetGroup * findGroupById(int id, TQPtrList<SnippetItem> &list); signals: @@ -59,7 +59,7 @@ private: TQString strName; TQString strText; int iParent; - KAction *action; + TDEAction *action; }; /** diff --git a/kmail/snippetwidget.cpp b/kmail/snippetwidget.cpp index b7ba16f1b..601174cfd 100644 --- a/kmail/snippetwidget.cpp +++ b/kmail/snippetwidget.cpp @@ -44,14 +44,14 @@ #include <cassert> -SnippetWidget::SnippetWidget(KMEdit* editor, KActionCollection* actionCollection, TQWidget* parent) - : KListView(parent, "snippet widget"), TQToolTip( viewport() ), +SnippetWidget::SnippetWidget(KMEdit* editor, TDEActionCollection* actionCollection, TQWidget* parent) + : TDEListView(parent, "snippet widget"), TQToolTip( viewport() ), mEditor( editor ), mActionCollection( actionCollection ) { // init the TQPtrList _list.setAutoDelete(TRUE); - // init the KListView + // init the TDEListView setSorting( -1 ); addColumn( "" ); setFullWidth(true); @@ -142,13 +142,13 @@ void SnippetWidget::slotAdd() \fn SnippetWidget::makeItem( SnippetItem* parent, const TQString& name, const TQString& text ) Helper factory method. */ -SnippetItem* SnippetWidget::makeItem( SnippetItem* parent, const TQString& name, const TQString& text, const KShortcut& shortcut ) +SnippetItem* SnippetWidget::makeItem( SnippetItem* parent, const TQString& name, const TQString& text, const TDEShortcut& shortcut ) { SnippetItem * item = new SnippetItem(parent, name, text); const TQString actionName = i18n("Snippet %1").arg(name); const TQString normalizedName = TQString(actionName).replace(" ", "_"); if ( !mActionCollection->action(normalizedName.utf8().data() ) ) { - KAction * action = new KAction( actionName, shortcut, item, + TDEAction * action = new TDEAction( actionName, shortcut, item, TQT_SLOT( slotExecute() ), mActionCollection, normalizedName.utf8() ); item->setAction(action); @@ -249,7 +249,7 @@ void SnippetWidget::slotEdit( TQListViewItem* item ) dlg.cbGroup->setCurrentText(SnippetItem::findGroupById(pSnippet->getParent(), _list)->getName()); if (dlg.exec() == TQDialog::Accepted) { - //update the KListView and the SnippetItem + //update the TDEListView and the SnippetItem item->setText( 0, dlg.snippetName->text() ); pSnippet->setName( dlg.snippetName->text() ); pSnippet->setText( dlg.snippetText->text() ); @@ -291,7 +291,7 @@ void SnippetWidget::slotEditGroup() dlg.cbGroup->insertItem(i18n("All")); if (dlg.exec() == TQDialog::Accepted) { - //update the KListView and the SnippetGroup + //update the TDEListView and the SnippetGroup item->setText( 0, dlg.snippetName->text() ); pGroup->setName( dlg.snippetName->text() ); @@ -369,9 +369,9 @@ void SnippetWidget::writeConfig() _cfg->writeEntry(strKeyText, item->getText()); _cfg->writeEntry(strKeyId, item->getParent()); - KAction * action = item->getAction(); + TDEAction * action = item->getAction(); assert( action ); - const KShortcut& sc = action->shortcut(); + const TDEShortcut& sc = action->shortcut(); if (!sc.isNull() ) { _cfg->writeEntry( TQString("snippetShortcut_%1").arg(iSnipCount), sc.toString() ); } @@ -474,7 +474,7 @@ void SnippetWidget::initConfig() //kdDebug(5006) << "Read item " << strNameVal << " " << iParentVal << endl; if (strNameVal != "" && strTextVal != "" && iParentVal != -1) { - KShortcut shortcut( _cfg->readEntry( TQString("snippetShortcut_%1").arg(i), TQString() ) ); + TDEShortcut shortcut( _cfg->readEntry( TQString("snippetShortcut_%1").arg(i), TQString() ) ); item = makeItem( SnippetItem::findGroupById(iParentVal, _list), strNameVal, strTextVal, shortcut ); //kdDebug(5006) << "Created item " << item->getName() << " " << item->getParent() << endl; _list.append(item); @@ -536,7 +536,7 @@ void SnippetWidget::maybeTip( const TQPoint & p ) */ void SnippetWidget::showPopupMenu( TQListViewItem * item, const TQPoint & p, int ) { - KPopupMenu popup; + TDEPopupMenu popup; SnippetItem * selectedItem = static_cast<SnippetItem *>(item); if ( item ) { @@ -868,7 +868,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri // fn SnippetWidget::acceptDrag (TQDropEvent *event) const /*! - Reimplementation from KListView. + Reimplementation from TDEListView. Check here if the data the user is about to drop fits our restrictions. We only accept dropps of plaintext, because from the dropped text we will create a snippet. diff --git a/kmail/snippetwidget.h b/kmail/snippetwidget.h index 88a967194..8471f0556 100644 --- a/kmail/snippetwidget.h +++ b/kmail/snippetwidget.h @@ -26,7 +26,7 @@ class KDevProject; class SnippetPart; class TQPushButton; -class KListView; +class TDEListView; class TQListViewItem; class TQPoint; class SnippetDlg; @@ -34,21 +34,21 @@ class SnippetItem; class KTextEdit; class TDEConfig; class KMEdit; -class KActionCollection; +class TDEActionCollection; /** This is the widget which gets added to the right TreeToolView. -It inherits KListView and TQToolTip which is needed for showing the +It inherits TDEListView and TQToolTip which is needed for showing the tooltips which contains the text of the snippet @author Robert Gruber */ -class SnippetWidget : public KListView, public TQToolTip +class SnippetWidget : public TDEListView, public TQToolTip { Q_OBJECT public: - SnippetWidget(KMEdit* editor, KActionCollection* actionCollection, TQWidget* parent = 0); + SnippetWidget(KMEdit* editor, TDEActionCollection* actionCollection, TQWidget* parent = 0); ~SnippetWidget(); TQPtrList<SnippetItem> * getList() { return (&_list); } void writeConfig(); @@ -68,14 +68,14 @@ private: bool showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQString, TQString> * mapSave, int & iWidth, int & iBasicHeight, int & iOneHeight); TQString showSingleVarDialog(TQString var, TQMap<TQString, TQString> * mapSave, TQRect & dlgSize); - SnippetItem* makeItem( SnippetItem* parent, const TQString& name, const TQString& text, const KShortcut& shortcut ); + SnippetItem* makeItem( SnippetItem* parent, const TQString& name, const TQString& text, const TDEShortcut& shortcut ); TQPtrList<SnippetItem> _list; TQMap<TQString, TQString> _mapSaved; TDEConfig * _cfg; SnippetConfig _SnippetConfig; KMEdit* mEditor; - KActionCollection* mActionCollection; + TDEActionCollection* mActionCollection; public slots: void slotRemove(); diff --git a/kmail/templatesinsertcommand.cpp b/kmail/templatesinsertcommand.cpp index f084be379..41a0cb0eb 100644 --- a/kmail/templatesinsertcommand.cpp +++ b/kmail/templatesinsertcommand.cpp @@ -38,282 +38,282 @@ TemplatesInsertCommand::TemplatesInsertCommand( TQWidget *parent, connect( this, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotClicked() ) ); - KAction *action; - KActionMenu *menu; + TDEAction *action; + TDEActionMenu *menu; TQSignalMapper *mapper = new TQSignalMapper( TQT_TQOBJECT(this) ); connect( mapper, TQT_SIGNAL( mapped(int) ), this, TQT_SLOT( slotMapped(int) ) ); - mMenu = new KActionMenu( i18n( "Insert Command..." ), TQT_TQOBJECT(this) ); + mMenu = new TDEActionMenu( i18n( "Insert Command..." ), TQT_TQOBJECT(this) ); // ****************************************************** - menu = new KActionMenu( i18n( "Original Message" ), mMenu ); + menu = new TDEActionMenu( i18n( "Original Message" ), mMenu ); mMenu->insert( menu ); - action = new KAction( i18n("Quoted Message"), + action = new TDEAction( i18n("Quoted Message"), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, CQuote ); menu->insert( action ); - action = new KAction( i18n("Message Text as Is"), + action = new TDEAction( i18n("Message Text as Is"), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, CText ); menu->insert( action ); - action = new KAction( i18n("Message Id"), + action = new TDEAction( i18n("Message Id"), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, COMsgId ); menu->insert( action ); - action = new KAction( i18n("Date"), + action = new TDEAction( i18n("Date"), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, CODate ); menu->insert( action ); - action = new KAction( i18n("Date in Short Format"), + action = new TDEAction( i18n("Date in Short Format"), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, CODateShort ); menu->insert( action ); - action = new KAction( i18n("Date in C Locale"), + action = new TDEAction( i18n("Date in C Locale"), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, CODateEn ); menu->insert( action ); - action = new KAction( i18n("Day of Week"), + action = new TDEAction( i18n("Day of Week"), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, CODow ); menu->insert( action ); - action = new KAction( i18n("Time"), + action = new TDEAction( i18n("Time"), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, COTime ); menu->insert( action ); - action = new KAction( i18n("Time in Long Format"), + action = new TDEAction( i18n("Time in Long Format"), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, COTimeLong ); menu->insert( action ); - action = new KAction( i18n("Time in C Locale"), + action = new TDEAction( i18n("Time in C Locale"), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, COTimeLongEn ); menu->insert( action ); - action = new KAction( i18n("To Field Address"), + action = new TDEAction( i18n("To Field Address"), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, COToAddr ); menu->insert( action ); - action = new KAction( i18n("To Field Name"), + action = new TDEAction( i18n("To Field Name"), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, COToName ); menu->insert( action ); - action = new KAction( i18n("To Field First Name"), + action = new TDEAction( i18n("To Field First Name"), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, COToFName ); menu->insert( action ); - action = new KAction( i18n("To Field Last Name"), + action = new TDEAction( i18n("To Field Last Name"), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, COToLName ); menu->insert( action ); - action = new KAction( i18n( "CC Field Address" ), + action = new TDEAction( i18n( "CC Field Address" ), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, COCCAddr ); menu->insert( action ); - action = new KAction( i18n( "CC Field Name" ), + action = new TDEAction( i18n( "CC Field Name" ), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, COCCName ); menu->insert( action ); - action = new KAction( i18n( "CC Field First Name" ), + action = new TDEAction( i18n( "CC Field First Name" ), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, COCCFName ); menu->insert( action ); - action = new KAction( i18n( "CC Field Last Name" ), + action = new TDEAction( i18n( "CC Field Last Name" ), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, COCCLName ); menu->insert( action ); - action = new KAction( i18n( "From Field Address" ), + action = new TDEAction( i18n( "From Field Address" ), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, COFromAddr ); menu->insert( action ); - action = new KAction( i18n( "From Field Name" ), + action = new TDEAction( i18n( "From Field Name" ), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, COFromName ); menu->insert( action ); - action = new KAction( i18n( "From Field First Name" ), + action = new TDEAction( i18n( "From Field First Name" ), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, COFromFName ); menu->insert( action ); - action = new KAction( i18n( "From Field Last Name" ), + action = new TDEAction( i18n( "From Field Last Name" ), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, COFromLName ); menu->insert( action ); - action = new KAction( i18n( "Addresses of all original recipients" ), + action = new TDEAction( i18n( "Addresses of all original recipients" ), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, COAddresseesAddr ); - action = new KAction( i18n( "Subject" ), + action = new TDEAction( i18n( "Subject" ), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, COFullSubject ); menu->insert( action ); - action = new KAction( i18n( "Quoted Headers" ), + action = new TDEAction( i18n( "Quoted Headers" ), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, CTQHeaders ); menu->insert( action ); - action = new KAction( i18n( "Headers as Is" ), + action = new TDEAction( i18n( "Headers as Is" ), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, CHeaders ); menu->insert( action ); - action = new KAction( i18n( "Header Content" ), + action = new TDEAction( i18n( "Header Content" ), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, COHeader ); menu->insert( action ); // ****************************************************** - menu = new KActionMenu( i18n( "Current Message" ), mMenu ); + menu = new TDEActionMenu( i18n( "Current Message" ), mMenu ); mMenu->insert( menu ); - action = new KAction( i18n( "Message Id" ), + action = new TDEAction( i18n( "Message Id" ), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, CMsgId ); menu->insert( action ); - action = new KAction( i18n( "Date" ), + action = new TDEAction( i18n( "Date" ), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, CDate ); menu->insert( action ); - action = new KAction( i18n( "Date in Short Format" ), + action = new TDEAction( i18n( "Date in Short Format" ), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, CDateShort ); menu->insert( action ); - action = new KAction( i18n( "Date in C Locale" ), + action = new TDEAction( i18n( "Date in C Locale" ), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, CDateEn ); menu->insert( action ); - action = new KAction( i18n( "Day of Week" ), + action = new TDEAction( i18n( "Day of Week" ), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, CDow ); menu->insert( action ); - action = new KAction( i18n( "Time" ), + action = new TDEAction( i18n( "Time" ), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, CTime ); menu->insert( action ); - action = new KAction( i18n( "Time in Long Format" ), + action = new TDEAction( i18n( "Time in Long Format" ), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, CTimeLong ); menu->insert( action ); - action = new KAction( i18n( "Time in C Locale" ), + action = new TDEAction( i18n( "Time in C Locale" ), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, CTimeLongEn ); menu->insert( action ); - action = new KAction( i18n( "To Field Address" ), + action = new TDEAction( i18n( "To Field Address" ), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, CToAddr ); menu->insert( action ); - action = new KAction( i18n( "To Field Name" ), + action = new TDEAction( i18n( "To Field Name" ), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, CToName ); menu->insert( action ); - action = new KAction( i18n( "To Field First Name" ), + action = new TDEAction( i18n( "To Field First Name" ), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, CToFName ); menu->insert( action ); - action = new KAction( i18n( "To Field Last Name" ), + action = new TDEAction( i18n( "To Field Last Name" ), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, CToLName ); menu->insert( action ); - action = new KAction( i18n( "CC Field Address" ), + action = new TDEAction( i18n( "CC Field Address" ), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, CCCAddr ); menu->insert( action ); - action = new KAction( i18n( "CC Field Name" ), + action = new TDEAction( i18n( "CC Field Name" ), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, CCCName ); menu->insert( action ); - action = new KAction( i18n( "CC Field First Name" ), + action = new TDEAction( i18n( "CC Field First Name" ), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, CCCFName ); menu->insert( action ); - action = new KAction( i18n( "CC Field Last Name" ), + action = new TDEAction( i18n( "CC Field Last Name" ), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, CCCLName ); menu->insert( action ); - action = new KAction( i18n( "From Field Address" ), + action = new TDEAction( i18n( "From Field Address" ), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, CFromAddr ); menu->insert( action ); - action = new KAction( i18n( "From Field Name" ), + action = new TDEAction( i18n( "From Field Name" ), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, CFromName ); menu->insert( action ); - action = new KAction( i18n( "From Field First Name" ), + action = new TDEAction( i18n( "From Field First Name" ), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, CFromFName ); menu->insert( action ); - action = new KAction( i18n( "From Field Last Name" ), + action = new TDEAction( i18n( "From Field Last Name" ), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, CFromLName ); menu->insert( action ); - action = new KAction( i18n( "Subject" ), + action = new TDEAction( i18n( "Subject" ), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, CFullSubject ); menu->insert( action ); - action = new KAction( i18n( "Header Content" ), + action = new TDEAction( i18n( "Header Content" ), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, CHeader ); menu->insert( action ); // ****************************************************** - menu = new KActionMenu( i18n( "Process With External Programs" ), mMenu ); + menu = new TDEActionMenu( i18n( "Process With External Programs" ), mMenu ); mMenu->insert( menu ); - action = new KAction( i18n( "Insert Result of Command" ), + action = new TDEAction( i18n( "Insert Result of Command" ), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, CSystem ); menu->insert( action ); - action = new KAction( i18n( "Pipe Original Message Body and Insert Result as Quoted Text" ), + action = new TDEAction( i18n( "Pipe Original Message Body and Insert Result as Quoted Text" ), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, CQuotePipe ); menu->insert( action ); - action = new KAction( i18n( "Pipe Original Message Body and Insert Result as Is" ), + action = new TDEAction( i18n( "Pipe Original Message Body and Insert Result as Is" ), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, CTextPipe ); menu->insert( action ); - action = new KAction( i18n( "Pipe Original Message with Headers and Insert Result as Is" ), + action = new TDEAction( i18n( "Pipe Original Message with Headers and Insert Result as Is" ), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, CMsgPipe ); menu->insert( action ); - action = new KAction( i18n( "Pipe Current Message Body and Insert Result as Is" ), + action = new TDEAction( i18n( "Pipe Current Message Body and Insert Result as Is" ), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, CBodyPipe ); menu->insert( action ); - action = new KAction( i18n( "Pipe Current Message Body and Replace with Result" ), + action = new TDEAction( i18n( "Pipe Current Message Body and Replace with Result" ), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, CClearPipe ); menu->insert( action ); // ****************************************************** - menu = new KActionMenu( i18n( "Miscellaneous" ), mMenu ); + menu = new TDEActionMenu( i18n( "Miscellaneous" ), mMenu ); mMenu->insert( menu ); - action = new KAction( i18n( "Set Cursor Position" ), + action = new TDEAction( i18n( "Set Cursor Position" ), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, CCursor ); menu->insert( action ); - action = new KAction( i18n( "Insert File Content" ), + action = new TDEAction( i18n( "Insert File Content" ), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, CInsert ); menu->insert( action ); - action = new KAction( i18n( "DNL" ), + action = new TDEAction( i18n( "DNL" ), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, CDnl ); menu->insert( action ); - action = new KAction( i18n( "Template Comment" ), + action = new TDEAction( i18n( "Template Comment" ), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, CRem ); menu->insert( action ); - action = new KAction( i18n( "No Operation" ), + action = new TDEAction( i18n( "No Operation" ), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, CNop ); menu->insert( action ); - action = new KAction( i18n( "Clear Generated Message" ), + action = new TDEAction( i18n( "Clear Generated Message" ), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, CClear ); menu->insert( action ); - action = new KAction( i18n( "Turn Debug On" ), + action = new TDEAction( i18n( "Turn Debug On" ), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, CDebug ); menu->insert( action ); - action = new KAction( i18n( "Turn Debug Off" ), + action = new TDEAction( i18n( "Turn Debug Off" ), 0, mapper, TQT_SLOT( map() ), menu ); mapper->setMapping( action, CDebugOff ); menu->insert( action ); diff --git a/kmail/templatesinsertcommand.h b/kmail/templatesinsertcommand.h index 26ba889d6..437ad8bdf 100644 --- a/kmail/templatesinsertcommand.h +++ b/kmail/templatesinsertcommand.h @@ -25,7 +25,7 @@ #include <tqpushbutton.h> -class KActionMenu; +class TDEActionMenu; class TemplatesInsertCommand : public TQPushButton { @@ -57,7 +57,7 @@ class TemplatesInsertCommand : public TQPushButton void slotMapped( int cmd ); protected: - KActionMenu *mMenu; + TDEActionMenu *mMenu; }; #endif // TEMPLATESINSERTCOMMAND_H diff --git a/kmail/treebase.cpp b/kmail/treebase.cpp index d3e8a045b..bda40c121 100644 --- a/kmail/treebase.cpp +++ b/kmail/treebase.cpp @@ -29,7 +29,7 @@ using namespace KMail; TreeBase::TreeBase( TQWidget *parent, KMFolderTree *folderTree, const TQString &preSelection, bool mustBeReadWrite ) - : KListView( parent ), mFolderTree( folderTree ) + : TDEListView( parent ), mFolderTree( folderTree ) { Q_UNUSED( preSelection ); Q_UNUSED( mustBeReadWrite ); @@ -92,7 +92,7 @@ void TreeBase::slotContextMenuRequested( TQListViewItem *lvi, const TQPoint &p if ( !folder || folder->noContent() || folder->noChildren() ) return; - KPopupMenu *folderMenu = new KPopupMenu; + TDEPopupMenu *folderMenu = new TDEPopupMenu; folderMenu->insertTitle( folder->label() ); folderMenu->insertSeparator(); folderMenu->insertItem(SmallIconSet("folder_new"), diff --git a/kmail/treebase.h b/kmail/treebase.h index 94f0756c5..ff0e68d66 100644 --- a/kmail/treebase.h +++ b/kmail/treebase.h @@ -30,7 +30,7 @@ namespace KMail { class TreeItemBase; -class TreeBase : public KListView +class TreeBase : public TDEListView { Q_OBJECT diff --git a/kmobile/kmobile.cpp b/kmobile/kmobile.cpp index 48d8d2983..3d867b3d7 100644 --- a/kmobile/kmobile.cpp +++ b/kmobile/kmobile.cpp @@ -53,13 +53,13 @@ #include "kmobile_selectiondialog.h" KMobile::KMobile() - : KMainWindow( 0, "kmobile" ) + : TDEMainWindow( 0, "kmobile" ) { m_config = new TDEConfig("kmobilerc"); m_view = new KMobileView(this, m_config); - // tell the KMainWindow that this is indeed the main widget + // tell the TDEMainWindow that this is indeed the main widget setCentralWidget(m_view); // then, setup our actions @@ -104,13 +104,13 @@ void KMobile::setupActions() KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection()); KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(optionsPreferences()), actionCollection()); - new KAction(i18n("&Add Device..."), "folder_new", 0, + new TDEAction(i18n("&Add Device..."), "folder_new", 0, TQT_TQOBJECT(this), TQT_SLOT(addDevice()), actionCollection(), "device_add"); - new KAction( 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"); - new KAction(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"); - new KAction(i18n("&Configure Device..."), "configure", 0, + new TDEAction(i18n("&Configure Device..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(configDevice()), actionCollection(), "device_configure"); createGUI(); diff --git a/kmobile/kmobile.h b/kmobile/kmobile.h index 58d3f4c23..a91c4cce3 100644 --- a/kmobile/kmobile.h +++ b/kmobile/kmobile.h @@ -11,7 +11,7 @@ #include "kmobileview.h" -class KToggleAction; +class TDEToggleAction; class SystemTray; /** @@ -20,7 +20,7 @@ class SystemTray; * * @short Main window class */ -class KMobile : public KMainWindow +class KMobile : public TDEMainWindow { Q_OBJECT @@ -92,8 +92,8 @@ private: KMobileView *m_view; SystemTray *m_systemTray; - KToggleAction *m_toolbarAction; - KToggleAction *m_statusbarAction; + TDEToggleAction *m_toolbarAction; + TDEToggleAction *m_statusbarAction; }; #endif // _KMOBILE_H_ diff --git a/kmobile/systemtray.cpp b/kmobile/systemtray.cpp index 9f15f0551..b18faa976 100644 --- a/kmobile/systemtray.cpp +++ b/kmobile/systemtray.cpp @@ -35,7 +35,7 @@ #include "kmobileview.h" -SystemTray::SystemTray(KMainWindow *parent, const char *name) : KSystemTray(parent, name) +SystemTray::SystemTray(TDEMainWindow *parent, const char *name) : KSystemTray(parent, name) { m_appPix = TDEGlobal::instance()->iconLoader()->loadIcon("kmobile", KIcon::Small); @@ -44,9 +44,9 @@ SystemTray::SystemTray(KMainWindow *parent, const char *name) : KSystemTray(pare setToolTip(); m_actionCollection = parent->actionCollection(); - KAction *addAction = m_actionCollection->action("device_add"); + TDEAction *addAction = m_actionCollection->action("device_add"); - KPopupMenu* menu = contextMenu(); + TDEPopupMenu* menu = contextMenu(); addAction->plug(menu); menu->insertSeparator(); } @@ -58,7 +58,7 @@ SystemTray::~SystemTray() #define SYSTEMTRAY_STARTID 1000 -void SystemTray::contextMenuAboutToShow(KPopupMenu *menu) +void SystemTray::contextMenuAboutToShow(TDEPopupMenu *menu) { KMobile *main = static_cast<KMobile *>(TQT_TQWIDGET(parent())); diff --git a/kmobile/systemtray.h b/kmobile/systemtray.h index 29e723c18..a64cabad1 100644 --- a/kmobile/systemtray.h +++ b/kmobile/systemtray.h @@ -22,8 +22,8 @@ #include <ksystemtray.h> -class KMainWindow; -class KAction; +class TDEMainWindow; +class TDEAction; class SystemTray : public KSystemTray { @@ -31,7 +31,7 @@ class SystemTray : public KSystemTray public: - SystemTray(KMainWindow *parent = 0, const char *name = 0); + SystemTray(TDEMainWindow *parent = 0, const char *name = 0); virtual ~SystemTray(); protected slots: @@ -39,7 +39,7 @@ protected slots: void menuItemSelected(); protected: - void contextMenuAboutToShow( KPopupMenu* menu ); + void contextMenuAboutToShow( TDEPopupMenu* menu ); private: void setToolTip(const TQString &tip = TQString()); @@ -47,7 +47,7 @@ private: TQPixmap m_appPix; TQLabel *m_currentLabel; - KActionCollection *m_actionCollection; + TDEActionCollection *m_actionCollection; int m_menuID; }; diff --git a/knode/articlewidget.cpp b/knode/articlewidget.cpp index 91ba87ac5..6e7c4f613 100644 --- a/knode/articlewidget.cpp +++ b/knode/articlewidget.cpp @@ -77,7 +77,7 @@ TQValueList<ArticleWidget*> ArticleWidget::mInstances; ArticleWidget::ArticleWidget( TQWidget *parent, KXMLGUIClient *guiClient, - KActionCollection *actionCollection, + TDEActionCollection *actionCollection, const char *name ) : TQWidget( parent, name ), mArticle( 0 ), @@ -141,78 +141,78 @@ void ArticleWidget::initActions() mSelectAllAction = KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT(slotSelectAll()), mActionCollection ); mFindAction = KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT(slotFind()), mActionCollection, "find_in_article" ); mFindAction->setText( i18n("F&ind in Article...") ); - mViewSourceAction = new KAction( i18n("&View Source"), Key_V , TQT_TQOBJECT(this), + mViewSourceAction = new TDEAction( i18n("&View Source"), Key_V , TQT_TQOBJECT(this), TQT_SLOT(slotViewSource()), mActionCollection, "article_viewSource" ); - mReplyAction = new KAction( 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" ); - mRemailAction = new KAction( i18n("Reply by E&mail..."), "mail_reply", + mRemailAction = new TDEAction( i18n("Reply by E&mail..."), "mail_reply", Key_A, TQT_TQOBJECT(this), TQT_SLOT(slotRemail()), mActionCollection, "article_mailReply" ); - mForwardAction = new KAction( 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" ); - mCancelAction = new KAction( i18n("article","&Cancel Article"), + mCancelAction = new TDEAction( i18n("article","&Cancel Article"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCancel()), mActionCollection, "article_cancel" ); - mSupersedeAction = new KAction(i18n("S&upersede Article"), + mSupersedeAction = new TDEAction(i18n("S&upersede Article"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSupersede()), mActionCollection, "article_supersede" ); - mFixedFontToggle = new KToggleAction( i18n("U&se Fixed Font"), + mFixedFontToggle = new TDEToggleAction( i18n("U&se Fixed Font"), Key_X ,TQT_TQOBJECT(this), TQT_SLOT(slotToggleFixedFont()), mActionCollection, "view_useFixedFont" ); - mFancyToggle = new KToggleAction( i18n("Fancy Formating"), + mFancyToggle = new TDEToggleAction( i18n("Fancy Formating"), Key_Y, TQT_TQOBJECT(this), TQT_SLOT(slotToggleFancyFormating()), mActionCollection, "view_fancyFormating" ); - mRot13Toggle = new KToggleAction( i18n("&Unscramble (Rot 13)"), "decrypted", 0 , TQT_TQOBJECT(this), + mRot13Toggle = new TDEToggleAction( i18n("&Unscramble (Rot 13)"), "decrypted", 0 , TQT_TQOBJECT(this), TQT_SLOT(slotToggleRot13()), mActionCollection, "view_rot13" ); mRot13Toggle->setChecked( false ); - KRadioAction *ra; - mHeaderStyleMenu = new KActionMenu( i18n("&Headers"), mActionCollection, "view_headers" ); - ra = new KRadioAction( i18n("&Fancy Headers"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFancyHeaders()), + TDERadioAction *ra; + mHeaderStyleMenu = new TDEActionMenu( i18n("&Headers"), mActionCollection, "view_headers" ); + ra = new TDERadioAction( i18n("&Fancy Headers"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFancyHeaders()), mActionCollection, "view_headers_fancy" ); ra->setExclusiveGroup( "view_headers" ); mHeaderStyleMenu->insert( ra ); - ra = new KRadioAction( i18n("&Standard Headers"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotStandardHeaders()), + ra = new TDERadioAction( i18n("&Standard Headers"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotStandardHeaders()), mActionCollection, "view_headers_standard" ); ra->setExclusiveGroup( "view_headers" ); mHeaderStyleMenu->insert( ra ); - ra = new KRadioAction( i18n("&All Headers"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAllHeaders()), + ra = new TDERadioAction( i18n("&All Headers"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAllHeaders()), mActionCollection, "view_headers_all" ); ra->setExclusiveGroup( "view_headers" ); mHeaderStyleMenu->insert( ra ); - mAttachmentStyleMenu = new KActionMenu( i18n("&Attachments"), mActionCollection, "view_attachments" ); - ra = new KRadioAction( i18n("&As Icon"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotIconAttachments()), + mAttachmentStyleMenu = new TDEActionMenu( i18n("&Attachments"), mActionCollection, "view_attachments" ); + ra = new TDERadioAction( i18n("&As Icon"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotIconAttachments()), mActionCollection, "view_attachments_icon" ); ra->setExclusiveGroup( "view_attachments" ); mAttachmentStyleMenu->insert( ra ); - ra = new KRadioAction( i18n("&Inline"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInlineAttachments()), + ra = new TDERadioAction( i18n("&Inline"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInlineAttachments()), mActionCollection, "view_attachments_inline" ); ra->setExclusiveGroup( "view_attachments" ); mAttachmentStyleMenu->insert( ra ); - ra = new KRadioAction( i18n("&Hide"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotHideAttachments()), + ra = new TDERadioAction( i18n("&Hide"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotHideAttachments()), mActionCollection, "view_attachments_hide" ); ra->setExclusiveGroup( "view_attachments" ); mAttachmentStyleMenu->insert( ra ); - mCharsetSelect = new KSelectAction( i18n("Chars&et"), 0, mActionCollection, "set_charset" ); + mCharsetSelect = new TDESelectAction( i18n("Chars&et"), 0, mActionCollection, "set_charset" ); mCharsetSelect->setShortcutConfigurable( false ); TQStringList cs = TDEGlobal::charsets()->descriptiveEncodingNames(); cs.prepend( i18n("Automatic") ); mCharsetSelect->setItems( cs ); mCharsetSelect->setCurrentItem( 0 ); connect( mCharsetSelect, TQT_SIGNAL(activated(const TQString&)),TQT_SLOT(slotSetCharset(const TQString&)) ); - mCharsetSelectKeyb = new KAction( i18n("Charset"), Key_C, TQT_TQOBJECT(this), + mCharsetSelectKeyb = new TDEAction( i18n("Charset"), Key_C, TQT_TQOBJECT(this), TQT_SLOT(slotSetCharsetKeyboard()), mActionCollection, "set_charset_keyboard" ); - new KAction( i18n("&Open URL"), "fileopen", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenURL()), + new TDEAction( i18n("&Open URL"), "fileopen", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenURL()), mActionCollection, "open_url" ); - new KAction( i18n("&Copy Link Address"), "editcopy", 0, TQT_TQOBJECT(this), TQT_SLOT( slotCopyURL()), + new TDEAction( i18n("&Copy Link Address"), "editcopy", 0, TQT_TQOBJECT(this), TQT_SLOT( slotCopyURL()), mActionCollection, "copy_url" ); - new KAction( i18n("&Bookmark This Link"), "bookmark_add", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddBookmark()), + new TDEAction( i18n("&Bookmark This Link"), "bookmark_add", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddBookmark()), mActionCollection, "add_bookmark" ); - new KAction( i18n("&Add to Address Book"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddToAddressBook()), + new TDEAction( i18n("&Add to Address Book"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddToAddressBook()), mActionCollection, "add_addr_book" ); - new KAction( i18n("&Open in Address Book"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenInAddressBook()), + new TDEAction( i18n("&Open in Address Book"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenInAddressBook()), mActionCollection, "openin_addr_book" ); - new KAction( i18n("&Open Attachment"), "fileopen", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenAttachment()), + new TDEAction( i18n("&Open Attachment"), "fileopen", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenAttachment()), mActionCollection, "open_attachment" ); - new KAction( i18n("&Save Attachment As..."), "filesaveas", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveAttachment()), + new TDEAction( i18n("&Save Attachment As..."), "filesaveas", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveAttachment()), mActionCollection, "save_attachment" ); } @@ -289,10 +289,10 @@ void ArticleWidget::readConfig() conf->setGroup( "READNEWS" ); mAttachmentStyle = conf->readEntry( "attachmentStyle", "inline" ); mHeaderStyle = conf->readEntry( "headerStyle", "fancy" ); - KRadioAction *ra = 0; - ra = static_cast<KRadioAction*>( mActionCollection->action( TQString("view_attachments_%1").arg(mAttachmentStyle).latin1() ) ); + TDERadioAction *ra = 0; + ra = static_cast<TDERadioAction*>( mActionCollection->action( TQString("view_attachments_%1").arg(mAttachmentStyle).latin1() ) ); ra->setChecked( true ); - ra = static_cast<KRadioAction*>( mActionCollection->action( TQString("view_headers_%1").arg(mHeaderStyle).latin1() ) ); + ra = static_cast<TDERadioAction*>( mActionCollection->action( TQString("view_headers_%1").arg(mHeaderStyle).latin1() ) ); ra->setChecked( true ); delete mCSSHelper; diff --git a/knode/articlewidget.h b/knode/articlewidget.h index 2a508ee72..cc1cac20b 100644 --- a/knode/articlewidget.h +++ b/knode/articlewidget.h @@ -27,13 +27,13 @@ class TQStringList; class TQTimer; -class KAction; -class KActionCollection; -class KActionMenu; +class TDEAction; +class TDEActionCollection; +class TDEActionMenu; class TDEHTMLPart; class KURL; -class KSelectAction; -class KToggleAction; +class TDESelectAction; +class TDEToggleAction; class KXMLGUIClient; namespace Kpgp { @@ -59,7 +59,7 @@ class ArticleWidget : public TQWidget, public KNJobConsumer { /// Construct a new article widget ArticleWidget( TQWidget *parent, KXMLGUIClient *guiClient, - KActionCollection *actionCollection, + TDEActionCollection *actionCollection, const char *name = 0 ); ~ArticleWidget(); @@ -73,7 +73,7 @@ class ArticleWidget : public TQWidget, public KNJobConsumer { /// returns the currently shown article KNArticle *article() const { return mArticle; } - KAction* setCharsetKeyboardAction() const { return mCharsetSelectKeyb; } + TDEAction* setCharsetKeyboardAction() const { return mCharsetSelectKeyb; } /// notify all instances about a config change static void configChanged(); @@ -243,26 +243,26 @@ class ArticleWidget : public TQWidget, public KNJobConsumer { static TQValueList<ArticleWidget*> mInstances; KXMLGUIClient *mGuiClient; - KActionCollection *mActionCollection; - - KAction *mSaveAction; - KAction *mPrintAction; - KAction *mCopySelectionAction; - KAction *mSelectAllAction; - KAction *mFindAction; - KAction *mViewSourceAction; - KAction *mCharsetSelectKeyb; - KAction *mReplyAction; - KAction *mRemailAction; - KAction *mForwardAction; - KAction *mCancelAction; - KAction *mSupersedeAction; - KActionMenu *mHeaderStyleMenu; - KActionMenu *mAttachmentStyleMenu; - KToggleAction *mFixedFontToggle; - KToggleAction *mFancyToggle; - KToggleAction *mRot13Toggle; - KSelectAction *mCharsetSelect; + TDEActionCollection *mActionCollection; + + TDEAction *mSaveAction; + TDEAction *mPrintAction; + TDEAction *mCopySelectionAction; + TDEAction *mSelectAllAction; + TDEAction *mFindAction; + TDEAction *mViewSourceAction; + TDEAction *mCharsetSelectKeyb; + TDEAction *mReplyAction; + TDEAction *mRemailAction; + TDEAction *mForwardAction; + TDEAction *mCancelAction; + TDEAction *mSupersedeAction; + TDEActionMenu *mHeaderStyleMenu; + TDEActionMenu *mAttachmentStyleMenu; + TDEToggleAction *mFixedFontToggle; + TDEToggleAction *mFancyToggle; + TDEToggleAction *mRot13Toggle; + TDESelectAction *mCharsetSelect; }; } diff --git a/knode/headerview.cpp b/knode/headerview.cpp index 9995ba465..6bfea7042 100644 --- a/knode/headerview.cpp +++ b/knode/headerview.cpp @@ -33,7 +33,7 @@ KNHeaderView::KNHeaderView(TQWidget *parent, const char *name) : - KListView(parent,name), + TDEListView(parent,name), mSortCol( -1 ), mSortAsc( true ), mSortByThreadChangeDate( false ), @@ -70,7 +70,7 @@ KNHeaderView::KNHeaderView(TQWidget *parent, const char *name) : TQT_SLOT(slotSizeChanged(int, int, int)) ); // column selection RMB menu - mPopup = new KPopupMenu( this ); + mPopup = new TDEPopupMenu( this ); mPopup->insertTitle( i18n("View Columns") ); mPopup->setCheckable( true ); mPopup->insertItem( i18n("Line Count"), KPaintInfo::COL_SIZE ); @@ -213,7 +213,7 @@ void KNHeaderView::setSorting( int column, bool ascending ) emit sortingChanged( column ); } - KListView::setSorting( column, ascending ); + TDEListView::setSorting( column, ascending ); if ( currentItem() ) ensureItemVisible( currentItem() ); @@ -458,7 +458,7 @@ bool KNHeaderView::event( TQEvent *e ) if (e->type() == TQEvent::ApplicationPaletteChange) return TQListView::event(e); else - return KListView::event(e); + return TDEListView::event(e); } void KNHeaderView::contentsMousePressEvent( TQMouseEvent *e ) @@ -470,7 +470,7 @@ void KNHeaderView::contentsMousePressEvent( TQMouseEvent *e ) TQPoint vp = contentsToViewport(e->pos()); TQListViewItem *i = itemAt(vp); - KListView::contentsMousePressEvent( e ); + TDEListView::contentsMousePressEvent( e ); if ( i ) { int decoLeft = header()->sectionPos( 0 ) + @@ -495,7 +495,7 @@ void KNHeaderView::contentsMouseDoubleClickEvent( TQMouseEvent *e ) return; } - KListView::contentsMouseDoubleClickEvent( e ); + TDEListView::contentsMouseDoubleClickEvent( e ); } @@ -517,7 +517,7 @@ void KNHeaderView::keyPressEvent(TQKeyEvent *e) break; default: - KListView::keyPressEvent (e); + TDEListView::keyPressEvent (e); } } @@ -555,7 +555,7 @@ bool KNHeaderView::eventFilter(TQObject *o, TQEvent *e) return true; } - return KListView::eventFilter(o, e); + return TDEListView::eventFilter(o, e); } diff --git a/knode/headerview.h b/knode/headerview.h index 78e6f2a65..4a297c817 100644 --- a/knode/headerview.h +++ b/knode/headerview.h @@ -21,10 +21,10 @@ #include <kfoldertree.h> #include <kmime_util.h> -class KPopupMenu; +class TDEPopupMenu; class KNHdrViewItem; -class KNHeaderView : public KListView { +class KNHeaderView : public TDEListView { Q_OBJECT @@ -73,7 +73,7 @@ class KNHeaderView : public KListView { protected: void activeRemoved() { mActiveItem = 0; } /** - * Reimplemented to avoid that KListview reloads the alternate + * Reimplemented to avoid that TDEListview reloads the alternate * background on palette changes. */ virtual bool event( TQEvent *e ); @@ -93,7 +93,7 @@ class KNHeaderView : public KListView { KNHdrViewItem *mActiveItem; KPaintInfo mPaintInfo; KMime::DateFormatter mDateFormatter; - KPopupMenu *mPopup; + TDEPopupMenu *mPopup; bool mShowingFolder; bool mInitDone; diff --git a/knode/knarticlewindow.cpp b/knode/knarticlewindow.cpp index a45cf7735..22e37171d 100644 --- a/knode/knarticlewindow.cpp +++ b/knode/knarticlewindow.cpp @@ -86,7 +86,7 @@ bool KNArticleWindow::raiseWindowForArticle(const TQCString &mid) //================================================================================== KNArticleWindow::KNArticleWindow(KNArticle *art) - : KMainWindow(0, "articleWindow") + : TDEMainWindow(0, "articleWindow") { if(knGlobals.instance) setInstance(knGlobals.instance); @@ -106,7 +106,7 @@ KNArticleWindow::KNArticleWindow(KNArticle *art) // settings menu KStdAction::preferences(TQT_TQOBJECT(knGlobals.top), TQT_SLOT(slotSettings()), actionCollection()); - KAccel *accel = new KAccel( this ); + TDEAccel *accel = new TDEAccel( this ); artW->setCharsetKeyboardAction()->plugAccel( accel ); setupGUI( ToolBar|Keys|Create, "knreaderui.rc"); diff --git a/knode/knarticlewindow.h b/knode/knarticlewindow.h index 2fa102860..5feafa033 100644 --- a/knode/knarticlewindow.h +++ b/knode/knarticlewindow.h @@ -24,7 +24,7 @@ namespace KNode { class ArticleWidget; } -class KNArticleWindow : public KMainWindow { +class KNArticleWindow : public TDEMainWindow { Q_OBJECT diff --git a/knode/kncollectionview.cpp b/knode/kncollectionview.cpp index 56fe429f6..2f45a30ad 100644 --- a/knode/kncollectionview.cpp +++ b/knode/kncollectionview.cpp @@ -46,7 +46,7 @@ KNCollectionView::KNCollectionView(TQWidget *parent, const char* name) : // popup menu to enable/disable unread and total columns header()->setClickEnabled( true ); header()->installEventFilter( this ); - mPopup = new KPopupMenu( this ); + mPopup = new TDEPopupMenu( this ); mPopup->insertTitle( i18n("View Columns") ); mPopup->setCheckable( true ); mUnreadPop = mPopup->insertItem( i18n("Unread Column"), this, TQT_SLOT(toggleUnreadColumn()) ); @@ -377,7 +377,7 @@ TQDragObject* KNCollectionView::dragObject() void KNCollectionView::contentsDropEvent( TQDropEvent *e ) { - cleanItemHighlighter(); // necessary since we overwrite KListView::contentsDropEvent() + cleanItemHighlighter(); // necessary since we overwrite TDEListView::contentsDropEvent() TQListViewItem *item = itemAt( contentsToViewport(e->pos()) ); KNCollectionViewItem *fti = static_cast<KNCollectionViewItem*>(item); if (fti && (fti->coll) && acceptDrag(e)) { diff --git a/knode/kncollectionview.h b/knode/kncollectionview.h index 44d6ab3af..74a6e25ee 100644 --- a/knode/kncollectionview.h +++ b/knode/kncollectionview.h @@ -18,7 +18,7 @@ #include <kfoldertree.h> -class KPopupMenu; +class TDEPopupMenu; class KNNntpAccount; class KNGroup; class KNFolder; @@ -86,7 +86,7 @@ class KNCollectionView : public KFolderTree { private: TQListViewItem *mActiveItem; - KPopupMenu *mPopup; + TDEPopupMenu *mPopup; int mUnreadPop, mTotalPop; }; diff --git a/knode/kncomposer.cpp b/knode/kncomposer.cpp index 6a31f805c..555d224aa 100644 --- a/knode/kncomposer.cpp +++ b/knode/kncomposer.cpp @@ -21,7 +21,7 @@ #include "addressesdialog.h" using KPIM::AddressesDialog; #include "recentaddresses.h" -using KRecentAddress::RecentAddresses; +using TDERecentAddress::RecentAddresses; #include <kaccel.h> #include <kcharsets.h> #include <kmessagebox.h> @@ -85,7 +85,7 @@ TQPopupMenu *KNLineEdit::createPopupMenu() void KNLineEdit::editRecentAddresses() { - KRecentAddress::RecentAddressDialog dlg( this ); + TDERecentAddress::RecentAddressDialog dlg( this ); dlg.setAddresses( RecentAddresses::self( knGlobals.config() )->addresses() ); if ( dlg.exec() ) { RecentAddresses::self( knGlobals.config() )->clear(); @@ -164,7 +164,7 @@ void KNLineEditSpell::spellCheckerCorrected( const TQString &old, const TQString KNComposer::KNComposer(KNLocalArticle *a, const TQString &text, const TQString &sig, const TQString &unwraped, bool firstEdit, bool dislikesCopies, bool createCopy) - : KMainWindow(0,"composerWindow"), r_esult(CRsave), a_rticle(a), s_ignature(sig), u_nwraped(unwraped), + : TDEMainWindow(0,"composerWindow"), r_esult(CRsave), a_rticle(a), s_ignature(sig), u_nwraped(unwraped), n_eeds8Bit(true), v_alidated(false), a_uthorDislikesMailCopies(dislikesCopies), e_xternalEdited(false), e_xternalEditor(0), e_ditorTempfile(0), s_pellChecker(0), a_ttChanged(false), mFirstEdit( firstEdit ) @@ -205,16 +205,16 @@ KNComposer::KNComposer(KNLocalArticle *a, const TQString &text, const TQString & //------------------------------- <Actions> -------------------------------------- //file menu - new KAction(i18n("&Send Now"),"mail_send", CTRL + Key_Return , TQT_TQOBJECT(this), + new TDEAction(i18n("&Send Now"),"mail_send", CTRL + Key_Return , TQT_TQOBJECT(this), TQT_SLOT(slotSendNow()), actionCollection(), "send_now"); - new KAction(i18n("Send &Later"), "queue", 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Send &Later"), "queue", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSendLater()), actionCollection(), "send_later"); - new KAction(i18n("Save as &Draft"),"filesave", 0 , TQT_TQOBJECT(this), + new TDEAction(i18n("Save as &Draft"),"filesave", 0 , TQT_TQOBJECT(this), TQT_SLOT(slotSaveAsDraft()), actionCollection(), "save_as_draft"); - new KAction(i18n("D&elete"),"editdelete", 0 , TQT_TQOBJECT(this), + new TDEAction(i18n("D&elete"),"editdelete", 0 , TQT_TQOBJECT(this), TQT_SLOT(slotArtDelete()), actionCollection(), "art_delete"); KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()),actionCollection()); @@ -230,7 +230,7 @@ KNComposer::KNComposer(KNLocalArticle *a, const TQString &text, const TQString & KStdAction::pasteText(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), actionCollection()); - new KAction(i18n("Paste as &Quotation"), 0, TQT_TQOBJECT(v_iew->e_dit), + new TDEAction(i18n("Paste as &Quotation"), 0, TQT_TQOBJECT(v_iew->e_dit), TQT_SLOT(slotPasteAsQuotation()), actionCollection(), "paste_quoted"); KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT(slotSelectAll()), actionCollection()); @@ -241,73 +241,73 @@ KNComposer::KNComposer(KNLocalArticle *a, const TQString &text, const TQString & KStdAction::replace(TQT_TQOBJECT(v_iew->e_dit), TQT_SLOT(slotReplace()), actionCollection()); //attach menu - new KAction(i18n("Append &Signature"), 0 , TQT_TQOBJECT(this), TQT_SLOT(slotAppendSig()), + new TDEAction(i18n("Append &Signature"), 0 , TQT_TQOBJECT(this), TQT_SLOT(slotAppendSig()), actionCollection(), "append_signature"); - new KAction(i18n("&Insert File..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInsertFile()), + new TDEAction(i18n("&Insert File..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInsertFile()), actionCollection(), "insert_file"); - new KAction(i18n("Insert File (in a &box)..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInsertFileBoxed()), + new TDEAction(i18n("Insert File (in a &box)..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInsertFileBoxed()), actionCollection(), "insert_file_boxed"); - new KAction(i18n("Attach &File..."), "attach", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAttachFile()), + new TDEAction(i18n("Attach &File..."), "attach", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAttachFile()), actionCollection(), "attach_file"); - a_ctPGPsign = new KToggleAction(i18n("Sign Article with &PGP"), + a_ctPGPsign = new TDEToggleAction(i18n("Sign Article with &PGP"), "signature", 0, actionCollection(), "sign_article"); - a_ctRemoveAttachment = new KAction(i18n("&Remove"), 0, TQT_TQOBJECT(this), + a_ctRemoveAttachment = new TDEAction(i18n("&Remove"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveAttachment()), actionCollection(), "remove_attachment"); - a_ctAttachmentProperties = new KAction(i18n("&Properties"), 0, TQT_TQOBJECT(this), + a_ctAttachmentProperties = new TDEAction(i18n("&Properties"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAttachmentProperties()), actionCollection(), "attachment_properties"); //options menu - a_ctDoPost = new KToggleAction(i18n("Send &News Article"), "filenew", 0 , TQT_TQOBJECT(this), + a_ctDoPost = new TDEToggleAction(i18n("Send &News Article"), "filenew", 0 , TQT_TQOBJECT(this), TQT_SLOT(slotToggleDoPost()), actionCollection(), "send_news"); - a_ctDoMail = new KToggleAction(i18n("Send E&mail"), "mail_generic" , 0 , TQT_TQOBJECT(this), + a_ctDoMail = new TDEToggleAction(i18n("Send E&mail"), "mail_generic" , 0 , TQT_TQOBJECT(this), TQT_SLOT(slotToggleDoMail()), actionCollection(), "send_mail"); - a_ctSetCharset = new KSelectAction(i18n("Set &Charset"), 0, actionCollection(), "set_charset"); + a_ctSetCharset = new TDESelectAction(i18n("Set &Charset"), 0, actionCollection(), "set_charset"); a_ctSetCharset->setItems(knGlobals.configManager()->postNewsTechnical()->composerCharsets()); a_ctSetCharset->setShortcutConfigurable(false); connect(a_ctSetCharset, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotSetCharset(const TQString&))); - a_ctSetCharsetKeyb = new KAction(i18n("Set Charset"), 0, TQT_TQOBJECT(this), + a_ctSetCharsetKeyb = new TDEAction(i18n("Set Charset"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetCharsetKeyboard()), actionCollection(), "set_charset_keyboard"); - a_ctWordWrap = new KToggleAction(i18n("&Word Wrap"), 0 , TQT_TQOBJECT(this), + a_ctWordWrap = new TDEToggleAction(i18n("&Word Wrap"), 0 , TQT_TQOBJECT(this), TQT_SLOT(slotToggleWordWrap()), actionCollection(), "toggle_wordwrap"); //tools menu - new KAction(i18n("Add &Quote Characters"), 0, TQT_TQOBJECT(v_iew->e_dit), + new TDEAction(i18n("Add &Quote Characters"), 0, TQT_TQOBJECT(v_iew->e_dit), TQT_SLOT(slotAddQuotes()), actionCollection(), "tools_quote"); - new KAction(i18n("&Remove Quote Characters"), 0, TQT_TQOBJECT(v_iew->e_dit), + new TDEAction(i18n("&Remove Quote Characters"), 0, TQT_TQOBJECT(v_iew->e_dit), TQT_SLOT(slotRemoveQuotes()), actionCollection(), "tools_unquote"); - new KAction(i18n("Add &Box"), 0, TQT_TQOBJECT(v_iew->e_dit), + new TDEAction(i18n("Add &Box"), 0, TQT_TQOBJECT(v_iew->e_dit), TQT_SLOT(slotAddBox()), actionCollection(), "tools_box"); - new KAction(i18n("Re&move Box"), 0, TQT_TQOBJECT(v_iew->e_dit), + new TDEAction(i18n("Re&move Box"), 0, TQT_TQOBJECT(v_iew->e_dit), TQT_SLOT(slotRemoveBox()), actionCollection(), "tools_unbox"); - KAction *undoRewrap = new KAction(i18n("Get &Original Text (not re-wrapped)"), 0, TQT_TQOBJECT(this), + TDEAction *undoRewrap = new TDEAction(i18n("Get &Original Text (not re-wrapped)"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotUndoRewrap()), actionCollection(), "tools_undoRewrap"); undoRewrap->setEnabled(!u_nwraped.isNull()); - KAction *rot13 = new KAction(i18n("S&cramble (Rot 13)"), "encrypted", 0, TQT_TQOBJECT(v_iew->e_dit), + TDEAction *rot13 = new TDEAction(i18n("S&cramble (Rot 13)"), "encrypted", 0, TQT_TQOBJECT(v_iew->e_dit), TQT_SLOT(slotRot13()), actionCollection(), "tools_rot13"); rot13->setEnabled(false); connect(v_iew->e_dit, TQT_SIGNAL(copyAvailable(bool)), rot13, TQT_SLOT(setEnabled(bool))); - a_ctExternalEditor = new KAction(i18n("Start &External Editor"), "run", 0, TQT_TQOBJECT(this), + a_ctExternalEditor = new TDEAction(i18n("Start &External Editor"), "run", 0, TQT_TQOBJECT(this), TQT_SLOT(slotExternalEditor()), actionCollection(), "external_editor"); a_ctSpellCheck = KStdAction::spelling (TQT_TQOBJECT(this), TQT_SLOT(slotSpellcheck()), actionCollection()); @@ -322,7 +322,7 @@ KNComposer::KNComposer(KNLocalArticle *a, const TQString &text, const TQString & KStdAction::preferences(TQT_TQOBJECT(knGlobals.top), TQT_SLOT(slotSettings()), actionCollection()); - a_ccel=new KAccel(this); + a_ccel=new TDEAccel(this); a_ctSetCharsetKeyb->plugAccel(a_ccel); createGUI("kncomposerui.rc", false); @@ -418,7 +418,7 @@ int KNComposer::listOfResultOfCheckWord( const TQStringList & lst , const TQStri { if ( !(*it).isEmpty() ) // in case of removed subtypes or placeholders { - KAction * act = new KAction( *it ); + TDEAction * act = new TDEAction( *it ); connect( act, TQT_SIGNAL(activated()), v_iew->e_dit, TQT_SLOT(slotCorrectWord()) ); m_listAction.append( act ); @@ -1547,7 +1547,7 @@ void KNComposer::slotCancelEditor() } -void KNComposer::slotAttachmentPopup(KListView*, TQListViewItem *it, const TQPoint &p) +void KNComposer::slotAttachmentPopup(TDEListView*, TQListViewItem *it, const TQPoint &p) { if(it) a_ttPopup->popup(p); @@ -1911,8 +1911,8 @@ void KNComposer::ComposerView::showAttachmentView() connect(a_ttView, TQT_SIGNAL(clicked ( TQListViewItem * )), parent(), TQT_SLOT(slotAttachmentSelected(TQListViewItem*))); - connect(a_ttView, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), - parent(), TQT_SLOT(slotAttachmentPopup(KListView*, TQListViewItem*, const TQPoint&))); + connect(a_ttView, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + parent(), TQT_SLOT(slotAttachmentPopup(TDEListView*, TQListViewItem*, const TQPoint&))); connect(a_ttView, TQT_SIGNAL(delPressed(TQListViewItem*)), parent(), TQT_SLOT(slotAttachmentRemove(TQListViewItem*))); connect(a_ttView, TQT_SIGNAL(doubleClicked(TQListViewItem*)), @@ -2054,7 +2054,7 @@ bool KNComposer::Editor::eventFilter(TQObject*o, TQEvent* e) //Continue if this word was misspelled if( !word.isEmpty() && m_replacements.contains( word ) ) { - KPopupMenu p; + TDEPopupMenu p; p.insertTitle( i18n("Suggestions") ); //Add the suggestions to the popup menu @@ -2476,7 +2476,7 @@ void KNComposer::Editor::slotMisspelling (const TQString &, const TQStringList & void KNComposer::Editor::slotCorrectWord() { removeSelectedText(); - KAction * act = (KAction *)(sender()); + TDEAction * act = (TDEAction *)(sender()); int line, col; getCursorPosition(&line,&col); @@ -2491,7 +2491,7 @@ void KNComposer::Editor::slotCorrectWord() KNComposer::AttachmentView::AttachmentView(TQWidget *parent, char *name) - : KListView(parent, name) + : TDEListView(parent, name) { setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken); // match the TQMultiLineEdit style addColumn(i18n("File"), 115); @@ -2517,15 +2517,15 @@ void KNComposer::AttachmentView::keyPressEvent(TQKeyEvent *e) if( (e->key()==Key_Delete) && (currentItem()) ) emit(delPressed(currentItem())); else - KListView::keyPressEvent(e); + TDEListView::keyPressEvent(e); } //===================================================================================== -KNComposer::AttachmentViewItem::AttachmentViewItem(KListView *v, KNAttachment *a) : - KListViewItem(v), attachment(a) +KNComposer::AttachmentViewItem::AttachmentViewItem(TDEListView *v, KNAttachment *a) : + TDEListViewItem(v), attachment(a) { setText(0, a->name()); setText(1, a->mimeType()); diff --git a/knode/kncomposer.h b/knode/kncomposer.h index e41a40f11..2f136f11c 100644 --- a/knode/kncomposer.h +++ b/knode/kncomposer.h @@ -34,14 +34,14 @@ class TQGroupBox; class TDEProcess; class KSpell; class KDictSpellingHighlighter; -class KSelectAction; -class KToggleAction; +class TDESelectAction; +class TDEToggleAction; class KNLocalArticle; class KNAttachment; class SpellingFilter; -class KNComposer : public KMainWindow , virtual public KNodeComposerIface { +class KNComposer : public TDEMainWindow , virtual public KNodeComposerIface { Q_OBJECT @@ -110,20 +110,20 @@ class KNComposer : public KMainWindow , virtual public KNodeComposerIface { //Attachments TQValueList<KNAttachment*> mDeletedAttachments; - TQPtrList<KAction> m_listAction; + TQPtrList<TDEAction> m_listAction; bool a_ttChanged; //------------------------------ <Actions> ----------------------------- - KAccel *a_ccel; - KAction *a_ctExternalEditor, + TDEAccel *a_ccel; + TDEAction *a_ctExternalEditor, *a_ctSpellCheck, *a_ctRemoveAttachment, *a_ctAttachmentProperties, *a_ctSetCharsetKeyb; - KToggleAction *a_ctPGPsign, + TDEToggleAction *a_ctPGPsign, *a_ctDoPost, *a_ctDoMail, *a_ctWordWrap; - KSelectAction *a_ctSetCharset; + TDESelectAction *a_ctSetCharset; bool spellLineEdit; protected slots: void slotSendNow(); @@ -164,7 +164,7 @@ class KNComposer : public KMainWindow , virtual public KNodeComposerIface { void slotCancelEditor(); // attachment list - void slotAttachmentPopup(KListView*, TQListViewItem *it, const TQPoint &p); + void slotAttachmentPopup(TDEListView*, TQListViewItem *it, const TQPoint &p); void slotAttachmentSelected(TQListViewItem *it); void slotAttachmentEdit(TQListViewItem *it); void slotAttachmentRemove(TQListViewItem *it); @@ -302,7 +302,7 @@ private: }; -class KNComposer::AttachmentView : public KListView { +class KNComposer::AttachmentView : public TDEListView { Q_OBJECT @@ -319,10 +319,10 @@ class KNComposer::AttachmentView : public KListView { }; -class KNComposer::AttachmentViewItem : public KListViewItem { +class KNComposer::AttachmentViewItem : public TDEListViewItem { public: - AttachmentViewItem(KListView *v, KNAttachment *a); + AttachmentViewItem(TDEListView *v, KNAttachment *a); ~AttachmentViewItem(); KNAttachment *attachment; diff --git a/knode/knconfigwidgets.cpp b/knode/knconfigwidgets.cpp index 8a1c3fbcb..48447cbc1 100644 --- a/knode/knconfigwidgets.cpp +++ b/knode/knconfigwidgets.cpp @@ -964,9 +964,9 @@ void KNConfig::AppearanceWidget::slotFontItemSelected(TQListBoxItem *it) if (it) { FontListItem *fontItem = static_cast<FontListItem*>(it); TQFont font = fontItem->font(); - int result = KFontDialog::getFont(font,false,this); + int result = TDEFontDialog::getFont(font,false,this); - if (result == KFontDialog::Accepted) { + if (result == TDEFontDialog::Accepted) { fontItem->setFont(font); f_List->triggerUpdate(false); } diff --git a/knode/knfiltermanager.cpp b/knode/knfiltermanager.cpp index 16ff8ce3a..b7401f1ac 100644 --- a/knode/knfiltermanager.cpp +++ b/knode/knfiltermanager.cpp @@ -31,7 +31,7 @@ KNFilterSelectAction::KNFilterSelectAction( const TQString& text, const TQString& pix, TQObject* parent, const char *name ) - : KActionMenu(text,pix,parent,name), currentItem(-42) + : TDEActionMenu(text,pix,parent,name), currentItem(-42) { popupMenu()->setCheckable(true); connect(popupMenu(),TQT_SIGNAL(activated(int)),this,TQT_SLOT(slotMenuActivated(int))); @@ -379,7 +379,7 @@ void KNFilterManager::slotShowFilterChooser() } -void KNFilterManager::setMenuAction(KNFilterSelectAction *a, KAction *keybA) +void KNFilterManager::setMenuAction(KNFilterSelectAction *a, TDEAction *keybA) { if(a) { a_ctFilter = a; diff --git a/knode/knfiltermanager.h b/knode/knfiltermanager.h index 5bf974546..3172ce788 100644 --- a/knode/knfiltermanager.h +++ b/knode/knfiltermanager.h @@ -28,7 +28,7 @@ class KNArticleFilter; class KNFilterDialog; -class KNFilterSelectAction : public KActionMenu +class KNFilterSelectAction : public TDEActionMenu { Q_OBJECT @@ -79,7 +79,7 @@ class KNFilterManager : public TQObject // Allow to delay the setup of UI elements, since the knode part may not // be available when the config dialog is called - void setMenuAction(KNFilterSelectAction *a, KAction *keybA); + void setMenuAction(KNFilterSelectAction *a, TDEAction *keybA); protected: void loadFilters(); diff --git a/knode/knhdrviewitem.cpp b/knode/knhdrviewitem.cpp index 6330b89ab..1e31a1b9f 100644 --- a/knode/knhdrviewitem.cpp +++ b/knode/knhdrviewitem.cpp @@ -29,14 +29,14 @@ KNHdrViewItem::KNHdrViewItem( KNHeaderView *ref, KNArticle *a ) : - KListViewItem( ref ) + TDEListViewItem( ref ) { init( a ); } KNHdrViewItem::KNHdrViewItem( KNHdrViewItem *ref, KNArticle *a ) : - KListViewItem( ref ) + TDEListViewItem( ref ) { init( a ); } @@ -235,7 +235,7 @@ TQString KNHdrViewItem::text( int col ) const if ( col == hv->paintInfo()->dateCol ) { return hv->mDateFormatter.dateString( art->date()->qdt() ); } else - return KListViewItem::text( col ); + return TDEListViewItem::text( col ); } diff --git a/knode/knhdrviewitem.h b/knode/knhdrviewitem.h index 476c6d53c..5b69e947e 100644 --- a/knode/knhdrviewitem.h +++ b/knode/knhdrviewitem.h @@ -24,7 +24,7 @@ class KNArticle; class KNHeaderView; -class KNHdrViewItem : public KListViewItem { +class KNHdrViewItem : public TDEListViewItem { public: KNHdrViewItem( KNHeaderView *ref, KNArticle *a = 0 ); diff --git a/knode/knmainwidget.cpp b/knode/knmainwidget.cpp index 30edb5edb..d4ae80256 100644 --- a/knode/knmainwidget.cpp +++ b/knode/knmainwidget.cpp @@ -35,7 +35,7 @@ #include "krsqueezedtextlabel.h" #include "recentaddresses.h" using KPIM::BroadcastStatus; -using KRecentAddress::RecentAddresses; +using TDERecentAddress::RecentAddresses; //GUI #include "knmainwidget.h" @@ -128,8 +128,8 @@ KNMainWidget::KNMainWidget( KXMLGUIClient* client, bool detachable, TQWidget* pa connect(c_olView, TQT_SIGNAL(focusChangeRequest(TQWidget *)), TQT_SLOT(slotDockWidgetFocusChangeRequest(TQWidget *))); connect(c_olView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotCollectionSelected(TQListViewItem*))); - connect(c_olView, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), - TQT_SLOT(slotCollectionRMB(KListView*, TQListViewItem*, const TQPoint&))); + connect(c_olView, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + TQT_SLOT(slotCollectionRMB(TDEListView*, TQListViewItem*, const TQPoint&))); connect(c_olView, TQT_SIGNAL(folderDrop(TQDropEvent*, KNCollectionViewItem*)), TQT_SLOT(slotCollectionViewDrop(TQDropEvent*, KNCollectionViewItem*))); connect(c_olView, TQT_SIGNAL(itemRenamed(TQListViewItem*)), @@ -155,8 +155,8 @@ KNMainWidget::KNMainWidget( KXMLGUIClient* client, bool detachable, TQWidget* pa h_drDock->setWidget(dummy); h_drDock->manualDock(a_rtDock, KDockWidget::DockTop, 5000); - q_uicksearch = new KToolBar(dummy, "search toolbar"); - KAction *resetQuickSearch = new KAction( i18n( "Reset Quick Search" ), + q_uicksearch = new TDEToolBar(dummy, "search toolbar"); + TDEAction *resetQuickSearch = new TDEAction( i18n( "Reset Quick Search" ), TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", @@ -168,7 +168,7 @@ KNMainWidget::KNMainWidget( KXMLGUIClient* client, bool detachable, TQWidget* pa "all messages are shown again." ) ); TQLabel *lbl = new TQLabel(i18n("&Search:"), q_uicksearch, "kde toolbar widget"); - s_earchLineEdit = new KListViewSearchLine(q_uicksearch, h_drView, "KListViewSearchLine"); + s_earchLineEdit = new TDEListViewSearchLine(q_uicksearch, h_drView, "TDEListViewSearchLine"); q_uicksearch->setStretchableWidget(s_earchLineEdit); lbl->setBuddy(s_earchLineEdit); connect( resetQuickSearch, TQT_SIGNAL( activated() ), s_earchLineEdit, TQT_SLOT( clear() )); @@ -184,8 +184,8 @@ KNMainWidget::KNMainWidget( KXMLGUIClient* client, bool detachable, TQWidget* pa TQT_SLOT(slotArticleSelected(TQListViewItem*))); connect(h_drView, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotArticleSelectionChanged())); - connect(h_drView, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), - TQT_SLOT(slotArticleRMB(KListView*, TQListViewItem*, const TQPoint&))); + connect(h_drView, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + TQT_SLOT(slotArticleRMB(TDEListView*, TQListViewItem*, const TQPoint&))); connect(h_drView, TQT_SIGNAL(doubleClick(TQListViewItem *)), TQT_SLOT(slotOpenArticle(TQListViewItem *))); connect(h_drView, TQT_SIGNAL(sortingChanged(int)), @@ -305,7 +305,7 @@ KNMainWidget::~KNMainWidget() void KNMainWidget::iniStatusBar() { //statusbar - KMainWindow *mainWin = dynamic_cast<KMainWindow*>(topLevelWidget()); + TDEMainWindow *mainWin = dynamic_cast<TDEMainWindow*>(topLevelWidget()); KStatusBar *sb = mainWin ? mainWin->statusBar() : 0; s_tatusFilter = new KRSqueezedTextLabel( TQString(), sb ); s_tatusFilter->setAlignment( AlignLeft | AlignVCenter ); @@ -317,7 +317,7 @@ void KNMainWidget::iniStatusBar() void KNMainWidget::setStatusMsg(const TQString& text, int id) { - KMainWindow *mainWin = dynamic_cast<KMainWindow*>(topLevelWidget()); + TDEMainWindow *mainWin = dynamic_cast<TDEMainWindow*>(topLevelWidget()); KStatusBar *bar = mainWin ? mainWin->statusBar() : 0; if ( !bar ) return; @@ -342,7 +342,7 @@ void KNMainWidget::setStatusMsg(const TQString& text, int id) void KNMainWidget::setStatusHelpMsg(const TQString& text) { - KMainWindow *mainWin = dynamic_cast<KMainWindow*>(topLevelWidget()); + TDEMainWindow *mainWin = dynamic_cast<TDEMainWindow*>(topLevelWidget()); KStatusBar *bar = mainWin ? mainWin->statusBar() : 0; if ( bar ) bar->message(text, 2000); @@ -375,12 +375,12 @@ void KNMainWidget::setCursorBusy(bool b) void KNMainWidget::blockUI(bool b) { b_lockui = b; - KMainWindow *mainWin = dynamic_cast<KMainWindow*>(topLevelWidget()); + TDEMainWindow *mainWin = dynamic_cast<TDEMainWindow*>(topLevelWidget()); KMenuBar *mbar = mainWin ? mainWin->menuBar() : 0; if ( mbar ) mbar->setEnabled(!b); a_ccel->setEnabled(!b); - KAccel *naccel = mainWin ? mainWin->accel() : 0; + TDEAccel *naccel = mainWin ? mainWin->accel() : 0; if ( naccel ) naccel->setEnabled(!b); if (b) @@ -394,8 +394,8 @@ void KNMainWidget::blockUI(bool b) void KNMainWidget::disableAccels(bool b) { a_ccel->setEnabled(!b); - KMainWindow *mainWin = dynamic_cast<KMainWindow*>(topLevelWidget()); - KAccel *naccel = mainWin ? mainWin->accel() : 0; + TDEMainWindow *mainWin = dynamic_cast<TDEMainWindow*>(topLevelWidget()); + TDEAccel *naccel = mainWin ? mainWin->accel() : 0; if ( naccel ) naccel->setEnabled(!b); if (b) @@ -409,12 +409,12 @@ void KNMainWidget::disableAccels(bool b) void KNMainWidget::secureProcessEvents() { b_lockui = true; - KMainWindow *mainWin = dynamic_cast<KMainWindow*>(topLevelWidget()); + TDEMainWindow *mainWin = dynamic_cast<TDEMainWindow*>(topLevelWidget()); KMenuBar *mbar = mainWin ? mainWin->menuBar() : 0; if ( mbar ) mbar->setEnabled(false); a_ccel->setEnabled(false); - KAccel *naccel = mainWin ? mainWin->accel() : 0; + TDEAccel *naccel = mainWin ? mainWin->accel() : 0; if ( naccel ) naccel->setEnabled(false); installEventFilter(this); @@ -545,122 +545,122 @@ void KNMainWidget::configChanged() void KNMainWidget::initActions() { - a_ccel=new KAccel(this); + a_ccel=new TDEAccel(this); mArticleViewer->setCharsetKeyboardAction()->plugAccel(a_ccel); //navigation - a_ctNavNextArt = new KAction( KGuiItem(i18n("&Next Article"), "next", + a_ctNavNextArt = new TDEAction( KGuiItem(i18n("&Next Article"), "next", i18n("Go to next article")), "N;Right", TQT_TQOBJECT(h_drView), TQT_SLOT(nextArticle()), actionCollection(), "go_nextArticle" ); - a_ctNavPrevArt = new KAction( KGuiItem(i18n("&Previous Article"), "previous", + a_ctNavPrevArt = new TDEAction( KGuiItem(i18n("&Previous Article"), "previous", i18n("Go to previous article")), "P;Left" , TQT_TQOBJECT(h_drView), TQT_SLOT(prevArticle()), actionCollection(), "go_prevArticle" ); - a_ctNavNextUnreadArt = new KAction(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 , TQT_TQOBJECT(this), TQT_SLOT(slotNavNextUnreadArt()), actionCollection(), "go_nextUnreadArticle"); - a_ctNavNextUnreadThread = new KAction(i18n("Next Unread &Thread"),"2rightarrow", SHIFT+Key_Space , TQT_TQOBJECT(this), + a_ctNavNextUnreadThread = new TDEAction(i18n("Next Unread &Thread"),"2rightarrow", SHIFT+Key_Space , TQT_TQOBJECT(this), TQT_SLOT(slotNavNextUnreadThread()), actionCollection(), "go_nextUnreadThread"); - a_ctNavNextGroup = new KAction(i18n("Ne&xt Group"), "down", Key_Plus , TQT_TQOBJECT(c_olView), + a_ctNavNextGroup = new TDEAction(i18n("Ne&xt Group"), "down", Key_Plus , TQT_TQOBJECT(c_olView), TQT_SLOT(nextGroup()), actionCollection(), "go_nextGroup"); - a_ctNavPrevGroup = new KAction(i18n("Pre&vious Group"), "up", Key_Minus , TQT_TQOBJECT(c_olView), + a_ctNavPrevGroup = new TDEAction(i18n("Pre&vious Group"), "up", Key_Minus , TQT_TQOBJECT(c_olView), TQT_SLOT(prevGroup()), actionCollection(), "go_prevGroup"); - a_ctNavReadThrough = new KAction(i18n("Read &Through Articles"), Key_Space , TQT_TQOBJECT(this), + a_ctNavReadThrough = new TDEAction(i18n("Read &Through Articles"), Key_Space , TQT_TQOBJECT(this), TQT_SLOT(slotNavReadThrough()), actionCollection(), "go_readThrough"); a_ctNavReadThrough->plugAccel(a_ccel); TQAccel *accel = new TQAccel( this ); - new KAction( i18n("Focus on Next Folder"), CTRL+Key_Right, TQT_TQOBJECT(c_olView), + new TDEAction( i18n("Focus on Next Folder"), CTRL+Key_Right, TQT_TQOBJECT(c_olView), TQT_SLOT(incCurrentFolder()), actionCollection(), "inc_current_folder" ); accel->connectItem(accel->insertItem(CTRL+Key_Right), c_olView, TQT_SLOT(incCurrentFolder())); - new KAction( i18n("Focus on Previous Folder"), CTRL+Key_Left, TQT_TQOBJECT(c_olView), + new TDEAction( i18n("Focus on Previous Folder"), CTRL+Key_Left, TQT_TQOBJECT(c_olView), TQT_SLOT(decCurrentFolder()), actionCollection(), "dec_current_folder" ); accel->connectItem(accel->insertItem(CTRL+Key_Left), c_olView, TQT_SLOT(decCurrentFolder())); - new KAction( i18n("Select Folder with Focus"), CTRL+Key_Space, TQT_TQOBJECT(c_olView), + new TDEAction( i18n("Select Folder with Focus"), CTRL+Key_Space, TQT_TQOBJECT(c_olView), TQT_SLOT(selectCurrentFolder()), actionCollection(), "select_current_folder" ); accel->connectItem(accel->insertItem(CTRL+Key_Space), c_olView, TQT_SLOT(selectCurrentFolder())); - new KAction( i18n("Focus on Next Article"), ALT+Key_Right, TQT_TQOBJECT(h_drView), + new TDEAction( i18n("Focus on Next Article"), ALT+Key_Right, TQT_TQOBJECT(h_drView), TQT_SLOT(incCurrentArticle()), actionCollection(), "inc_current_article" ); accel->connectItem( accel->insertItem(ALT+Key_Right), TQT_TQOBJECT(h_drView), TQT_SLOT(incCurrentArticle()) ); - new KAction( i18n("Focus on Previous Article"), ALT+Key_Left, TQT_TQOBJECT(h_drView), + new TDEAction( i18n("Focus on Previous Article"), ALT+Key_Left, TQT_TQOBJECT(h_drView), TQT_SLOT(decCurrentArticle()), actionCollection(), "dec_current_article" ); accel->connectItem( accel->insertItem(ALT+Key_Left), TQT_TQOBJECT(h_drView), TQT_SLOT(decCurrentArticle()) ); - new KAction( i18n("Select Article with Focus"), ALT+Key_Space, TQT_TQOBJECT(h_drView), + new TDEAction( i18n("Select Article with Focus"), ALT+Key_Space, TQT_TQOBJECT(h_drView), TQT_SLOT(selectCurrentArticle()), actionCollection(), "select_current_article" ); accel->connectItem( accel->insertItem(ALT+Key_Space), TQT_TQOBJECT(h_drView), TQT_SLOT(selectCurrentArticle()) ); //collection-view - accounts - a_ctAccProperties = new KAction(i18n("Account &Properties"), "configure", 0, TQT_TQOBJECT(this), + a_ctAccProperties = new TDEAction(i18n("Account &Properties"), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccProperties()), actionCollection(), "account_properties"); - a_ctAccRename = new KAction(i18n("&Rename Account"), "text", 0, TQT_TQOBJECT(this), + a_ctAccRename = new TDEAction(i18n("&Rename Account"), "text", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccRename()), actionCollection(), "account_rename"); - a_ctAccSubscribe = new KAction(i18n("&Subscribe to Newsgroups..."), "news_subscribe", 0, TQT_TQOBJECT(this), + a_ctAccSubscribe = new TDEAction(i18n("&Subscribe to Newsgroups..."), "news_subscribe", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccSubscribe()), actionCollection(), "account_subscribe"); - a_ctAccExpireAll = new KAction(i18n("&Expire All Groups"), 0, TQT_TQOBJECT(this), + a_ctAccExpireAll = new TDEAction(i18n("&Expire All Groups"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccExpireAll()), actionCollection(), "account_expire_all"); - a_ctAccGetNewHdrs = new KAction(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, TQT_TQOBJECT(this), TQT_SLOT(slotAccGetNewHdrs()), actionCollection(), "account_dnlHeaders"); - a_ctAccGetNewHdrsAll = new KAction(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, TQT_TQOBJECT(this), TQT_SLOT(slotAccGetNewHdrsAll()), actionCollection(), "account_dnlAllHeaders"); - a_ctAccDelete = new KAction(i18n("&Delete Account"), "editdelete", 0, TQT_TQOBJECT(this), + a_ctAccDelete = new TDEAction(i18n("&Delete Account"), "editdelete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccDelete()), actionCollection(), "account_delete"); - a_ctAccPostNewArticle = new KAction(i18n("&Post to Newsgroup..."), "mail_new", CTRL+Key_N, TQT_TQOBJECT(this), + a_ctAccPostNewArticle = new TDEAction(i18n("&Post to Newsgroup..."), "mail_new", CTRL+Key_N, TQT_TQOBJECT(this), TQT_SLOT(slotAccPostNewArticle()), actionCollection(), "article_postNew"); //collection-view - groups - a_ctGrpProperties = new KAction(i18n("Group &Properties"), "configure", 0, TQT_TQOBJECT(this), + a_ctGrpProperties = new TDEAction(i18n("Group &Properties"), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(slotGrpProperties()), actionCollection(), "group_properties"); - a_ctGrpRename = new KAction(i18n("Rename &Group"), "text", 0, TQT_TQOBJECT(this), + a_ctGrpRename = new TDEAction(i18n("Rename &Group"), "text", 0, TQT_TQOBJECT(this), TQT_SLOT(slotGrpRename()), actionCollection(), "group_rename"); - a_ctGrpGetNewHdrs = new KAction(i18n("&Get New Articles"), "mail_get" , 0, TQT_TQOBJECT(this), + a_ctGrpGetNewHdrs = new TDEAction(i18n("&Get New Articles"), "mail_get" , 0, TQT_TQOBJECT(this), TQT_SLOT(slotGrpGetNewHdrs()), actionCollection(), "group_dnlHeaders"); - a_ctGrpExpire = new KAction(i18n("E&xpire Group"), "wizard", 0, TQT_TQOBJECT(this), + a_ctGrpExpire = new TDEAction(i18n("E&xpire Group"), "wizard", 0, TQT_TQOBJECT(this), TQT_SLOT(slotGrpExpire()), actionCollection(), "group_expire"); - a_ctGrpReorganize = new KAction(i18n("Re&organize Group"), 0, TQT_TQOBJECT(this), + a_ctGrpReorganize = new TDEAction(i18n("Re&organize Group"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotGrpReorganize()), actionCollection(), "group_reorg"); - a_ctGrpUnsubscribe = new KAction(i18n("&Unsubscribe From Group"), "news_unsubscribe", 0, TQT_TQOBJECT(this), + a_ctGrpUnsubscribe = new TDEAction(i18n("&Unsubscribe From Group"), "news_unsubscribe", 0, TQT_TQOBJECT(this), TQT_SLOT(slotGrpUnsubscribe()), actionCollection(), "group_unsubscribe"); - a_ctGrpSetAllRead = new KAction(i18n("Mark All as &Read"), "goto", 0, TQT_TQOBJECT(this), + a_ctGrpSetAllRead = new TDEAction(i18n("Mark All as &Read"), "goto", 0, TQT_TQOBJECT(this), TQT_SLOT(slotGrpSetAllRead()), actionCollection(), "group_allRead"); - a_ctGrpSetAllUnread = new KAction(i18n("Mark All as U&nread"), 0, TQT_TQOBJECT(this), + a_ctGrpSetAllUnread = new TDEAction(i18n("Mark All as U&nread"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotGrpSetAllUnread()), actionCollection(), "group_allUnread"); - a_ctGrpSetUnread = new KAction(i18n("Mark Last as Unr&ead..."), 0, TQT_TQOBJECT(this), + a_ctGrpSetUnread = new TDEAction(i18n("Mark Last as Unr&ead..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotGrpSetUnread()), actionCollection(), "group_unread"); - (void) new KAction( i18n("&Configure KNode..."), + (void) new TDEAction( i18n("&Configure KNode..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSettings()), actionCollection(), "knode_configure_knode" ); //collection-view - folder - a_ctFolNew = new KAction(i18n("&New Folder"), "folder_new", 0, TQT_TQOBJECT(this), + a_ctFolNew = new TDEAction(i18n("&New Folder"), "folder_new", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFolNew()), actionCollection(), "folder_new"); - a_ctFolNewChild = new KAction(i18n("New &Subfolder"), "folder_new", 0, TQT_TQOBJECT(this), + a_ctFolNewChild = new TDEAction(i18n("New &Subfolder"), "folder_new", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFolNewChild()), actionCollection(), "folder_newChild"); - a_ctFolDelete = new KAction(i18n("&Delete Folder"), "editdelete", 0, TQT_TQOBJECT(this), + a_ctFolDelete = new TDEAction(i18n("&Delete Folder"), "editdelete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFolDelete()), actionCollection(), "folder_delete"); - a_ctFolRename = new KAction(i18n("&Rename Folder"), "text", 0, TQT_TQOBJECT(this), + a_ctFolRename = new TDEAction(i18n("&Rename Folder"), "text", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFolRename()), actionCollection(), "folder_rename"); - a_ctFolCompact = new KAction(i18n("C&ompact Folder"), "wizard", 0, TQT_TQOBJECT(this), + a_ctFolCompact = new TDEAction(i18n("C&ompact Folder"), "wizard", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFolCompact()), actionCollection(), "folder_compact"); - a_ctFolCompactAll = new KAction(i18n("Co&mpact All Folders"), 0, TQT_TQOBJECT(this), + a_ctFolCompactAll = new TDEAction(i18n("Co&mpact All Folders"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFolCompactAll()), actionCollection(), "folder_compact_all"); - a_ctFolEmpty = new KAction(i18n("&Empty Folder"), 0, TQT_TQOBJECT(this), + a_ctFolEmpty = new TDEAction(i18n("&Empty Folder"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFolEmpty()), actionCollection(), "folder_empty"); - a_ctFolMboxImport = new KAction(i18n("&Import MBox Folder..."), 0, TQT_TQOBJECT(this), + a_ctFolMboxImport = new TDEAction(i18n("&Import MBox Folder..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFolMBoxImport()), actionCollection(), "folder_MboxImport"); - a_ctFolMboxExport = new KAction(i18n("E&xport as MBox Folder..."), 0, TQT_TQOBJECT(this), + a_ctFolMboxExport = new TDEAction(i18n("E&xport as MBox Folder..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFolMBoxExport()), actionCollection(), "folder_MboxExport"); //header-view - list-handling - a_ctArtSortHeaders = new KSelectAction(i18n("S&ort"), 0, actionCollection(), "view_Sort"); + a_ctArtSortHeaders = new TDESelectAction(i18n("S&ort"), 0, actionCollection(), "view_Sort"); TQStringList items; items += i18n("By &Subject"); items += i18n("By S&ender"); @@ -670,94 +670,94 @@ void KNMainWidget::initActions() a_ctArtSortHeaders->setItems(items); a_ctArtSortHeaders->setShortcutConfigurable(false); connect(a_ctArtSortHeaders, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotArtSortHeaders(int))); - a_ctArtSortHeadersKeyb = new KAction(i18n("Sort"), TQString(), Key_F7 , TQT_TQOBJECT(this), + a_ctArtSortHeadersKeyb = new TDEAction(i18n("Sort"), TQString(), Key_F7 , TQT_TQOBJECT(this), TQT_SLOT(slotArtSortHeadersKeyb()), actionCollection(), "view_Sort_Keyb"); a_ctArtSortHeadersKeyb->plugAccel(a_ccel); a_ctArtFilter = new KNFilterSelectAction(i18n("&Filter"), "filter", actionCollection(), "view_Filter"); a_ctArtFilter->setShortcutConfigurable(false); - a_ctArtFilterKeyb = new KAction(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_ctArtSearch = new KAction(i18n("&Search Articles..."),"mail_find" , Key_F4 , TQT_TQOBJECT(this), + a_ctArtSearch = new TDEAction(i18n("&Search Articles..."),"mail_find" , Key_F4 , TQT_TQOBJECT(this), TQT_SLOT(slotArtSearch()), actionCollection(), "article_search"); - a_ctArtRefreshList = new KAction(i18n("&Refresh List"),"reload", KStdAccel::shortcut(KStdAccel::Reload), TQT_TQOBJECT(this), + a_ctArtRefreshList = new TDEAction(i18n("&Refresh List"),"reload", TDEStdAccel::shortcut(TDEStdAccel::Reload), TQT_TQOBJECT(this), TQT_SLOT(slotArtRefreshList()), actionCollection(), "view_Refresh"); - a_ctArtCollapseAll = new KAction(i18n("&Collapse All Threads"), 0 , TQT_TQOBJECT(this), + a_ctArtCollapseAll = new TDEAction(i18n("&Collapse All Threads"), 0 , TQT_TQOBJECT(this), TQT_SLOT(slotArtCollapseAll()), actionCollection(), "view_CollapseAll"); - a_ctArtExpandAll = new KAction(i18n("E&xpand All Threads"), 0 , TQT_TQOBJECT(this), + a_ctArtExpandAll = new TDEAction(i18n("E&xpand All Threads"), 0 , TQT_TQOBJECT(this), TQT_SLOT(slotArtExpandAll()), actionCollection(), "view_ExpandAll"); - a_ctArtToggleThread = new KAction(i18n("&Toggle Subthread"), Key_T, TQT_TQOBJECT(this), + a_ctArtToggleThread = new TDEAction(i18n("&Toggle Subthread"), Key_T, TQT_TQOBJECT(this), TQT_SLOT(slotArtToggleThread()), actionCollection(), "thread_toggle"); - a_ctArtToggleShowThreads = new KToggleAction(i18n("Show T&hreads"), 0 , TQT_TQOBJECT(this), + a_ctArtToggleShowThreads = new TDEToggleAction(i18n("Show T&hreads"), 0 , TQT_TQOBJECT(this), TQT_SLOT(slotArtToggleShowThreads()), actionCollection(), "view_showThreads"); a_ctArtToggleShowThreads->setCheckedState(i18n("Hide T&hreads")); a_ctArtToggleShowThreads->setChecked(c_fgManager->readNewsGeneral()->showThreads()); //header-view - remote articles - a_ctArtSetArtRead = new KAction(i18n("Mark as &Read"), Key_D , TQT_TQOBJECT(this), + a_ctArtSetArtRead = new TDEAction(i18n("Mark as &Read"), Key_D , TQT_TQOBJECT(this), TQT_SLOT(slotArtSetArtRead()), actionCollection(), "article_read"); - a_ctArtSetArtUnread = new KAction(i18n("Mar&k as Unread"), Key_U , TQT_TQOBJECT(this), + a_ctArtSetArtUnread = new TDEAction(i18n("Mar&k as Unread"), Key_U , TQT_TQOBJECT(this), TQT_SLOT(slotArtSetArtUnread()), actionCollection(), "article_unread"); - a_ctArtSetThreadRead = new KAction(i18n("Mark &Thread as Read"), CTRL+Key_D , TQT_TQOBJECT(this), + a_ctArtSetThreadRead = new TDEAction(i18n("Mark &Thread as Read"), CTRL+Key_D , TQT_TQOBJECT(this), TQT_SLOT(slotArtSetThreadRead()), actionCollection(), "thread_read"); - a_ctArtSetThreadUnread = new KAction(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 , TQT_TQOBJECT(this), TQT_SLOT(slotArtSetThreadUnread()), actionCollection(), "thread_unread"); - a_ctArtOpenNewWindow = new KAction(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 , TQT_TQOBJECT(this), TQT_SLOT(slotArtOpenNewWindow()), actionCollection(), "article_ownWindow"); // scoring - a_ctScoresEdit = new KAction(i18n("&Edit Scoring Rules..."), "edit", CTRL+Key_E, TQT_TQOBJECT(this), + a_ctScoresEdit = new TDEAction(i18n("&Edit Scoring Rules..."), "edit", CTRL+Key_E, TQT_TQOBJECT(this), TQT_SLOT(slotScoreEdit()), actionCollection(), "scoreedit"); - a_ctReScore = new KAction(i18n("Recalculate &Scores"), 0, TQT_TQOBJECT(this), + a_ctReScore = new TDEAction(i18n("Recalculate &Scores"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotReScore()),actionCollection(),"rescore"); - a_ctScoreLower = new KAction(i18n("&Lower Score for Author..."), CTRL+Key_L, TQT_TQOBJECT(this), + a_ctScoreLower = new TDEAction(i18n("&Lower Score for Author..."), CTRL+Key_L, TQT_TQOBJECT(this), TQT_SLOT(slotScoreLower()), actionCollection(), "scorelower"); - a_ctScoreRaise = new KAction(i18n("&Raise Score for Author..."), CTRL+Key_I, TQT_TQOBJECT(this), + a_ctScoreRaise = new TDEAction(i18n("&Raise Score for Author..."), CTRL+Key_I, TQT_TQOBJECT(this), TQT_SLOT(slotScoreRaise()),actionCollection(),"scoreraise"); - a_ctArtToggleIgnored = new KAction(i18n("&Ignore Thread"), "bottom", Key_I , TQT_TQOBJECT(this), + a_ctArtToggleIgnored = new TDEAction(i18n("&Ignore Thread"), "bottom", Key_I , TQT_TQOBJECT(this), TQT_SLOT(slotArtToggleIgnored()), actionCollection(), "thread_ignore"); - a_ctArtToggleWatched = new KAction(i18n("&Watch Thread"), "top", Key_W , TQT_TQOBJECT(this), + a_ctArtToggleWatched = new TDEAction(i18n("&Watch Thread"), "top", Key_W , TQT_TQOBJECT(this), TQT_SLOT(slotArtToggleWatched()), actionCollection(), "thread_watch"); //header-view local articles - a_ctArtSendOutbox = new KAction(i18n("Sen&d Pending Messages"), "mail_send", 0, TQT_TQOBJECT(this), + a_ctArtSendOutbox = new TDEAction(i18n("Sen&d Pending Messages"), "mail_send", 0, TQT_TQOBJECT(this), TQT_SLOT(slotArtSendOutbox()), actionCollection(), "net_sendPending"); - a_ctArtDelete = new KAction(i18n("&Delete Article"), "editdelete", Key_Delete, TQT_TQOBJECT(this), + a_ctArtDelete = new TDEAction(i18n("&Delete Article"), "editdelete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotArtDelete()), actionCollection(), "article_delete"); - a_ctArtSendNow = new KAction(i18n("Send &Now"),"mail_send", 0 , TQT_TQOBJECT(this), + a_ctArtSendNow = new TDEAction(i18n("Send &Now"),"mail_send", 0 , TQT_TQOBJECT(this), TQT_SLOT(slotArtSendNow()), actionCollection(), "article_sendNow"); - a_ctArtEdit = new KAction(i18n("edit article","&Edit Article..."), "edit", Key_E , TQT_TQOBJECT(this), + a_ctArtEdit = new TDEAction(i18n("edit article","&Edit Article..."), "edit", Key_E , TQT_TQOBJECT(this), TQT_SLOT(slotArtEdit()), actionCollection(), "article_edit"); //network - a_ctNetCancel = new KAction(i18n("Stop &Network"),"stop",0, TQT_TQOBJECT(this), + a_ctNetCancel = new TDEAction(i18n("Stop &Network"),"stop",0, TQT_TQOBJECT(this), TQT_SLOT(slotNetCancel()), actionCollection(), "net_stop"); a_ctNetCancel->setEnabled(false); - a_ctFetchArticleWithID = new KAction(i18n("&Fetch Article with ID..."), 0, TQT_TQOBJECT(this), + a_ctFetchArticleWithID = new TDEAction(i18n("&Fetch Article with ID..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFetchArticleWithID()), actionCollection(), "fetch_article_with_id"); a_ctFetchArticleWithID->setEnabled(false); - a_ctToggleGroupView = new KToggleAction(i18n("Show &Group View"), CTRL+Key_G, TQT_TQOBJECT(this), + a_ctToggleGroupView = new TDEToggleAction(i18n("Show &Group View"), CTRL+Key_G, TQT_TQOBJECT(this), TQT_SLOT(slotToggleGroupView()), actionCollection(), "settings_show_groupView"); a_ctToggleGroupView->setCheckedState(i18n("Hide &Group View")); - a_ctToggleHeaderView = new KToggleAction(i18n("Show &Header View"), CTRL+Key_H, TQT_TQOBJECT(this), + a_ctToggleHeaderView = new TDEToggleAction(i18n("Show &Header View"), CTRL+Key_H, TQT_TQOBJECT(this), TQT_SLOT(slotToggleHeaderView()), actionCollection(), "settings_show_headerView"); a_ctToggleHeaderView->setCheckedState(i18n("Hide &Header View")); - a_ctToggleArticleViewer = new KToggleAction(i18n("Show &Article Viewer"), CTRL+Key_J, TQT_TQOBJECT(this), + a_ctToggleArticleViewer = new TDEToggleAction(i18n("Show &Article Viewer"), CTRL+Key_J, TQT_TQOBJECT(this), TQT_SLOT(slotToggleArticleViewer()), actionCollection(), "settings_show_articleViewer"); a_ctToggleArticleViewer->setCheckedState(i18n("Hide &Article Viewer")); - a_ctToggleQuickSearch = new KToggleAction(i18n("Show Quick Search"), TQString(), TQT_TQOBJECT(this), + a_ctToggleQuickSearch = new TDEToggleAction(i18n("Show Quick Search"), TQString(), TQT_TQOBJECT(this), TQT_SLOT(slotToggleQuickSearch()), actionCollection(), "settings_show_quickSearch"); a_ctToggleQuickSearch->setCheckedState(i18n("Hide Quick Search")); - a_ctSwitchToGroupView = new KAction(i18n("Switch to Group View"), Key_G , TQT_TQOBJECT(this), + a_ctSwitchToGroupView = new TDEAction(i18n("Switch to Group View"), Key_G , TQT_TQOBJECT(this), TQT_SLOT(slotSwitchToGroupView()), actionCollection(), "switch_to_group_view"); a_ctSwitchToGroupView->plugAccel(a_ccel); - a_ctSwitchToHeaderView = new KAction(i18n("Switch to Header View"), Key_H , TQT_TQOBJECT(this), + a_ctSwitchToHeaderView = new TDEAction(i18n("Switch to Header View"), Key_H , TQT_TQOBJECT(this), TQT_SLOT(slotSwitchToHeaderView()), actionCollection(), "switch_to_header_view"); a_ctSwitchToHeaderView->plugAccel(a_ccel); - a_ctSwitchToArticleViewer = new KAction(i18n("Switch to Article Viewer"), Key_J , TQT_TQOBJECT(this), + a_ctSwitchToArticleViewer = new TDEAction(i18n("Switch to Article Viewer"), Key_J , TQT_TQOBJECT(this), TQT_SLOT(slotSwitchToArticleViewer()), actionCollection(), "switch_to_article_viewer"); a_ctSwitchToArticleViewer->plugAccel(a_ccel); } @@ -1220,7 +1220,7 @@ void KNMainWidget::slotCollectionViewDrop(TQDropEvent* e, KNCollectionViewItem* } -void KNMainWidget::slotArticleRMB(KListView*, TQListViewItem *i, const TQPoint &p) +void KNMainWidget::slotArticleRMB(TDEListView*, TQListViewItem *i, const TQPoint &p) { if(b_lockui) return; @@ -1239,7 +1239,7 @@ void KNMainWidget::slotArticleRMB(KListView*, TQListViewItem *i, const TQPoint & } -void KNMainWidget::slotCollectionRMB(KListView*, TQListViewItem *i, const TQPoint &p) +void KNMainWidget::slotCollectionRMB(TDEListView*, TQListViewItem *i, const TQPoint &p) { if(b_lockui) return; @@ -2028,7 +2028,7 @@ void KNMainWidget::slotSettings() c_fgManager->configure(); } -KActionCollection* KNMainWidget::actionCollection() const +TDEActionCollection* KNMainWidget::actionCollection() const { return m_GUIClient->actionCollection(); } diff --git a/knode/knmainwidget.h b/knode/knmainwidget.h index 8670966a8..c90e697df 100644 --- a/knode/knmainwidget.h +++ b/knode/knmainwidget.h @@ -26,10 +26,10 @@ class TQListViewItem; class KURL; -class KAccel; -class KAction; -class KToggleAction; -class KSelectAction; +class TDEAccel; +class TDEAction; +class TDEToggleAction; +class TDESelectAction; class KRSqueezedTextLabel; class KLineEdit; class KXMLGUIClient; @@ -58,7 +58,7 @@ namespace KNode { class KNArticle; class KNLocalArticle; class KNRemoteArticle; -class KActionCollection; +class TDEActionCollection; class KDE_EXPORT KNMainWidget : public KDockArea, virtual public KNodeIface { @@ -160,7 +160,7 @@ signals: protected: - KActionCollection* actionCollection() const; + TDEActionCollection* actionCollection() const; KXMLGUIFactory *factory() const; void initActions(); @@ -190,14 +190,14 @@ protected: void closeCurrentThread(); //GUI - KAccel *a_ccel; + TDEAccel *a_ccel; KNProgress *p_rogBar; KNode::ArticleWidget *mArticleViewer; KNCollectionView *c_olView; KNHeaderView *h_drView; KDockWidget *c_olDock, *h_drDock, *a_rtDock; bool b_lockui; - KToolBar *q_uicksearch; + TDEToolBar *q_uicksearch; TQLineEdit *s_earchLineEdit; //Core @@ -220,8 +220,8 @@ protected slots: void slotCollectionSelected(TQListViewItem*); void slotCollectionRenamed(TQListViewItem*); void slotCollectionViewDrop(TQDropEvent* e, KNCollectionViewItem* after); - void slotArticleRMB(KListView*, TQListViewItem *i, const TQPoint &p); - void slotCollectionRMB(KListView*, TQListViewItem *i, const TQPoint &p); + void slotArticleRMB(TDEListView*, TQListViewItem *i, const TQPoint &p); + void slotCollectionRMB(TDEListView*, TQListViewItem *i, const TQPoint &p); /** Open selected article in own composer/reader window */ void slotOpenArticle(TQListViewItem *item); void slotHdrViewSortingChanged(int i); @@ -241,7 +241,7 @@ protected slots: protected: //navigation - KAction *a_ctNavNextArt, + TDEAction *a_ctNavNextArt, *a_ctNavPrevArt, *a_ctNavNextUnreadArt, *a_ctNavNextUnreadThread, @@ -250,7 +250,7 @@ protected: *a_ctNavReadThrough; //collection-view - accounts - KAction *a_ctAccProperties, + TDEAction *a_ctAccProperties, *a_ctAccRename, *a_ctAccSubscribe, *a_ctAccExpireAll, @@ -260,7 +260,7 @@ protected: *a_ctAccPostNewArticle; //collection-view - groups - KAction *a_ctGrpProperties, + TDEAction *a_ctGrpProperties, *a_ctGrpRename, *a_ctGrpGetNewHdrs, *a_ctGrpExpire, @@ -271,7 +271,7 @@ protected: *a_ctGrpSetUnread; //collection-view - folder - KAction *a_ctFolNew, + TDEAction *a_ctFolNew, *a_ctFolNewChild, *a_ctFolDelete, *a_ctFolRename, @@ -282,26 +282,26 @@ protected: *a_ctFolMboxExport; //header-view - list-handling - KSelectAction *a_ctArtSortHeaders; + TDESelectAction *a_ctArtSortHeaders; KNFilterSelectAction *a_ctArtFilter; - KAction *a_ctArtSortHeadersKeyb, + TDEAction *a_ctArtSortHeadersKeyb, *a_ctArtFilterKeyb, *a_ctArtSearch, *a_ctArtRefreshList, *a_ctArtCollapseAll, *a_ctArtExpandAll, *a_ctArtToggleThread; - KToggleAction *a_ctArtToggleShowThreads; + TDEToggleAction *a_ctArtToggleShowThreads; //header-view - remote articles - KAction *a_ctArtSetArtRead, + TDEAction *a_ctArtSetArtRead, *a_ctArtSetArtUnread, *a_ctArtSetThreadRead, *a_ctArtSetThreadUnread, *a_ctArtOpenNewWindow; // scoring - KAction *a_ctScoresEdit, + TDEAction *a_ctScoresEdit, *a_ctReScore, *a_ctScoreLower, *a_ctScoreRaise, @@ -309,22 +309,22 @@ protected: *a_ctArtToggleWatched; //header-view local articles - KAction *a_ctArtSendOutbox, + TDEAction *a_ctArtSendOutbox, *a_ctArtDelete, *a_ctArtSendNow, *a_ctArtEdit; //network - KAction *a_ctNetCancel; + TDEAction *a_ctNetCancel; - KAction *a_ctFetchArticleWithID; + TDEAction *a_ctFetchArticleWithID; // settings menu - KToggleAction *a_ctToggleGroupView, + TDEToggleAction *a_ctToggleGroupView, *a_ctToggleHeaderView, *a_ctToggleArticleViewer, *a_ctToggleQuickSearch; - KAction *a_ctSwitchToGroupView, + TDEAction *a_ctSwitchToGroupView, *a_ctSwitchToHeaderView, *a_ctSwitchToArticleViewer; diff --git a/knode/knode.cpp b/knode/knode.cpp index 6bb741c80..40dfa2cf6 100644 --- a/knode/knode.cpp +++ b/knode/knode.cpp @@ -39,7 +39,7 @@ #include "knhdrviewitem.h" KNMainWindow::KNMainWindow( TQWidget* pWidget ) - : KMainWindow(pWidget,"mainWindow") + : TDEMainWindow(pWidget,"mainWindow") { //setupStatusBar(); createStandardStatusBarAction(); diff --git a/knode/knode.h b/knode/knode.h index d22c96084..5d89532b7 100644 --- a/knode/knode.h +++ b/knode/knode.h @@ -41,7 +41,7 @@ class KNMainWidget; class KNHeaderView; -class KNMainWindow : public KMainWindow +class KNMainWindow : public TDEMainWindow { Q_OBJECT diff --git a/knotes/ChangeLog b/knotes/ChangeLog index fa22d2ec4..dfe1fc951 100644 --- a/knotes/ChangeLog +++ b/knotes/ChangeLog @@ -825,7 +825,7 @@ ChangeLog for KNotes I do this for the popup menu in the taskbar as well. I assume this is correct? - Replaced QPopupMenu with KPopupMenu in the taskbar widget. + Replaced QPopupMenu with TDEPopupMenu in the taskbar widget. 1999/12/30 Espen Sand <espen@kde.org> diff --git a/knotes/knote.cpp b/knotes/knote.cpp index e59be706b..ea96d4c80 100644 --- a/knotes/knote.cpp +++ b/knotes/knote.cpp @@ -104,47 +104,47 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char * // create the menu items for the note - not the editor... // rename, mail, print, save as, insert date, alarm, close, delete, new note - new KAction( i18n("New"), "filenew", 0, + new TDEAction( i18n("New"), "filenew", 0, TQT_TQOBJECT(this),TQT_SLOT(slotRequestNewNote()) , actionCollection(), "new_note" ); - new KAction( i18n("Rename..."), "text", 0, + new TDEAction( i18n("Rename..."), "text", 0, TQT_TQOBJECT(this), TQT_SLOT(slotRename()), actionCollection(), "rename_note" ); - m_readOnly = new KToggleAction( i18n("Lock"), "lock" , 0, + m_readOnly = new TDEToggleAction( i18n("Lock"), "lock" , 0, TQT_TQOBJECT(this), TQT_SLOT(slotUpdateReadOnly()), actionCollection(), "lock_note" ); m_readOnly->setCheckedState( KGuiItem( i18n("Unlock"), "unlock" ) ); - new KAction( i18n("Hide"), "fileclose" , Key_Escape, + new TDEAction( i18n("Hide"), "fileclose" , Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(slotClose()), actionCollection(), "hide_note" ); - new KAction( i18n("Delete"), "knotes_delete", 0, + new TDEAction( i18n("Delete"), "knotes_delete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotKill()), actionCollection(), "delete_note" ); - new KAction( i18n("Insert Date"), "knotes_date", 0 , + new TDEAction( i18n("Insert Date"), "knotes_date", 0 , TQT_TQOBJECT(this), TQT_SLOT(slotInsDate()), actionCollection(), "insert_date" ); - new KAction( i18n("Set Alarm..."), "knotes_alarm", 0 , + new TDEAction( i18n("Set Alarm..."), "knotes_alarm", 0 , TQT_TQOBJECT(this), TQT_SLOT(slotSetAlarm()), actionCollection(), "set_alarm" ); - new KAction( i18n("Send..."), "network", 0, + new TDEAction( i18n("Send..."), "network", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSend()), actionCollection(), "send_note" ); - new KAction( i18n("Mail..."), "mail_send", 0, + new TDEAction( i18n("Mail..."), "mail_send", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMail()), actionCollection(), "mail_note" ); - new KAction( i18n("Save As..."), "filesaveas", 0, + new TDEAction( i18n("Save As..."), "filesaveas", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs()), actionCollection(), "save_note" ); KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT(slotPrint()), actionCollection(), "print_note" ); - new KAction( i18n("Preferences..."), "configure", 0, + new TDEAction( i18n("Preferences..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(slotPreferences()), actionCollection(), "configure_note" ); - m_keepAbove = new KToggleAction( i18n("Keep Above Others"), "up", 0, + m_keepAbove = new TDEToggleAction( i18n("Keep Above Others"), "up", 0, TQT_TQOBJECT(this), TQT_SLOT(slotUpdateKeepAboveBelow()), actionCollection(), "keep_above" ); m_keepAbove->setExclusiveGroup( "keepAB" ); - m_keepBelow = new KToggleAction( i18n("Keep Below Others"), "down", 0, + m_keepBelow = new TDEToggleAction( i18n("Keep Below Others"), "down", 0, TQT_TQOBJECT(this), TQT_SLOT(slotUpdateKeepAboveBelow()), actionCollection(), "keep_below" ); m_keepBelow->setExclusiveGroup( "keepAB" ); - m_toDesktop = new KListAction( i18n("To Desktop"), 0, + m_toDesktop = new TDEListAction( i18n("To Desktop"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotPopupActionToDesktop(int)), actionCollection(), "to_desktop" ); connect( m_toDesktop->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateDesktopActions()) ); // invisible action to walk through the notes to make this configurable - new KAction( 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" ); // create the note header, button and label... @@ -168,14 +168,14 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *parent, const char * KXMLGUIFactory factory( &builder, TQT_TQOBJECT(this) ); factory.addClient( this ); - m_menu = dynamic_cast<KPopupMenu*>(factory.container( "note_context", this )); - m_edit_menu = dynamic_cast<KPopupMenu*>(factory.container( "note_edit", this )); - m_tool = dynamic_cast<KToolBar*>(factory.container( "note_tool", this )); + m_menu = dynamic_cast<TDEPopupMenu*>(factory.container( "note_context", this )); + m_edit_menu = dynamic_cast<TDEPopupMenu*>(factory.container( "note_edit", this )); + m_tool = dynamic_cast<TDEToolBar*>(factory.container( "note_tool", this )); if ( m_tool ) { m_tool->setIconSize( 10 ); m_tool->setFixedHeight( 16 ); - m_tool->setIconText( KToolBar::IconOnly ); + m_tool->setIconText( TDEToolBar::IconOnly ); // if there was just a way of making KComboBox adhere the toolbar height... TQObjectList *list = m_tool->queryList( "KComboBox" ); diff --git a/knotes/knote.h b/knotes/knote.h index 3b7928c42..43444b991 100644 --- a/knotes/knote.h +++ b/knotes/knote.h @@ -35,13 +35,13 @@ class TQLabel; class KXMLGUIBuilder; class KFind; -class KPopupMenu; +class TDEPopupMenu; class KNoteButton; class KNoteEdit; class KNoteConfig; -class KToolBar; -class KListAction; -class KToggleAction; +class TDEToolBar; +class TDEListAction; +class TDEToggleAction; namespace KCal { class Journal; @@ -159,7 +159,7 @@ private: private: TQLabel *m_label, *m_pushpin, *m_fold; KNoteButton *m_button; - KToolBar *m_tool; + TDEToolBar *m_tool; KNoteEdit *m_editor; KNoteConfig *m_config; @@ -167,14 +167,14 @@ private: KFind *m_find; - KPopupMenu *m_menu; - KPopupMenu *m_edit_menu; + TDEPopupMenu *m_menu; + TDEPopupMenu *m_edit_menu; - KToggleAction *m_readOnly; + TDEToggleAction *m_readOnly; - KListAction *m_toDesktop; - KToggleAction *m_keepAbove; - KToggleAction *m_keepBelow; + TDEListAction *m_toDesktop; + TDEToggleAction *m_keepAbove; + TDEToggleAction *m_keepBelow; TDESharedConfig::Ptr m_twinConf; diff --git a/knotes/knoteconfigdlg.cpp b/knotes/knoteconfigdlg.cpp index 6b01b7b86..17ede6699 100644 --- a/knotes/knoteconfigdlg.cpp +++ b/knotes/knoteconfigdlg.cpp @@ -158,14 +158,14 @@ TQWidget *KNoteConfigDlg::makeEditorPage( bool defaults ) TQLabel *label_Font = new TQLabel( i18n("Text font:"), editorPage, "label_Font" ); layout->addWidget( label_Font, 3, 0 ); - KFontRequester *kcfg_Font = new KFontRequester( editorPage, "kcfg_Font" ); + TDEFontRequester *kcfg_Font = new TDEFontRequester( editorPage, "kcfg_Font" ); kcfg_Font->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) ); layout->addMultiCellWidget( kcfg_Font, 3, 3, 1, 2 ); TQLabel *label_TitleFont = new TQLabel( i18n("Title font:"), editorPage, "label_TitleFont" ); layout->addWidget( label_TitleFont, 2, 0 ); - KFontRequester *kcfg_TitleFont = new KFontRequester( editorPage, "kcfg_TitleFont" ); + TDEFontRequester *kcfg_TitleFont = new TDEFontRequester( editorPage, "kcfg_TitleFont" ); kcfg_TitleFont->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) ); layout->addMultiCellWidget( kcfg_TitleFont, 2, 2, 1, 2 ); diff --git a/knotes/knoteedit.cpp b/knotes/knoteedit.cpp index 2844c29f3..62fe2a4be 100644 --- a/knotes/knoteedit.cpp +++ b/knotes/knoteedit.cpp @@ -36,7 +36,7 @@ static const short SEP = 5; static const short ICON_SIZE = 10; -KNoteEdit::KNoteEdit( KActionCollection *actions, TQWidget *parent, const char *name ) +KNoteEdit::KNoteEdit( TDEActionCollection *actions, TQWidget *parent, const char *name ) : KTextEdit( parent, name ), m_note( 0 ) { setAcceptDrops( true ); @@ -64,17 +64,17 @@ KNoteEdit::KNoteEdit( KActionCollection *actions, TQWidget *parent, const char * connect( this, TQT_SIGNAL(copyAvailable(bool)), TQT_TQOBJECT(this), TQT_SLOT( slotCutEnabled( bool ) ) ); connect( this, TQT_SIGNAL(copyAvailable(bool)), m_copy, TQT_SLOT(setEnabled(bool)) ); - new KAction( KStdGuiItem::clear(), 0, TQT_TQOBJECT(this), TQT_SLOT(clear()), actions, "edit_clear" ); + new TDEAction( KStdGuiItem::clear(), 0, TQT_TQOBJECT(this), TQT_SLOT(clear()), actions, "edit_clear" ); KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT(selectAll()), actions ); // create the actions modifying the text format - m_textBold = new KToggleAction( i18n("Bold"), "text_bold", CTRL + Key_B, 0, 0, + m_textBold = new TDEToggleAction( i18n("Bold"), "text_bold", CTRL + Key_B, 0, 0, actions, "format_bold" ); - m_textItalic = new KToggleAction( i18n("Italic"), "text_italic", CTRL + Key_I, 0, 0, + m_textItalic = new TDEToggleAction( i18n("Italic"), "text_italic", CTRL + Key_I, 0, 0, actions, "format_italic" ); - m_textUnderline = new KToggleAction( i18n("Underline"), "text_under", CTRL + Key_U, 0, 0, + m_textUnderline = new TDEToggleAction( i18n("Underline"), "text_under", CTRL + Key_U, 0, 0, actions, "format_underline" ); - m_textStrikeOut = new KToggleAction( i18n("Strike Out"), "text_strike", CTRL + Key_S, 0, 0, + m_textStrikeOut = new TDEToggleAction( i18n("Strike Out"), "text_strike", CTRL + Key_S, 0, 0, actions, "format_strikeout" ); connect( m_textBold, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setBold(bool)) ); @@ -82,17 +82,17 @@ KNoteEdit::KNoteEdit( KActionCollection *actions, TQWidget *parent, const char * connect( m_textUnderline, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setUnderline(bool)) ); connect( m_textStrikeOut, TQT_SIGNAL(toggled(bool)), TQT_SLOT(textStrikeOut(bool)) ); - m_textAlignLeft = new KToggleAction( i18n("Align Left"), "text_left", ALT + Key_L, + m_textAlignLeft = new TDEToggleAction( i18n("Align Left"), "text_left", ALT + Key_L, TQT_TQOBJECT(this), TQT_SLOT(textAlignLeft()), actions, "format_alignleft" ); m_textAlignLeft->setChecked( true ); // just a dummy, will be updated later - m_textAlignCenter = new KToggleAction( 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()), actions, "format_aligncenter" ); - m_textAlignRight = new KToggleAction( i18n("Align Right"), "text_right", ALT + Key_R, + m_textAlignRight = new TDEToggleAction( i18n("Align Right"), "text_right", ALT + Key_R, TQT_TQOBJECT(this), TQT_SLOT(textAlignRight()), actions, "format_alignright" ); - m_textAlignBlock = new KToggleAction( 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()), actions, "format_alignblock" ); @@ -101,16 +101,16 @@ KNoteEdit::KNoteEdit( KActionCollection *actions, TQWidget *parent, const char * m_textAlignRight->setExclusiveGroup( "align" ); m_textAlignBlock->setExclusiveGroup( "align" ); - m_textList = new KToggleAction( i18n("List"), "enum_list", 0, + m_textList = new TDEToggleAction( i18n("List"), "enum_list", 0, TQT_TQOBJECT(this), TQT_SLOT(textList()), actions, "format_list" ); m_textList->setExclusiveGroup( "style" ); - m_textSuper = new KToggleAction( i18n("Superscript"), "text_super", 0, + m_textSuper = new TDEToggleAction( i18n("Superscript"), "text_super", 0, TQT_TQOBJECT(this), TQT_SLOT(textSuperScript()), actions, "format_super" ); - m_textSub = new KToggleAction( i18n("Subscript"), "text_sub", 0, + m_textSub = new TDEToggleAction( i18n("Subscript"), "text_sub", 0, TQT_TQOBJECT(this), TQT_SLOT(textSubScript()), actions, "format_sub" ); @@ -119,25 +119,25 @@ KNoteEdit::KNoteEdit( KActionCollection *actions, TQWidget *parent, const char * // There is no easy possibility to implement text indenting with TQTextEdit // -// m_textIncreaseIndent = new KAction( i18n("Increase Indent"), "format_increaseindent", 0, +// m_textIncreaseIndent = new TDEAction( i18n("Increase Indent"), "format_increaseindent", 0, // TQT_TQOBJECT(this), TQT_SLOT(textIncreaseIndent()), // actions, "format_increaseindent" ); // -// m_textDecreaseIndent = new KAction( i18n("Decrease Indent"), "format_decreaseindent", 0, +// m_textDecreaseIndent = new TDEAction( i18n("Decrease Indent"), "format_decreaseindent", 0, // TQT_TQOBJECT(this), TQT_SLOT(textDecreaseIndent()), // actions, "format_decreaseindent" ); TQPixmap pix( ICON_SIZE, ICON_SIZE ); pix.fill( black ); // just a dummy, gets updated before widget is shown - m_textColor = new KAction( i18n("Text Color..."), pix, 0, TQT_TQOBJECT(this), + m_textColor = new TDEAction( i18n("Text Color..."), pix, 0, TQT_TQOBJECT(this), TQT_SLOT(textColor()), actions, "format_color" ); - m_textFont = new KFontAction( i18n("Text Font"), "text", KKey(), + m_textFont = new TDEFontAction( i18n("Text Font"), "text", KKey(), actions, "format_font" ); connect( m_textFont, TQT_SIGNAL(activated( const TQString & )), TQT_TQOBJECT(this), TQT_SLOT(setFamily( const TQString & )) ); - m_textSize = new KFontSizeAction( i18n("Text Size"), KKey(), + m_textSize = new TDEFontSizeAction( i18n("Text Size"), KKey(), actions, "format_size" ); connect( m_textSize, TQT_SIGNAL(fontSizeChanged( int )), TQT_TQOBJECT(this), TQT_SLOT(setPointSize( int )) ); diff --git a/knotes/knoteedit.h b/knotes/knoteedit.h index 65de3e45a..caa2c51a1 100644 --- a/knotes/knoteedit.h +++ b/knotes/knoteedit.h @@ -28,11 +28,11 @@ class KNote; class TQFont; class TQColor; class TQPushButton; -class KAction; -class KActionCollection; -class KToggleAction; -class KFontAction; -class KFontSizeAction; +class TDEAction; +class TDEActionCollection; +class TDEToggleAction; +class TDEFontAction; +class TDEFontSizeAction; class KNoteEdit : public KTextEdit @@ -40,7 +40,7 @@ class KNoteEdit : public KTextEdit Q_OBJECT public: - KNoteEdit( KActionCollection *actions, TQWidget *parent=0, const char *name=0 ); + KNoteEdit( TDEActionCollection *actions, TQWidget *parent=0, const char *name=0 ); ~KNoteEdit(); void setNote( KNote *_note ) { m_note = _note; @@ -99,32 +99,32 @@ private: void disableRichTextActions(); private: - KAction *m_cut; - KAction *m_copy; - KAction *m_paste; - - KToggleAction *m_textBold; - KToggleAction *m_textItalic; - KToggleAction *m_textUnderline; - KToggleAction *m_textStrikeOut; - - KToggleAction *m_textAlignLeft; - KToggleAction *m_textAlignCenter; - KToggleAction *m_textAlignRight; - KToggleAction *m_textAlignBlock; - - KToggleAction *m_textList; - KToggleAction *m_textSuper; - KToggleAction *m_textSub; - - //KAction *m_textIncreaseIndent; - //KAction *m_textDecreaseIndent; - - KAction *m_textColor; - KFontAction *m_textFont; - KFontSizeAction *m_textSize; - KAction* undo; - KAction* redo; + TDEAction *m_cut; + TDEAction *m_copy; + TDEAction *m_paste; + + TDEToggleAction *m_textBold; + TDEToggleAction *m_textItalic; + TDEToggleAction *m_textUnderline; + TDEToggleAction *m_textStrikeOut; + + TDEToggleAction *m_textAlignLeft; + TDEToggleAction *m_textAlignCenter; + TDEToggleAction *m_textAlignRight; + TDEToggleAction *m_textAlignBlock; + + TDEToggleAction *m_textList; + TDEToggleAction *m_textSuper; + TDEToggleAction *m_textSub; + + //TDEAction *m_textIncreaseIndent; + //TDEAction *m_textDecreaseIndent; + + TDEAction *m_textColor; + TDEFontAction *m_textFont; + TDEFontSizeAction *m_textSize; + TDEAction* undo; + TDEAction* redo; bool m_autoIndentMode; KNote *m_note; }; diff --git a/knotes/knotesapp.cpp b/knotes/knotesapp.cpp index 718a35004..069bf9da8 100644 --- a/knotes/knotesapp.cpp +++ b/knotes/knotesapp.cpp @@ -68,7 +68,7 @@ public: connect( this, TQT_SIGNAL(defaultClicked()), m_keyChooser, TQT_SLOT(allDefault()) ); } - void insert( KActionCollection *actions ) + void insert( TDEActionCollection *actions ) { m_keyChooser->insert( actions, i18n("Note Actions") ); } @@ -86,9 +86,9 @@ private: int KNotesApp::KNoteActionList::compareItems( TQPtrCollection::Item s1, TQPtrCollection::Item s2 ) { - if ( ((KAction*)s1)->text() == ((KAction*)s2)->text() ) + if ( ((TDEAction*)s1)->text() == ((TDEAction*)s2)->text() ) return 0; - return ( ((KAction*)s1)->text() < ((KAction*)s2)->text() ? -1 : 1 ); + return ( ((TDEAction*)s1)->text() < ((TDEAction*)s2)->text() ? -1 : 1 ); } @@ -111,13 +111,13 @@ KNotesApp::KNotesApp() KNote::setStyle( KNotesGlobalConfig::style() ); // create the GUI... - new KAction( i18n("New Note"), "filenew", 0, + new TDEAction( i18n("New Note"), "filenew", 0, TQT_TQOBJECT(this), TQT_SLOT(newNote()), actionCollection(), "new_note" ); - new KAction( i18n("New Note From Clipboard"), "editpaste", 0, + new TDEAction( i18n("New Note From Clipboard"), "editpaste", 0, TQT_TQOBJECT(this), TQT_SLOT(newNoteFromClipboard()), actionCollection(), "new_note_clipboard" ); - new KAction( i18n("Show All Notes"), "knotes", 0, + new TDEAction( i18n("Show All Notes"), "knotes", 0, TQT_TQOBJECT(this), TQT_SLOT(showAllNotes()), actionCollection(), "show_all_notes" ); - new KAction( i18n("Hide All Notes"), "fileclose", 0, + new TDEAction( i18n("Hide All Notes"), "fileclose", 0, TQT_TQOBJECT(this), TQT_SLOT(hideAllNotes()), actionCollection(), "hide_all_notes" ); new KHelpMenu( this, kapp->aboutData(), false, actionCollection() ); @@ -133,8 +133,8 @@ KNotesApp::KNotesApp() m_guiFactory = new KXMLGUIFactory( m_guiBuilder, TQT_TQOBJECT(this) ); m_guiFactory->addClient( this ); - m_context_menu = static_cast<KPopupMenu*>(m_guiFactory->container( "knotes_context", this )); - m_note_menu = static_cast<KPopupMenu*>(m_guiFactory->container( "notes_menu", this )); + m_context_menu = static_cast<TDEPopupMenu*>(m_guiFactory->container( "knotes_context", this )); + m_note_menu = static_cast<TDEPopupMenu*>(m_guiFactory->container( "notes_menu", this )); // get the most recent XML UI file TQString xmlFileName = instance()->instanceName() + "ui.rc"; @@ -579,13 +579,13 @@ void KNotesApp::slotConfigureAccels() return; notes.toFirst(); - TQValueList<KAction *> list = (*notes)->actionCollection()->actions(); - for ( TQValueList<KAction *>::iterator it = list.begin(); it != list.end(); ++it ) + TQValueList<TDEAction *> list = (*notes)->actionCollection()->actions(); + for ( TQValueList<TDEAction *>::iterator it = list.begin(); it != list.end(); ++it ) { notes.toFirst(); for ( ++notes; *notes; ++notes ) { - KAction *toChange = (*notes)->actionCollection()->action( (*it)->name() ); + TDEAction *toChange = (*notes)->actionCollection()->action( (*it)->name() ); if ( toChange->shortcut() != (*it)->shortcut() ) toChange->setShortcut( (*it)->shortcut() ); } @@ -703,8 +703,8 @@ void KNotesApp::updateNoteActions() for ( TQDictIterator<KNote> it( m_noteList ); it.current(); ++it ) { - KAction *action = new KAction( it.current()->name().replace("&", "&&"), - KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotShowNote()), + TDEAction *action = new TDEAction( it.current()->name().replace("&", "&&"), + TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotShowNote()), (TQObject *)0, it.current()->noteId().utf8() ); KIconEffect effect; @@ -719,7 +719,7 @@ void KNotesApp::updateNoteActions() actionCollection()->action( "hide_all_notes" )->setEnabled( false ); actionCollection()->action( "show_all_notes" )->setEnabled( false ); m_findAction->setEnabled( false ); - KAction *action = new KAction( i18n("No Notes") ); + TDEAction *action = new TDEAction( i18n("No Notes") ); m_noteActions.append( action ); } else @@ -736,7 +736,7 @@ void KNotesApp::updateGlobalAccels() { if ( m_globalAccel->isEnabled() ) { - KAction *action = actionCollection()->action( "new_note" ); + TDEAction *action = actionCollection()->action( "new_note" ); if ( action ) action->setShortcut( m_globalAccel->shortcut( "global_new_note" ) ); action = actionCollection()->action( "new_note_clipboard" ); @@ -753,7 +753,7 @@ void KNotesApp::updateGlobalAccels() } else { - KAction *action = actionCollection()->action( "new_note" ); + TDEAction *action = actionCollection()->action( "new_note" ); if ( action ) action->setShortcut( 0 ); action = actionCollection()->action( "new_note_clipboard" ); diff --git a/knotes/knotesapp.h b/knotes/knotesapp.h index a850bec73..74a8fdc89 100644 --- a/knotes/knotesapp.h +++ b/knotes/knotesapp.h @@ -34,9 +34,9 @@ class KFind; class KNote; -class KPopupMenu; -class KAction; -class KActionMenu; +class TDEPopupMenu; +class TDEAction; +class TDEActionMenu; class TDEGlobalAccel; class KXMLGUIFactory; class KXMLGUIBuilder; @@ -136,7 +136,7 @@ private slots: void killNote( KCal::Journal *journal ); private: - class KNoteActionList : public TQPtrList<KAction> + class KNoteActionList : public TQPtrList<TDEAction> { public: virtual int compareItems( TQPtrCollection::Item s1, TQPtrCollection::Item s2 ); @@ -153,15 +153,15 @@ private: KFind *m_find; TQDictIterator<KNote> *m_findPos; - KPopupMenu *m_note_menu; - KPopupMenu *m_context_menu; + TDEPopupMenu *m_note_menu; + TDEPopupMenu *m_context_menu; TDEGlobalAccel *m_globalAccel; KXMLGUIFactory *m_guiFactory; KXMLGUIBuilder *m_guiBuilder; TQDomDocument m_noteGUI; - KAction *m_findAction; + TDEAction *m_findAction; TQString m_noteUidModify; }; diff --git a/kontact/interfaces/core.h b/kontact/interfaces/core.h index c92aca5d1..65e939b94 100644 --- a/kontact/interfaces/core.h +++ b/kontact/interfaces/core.h @@ -28,7 +28,7 @@ #include <tdeparts/mainwindow.h> #include <tdeparts/part.h> -class KAction; +class TDEAction; namespace Kontact { diff --git a/kontact/interfaces/plugin.cpp b/kontact/interfaces/plugin.cpp index 9d9445e99..ae7efa528 100644 --- a/kontact/interfaces/plugin.cpp +++ b/kontact/interfaces/plugin.cpp @@ -40,8 +40,8 @@ class Plugin::Private public: Kontact::Core *core; DCOPClient *dcopClient; - TQPtrList<KAction> *newActions; - TQPtrList<KAction> *syncActions; + TQPtrList<TDEAction> *newActions; + TQPtrList<TDEAction> *syncActions; TQString identifier; TQString title; TQString icon; @@ -61,8 +61,8 @@ Plugin::Plugin( Kontact::Core *core, TQObject *parent, const char *name ) d->core = core; d->dcopClient = 0; - d->newActions = new TQPtrList<KAction>; - d->syncActions = new TQPtrList<KAction>; + d->newActions = new TQPtrList<TDEAction>; + d->syncActions = new TQPtrList<TDEAction>; d->hasPart = true; d->part = 0; d->disabled = false; @@ -173,22 +173,22 @@ DCOPClient* Plugin::dcopClient() const return d->dcopClient; } -void Plugin::insertNewAction( KAction *action ) +void Plugin::insertNewAction( TDEAction *action ) { d->newActions->append( action ); } -void Plugin::insertSyncAction( KAction *action ) +void Plugin::insertSyncAction( TDEAction *action ) { d->syncActions->append( action ); } -TQPtrList<KAction> *Plugin::newActions() const +TQPtrList<TDEAction> *Plugin::newActions() const { return d->newActions; } -TQPtrList<KAction> *Plugin::syncActions() const +TQPtrList<TDEAction> *Plugin::syncActions() const { return d->syncActions; } diff --git a/kontact/interfaces/plugin.h b/kontact/interfaces/plugin.h index 863e75c6d..c4d573abe 100644 --- a/kontact/interfaces/plugin.h +++ b/kontact/interfaces/plugin.h @@ -33,7 +33,7 @@ class TQStringList; class DCOPClient; class DCOPObject; class TDEAboutData; -class KAction; +class TDEAction; class TDEConfig; class TQWidget; namespace KParts { class ReadOnlyPart; } @@ -211,22 +211,22 @@ class KDE_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient /** Insert "New" action. */ - void insertNewAction( KAction *action ); + void insertNewAction( TDEAction *action ); /** Insert "Sync" action. */ - void insertSyncAction( KAction *action ); + void insertSyncAction( TDEAction *action ); /** FIXME: write API doc for Kontact::Plugin::newActions(). */ - TQPtrList<KAction>* newActions() const; + TQPtrList<TDEAction>* newActions() const; /** FIXME: write API doc for Kontact::Plugin::syncActions(). */ - TQPtrList<KAction>* syncActions() const; + TQPtrList<TDEAction>* syncActions() const; /** Returns a list of action name which shall be hidden in the main toolbar. diff --git a/kontact/plugins/akregator/akregator_plugin.cpp b/kontact/plugins/akregator/akregator_plugin.cpp index bf4e2b17c..81740c7b7 100644 --- a/kontact/plugins/akregator/akregator_plugin.cpp +++ b/kontact/plugins/akregator/akregator_plugin.cpp @@ -54,7 +54,7 @@ Plugin::Plugin( Kontact::Core *core, const char *, const TQStringList& ) setInstance( PluginFactory::instance() ); - insertNewAction( new KAction( i18n( "New Feed..." ), "bookmark_add", CTRL+SHIFT+Key_F, this, TQT_SLOT( addFeed() ), actionCollection(), "feed_new" ) ); + insertNewAction( new TDEAction( i18n( "New Feed..." ), "bookmark_add", CTRL+SHIFT+Key_F, this, TQT_SLOT( addFeed() ), actionCollection(), "feed_new" ) ); m_uniqueAppWatcher = new Kontact::UniqueAppWatcher( new Kontact::UniqueAppHandlerFactory<Akregator::UniqueAppHandler>(), this ); diff --git a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp index 159962e7a..929bd1b83 100644 --- a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp +++ b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp @@ -57,14 +57,14 @@ KAddressbookPlugin::KAddressbookPlugin( Kontact::Core *core, const char *, const { setInstance( KAddressbookPluginFactory::instance() ); - insertNewAction( new KAction( i18n( "New Contact..." ), "identity", + insertNewAction( new TDEAction( i18n( "New Contact..." ), "identity", CTRL+SHIFT+Key_C, this, TQT_SLOT( slotNewContact() ), actionCollection(), "new_contact" ) ); - insertNewAction( new KAction( i18n( "&New Distribution List..." ), "kontact_contacts", 0, this, + insertNewAction( new TDEAction( i18n( "&New Distribution List..." ), "kontact_contacts", 0, this, TQT_SLOT( slotNewDistributionList() ), actionCollection(), "new_distributionlist" ) ); - insertSyncAction( new KAction( i18n( "Synchronize Contacts" ), "reload", + insertSyncAction( new TDEAction( i18n( "Synchronize Contacts" ), "reload", 0, this, TQT_SLOT( slotSyncContacts() ), actionCollection(), "kaddressbook_sync" ) ); mUniqueAppWatcher = new Kontact::UniqueAppWatcher( diff --git a/kontact/plugins/karm/karm_plugin.cpp b/kontact/plugins/karm/karm_plugin.cpp index 93d894933..8db54bc96 100644 --- a/kontact/plugins/karm/karm_plugin.cpp +++ b/kontact/plugins/karm/karm_plugin.cpp @@ -41,7 +41,7 @@ KarmPlugin::KarmPlugin( Kontact::Core *core, const char *, const TQStringList& ) { setInstance( KarmPluginFactory::instance() ); (void)dcopClient(); - insertNewAction( new KAction( i18n( "New Task" ), "karm", + insertNewAction( new TDEAction( i18n( "New Task" ), "karm", CTRL+SHIFT+Key_W, this, TQT_SLOT( newTask() ), actionCollection(), "new_task" ) ); } diff --git a/kontact/plugins/kmail/kcmkmailsummary.cpp b/kontact/plugins/kmail/kcmkmailsummary.cpp index eb8906d26..3ca4c9036 100644 --- a/kontact/plugins/kmail/kcmkmailsummary.cpp +++ b/kontact/plugins/kmail/kcmkmailsummary.cpp @@ -55,7 +55,7 @@ KCMKMailSummary::KCMKMailSummary( TQWidget *parent, const char *name ) connect( mFolderView, TQT_SIGNAL( clicked( TQListViewItem* ) ), TQT_SLOT( modified() ) ); connect( mFullPath, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) ); - KAcceleratorManager::manage( this ); + TDEAcceleratorManager::manage( this ); load(); @@ -77,7 +77,7 @@ void KCMKMailSummary::initGUI() { TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); - mFolderView = new KListView( this ); + mFolderView = new TDEListView( this ); mFolderView->setRootIsDecorated( true ); mFolderView->setFullWidth( true ); diff --git a/kontact/plugins/kmail/kcmkmailsummary.h b/kontact/plugins/kmail/kcmkmailsummary.h index 3b6a8f53e..7cc4763e7 100644 --- a/kontact/plugins/kmail/kcmkmailsummary.h +++ b/kontact/plugins/kmail/kcmkmailsummary.h @@ -28,7 +28,7 @@ #include <tdecmodule.h> -class KListView; +class TDEListView; class TQCheckBox; class TQCheckListItem; @@ -54,7 +54,7 @@ class KCMKMailSummary : public TDECModule void loadFolders(); void storeFolders(); - KListView *mFolderView; + TDEListView *mFolderView; TQCheckBox *mFullPath; TQMap<TQString, TQListViewItem*> mFolderMap; }; diff --git a/kontact/plugins/kmail/kmail_plugin.cpp b/kontact/plugins/kmail/kmail_plugin.cpp index e6a1fae21..051d69b95 100644 --- a/kontact/plugins/kmail/kmail_plugin.cpp +++ b/kontact/plugins/kmail/kmail_plugin.cpp @@ -61,11 +61,11 @@ KMailPlugin::KMailPlugin(Kontact::Core *core, const char *, const TQStringList& { setInstance( KMailPluginFactory::instance() ); - insertNewAction( new KAction( i18n( "New Message..." ), "mail_new", + insertNewAction( new TDEAction( i18n( "New Message..." ), "mail_new", CTRL+SHIFT+Key_M, this, TQT_SLOT( slotNewMail() ), actionCollection(), "new_mail" ) ); - insertSyncAction( new KAction( i18n( "Synchronize Mail" ), "reload", + insertSyncAction( new TDEAction( i18n( "Synchronize Mail" ), "reload", 0, this, TQT_SLOT( slotSyncFolders() ), actionCollection(), "sync_mail" ) ); diff --git a/kontact/plugins/knode/knode_plugin.cpp b/kontact/plugins/knode/knode_plugin.cpp index 9713d853f..eded07cbd 100644 --- a/kontact/plugins/knode/knode_plugin.cpp +++ b/kontact/plugins/knode/knode_plugin.cpp @@ -49,7 +49,7 @@ KNodePlugin::KNodePlugin( Kontact::Core *core, const char *, const TQStringList& { setInstance( KNodePluginFactory::instance() ); - insertNewAction( new KAction( i18n( "New Article..." ), "mail_new", CTRL+SHIFT+Key_A, + insertNewAction( new TDEAction( i18n( "New Article..." ), "mail_new", CTRL+SHIFT+Key_A, this, TQT_SLOT( slotPostArticle() ), actionCollection(), "post_article" ) ); mUniqueAppWatcher = new Kontact::UniqueAppWatcher( diff --git a/kontact/plugins/knotes/knotes_part.cpp b/kontact/plugins/knotes/knotes_part.cpp index 725219f4f..d73bd1fbe 100644 --- a/kontact/plugins/knotes/knotes_part.cpp +++ b/kontact/plugins/knotes/knotes_part.cpp @@ -50,13 +50,13 @@ KNotesPart::KNotesPart( TQObject *parent, const char *name ) setInstance( new TDEInstance( "knotes" ) ); // create the actions - new KAction( i18n( "&New" ), "knotes", CTRL+Key_N, this, TQT_SLOT( newNote() ), + new TDEAction( i18n( "&New" ), "knotes", CTRL+Key_N, this, TQT_SLOT( newNote() ), actionCollection(), "file_new" ); - new KAction( i18n( "Rename..." ), "text", this, TQT_SLOT( renameNote() ), + new TDEAction( i18n( "Rename..." ), "text", this, TQT_SLOT( renameNote() ), actionCollection(), "edit_rename" ); - new KAction( i18n( "Delete" ), "editdelete", Key_Delete, this, TQT_SLOT( killSelectedNotes() ), + new TDEAction( i18n( "Delete" ), "editdelete", Key_Delete, this, TQT_SLOT( killSelectedNotes() ), actionCollection(), "edit_delete" ); - new KAction( i18n( "Print Selected Notes..." ), "print", CTRL+Key_P, this, TQT_SLOT( printSelectedNotes() ), + new TDEAction( i18n( "Print Selected Notes..." ), "print", CTRL+Key_P, this, TQT_SLOT( printSelectedNotes() ), actionCollection(), "print_note" ); // TODO icons: s/editdelete/knotes_delete/ or the other way round in knotes @@ -398,8 +398,8 @@ void KNotesPart::renamedNote( TQIconViewItem* ) void KNotesPart::slotOnCurrentChanged( TQIconViewItem* ) { - KAction *renameAction = actionCollection()->action( "edit_rename" ); - KAction *deleteAction = actionCollection()->action( "edit_delete" ); + TDEAction *renameAction = actionCollection()->action( "edit_rename" ); + TDEAction *deleteAction = actionCollection()->action( "edit_delete" ); if ( !mNotesView->currentItem() ) { renameAction->setEnabled( false ); diff --git a/kontact/plugins/knotes/knotes_part_p.h b/kontact/plugins/knotes/knotes_part_p.h index 91c198af2..648c94c2d 100644 --- a/kontact/plugins/knotes/knotes_part_p.h +++ b/kontact/plugins/knotes/knotes_part_p.h @@ -147,7 +147,7 @@ class KNoteEditDlg : public KDialogBase, virtual public KXMLGUIClient KXMLGUIFactory factory( &builder, TQT_TQOBJECT(this) ); factory.addClient( this ); - mTool = static_cast<KToolBar *>(factory.container( "note_tool", this )); + mTool = static_cast<TDEToolBar *>(factory.container( "note_tool", this )); layout->addWidget( mTool ); layout->addWidget( mNoteEdit ); @@ -181,8 +181,8 @@ class KNoteEditDlg : public KDialogBase, virtual public KXMLGUIClient private: KLineEdit *mTitleEdit; KNoteEdit *mNoteEdit; - KToolBar *mTool; - KPopupMenu *mEditMenu; + TDEToolBar *mTool; + TDEPopupMenu *mEditMenu; }; diff --git a/kontact/plugins/knotes/knotes_plugin.cpp b/kontact/plugins/knotes/knotes_plugin.cpp index 2f3f470b8..adf704b1d 100644 --- a/kontact/plugins/knotes/knotes_plugin.cpp +++ b/kontact/plugins/knotes/knotes_plugin.cpp @@ -44,9 +44,9 @@ KNotesPlugin::KNotesPlugin( Kontact::Core *core, const char *, const TQStringLis { setInstance( KNotesPluginFactory::instance() ); - insertNewAction( new KAction( i18n( "New Note..." ), "knotes", CTRL+SHIFT+Key_N, + insertNewAction( new TDEAction( i18n( "New Note..." ), "knotes", CTRL+SHIFT+Key_N, this, TQT_SLOT( slotNewNote() ), actionCollection(), "new_note" ) ); - insertSyncAction( new KAction( i18n( "Synchronize Notes" ), "reload", 0, + insertSyncAction( new TDEAction( i18n( "Synchronize Notes" ), "reload", 0, this, TQT_SLOT( slotSyncNotes() ), actionCollection(), "knotes_sync" ) ); } diff --git a/kontact/plugins/korganizer/journalplugin.cpp b/kontact/plugins/korganizer/journalplugin.cpp index 0bdb167f8..d75bfe76d 100644 --- a/kontact/plugins/korganizer/journalplugin.cpp +++ b/kontact/plugins/korganizer/journalplugin.cpp @@ -49,10 +49,10 @@ JournalPlugin::JournalPlugin( Kontact::Core *core, const char *, const TQStringL setInstance( JournalPluginFactory::instance() ); instance()->iconLoader()->addAppDir("tdepim"); - insertNewAction( new KAction( i18n( "New Journal..." ), "newjournal", + insertNewAction( new TDEAction( i18n( "New Journal..." ), "newjournal", CTRL+SHIFT+Key_J, this, TQT_SLOT( slotNewJournal() ), actionCollection(), "new_journal" ) ); - insertSyncAction( new KAction( i18n( "Synchronize Journal" ), "reload", + insertSyncAction( new TDEAction( i18n( "Synchronize Journal" ), "reload", 0, this, TQT_SLOT( slotSyncJournal() ), actionCollection(), "journal_sync" ) ); diff --git a/kontact/plugins/korganizer/kcmkorgsummary.cpp b/kontact/plugins/korganizer/kcmkorgsummary.cpp index 818f3c056..acc95d0f2 100644 --- a/kontact/plugins/korganizer/kcmkorgsummary.cpp +++ b/kontact/plugins/korganizer/kcmkorgsummary.cpp @@ -60,7 +60,7 @@ KCMKOrgSummary::KCMKOrgSummary( TQWidget *parent, const char *name ) connect( mCustomDays, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( modified() ) ); connect( mCustomDays, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( customDaysChanged( int ) ) ); - KAcceleratorManager::manage( this ); + TDEAcceleratorManager::manage( this ); load(); diff --git a/kontact/plugins/korganizer/korganizerplugin.cpp b/kontact/plugins/korganizer/korganizerplugin.cpp index 2262dcef3..00ed1e532 100644 --- a/kontact/plugins/korganizer/korganizerplugin.cpp +++ b/kontact/plugins/korganizer/korganizerplugin.cpp @@ -64,11 +64,11 @@ KOrganizerPlugin::KOrganizerPlugin( Kontact::Core *core, const char *, const TQS setInstance( KOrganizerPluginFactory::instance() ); instance()->iconLoader()->addAppDir("tdepim"); - insertNewAction( new KAction( i18n( "New Event..." ), "newappointment", + insertNewAction( new TDEAction( i18n( "New Event..." ), "newappointment", CTRL+SHIFT+Key_E, this, TQT_SLOT( slotNewEvent() ), actionCollection(), "new_event" ) ); - insertSyncAction( new KAction( i18n( "Synchronize Calendar" ), "reload", + insertSyncAction( new TDEAction( i18n( "Synchronize Calendar" ), "reload", 0, this, TQT_SLOT( slotSyncEvents() ), actionCollection(), "korganizer_sync" ) ); diff --git a/kontact/plugins/korganizer/summarywidget.cpp b/kontact/plugins/korganizer/summarywidget.cpp index 451d8df57..416b0a5ad 100644 --- a/kontact/plugins/korganizer/summarywidget.cpp +++ b/kontact/plugins/korganizer/summarywidget.cpp @@ -267,7 +267,7 @@ void SummaryWidget::removeEvent( const TQString &uid ) void SummaryWidget::popupMenu( const TQString &uid ) { - KPopupMenu popup( this ); + TDEPopupMenu popup( this ); TQToolTip::remove( this ); popup.insertItem( i18n( "&Edit Appointment..." ), 0 ); popup.insertItem( TDEGlobal::iconLoader()->loadIcon( "editdelete", KIcon::Small), diff --git a/kontact/plugins/korganizer/todoplugin.cpp b/kontact/plugins/korganizer/todoplugin.cpp index e3ff2ba8f..5c6ce7e9d 100644 --- a/kontact/plugins/korganizer/todoplugin.cpp +++ b/kontact/plugins/korganizer/todoplugin.cpp @@ -61,11 +61,11 @@ TodoPlugin::TodoPlugin( Kontact::Core *core, const char *, const TQStringList& ) setInstance( TodoPluginFactory::instance() ); instance()->iconLoader()->addAppDir("tdepim"); - insertNewAction( new KAction( i18n( "New To-do..." ), "newtodo", + insertNewAction( new TDEAction( i18n( "New To-do..." ), "newtodo", CTRL+SHIFT+Key_T, this, TQT_SLOT( slotNewTodo() ), actionCollection(), "new_todo" ) ); - insertSyncAction( new KAction( i18n( "Synchronize To-do List" ), "reload", + insertSyncAction( new TDEAction( i18n( "Synchronize To-do List" ), "reload", 0, this, TQT_SLOT( slotSyncTodos() ), actionCollection(), "todo_sync" ) ); diff --git a/kontact/plugins/korganizer/todosummarywidget.cpp b/kontact/plugins/korganizer/todosummarywidget.cpp index 818eac7c4..996ea070f 100644 --- a/kontact/plugins/korganizer/todosummarywidget.cpp +++ b/kontact/plugins/korganizer/todosummarywidget.cpp @@ -224,7 +224,7 @@ void TodoSummaryWidget::completeTodo( const TQString &uid ) void TodoSummaryWidget::popupMenu( const TQString &uid ) { - KPopupMenu popup( this ); + TDEPopupMenu popup( this ); TQToolTip::remove( this ); popup.insertItem( i18n( "&Edit To-do..." ), 0 ); popup.insertItem( TDEGlobal::iconLoader()->loadIcon( "editdelete", KIcon::Small), diff --git a/kontact/plugins/newsticker/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp index 958959667..ce433d053 100644 --- a/kontact/plugins/newsticker/kcmkontactknt.cpp +++ b/kontact/plugins/newsticker/kcmkontactknt.cpp @@ -146,7 +146,7 @@ KCMKontactKNT::KCMKontactKNT( TQWidget *parent, const char *name ) connect( mNewButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( newFeed() ) ); connect( mDeleteButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( deleteFeed() ) ); - KAcceleratorManager::manage( this ); + TDEAcceleratorManager::manage( this ); load(); } @@ -334,7 +334,7 @@ void KCMKontactKNT::initGUI() TQGridLayout *layout = new TQGridLayout( this, 2, 3, KDialog::marginHint(), KDialog::spacingHint() ); - mAllNews = new KListView( this ); + mAllNews = new TDEListView( this ); mAllNews->addColumn( i18n( "All" ) ); mAllNews->setRootIsDecorated( true ); mAllNews->setFullWidth( true ); @@ -351,7 +351,7 @@ void KCMKontactKNT::initGUI() vbox->addWidget( mRemoveButton ); vbox->addStretch(); - mSelectedNews = new KListView( this ); + mSelectedNews = new TDEListView( this ); mSelectedNews->addColumn( i18n( "Selected" ) ); mSelectedNews->setFullWidth( true ); layout->addWidget( mSelectedNews, 0, 2 ); diff --git a/kontact/plugins/newsticker/kcmkontactknt.h b/kontact/plugins/newsticker/kcmkontactknt.h index cd3cbf0ee..a44cae7fb 100644 --- a/kontact/plugins/newsticker/kcmkontactknt.h +++ b/kontact/plugins/newsticker/kcmkontactknt.h @@ -30,7 +30,7 @@ class TQListViewItem; class TQSpinxBox; class TDEAboutData; -class KListView; +class TDEListView; class KPushButton; class NewsItem; @@ -68,8 +68,8 @@ class KCMKontactKNT : public TDECModule bool dcopActive() const; - KListView *mAllNews; - KListView *mSelectedNews; + TDEListView *mAllNews; + TDEListView *mSelectedNews; TQListViewItem *mCustomItem; KPushButton *mAddButton; diff --git a/kontact/plugins/specialdates/kcmsdsummary.cpp b/kontact/plugins/specialdates/kcmsdsummary.cpp index a15d1118c..e88911bad 100644 --- a/kontact/plugins/specialdates/kcmsdsummary.cpp +++ b/kontact/plugins/specialdates/kcmsdsummary.cpp @@ -63,7 +63,7 @@ KCMSDSummary::KCMSDSummary( TQWidget *parent, const char *name ) connect( mCustomDays, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( modified() ) ); connect( mCustomDays, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( customDaysChanged( int ) ) ); - KAcceleratorManager::manage( this ); + TDEAcceleratorManager::manage( this ); load(); } diff --git a/kontact/plugins/specialdates/sdsummarywidget.cpp b/kontact/plugins/specialdates/sdsummarywidget.cpp index 4857f1035..32aab8d0a 100644 --- a/kontact/plugins/specialdates/sdsummarywidget.cpp +++ b/kontact/plugins/specialdates/sdsummarywidget.cpp @@ -574,7 +574,7 @@ void SDSummaryWidget::viewContact( const TQString &uid ) void SDSummaryWidget::popupMenu( const TQString &uid ) { - KPopupMenu popup( this ); + TDEPopupMenu popup( this ); popup.insertItem( TDEGlobal::iconLoader()->loadIcon( "kmail", KIcon::Small ), i18n( "Send &Mail" ), 0 ); popup.insertItem( TDEGlobal::iconLoader()->loadIcon( "kaddressbook", KIcon::Small ), diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp index 91f33d3fc..e1e3c7f00 100644 --- a/kontact/plugins/summary/kcmkontactsummary.cpp +++ b/kontact/plugins/summary/kcmkontactsummary.cpp @@ -51,7 +51,7 @@ extern "C" class PluginItem : public TQCheckListItem { public: - PluginItem( KPluginInfo *info, KListView *parent ) + PluginItem( KPluginInfo *info, TDEListView *parent ) : TQCheckListItem( parent, TQString(), TQCheckListItem::CheckBox ), mInfo( info ) { @@ -79,7 +79,7 @@ class PluginItem : public TQCheckListItem }; PluginView::PluginView( TQWidget *parent, const char *name ) - : KListView( parent, name ) + : TDEListView( parent, name ) { addColumn( i18n( "Name" ) ); setAllColumnsShowFocus( true ); diff --git a/kontact/plugins/summary/kcmkontactsummary.h b/kontact/plugins/summary/kcmkontactsummary.h index 3e624798d..75cd79821 100644 --- a/kontact/plugins/summary/kcmkontactsummary.h +++ b/kontact/plugins/summary/kcmkontactsummary.h @@ -30,7 +30,7 @@ class KPluginInfo; -class PluginView : public KListView +class PluginView : public TDEListView { Q_OBJECT diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp index 27dac829f..335651cbd 100644 --- a/kontact/plugins/summary/summaryview_part.cpp +++ b/kontact/plugins/summary/summaryview_part.cpp @@ -88,7 +88,7 @@ SummaryViewPart::SummaryViewPart( Kontact::Core *core, const char*, connect( this, TQT_SIGNAL( textChanged( const TQString& ) ), info, TQT_SIGNAL( textChanged( const TQString& ) ) ); - mConfigAction = new KAction( i18n( "&Configure Summary View..." ), + mConfigAction = new TDEAction( i18n( "&Configure Summary View..." ), "configure", 0, this, TQT_SLOT( slotConfigure() ), actionCollection(), "summaryview_configure" ); diff --git a/kontact/plugins/summary/summaryview_part.h b/kontact/plugins/summary/summaryview_part.h index 9de42432e..03b37d033 100644 --- a/kontact/plugins/summary/summaryview_part.h +++ b/kontact/plugins/summary/summaryview_part.h @@ -46,7 +46,7 @@ namespace KParts class TQFrame; class TQLabel; class TQGridLayout; -class KAction; +class TDEAction; class KCMultiDialog; class SummaryViewPart : public KParts::ReadOnlyPart @@ -95,7 +95,7 @@ class SummaryViewPart : public KParts::ReadOnlyPart TQVBoxLayout *mRightColumn; TQLabel *mUsernameLabel; TQLabel *mDateLabel; - KAction *mConfigAction; + TDEAction *mConfigAction; TQStringList mLeftColumnSummaries; TQStringList mRightColumnSummaries; diff --git a/kontact/plugins/summary/summaryview_plugin.cpp b/kontact/plugins/summary/summaryview_plugin.cpp index a7bb89960..21c3a24c5 100644 --- a/kontact/plugins/summary/summaryview_plugin.cpp +++ b/kontact/plugins/summary/summaryview_plugin.cpp @@ -39,7 +39,7 @@ SummaryView::SummaryView( Kontact::Core *core, const char *name, const TQStringL { setInstance( SummaryViewFactory::instance() ); - mSyncAction = new KSelectAction( i18n( "Synchronize All" ), "reload", 0, 0, + mSyncAction = new TDESelectAction( i18n( "Synchronize All" ), "reload", 0, 0, 0, actionCollection(), "kontact_summary_sync" ); connect( mSyncAction, TQT_SIGNAL( activated( const TQString& ) ), this, TQT_SLOT( syncAccount( const TQString& ) ) ); @@ -90,8 +90,8 @@ void SummaryView::doSync() for ( TQValueList<Kontact::Plugin*>::ConstIterator it = pluginList.begin(), end = pluginList.end(); it != end; ++it ) { // execute all sync actions but our own - TQPtrList<KAction> *actions = (*it)->syncActions(); - for ( TQPtrList<KAction>::Iterator jt = actions->begin(), end = actions->end(); jt != end; ++jt ) { + TQPtrList<TDEAction> *actions = (*it)->syncActions(); + for ( TQPtrList<TDEAction>::Iterator jt = actions->begin(), end = actions->end(); jt != end; ++jt ) { if ( *jt != mSyncAction ) (*jt)->activate(); } diff --git a/kontact/plugins/summary/summaryview_plugin.h b/kontact/plugins/summary/summaryview_plugin.h index 336f43dbd..ad14ce2ec 100644 --- a/kontact/plugins/summary/summaryview_plugin.h +++ b/kontact/plugins/summary/summaryview_plugin.h @@ -28,7 +28,7 @@ #include <tqmap.h> -class KSelectAction; +class TDESelectAction; class SummaryViewPart; @@ -57,7 +57,7 @@ class SummaryView : public Kontact::Plugin private: TDEAboutData *mAboutData; SummaryViewPart *mPart; - KSelectAction *mSyncAction; + TDESelectAction *mSyncAction; }; #endif diff --git a/kontact/plugins/test/test_part.cpp b/kontact/plugins/test/test_part.cpp index b8e6f70cb..846717ee8 100644 --- a/kontact/plugins/test/test_part.cpp +++ b/kontact/plugins/test/test_part.cpp @@ -48,7 +48,7 @@ TestPart::TestPart(TQObject *parent, const char *name) // ## parentWidget m_edit = new TQTextEdit; setWidget(m_edit); setXMLFile("testpartui.rc"); - new KAction( "new contact (test)", 0, this, TQT_SLOT( newContact() ), actionCollection(), "test_deleteevent" ); + new TDEAction( "new contact (test)", 0, this, TQT_SLOT( newContact() ), actionCollection(), "test_deleteevent" ); m_kab_stub = 0L; new KParts::SideBarExtension(new TQComboBox(this), this, "sbe"); diff --git a/kontact/plugins/test/test_plugin.cpp b/kontact/plugins/test/test_plugin.cpp index bf5d00577..b5ca0462f 100644 --- a/kontact/plugins/test/test_plugin.cpp +++ b/kontact/plugins/test/test_plugin.cpp @@ -39,7 +39,7 @@ TestPlugin::TestPlugin(Kontact::Core *_core, const char *name, const TQStringLis { setInstance(TestPluginFactory::instance()); - insertNewAction(new KAction("Test", 0, this, TQT_SLOT(slotTestMenu()), actionCollection(), "edit_test")); + insertNewAction(new TDEAction("Test", 0, this, TQT_SLOT(slotTestMenu()), actionCollection(), "edit_test")); setXMLFile("kptestplugin.rc"); } diff --git a/kontact/src/iconsidepane.cpp b/kontact/src/iconsidepane.cpp index 2fef3e0b2..de16ee72d 100644 --- a/kontact/src/iconsidepane.cpp +++ b/kontact/src/iconsidepane.cpp @@ -251,7 +251,7 @@ void EntryItem::setPaintActive( bool paintActive ) } Navigator::Navigator( IconSidePane *parent, const char *name ) - : KListBox( parent, name ), mSidePane( parent ), + : TDEListBox( parent, name ), mSidePane( parent ), mShowIcons( true ), mShowText( true ) { mMouseOn = 0; @@ -259,7 +259,7 @@ Navigator::Navigator( IconSidePane *parent, const char *name ) mViewMode = sizeIntToEnum( Prefs::self()->sidePaneIconSize() ); mShowIcons = Prefs::self()->sidePaneShowIcons(); mShowText = Prefs::self()->sidePaneShowText(); - setSelectionMode( KListBox::Single ); + setSelectionMode( TDEListBox::Single ); viewport()->setBackgroundMode( PaletteBackground ); setFrameStyle( TQFrame::NoFrame ); setHScrollBarMode( TQScrollView::AlwaysOff ); @@ -400,13 +400,13 @@ void Navigator::resizeEvent( TQResizeEvent *event ) void Navigator::enterEvent( TQEvent *event ) { // work around TQt behaviour: onItem is not emmitted in enterEvent() - KListBox::enterEvent( event ); + TDEListBox::enterEvent( event ); emit onItem( itemAt( mapFromGlobal( TQCursor::pos() ) ) ); } void Navigator::leaveEvent( TQEvent *event ) { - KListBox::leaveEvent( event ); + TDEListBox::leaveEvent( event ); slotMouseOn( 0 ); mMouseOn = 0; } @@ -443,7 +443,7 @@ IconViewMode Navigator::sizeIntToEnum(int size) const void Navigator::slotShowRMBMenu( TQListBoxItem *, const TQPoint &pos ) { - KPopupMenu menu; + TDEPopupMenu menu; menu.insertTitle( i18n( "Icon Size" ) ); menu.insertItem( i18n( "Large" ), (int)LargeIcons ); menu.setItemEnabled( (int)LargeIcons, mShowIcons ); diff --git a/kontact/src/iconsidepane.h b/kontact/src/iconsidepane.h index 35859bda0..f7887b83e 100644 --- a/kontact/src/iconsidepane.h +++ b/kontact/src/iconsidepane.h @@ -115,7 +115,7 @@ class EntryItemToolTip : public TQToolTip /** Navigation pane showing all parts relevant to the user */ -class Navigator : public KListBox +class Navigator : public TDEListBox { Q_OBJECT @@ -132,7 +132,7 @@ class Navigator : public KListBox IconViewMode viewMode() { return mViewMode; } IconViewMode sizeIntToEnum(int size) const; - const TQPtrList<KAction> & actions() { return mActions; } + const TQPtrList<TDEAction> & actions() { return mActions; } bool showIcons() const { return mShowIcons; } bool showText() const { return mShowText; } signals: @@ -166,7 +166,7 @@ class Navigator : public KListBox EntryItem* mHighlightItem; TQSignalMapper *mMapper; - TQPtrList<KAction> mActions; + TQPtrList<TDEAction> mActions; bool mShowIcons; bool mShowText; }; @@ -185,7 +185,7 @@ class IconSidePane : public SidePaneBase virtual void updatePlugins(); virtual void selectPlugin( Kontact::Plugin* ); virtual void selectPlugin( const TQString &name ); - const TQPtrList<KAction> & actions() { return mNavigator->actions(); } + const TQPtrList<TDEAction> & actions() { return mNavigator->actions(); } private: Navigator *mNavigator; diff --git a/kontact/src/kcmkontact.h b/kontact/src/kcmkontact.h index 6e0c402af..f19980e29 100644 --- a/kontact/src/kcmkontact.h +++ b/kontact/src/kcmkontact.h @@ -34,7 +34,7 @@ class TQComboBox; class TQListViewItem; class TDEAboutData; -class KListView; +class TDEListView; class KcmKontact : public KPrefsModule { diff --git a/kontact/src/main.cpp b/kontact/src/main.cpp index 17b4710a7..1fa4e7f72 100644 --- a/kontact/src/main.cpp +++ b/kontact/src/main.cpp @@ -178,7 +178,7 @@ int main( int argc, char **argv ) KontactApp app; if ( app.restoringSession() ) { // There can only be one main window - if ( KMainWindow::canBeRestored( 1 ) ) { + if ( TDEMainWindow::canBeRestored( 1 ) ) { Kontact::MainWindow *mainWindow = new Kontact::MainWindow(); app.setMainWindow( mainWindow ); app.setSessionRestored( true ); @@ -188,8 +188,8 @@ int main( int argc, char **argv ) } bool ret = app.exec(); - while ( KMainWindow::memberList->first() ) - delete KMainWindow::memberList->first(); + while ( TDEMainWindow::memberList->first() ) + delete TDEMainWindow::memberList->first(); return ret; } diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp index 180b087b3..c7976bd42 100644 --- a/kontact/src/mainwindow.cpp +++ b/kontact/src/mainwindow.cpp @@ -132,7 +132,7 @@ void MainWindow::initGUI() for ( it = mPluginInfos.begin(); it != mPluginInfos.end(); ++it ) { (*it)->load(); - KAction *action = new KAction( (*it)->name(), (*it)->icon(), KShortcut(), + TDEAction *action = new TDEAction( (*it)->name(), (*it)->icon(), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotActionTriggered()), actionCollection(), (*it)->pluginName().latin1() ); action->setName( (*it)->pluginName().latin1() ); @@ -334,8 +334,8 @@ void MainWindow::initAboutScreen() void MainWindow::setupActions() { KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( slotQuit() ), actionCollection() ); - mNewActions = new KToolBarPopupAction( KGuiItem( i18n( "New" ), "" ), - KStdAccel::shortcut(KStdAccel::New), TQT_TQOBJECT(this), TQT_SLOT( slotNewClicked() ), + mNewActions = new TDEToolBarPopupAction( KGuiItem( i18n( "New" ), "" ), + TDEStdAccel::shortcut(TDEStdAccel::New), TQT_TQOBJECT(this), TQT_SLOT( slotNewClicked() ), actionCollection(), "action_new" ); TDEConfig* const cfg = Prefs::self()->config(); @@ -343,19 +343,19 @@ void MainWindow::setupActions() mSyncActionsEnabled = cfg->readBoolEntry( "GroupwareMailFoldersEnabled", true ); if ( mSyncActionsEnabled ) { - mSyncActions = new KToolBarPopupAction( KGuiItem( i18n( "Synchronize" ), "kitchensync" ), - KStdAccel::shortcut(KStdAccel::Reload), TQT_TQOBJECT(this), TQT_SLOT( slotSyncClicked() ), + mSyncActions = new TDEToolBarPopupAction( KGuiItem( i18n( "Synchronize" ), "kitchensync" ), + TDEStdAccel::shortcut(TDEStdAccel::Reload), TQT_TQOBJECT(this), TQT_SLOT( slotSyncClicked() ), actionCollection(), "action_sync" ); } - new KAction( i18n( "Configure Kontact..." ), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPreferences() ), + new TDEAction( i18n( "Configure Kontact..." ), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT( slotPreferences() ), actionCollection(), "settings_configure_kontact" ); - new KAction( i18n( "Configure &Profiles..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotConfigureProfiles() ), + new TDEAction( i18n( "Configure &Profiles..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotConfigureProfiles() ), actionCollection(), "settings_configure_kontact_profiles" ); - new KAction( i18n( "&Kontact Introduction" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotShowIntroduction() ), + new TDEAction( i18n( "&Kontact Introduction" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotShowIntroduction() ), actionCollection(), "help_introduction" ); - new KAction( i18n( "&Tip of the Day" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotShowTip() ), + new TDEAction( i18n( "&Tip of the Day" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotShowTip() ), actionCollection(), "help_tipofday" ); KWidgetAction* spacerAction = new KWidgetAction( new TQWidget( this ), "SpacerAction", "", 0, 0, actionCollection(), "navigator_spacer_item" ); @@ -468,7 +468,7 @@ Plugin *MainWindow::pluginFromInfo( const KPluginInfo *info ) return 0; } -Plugin *MainWindow::pluginFromAction( const KAction *action ) +Plugin *MainWindow::pluginFromAction( const TDEAction *action ) { PluginList::ConstIterator end = mPlugins.end(); for ( PluginList::ConstIterator it = mPlugins.begin(); it != end; ++it ) { @@ -479,7 +479,7 @@ Plugin *MainWindow::pluginFromAction( const KAction *action ) return 0; } -bool MainWindow::isPluginLoadedByAction( const KAction *action ) +bool MainWindow::isPluginLoadedByAction( const TDEAction *action ) { KPluginInfo::List::ConstIterator it; for ( it = mPluginInfos.begin(); it != mPluginInfos.end(); ++it ) { @@ -499,15 +499,15 @@ bool MainWindow::isPluginLoadedByAction( const KAction *action ) void MainWindow::sortActionsByWeight() { - TQPtrList<KAction> sorted; + TQPtrList<TDEAction> sorted; - TQPtrListIterator<KAction> eit( mActionPlugins ); - KAction *action; + TQPtrListIterator<TDEAction> eit( mActionPlugins ); + TDEAction *action; while ( ( action = eit.current() ) != 0 ) { ++eit; - TQPtrListIterator<KAction> sortIt( sorted ); + TQPtrListIterator<TDEAction> sortIt( sorted ); uint at = 0; - KAction *saction; + TDEAction *saction; Plugin *p1 = pluginFromAction( action ); while ( ( saction = sortIt.current() ) != 0 ) { Plugin *p2 = pluginFromAction( saction ); @@ -579,8 +579,8 @@ void MainWindow::loadPlugins() for ( i = 0; i < plugins.count(); ++ i ) { Plugin *plugin = plugins.at( i ); - KAction *action; - TQPtrList<KAction> *actionList = plugin->newActions(); + TDEAction *action; + TQPtrList<TDEAction> *actionList = plugin->newActions(); for ( action = actionList->first(); action; action = actionList->next() ) { kdDebug(5600) << "Plugging " << action->name() << endl; @@ -618,22 +618,22 @@ void MainWindow::unloadPlugins() void MainWindow::updateShortcuts() { - TQPtrList<KAction> loadedActions; + TQPtrList<TDEAction> loadedActions; sortActionsByWeight(); - TQPtrListIterator<KAction> it( mActionPlugins ); + TQPtrListIterator<TDEAction> it( mActionPlugins ); int i = 1; - KAction *action; + TDEAction *action; while ( ( action = it.current() ) != 0 ) { ++it; if ( isPluginLoadedByAction( action ) ) { loadedActions.append( action ); TQString shortcut = TQString( "CTRL+%1" ).arg( i ); - action->setShortcut( KShortcut( shortcut ) ); + action->setShortcut( TDEShortcut( shortcut ) ); i++; } else { - action->setShortcut( KShortcut() ); + action->setShortcut( TDEShortcut() ); } } unplugActionList( "navigator_actionlist" ); @@ -647,8 +647,8 @@ bool MainWindow::removePlugin( const KPluginInfo *info ) if ( ( *it )->identifier() == info->pluginName() ) { Plugin *plugin = *it; - KAction *action; - TQPtrList<KAction> *actionList = plugin->newActions(); + TDEAction *action; + TQPtrList<TDEAction> *actionList = plugin->newActions(); for ( action = actionList->first(); action; action = actionList->next() ) { kdDebug(5600) << "Unplugging " << action->name() << endl; action->unplug( mNewActions->popupMenu() ); @@ -728,7 +728,7 @@ void MainWindow::slotActivePartChanged( KParts::Part *part ) void MainWindow::slotNewClicked() { - KAction *action = mCurrentPlugin->newActions()->first(); + TDEAction *action = mCurrentPlugin->newActions()->first(); if ( action ) { action->activate(); } else { @@ -745,7 +745,7 @@ void MainWindow::slotNewClicked() void MainWindow::slotSyncClicked() { - KAction *action = mCurrentPlugin->syncActions()->first(); + TDEAction *action = mCurrentPlugin->syncActions()->first(); if ( action ) { action->activate(); } else { @@ -760,15 +760,15 @@ void MainWindow::slotSyncClicked() } } -KToolBar* Kontact::MainWindow::findToolBar(const char* name) +TDEToolBar* Kontact::MainWindow::findToolBar(const char* name) { - // like KMainWindow::toolBar, but which doesn't create the toolbar if not found - return static_cast<KToolBar *>(TQT_TQWIDGET(child(name, "KToolBar"))); + // like TDEMainWindow::toolBar, but which doesn't create the toolbar if not found + return static_cast<TDEToolBar *>(TQT_TQWIDGET(child(name, "TDEToolBar"))); } void MainWindow::slotActionTriggered() { - const KAction *actionSender = static_cast<const KAction*>( sender() ); + const TDEAction *actionSender = static_cast<const TDEAction*>( sender() ); TQString identifier = actionSender->name(); if ( !identifier.isEmpty() ) { selectPlugin( identifier ); @@ -836,15 +836,15 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin ) view->setFocus(); mCurrentPlugin = plugin; - KAction *newAction = plugin->newActions()->first(); - KAction *syncAction = plugin->syncActions()->first(); + TDEAction *newAction = plugin->newActions()->first(); + TDEAction *syncAction = plugin->syncActions()->first(); createGUI( plugin->part() ); - KToolBar* navigatorToolBar = findToolBar( "navigatorToolBar" ); + TDEToolBar* navigatorToolBar = findToolBar( "navigatorToolBar" ); // Let the navigator toolbar be always the last one, if it's in the top dockwindow if ( navigatorToolBar && !navigatorToolBar->isHidden() && - navigatorToolBar->barPos() == KToolBar::Top ) { + navigatorToolBar->barPos() == TDEToolBar::Top ) { topDock()->moveDockWindow( navigatorToolBar, -1 ); } @@ -885,9 +885,9 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin ) TQStringList::ConstIterator it; for ( it = invisibleActions.begin(); it != invisibleActions.end(); ++it ) { - KAction *action = part->actionCollection()->action( (*it).latin1() ); + TDEAction *action = part->actionCollection()->action( (*it).latin1() ); if ( action ) { - TQPtrListIterator<KToolBar> it( toolBarIterator() ); + TQPtrListIterator<TDEToolBar> it( toolBarIterator() ); for ( ; it.current() ; ++it ) { action->unplug( it.current() ); } diff --git a/kontact/src/mainwindow.h b/kontact/src/mainwindow.h index e9ddc121f..57df05c07 100644 --- a/kontact/src/mainwindow.h +++ b/kontact/src/mainwindow.h @@ -42,7 +42,7 @@ class TQSplitter; class TQVBox; class TQFrame; -class KAction; +class TDEAction; class TDEConfig; class KPluginInfo; class KRSqueezedTextLabel; @@ -62,7 +62,7 @@ class IconSidePane; class Plugin; typedef TQValueList<Kontact::Plugin*> PluginList; -typedef TQPtrList<KAction> ActionPluginList; +typedef TQPtrList<TDEAction> ActionPluginList; class MainWindow : public Kontact::Core, public KDCOPServiceStarter, public KontactIface { @@ -117,9 +117,9 @@ class MainWindow : public Kontact::Core, public KDCOPServiceStarter, public Kont void sortActionsByWeight(); bool isPluginLoaded( const KPluginInfo * ); - bool isPluginLoadedByAction( const KAction *action ); + bool isPluginLoadedByAction( const TDEAction *action ); Kontact::Plugin *pluginFromInfo( const KPluginInfo * ); - Kontact::Plugin *pluginFromAction( const KAction * ); + Kontact::Plugin *pluginFromAction( const TDEAction * ); void loadPlugins(); void unloadPlugins(); void updateShortcuts(); @@ -133,7 +133,7 @@ class MainWindow : public Kontact::Core, public KDCOPServiceStarter, public Kont virtual void saveProperties( TDEConfig *config ); void paintAboutScreen( const TQString& msg ); static TQString introductionString(); - KToolBar* findToolBar(const char* name); + TDEToolBar* findToolBar(const char* name); private slots: void pluginsChanged(); @@ -146,8 +146,8 @@ class MainWindow : public Kontact::Core, public KDCOPServiceStarter, public Kont TQSplitter *mSplitter; - KToolBarPopupAction *mNewActions; - KToolBarPopupAction *mSyncActions; + TDEToolBarPopupAction *mNewActions; + TDEToolBarPopupAction *mSyncActions; IconSidePane *mSidePane; TQWidgetStack *mPartsStack; Plugin *mCurrentPlugin; @@ -164,7 +164,7 @@ class MainWindow : public Kontact::Core, public KDCOPServiceStarter, public Kont TQString mActiveModule; TQMap<TQString, TQGuardedPtr<TQWidget> > mFocusWidgets; - TQMap<Kontact::Plugin *, KAction *> mPluginAction; + TQMap<Kontact::Plugin *, TDEAction *> mPluginAction; AboutDialog *mAboutDialog; bool mReallyClose; diff --git a/kontact/src/profiledialog.cpp b/kontact/src/profiledialog.cpp index e959ad865..6d1372deb 100644 --- a/kontact/src/profiledialog.cpp +++ b/kontact/src/profiledialog.cpp @@ -45,7 +45,7 @@ Kontact::ProfileDialog::ProfileDialog( TQWidget* parent, WFlags flags ) : KDialo TQHBoxLayout* horizontalLayout = new TQHBoxLayout( mainWidget ); horizontalLayout->setSpacing( 5 ); - m_list = new KListView( mainWidget ); + m_list = new TDEListView( mainWidget ); m_list->addColumn( i18n("Name") ); m_list->addColumn( i18n("Description") ); m_list->setSelectionMode( TQListView::Single ); diff --git a/kontact/src/profiledialog.h b/kontact/src/profiledialog.h index 640fec99a..73a44ae55 100644 --- a/kontact/src/profiledialog.h +++ b/kontact/src/profiledialog.h @@ -32,7 +32,7 @@ class TQListViewItem; -class KListView; +class TDEListView; class TQPushButton; namespace Kontact { @@ -76,7 +76,7 @@ private slots: void profileLoaded( const TQString& id ); private: - KListView* m_list; + TDEListView* m_list; TQPushButton* m_newProfileButton; TQPushButton* m_deleteProfileButton; TQPushButton* m_saveProfileButton; diff --git a/kontact/src/sidepanebase.h b/kontact/src/sidepanebase.h index 47ed09322..c8e83442c 100644 --- a/kontact/src/sidepanebase.h +++ b/kontact/src/sidepanebase.h @@ -56,7 +56,7 @@ class SidePaneBase : public TQVBox private: Core* mCore; - KActionCollection *mActionCollection; + TDEActionCollection *mActionCollection; }; } diff --git a/korganizer/actionmanager.cpp b/korganizer/actionmanager.cpp index 4ceb95a1b..7eef7539c 100644 --- a/korganizer/actionmanager.cpp +++ b/korganizer/actionmanager.cpp @@ -219,7 +219,7 @@ void ActionManager::initCalendar( Calendar *cal ) void ActionManager::initActions() { - KAction *action; + TDEAction *action; //*************************** FILE MENU ********************************** @@ -252,32 +252,32 @@ void ActionManager::initActions() //~~~~~~~~~~~~~~~~~~~~~~~~ IMPORT / EXPORT ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - new KAction( 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, TQT_TQOBJECT(this), TQT_SLOT( file_merge() ), mACollection, "import_icalendar" ); - new KAction( 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, TQT_TQOBJECT(this), TQT_SLOT( file_icalimport() ), mACollection, "import_ical" ); - new KAction( i18n("Get &Hot New Stuff..."), 0, this, + new TDEAction( i18n("Get &Hot New Stuff..."), 0, this, TQT_SLOT( downloadNewStuff() ), mACollection, "downloadnewstuff" ); - new KAction( i18n("Export &Web Page..."), "webexport", 0, + new TDEAction( i18n("Export &Web Page..."), "webexport", 0, TQT_TQOBJECT(mCalendarView), TQT_SLOT( exportWeb() ), mACollection, "export_web" ); - new KAction( i18n("&iCalendar..."), 0, + new TDEAction( i18n("&iCalendar..."), 0, TQT_TQOBJECT(mCalendarView), TQT_SLOT( exportICalendar() ), mACollection, "export_icalendar" ); - new KAction( i18n("&vCalendar..."), 0, + new TDEAction( i18n("&vCalendar..."), 0, TQT_TQOBJECT(mCalendarView), TQT_SLOT( exportVCalendar() ), mACollection, "export_vcalendar" ); - new KAction( i18n("Upload &Hot New Stuff..."), 0, TQT_TQOBJECT(this), + new TDEAction( i18n("Upload &Hot New Stuff..."), 0, TQT_TQOBJECT(this), TQT_SLOT( uploadNewStuff() ), mACollection, "uploadnewstuff" ); - new KAction( i18n("Archive O&ld Entries..."), 0, TQT_TQOBJECT(this), TQT_SLOT( file_archive() ), + new TDEAction( i18n("Archive O&ld Entries..."), 0, TQT_TQOBJECT(this), TQT_SLOT( file_archive() ), mACollection, "file_archive" ); - new KAction( 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, "purge_completed" ); @@ -285,7 +285,7 @@ void ActionManager::initActions() //************************** EDIT MENU ********************************* - KAction *pasteAction; + TDEAction *pasteAction; KOrg::History *h = mCalendarView->history(); if ( mIsPart ) { // edit menu @@ -309,7 +309,7 @@ void ActionManager::initActions() mUndoAction = KStdAction::undo( TQT_TQOBJECT(h), TQT_SLOT( undo() ), mACollection ); mRedoAction = KStdAction::redo( TQT_TQOBJECT(h), TQT_SLOT( redo() ), mACollection ); } - mDeleteAction = new KAction( i18n("&Delete"), "editdelete", 0, + mDeleteAction = new TDEAction( i18n("&Delete"), "editdelete", 0, TQT_TQOBJECT(mCalendarView), TQT_SLOT( appointment_delete() ), mACollection, "edit_delete" ); if ( mIsPart ) { @@ -335,60 +335,60 @@ void ActionManager::initActions() //************************** VIEW MENU ********************************* //~~~~~~~~~~~~~~~~~~~~~~~~~~~~ VIEWS ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - new KAction( i18n("What's &Next"), + new TDEAction( i18n("What's &Next"), KOGlobals::self()->smallIcon( "whatsnext" ), 0, mCalendarView->viewManager(), TQT_SLOT( showWhatsNextView() ), mACollection, "view_whatsnext" ); - new KAction( i18n("&Day"), + new TDEAction( i18n("&Day"), KOGlobals::self()->smallIcon( "1day" ), 0, mCalendarView->viewManager(), TQT_SLOT( showDayView() ), mACollection, "view_day" ); - mNextXDays = new KAction( "", + mNextXDays = new TDEAction( "", KOGlobals::self()->smallIcon( "xdays" ), 0, mCalendarView->viewManager(), TQT_SLOT( showNextXView() ), mACollection, "view_nextx" ); mNextXDays->setText( i18n( "&Next Day", "Ne&xt %n Days", KOPrefs::instance()->mNextXDays ) ); - new KAction( i18n("W&ork Week"), + new TDEAction( i18n("W&ork Week"), KOGlobals::self()->smallIcon( "5days" ), 0, mCalendarView->viewManager(), TQT_SLOT( showWorkWeekView() ), mACollection, "view_workweek" ); - new KAction( i18n("&Week"), + new TDEAction( i18n("&Week"), KOGlobals::self()->smallIcon( "7days" ), 0, mCalendarView->viewManager(), TQT_SLOT( showWeekView() ), mACollection, "view_week" ); - new KAction( i18n("&Month"), + new TDEAction( i18n("&Month"), KOGlobals::self()->smallIcon( "month" ), 0, mCalendarView->viewManager(), TQT_SLOT( showMonthView() ), mACollection, "view_month" ); - new KAction( i18n("&List"), + new TDEAction( i18n("&List"), KOGlobals::self()->smallIcon( "list" ), 0, mCalendarView->viewManager(), TQT_SLOT( showListView() ), mACollection, "view_list" ); - new KAction( i18n("&To-do List"), + new TDEAction( i18n("&To-do List"), KOGlobals::self()->smallIcon( "todo" ), 0, mCalendarView->viewManager(), TQT_SLOT( showTodoView() ), mACollection, "view_todo" ); - new KAction( i18n("&Journal"), + new TDEAction( i18n("&Journal"), KOGlobals::self()->smallIcon( "journal" ), 0, mCalendarView->viewManager(), TQT_SLOT( showJournalView() ), mACollection, "view_journal" ); - new KAction( i18n("&Timeline View"), + new TDEAction( i18n("&Timeline View"), KOGlobals::self()->smallIcon( "timeline" ), 0, mCalendarView->viewManager(), TQT_SLOT( showTimelineView() ), mACollection, "view_timeline" ); //~~~~~~~~~~~~~~~~~~~~~~~~~~~ FILTERS ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - new KAction( i18n("&Refresh"), 0, + new TDEAction( i18n("&Refresh"), 0, TQT_TQOBJECT(mCalendarView), TQT_SLOT( updateView() ), mACollection, "update" ); // TODO: -// new KAction( i18n("Hide &Completed To-dos"), 0, +// new TDEAction( i18n("Hide &Completed To-dos"), 0, // mCalendarView, TQT_SLOT( toggleHideCompleted() ), // mACollection, "hide_completed_todos" ); - mFilterAction = new KSelectAction( i18n("F&ilter"), 0, + mFilterAction = new TDESelectAction( i18n("F&ilter"), 0, mACollection, "filter_select" ); mFilterAction->setEditable( false ); connect( mFilterAction, TQT_SIGNAL( activated(int) ), @@ -403,16 +403,16 @@ void ActionManager::initActions() //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ZOOM ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // TODO: try to find / create better icons for the following 4 actions - new KAction( i18n( "Zoom In Horizontally" ), "viewmag+", 0, + new TDEAction( i18n( "Zoom In Horizontally" ), "viewmag+", 0, mCalendarView->viewManager(), TQT_SLOT( zoomInHorizontally() ), mACollection, "zoom_in_horizontally" ); - new KAction( i18n( "Zoom Out Horizontally" ), "viewmag-", 0, + new TDEAction( i18n( "Zoom Out Horizontally" ), "viewmag-", 0, mCalendarView->viewManager(), TQT_SLOT( zoomOutHorizontally() ), mACollection, "zoom_out_horizontally" ); - new KAction( i18n( "Zoom In Vertically" ), "viewmag+", 0, + new TDEAction( i18n( "Zoom In Vertically" ), "viewmag+", 0, mCalendarView->viewManager(), TQT_SLOT( zoomInVertically() ), mACollection, "zoom_in_vertically" ); - new KAction( i18n( "Zoom Out Vertically" ), "viewmag-", 0, + new TDEAction( i18n( "Zoom Out Vertically" ), "viewmag-", 0, mCalendarView->viewManager(), TQT_SLOT( zoomOutVertically() ), mACollection, "zoom_out_vertically" ); @@ -421,11 +421,11 @@ void ActionManager::initActions() //************************** Actions MENU ********************************* - new KAction( i18n("Go to &Today"), "today", 0, + new TDEAction( i18n("Go to &Today"), "today", 0, TQT_TQOBJECT(mCalendarView),TQT_SLOT( goToday() ), mACollection, "go_today" ); bool isRTL = TQApplication::reverseLayout(); - action = new KAction( i18n("Go &Backward"), isRTL ? "forward" : "back", 0, + action = new TDEAction( i18n("Go &Backward"), isRTL ? "forward" : "back", 0, TQT_TQOBJECT(mCalendarView),TQT_SLOT( goPrevious() ), mACollection, "go_previous" ); @@ -437,7 +437,7 @@ void ActionManager::initActions() connect( mCalendarView, TQT_SIGNAL( changeNavStringPrev( const TQString & ) ), TQT_TQOBJECT(this), TQT_SLOT( dumpText( const TQString & ) ) );*/ - action = new KAction( i18n("Go &Forward"), isRTL ? "back" : "forward", 0, + action = new TDEAction( i18n("Go &Forward"), isRTL ? "back" : "forward", 0, TQT_TQOBJECT(mCalendarView),TQT_SLOT( goNext() ), mACollection, "go_next" ); /* @@ -447,47 +447,47 @@ void ActionManager::initActions() //************************** Actions MENU ********************************* - new KAction( i18n("New E&vent..."), + new TDEAction( i18n("New E&vent..."), KOGlobals::self()->smallIcon( "newappointment" ), 0, TQT_TQOBJECT(mCalendarView), TQT_SLOT(newEvent()), mACollection, "new_event" ); - new KAction( i18n("New &To-do..."), + new TDEAction( i18n("New &To-do..."), KOGlobals::self()->smallIcon( "newtodo" ), 0, TQT_TQOBJECT(mCalendarView), TQT_SLOT(newTodo()), mACollection, "new_todo" ); - action = new KAction( i18n("New Su&b-to-do..."), 0, + action = new TDEAction( i18n("New Su&b-to-do..."), 0, TQT_TQOBJECT(mCalendarView),TQT_SLOT( newSubTodo() ), mACollection, "new_subtodo" ); action->setEnabled( false ); connect( mCalendarView,TQT_SIGNAL( todoSelected( bool ) ), action,TQT_SLOT( setEnabled( bool ) ) ); - new KAction( i18n("New &Journal..."), + new TDEAction( i18n("New &Journal..."), KOGlobals::self()->smallIcon( "newjournal" ), 0, TQT_TQOBJECT(mCalendarView), TQT_SLOT(newJournal()), mACollection, "new_journal" ); - mShowIncidenceAction = new KAction( i18n("&Show"), 0, + mShowIncidenceAction = new TDEAction( i18n("&Show"), 0, TQT_TQOBJECT(mCalendarView),TQT_SLOT( showIncidence() ), mACollection, "show_incidence" ); - mEditIncidenceAction = new KAction( i18n("&Edit..."), 0, + mEditIncidenceAction = new TDEAction( i18n("&Edit..."), 0, TQT_TQOBJECT(mCalendarView),TQT_SLOT( editIncidence() ), mACollection, "edit_incidence" ); - mDeleteIncidenceAction = new KAction( i18n("&Delete"), Key_Delete, + mDeleteIncidenceAction = new TDEAction( i18n("&Delete"), Key_Delete, TQT_TQOBJECT(mCalendarView),TQT_SLOT( deleteIncidence()), mACollection, "delete_incidence" ); - action = new KAction( i18n("&Make Sub-to-do Independent"), 0, + action = new TDEAction( i18n("&Make Sub-to-do Independent"), 0, TQT_TQOBJECT(mCalendarView),TQT_SLOT( todo_unsub() ), mACollection, "unsub_todo" ); action->setEnabled( false ); connect( mCalendarView,TQT_SIGNAL( subtodoSelected( bool ) ), action,TQT_SLOT( setEnabled( bool ) ) ); // TODO: Add item to move the incidence to different resource -// mAssignResourceAction = new KAction( i18n("Assign &Resource..."), 0, +// mAssignResourceAction = new TDEAction( i18n("Assign &Resource..."), 0, // mCalendarView, TQT_SLOT( assignResource()), // mACollection, "assign_resource" ); // TODO: Add item to quickly toggle the reminder of a given incidence -// mToggleAlarmAction = new KToggleAction( i18n("&Activate Reminder"), 0, +// mToggleAlarmAction = new TDEToggleAction( i18n("&Activate Reminder"), 0, // mCalendarView, TQT_SLOT( toggleAlarm()), // mACollection, "activate_alarm" ); @@ -495,12 +495,12 @@ void ActionManager::initActions() //************************** SCHEDULE MENU ******************************** - mPublishEvent = new KAction( i18n("&Publish Item Information..."), "mail_send", 0, + mPublishEvent = new TDEAction( i18n("&Publish Item Information..."), "mail_send", 0, TQT_TQOBJECT(mCalendarView), TQT_SLOT( schedule_publish() ), mACollection, "schedule_publish" ); mPublishEvent->setEnabled( false ); - mSendInvitation = new KAction( i18n( "Send &Invitation to Attendees" ), + mSendInvitation = new TDEAction( i18n( "Send &Invitation to Attendees" ), "mail_generic", 0, TQT_TQOBJECT(mCalendarView), TQT_SLOT(schedule_request()), mACollection, "schedule_request" ); @@ -508,21 +508,21 @@ void ActionManager::initActions() connect( mCalendarView, TQT_SIGNAL(organizerEventsSelected(bool)), mSendInvitation, TQT_SLOT(setEnabled(bool)) ); - mRequestUpdate = new KAction( i18n( "Re&quest Update" ), 0, + mRequestUpdate = new TDEAction( i18n( "Re&quest Update" ), 0, TQT_TQOBJECT(mCalendarView), TQT_SLOT(schedule_refresh()), mACollection, "schedule_refresh" ); mRequestUpdate->setEnabled( false ); connect( mCalendarView, TQT_SIGNAL(groupEventsSelected(bool)), mRequestUpdate, TQT_SLOT(setEnabled(bool)) ); - mSendCancel = new KAction( i18n( "Send &Cancelation to Attendees" ), 0, + mSendCancel = new TDEAction( i18n( "Send &Cancelation to Attendees" ), 0, TQT_TQOBJECT(mCalendarView), TQT_SLOT(schedule_cancel()), mACollection, "schedule_cancel" ); mSendCancel->setEnabled( false ); connect( mCalendarView, TQT_SIGNAL(organizerEventsSelected(bool)), mSendCancel, TQT_SLOT(setEnabled(bool)) ); - mSendStatusUpdate = new KAction( i18n( "Send Status &Update" ), + mSendStatusUpdate = new TDEAction( i18n( "Send Status &Update" ), "mail_reply", 0, TQT_TQOBJECT(mCalendarView),TQT_SLOT(schedule_reply()), mACollection, "schedule_reply" ); @@ -530,30 +530,30 @@ void ActionManager::initActions() connect( mCalendarView, TQT_SIGNAL(groupEventsSelected(bool)), mSendStatusUpdate, TQT_SLOT(setEnabled(bool)) ); - mRequestChange = new KAction( i18n( "counter proposal", "Request Chan&ge" ), 0, + mRequestChange = new TDEAction( i18n( "counter proposal", "Request Chan&ge" ), 0, TQT_TQOBJECT(mCalendarView), TQT_SLOT(schedule_counter()), mACollection, "schedule_counter" ); mRequestChange->setEnabled( false ); connect( mCalendarView, TQT_SIGNAL(groupEventsSelected(bool)), mRequestChange, TQT_SLOT(setEnabled(bool)) ); - mForwardEvent = new KAction( i18n("&Send as iCalendar..."), "mail_forward", 0, + mForwardEvent = new TDEAction( i18n("&Send as iCalendar..."), "mail_forward", 0, TQT_TQOBJECT(mCalendarView), TQT_SLOT(schedule_forward()), mACollection, "schedule_forward" ); mForwardEvent->setEnabled( false ); - action = new KAction( i18n("&Mail Free Busy Information..."), 0, + action = new TDEAction( i18n("&Mail Free Busy Information..."), 0, TQT_TQOBJECT(mCalendarView), TQT_SLOT( mailFreeBusy() ), mACollection, "mail_freebusy" ); action->setEnabled( true ); - action = new KAction( i18n("&Upload Free Busy Information"), 0, + action = new TDEAction( i18n("&Upload Free Busy Information"), 0, TQT_TQOBJECT(mCalendarView), TQT_SLOT( uploadFreeBusy() ), mACollection, "upload_freebusy" ); action->setEnabled( true ); if ( !mIsPart ) { - action = new KAction( i18n("&Addressbook"),"contents",0, + action = new TDEAction( i18n("&Addressbook"),"contents",0, TQT_TQOBJECT(mCalendarView),TQT_SLOT( openAddressbook() ), mACollection,"addressbook" ); } @@ -564,13 +564,13 @@ void ActionManager::initActions() //************************** SETTINGS MENU ******************************** //~~~~~~~~~~~~~~~~~~~~~~~~~~~~ SIDEBAR ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - mDateNavigatorShowAction = new KToggleAction( i18n("Show Date Navigator"), 0, + mDateNavigatorShowAction = new TDEToggleAction( i18n("Show Date Navigator"), 0, TQT_TQOBJECT(this), TQT_SLOT( toggleDateNavigator() ), mACollection, "show_datenavigator" ); - mTodoViewShowAction = new KToggleAction ( i18n("Show To-do View"), 0, + mTodoViewShowAction = new TDEToggleAction ( i18n("Show To-do View"), 0, TQT_TQOBJECT(this), TQT_SLOT( toggleTodoView() ), mACollection, "show_todoview" ); - mEventViewerShowAction = new KToggleAction ( i18n("Show Item Viewer"), 0, + mEventViewerShowAction = new TDEToggleAction ( i18n("Show Item Viewer"), 0, TQT_TQOBJECT(this), TQT_SLOT( toggleEventViewer() ), mACollection, "show_eventviewer" ); TDEConfig *config = KOGlobals::self()->config(); @@ -589,10 +589,10 @@ void ActionManager::initActions() toggleEventViewer(); if ( !mMainWindow->hasDocument() ) { - mResourceViewShowAction = new KToggleAction ( i18n("Show Resource View"), 0, + mResourceViewShowAction = new TDEToggleAction ( i18n("Show Resource View"), 0, TQT_TQOBJECT(this), TQT_SLOT( toggleResourceView() ), mACollection, "show_resourceview" ); - mResourceButtonsAction = new KToggleAction( i18n("Show &Resource Buttons"), 0, + mResourceButtonsAction = new TDEToggleAction( i18n("Show &Resource Buttons"), 0, TQT_TQOBJECT(this), TQT_SLOT( toggleResourceButtons() ), mACollection, "show_resourcebuttons" ); mResourceViewShowAction->setChecked( @@ -607,21 +607,21 @@ void ActionManager::initActions() //~~~~~~~~~~~~~~~~~~~~~~~~~~~~ SIDEBAR ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - new KAction( i18n("Configure &Date && Time..."), 0, + new TDEAction( i18n("Configure &Date && Time..."), 0, TQT_TQOBJECT(this), TQT_SLOT( configureDateTime() ), mACollection, "conf_datetime" ); // TODO: Add an item to show the resource management dlg -// new KAction( i18n("Manage &Resources..."), 0, +// new TDEAction( i18n("Manage &Resources..."), 0, // TQT_TQOBJECT(this), TQT_SLOT( manageResources() ), // mACollection, "conf_resources" ); - new KAction( i18n("Manage View &Filters..."), "configure", 0, + new TDEAction( i18n("Manage View &Filters..."), "configure", 0, TQT_TQOBJECT(mCalendarView), TQT_SLOT( editFilters() ), mACollection, "edit_filters" ); - new KAction( i18n("Manage C&ategories..."), 0, + new TDEAction( i18n("Manage C&ategories..."), 0, TQT_TQOBJECT(mCalendarView->dialogManager()), TQT_SLOT( showCategoryEditDialog() ), mACollection, "edit_categories" ); if ( mIsPart ) { - new KAction( i18n("&Configure Calendar..."), "configure", 0, + new TDEAction( i18n("&Configure Calendar..."), "configure", 0, TQT_TQOBJECT(mCalendarView), TQT_SLOT( edit_options() ), mACollection, "korganizer_configure" ); KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( keyBindings() ), @@ -638,7 +638,7 @@ void ActionManager::initActions() //**************************** HELP MENU ********************************** KStdAction::tipOfDay( TQT_TQOBJECT(this), TQT_SLOT( showTip() ), mACollection, "help_tipofday" ); -// new KAction( i18n("Show Intro Page"), 0, +// new TDEAction( i18n("Show Intro Page"), 0, // mCalendarView,TQT_SLOT( showIntro() ), // mACollection,"show_intro" ); @@ -1434,7 +1434,7 @@ class ActionManager::ActionStringsVisitor : public IncidenceBase::Visitor public: ActionStringsVisitor() : mShow( 0 ), mEdit( 0 ), mDelete( 0 ) {} - bool act( IncidenceBase *incidence, KAction *show, KAction *edit, KAction *del ) + bool act( IncidenceBase *incidence, TDEAction *show, TDEAction *edit, TDEAction *del ) { mShow = show; mEdit = edit; @@ -1463,9 +1463,9 @@ class ActionManager::ActionStringsVisitor : public IncidenceBase::Visitor if ( mDelete ) mDelete->setText( i18n("&Delete") ); return true; } - KAction *mShow; - KAction *mEdit; - KAction *mDelete; + TDEAction *mShow; + TDEAction *mEdit; + TDEAction *mDelete; }; void ActionManager::processIncidenceSelection( Incidence *incidence, const TQDate & ) @@ -1667,7 +1667,7 @@ void ActionManager::openEventEditor( const TQString & summary, if ( attachmentMimetype != "message/rfc822" ) { action = KOPrefs::Link; } else if ( KOPrefs::instance()->defaultEmailAttachMethod() == KOPrefs::Ask ) { - KPopupMenu *menu = new KPopupMenu( 0 ); + TDEPopupMenu *menu = new TDEPopupMenu( 0 ); menu->insertItem( i18n("Attach as &link"), KOPrefs::Link ); menu->insertItem( i18n("Attach &inline"), KOPrefs::InlineFull ); menu->insertItem( i18n("Attach inline &without attachments"), KOPrefs::InlineBody ); @@ -1790,7 +1790,7 @@ void ActionManager::openTodoEditor(const TQString & summary, if ( attachmentMimetype != "message/rfc822" ) { action = KOPrefs::TodoAttachLink; } else if ( KOPrefs::instance()->defaultTodoAttachMethod() == KOPrefs::TodoAttachAsk ) { - KPopupMenu *menu = new KPopupMenu( 0 ); + TDEPopupMenu *menu = new TDEPopupMenu( 0 ); menu->insertItem( i18n("Attach as &link"), KOPrefs::TodoAttachLink ); menu->insertItem( i18n("Attach &inline"), KOPrefs::TodoAttachInlineFull ); menu->insertSeparator(); diff --git a/korganizer/actionmanager.h b/korganizer/actionmanager.h index 1d7d99157..3494ecffe 100644 --- a/korganizer/actionmanager.h +++ b/korganizer/actionmanager.h @@ -45,11 +45,11 @@ namespace KOrg { class MainWindow; } -class KAction; -class KActionCollection; -class KRecentFilesAction; -class KSelectAction; -class KToggleAction; +class TDEAction; +class TDEActionCollection; +class TDERecentFilesAction; +class TDESelectAction; +class TDEToggleAction; class TDEConfig; class TDEProcess; class KTempFile; @@ -387,41 +387,41 @@ class KDE_EXPORT ActionManager : public TQObject, public KCalendarIface static KOWindowList *mWindowList; // Actions - KRecentFilesAction *mRecent; - KToggleAction *mResourceButtonsAction; + TDERecentFilesAction *mRecent; + TDEToggleAction *mResourceButtonsAction; - KToggleAction *mDateNavigatorShowAction; - KToggleAction *mTodoViewShowAction; - KToggleAction *mResourceViewShowAction; - KToggleAction *mEventViewerShowAction; -// KToggleAction *mToggleAlarmAction; + TDEToggleAction *mDateNavigatorShowAction; + TDEToggleAction *mTodoViewShowAction; + TDEToggleAction *mResourceViewShowAction; + TDEToggleAction *mEventViewerShowAction; +// TDEToggleAction *mToggleAlarmAction; - KAction *mShowIncidenceAction; - KAction *mEditIncidenceAction; - KAction *mDeleteIncidenceAction; -// KAction *mAssignResourceAction; + TDEAction *mShowIncidenceAction; + TDEAction *mEditIncidenceAction; + TDEAction *mDeleteIncidenceAction; +// TDEAction *mAssignResourceAction; - KAction *mCutAction; - KAction *mCopyAction; - KAction *mDeleteAction; - KAction *mNextXDays; - KAction *mPublishEvent; - KAction *mForwardEvent; + TDEAction *mCutAction; + TDEAction *mCopyAction; + TDEAction *mDeleteAction; + TDEAction *mNextXDays; + TDEAction *mPublishEvent; + TDEAction *mForwardEvent; - KAction *mSendInvitation; - KAction *mSendCancel; - KAction *mSendStatusUpdate; + TDEAction *mSendInvitation; + TDEAction *mSendCancel; + TDEAction *mSendStatusUpdate; - KAction *mRequestChange; - KAction *mRequestUpdate; + TDEAction *mRequestChange; + TDEAction *mRequestUpdate; - KAction *mUndoAction; - KAction *mRedoAction; + TDEAction *mUndoAction; + TDEAction *mRedoAction; - KSelectAction *mFilterAction; + TDESelectAction *mFilterAction; KXMLGUIClient *mGUIClient; - KActionCollection *mACollection; + TDEActionCollection *mACollection; CalendarView *mCalendarView; KOrg::MainWindow *mMainWindow; bool mIsPart; diff --git a/korganizer/customlistviewitem.h b/korganizer/customlistviewitem.h index 0a8aa7fe9..64d3dbfb8 100644 --- a/korganizer/customlistviewitem.h +++ b/korganizer/customlistviewitem.h @@ -29,13 +29,13 @@ #include <klistview.h> template<class T> -class CustomListViewItem : public KListViewItem +class CustomListViewItem : public TDEListViewItem { public: - CustomListViewItem( T data, KListView *parent ) : - KListViewItem( parent ), mData( data ) { updateItem(); }; - CustomListViewItem( T data, KListView *parent, KListViewItem* after ) : - KListViewItem( parent, after ), mData( data ) { updateItem(); }; + CustomListViewItem( T data, TDEListView *parent ) : + TDEListViewItem( parent ), mData( data ) { updateItem(); }; + CustomListViewItem( T data, TDEListView *parent, TDEListViewItem* after ) : + TDEListViewItem( parent, after ), mData( data ) { updateItem(); }; ~CustomListViewItem() {}; void updateItem() {}; diff --git a/korganizer/interfaces/korganizer/mainwindow.h b/korganizer/interfaces/korganizer/mainwindow.h index dcda1bee5..f8d32f7d7 100644 --- a/korganizer/interfaces/korganizer/mainwindow.h +++ b/korganizer/interfaces/korganizer/mainwindow.h @@ -24,8 +24,8 @@ #include <tqwidget.h> -class KActionCollection; -class KAction; +class TDEActionCollection; +class TDEAction; class ActionManager; @@ -76,7 +76,7 @@ class MainWindow /** Return actionCollection of this main window. */ - virtual KActionCollection *getActionCollection() const = 0; + virtual TDEActionCollection *getActionCollection() const = 0; /** Show status mesage in status bar. */ diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index cf6fa1021..a8a8095ea 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp @@ -515,7 +515,7 @@ void KODayMatrix::dropEvent( TQDropEvent *e ) } else if ( keybstate & ShiftMask ) { action = DRAG_MOVE; } else { - KPopupMenu *menu = new KPopupMenu( this ); + TDEPopupMenu *menu = new TDEPopupMenu( this ); if ( existingEvent || existingTodo ) { menu->insertItem( i18n("Move"), DRAG_MOVE, 0 ); if (existingEvent) diff --git a/korganizer/koeditorattachments.cpp b/korganizer/koeditorattachments.cpp index 74e908889..ae8e15af1 100644 --- a/korganizer/koeditorattachments.cpp +++ b/korganizer/koeditorattachments.cpp @@ -488,14 +488,14 @@ KOEditorAttachments::KOEditorAttachments( int spacing, TQWidget *parent, topLayout->addWidget( mRemoveBtn ); connect( mRemoveBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemove()) ); - mContextMenu = new KPopupMenu( this ); + mContextMenu = new TDEPopupMenu( this ); - KActionCollection* ac = new KActionCollection( TQT_TQWIDGET(this), TQT_TQOBJECT(this) ); + TDEActionCollection* ac = new TDEActionCollection( TQT_TQWIDGET(this), TQT_TQOBJECT(this) ); - mOpenAction = new KAction( i18n("Open"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShow()), ac ); + mOpenAction = new TDEAction( i18n("Open"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShow()), ac ); mOpenAction->plug( mContextMenu ); - mSaveAsAction = new KAction( i18n( "Save As..." ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs()), ac ); + mSaveAsAction = new TDEAction( i18n( "Save As..." ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs()), ac ); mSaveAsAction->plug( mContextMenu ); mContextMenu->insertSeparator(); @@ -503,16 +503,16 @@ KOEditorAttachments::KOEditorAttachments( int spacing, TQWidget *parent, mCopyAction->plug( mContextMenu ); mCutAction = KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(slotCut()), ac ); mCutAction->plug( mContextMenu ); - KAction *action = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), ac ); + TDEAction *action = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), ac ); action->plug( mContextMenu ); mContextMenu->insertSeparator(); - mDeleteAction = new KAction( i18n( "&Remove" ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotRemove()), ac ); + mDeleteAction = new TDEAction( i18n( "&Remove" ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotRemove()), ac ); mDeleteAction->plug( mContextMenu ); mDeleteAction->setShortcut( Key_Delete ); mContextMenu->insertSeparator(); - mEditAction = new KAction( i18n( "&Properties..." ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotEdit()), ac ); + mEditAction = new TDEAction( i18n( "&Properties..." ), 0, TQT_TQOBJECT(this), TQT_SLOT(slotEdit()), ac ); mEditAction->plug( mContextMenu ); selectionChanged(); @@ -579,7 +579,7 @@ void KOEditorAttachments::handlePasteOrDrop( TQMimeSource* source ) probablyWeHaveUris = true; } - KPopupMenu menu; + TDEPopupMenu menu; int items=0; if ( probablyWeHaveUris ) { menu.insertItem( i18n( "&Link here" ), DRAG_LINK, items++ ); diff --git a/korganizer/koeditorattachments.h b/korganizer/koeditorattachments.h index 479ce36a8..7d5b89d5a 100644 --- a/korganizer/koeditorattachments.h +++ b/korganizer/koeditorattachments.h @@ -49,7 +49,7 @@ class TQMimeSource; class TQPushButton; class TQPopupMenu; -class KAction; +class TDEAction; class KLineEdit; class KURLRequester; class KTempDir; @@ -140,12 +140,12 @@ class KOEditorAttachments : public TQWidget AttachmentIconView *mAttachments; TQPushButton *mRemoveBtn; TQPopupMenu *mContextMenu, *mAddMenu; - KAction *mOpenAction; - KAction *mSaveAsAction; - KAction *mCopyAction; - KAction *mCutAction; - KAction *mDeleteAction; - KAction *mEditAction; + TDEAction *mOpenAction; + TDEAction *mSaveAsAction; + TDEAction *mCopyAction; + TDEAction *mCutAction; + TDEAction *mDeleteAction; + TDEAction *mEditAction; }; diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp index adeb9bb00..ebc70200b 100644 --- a/korganizer/koeditordetails.cpp +++ b/korganizer/koeditordetails.cpp @@ -92,14 +92,14 @@ void CustomListViewItem<KCal::Attendee *>::updateItem() } KOAttendeeListView::KOAttendeeListView ( TQWidget *parent, const char *name ) - : KListView(parent, name) + : TDEListView(parent, name) { setAcceptDrops( true ); setAllColumnsShowFocus( true ); setSorting( -1 ); } -/** KOAttendeeListView is a child class of KListView which supports +/** KOAttendeeListView is a child class of TDEListView which supports * dropping of attendees (e.g. from kaddressbook) onto it. If an attendeee * was dropped, the signal dropped(Attendee*) is emitted. Valid drop classes * are KVCardDrag and TQTextDrag. @@ -265,7 +265,7 @@ void KOEditorDetails::insertAttendee( Attendee *a, bool goodEmailAddress ) // lastItem() is O(n), but for n very small that should be fine AttendeeListItem *item = new AttendeeListItem( - a, mListView, static_cast<KListViewItem*>( mListView->lastItem() ) ); + a, mListView, static_cast<TDEListViewItem*>( mListView->lastItem() ) ); mListView->setSelected( item, true ); emit updateAttendeeSummary( mListView->childCount() ); } diff --git a/korganizer/koeditordetails.h b/korganizer/koeditordetails.h index 10d61e213..bb4f7b109 100644 --- a/korganizer/koeditordetails.h +++ b/korganizer/koeditordetails.h @@ -52,12 +52,12 @@ class AddresseeLineEdit; typedef CustomListViewItem<KCal::Attendee *> AttendeeListItem; -/** KOAttendeeListView is a child class of KListView which supports +/** KOAttendeeListView is a child class of TDEListView which supports * dropping of attendees (e.g. from kaddressbook) onto it. If an attendeee * was dropped, the signal dropped(Attendee*) is emitted. Valid drop classes * are KVCardDrag and TQTextDrag. */ -class KOAttendeeListView : public KListView +class KOAttendeeListView : public TDEListView { Q_OBJECT @@ -117,7 +117,7 @@ class KOEditorDetails : public KOAttendeeEditor private: bool mDisableItemUpdate; - KListView *mListView; + TDEListView *mListView; // KOEditorFreeBusy *mFreeBusy; }; diff --git a/korganizer/koeventpopupmenu.cpp b/korganizer/koeventpopupmenu.cpp index 3c5dd5196..3562bc16b 100644 --- a/korganizer/koeventpopupmenu.cpp +++ b/korganizer/koeventpopupmenu.cpp @@ -195,7 +195,7 @@ void KOEventPopupMenu::forward() KOrg::MainWindow *w = ActionManager::findInstance( KURL() ); if ( !w || !mCurrentIncidence ) return; - KActionCollection *ac = w->getActionCollection(); - KAction *action = ac->action( "schedule_forward" ); + TDEActionCollection *ac = w->getActionCollection(); + TDEAction *action = ac->action( "schedule_forward" ); action->activate(); } diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp index 388e35699..89b4851e2 100644 --- a/korganizer/koeventviewer.cpp +++ b/korganizer/koeventviewer.cpp @@ -171,7 +171,7 @@ void KOEventViewer::contentsContextMenuEvent( TQContextMenuEvent *e ) return; } - KPopupMenu *menu = new KPopupMenu(); + TDEPopupMenu *menu = new TDEPopupMenu(); menu->insertItem( i18n( "Open Attachment" ), 0 ); menu->insertItem( i18n( "Save Attachment As..." ), 1 ); diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index 189a43b7f..d33f185d9 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp @@ -58,7 +58,7 @@ enum { KOListViewToolTip::KOListViewToolTip( TQWidget* parent, Calendar *calendar, - KListView *lv ) + TDEListView *lv ) :TQToolTip( parent ), mCalendar( calendar ) { eventlist = lv; @@ -204,7 +204,7 @@ KOListView::KOListView( Calendar *calendar, mActiveItem = 0; mIsNonInteractive = nonInteractive; - mListView = new KListView( this ); + mListView = new TDEListView( this ); mListView->addColumn( i18n("Summary") ); mListView->addColumn( i18n("Reminder") ); // alarm set? mListView->setColumnAlignment( Reminder_Column, AlignHCenter ); diff --git a/korganizer/kolistview.h b/korganizer/kolistview.h index bee6eb4a0..70ba080ce 100644 --- a/korganizer/kolistview.h +++ b/korganizer/kolistview.h @@ -44,14 +44,14 @@ class KOListView; class KOListViewToolTip : public TQToolTip { public: - KOListViewToolTip ( TQWidget* parent, Calendar *calendar, KListView* lv ); + KOListViewToolTip ( TQWidget* parent, Calendar *calendar, TDEListView* lv ); protected: void maybeTip( const TQPoint &pos ); private: Calendar *mCalendar; - KListView* eventlist; + TDEListView* eventlist; }; @@ -117,7 +117,7 @@ class KOListView : public KOEventView private: class ListItemVisitor; - KListView *mListView; + TDEListView *mListView; KOEventPopupMenu *mPopupMenu; KOListViewItem *mActiveItem; TQDict<Incidence> mUidDict; diff --git a/korganizer/korgac/alarmdialog.cpp b/korganizer/korgac/alarmdialog.cpp index bd005bc17..55de923ac 100644 --- a/korganizer/korgac/alarmdialog.cpp +++ b/korganizer/korgac/alarmdialog.cpp @@ -62,11 +62,11 @@ static int defSuspendVal = 5; static int defSuspendUnit = 0; // 0=>minutes, 1=>hours, 2=>days, 3=>weeks -class AlarmListItem : public KListViewItem +class AlarmListItem : public TDEListViewItem { public: AlarmListItem( const TQString &uid, TQListView *parent ) - : KListViewItem( parent ), mUid( uid ), mNotified( false ) + : TDEListViewItem( parent ), mUid( uid ), mNotified( false ) { } @@ -90,7 +90,7 @@ int AlarmListItem::compare( TQListViewItem *item, int iCol, bool bAscending ) co AlarmListItem *pItem = static_cast<AlarmListItem *>( item ); return pItem->mHappening.secsTo( mHappening ); } else { - return KListViewItem::compare( item, iCol, bAscending ); + return TDEListViewItem::compare( item, iCol, bAscending ); } } @@ -126,7 +126,7 @@ AlarmDialog::AlarmDialog( KCal::CalendarResources *calendar, TQWidget *parent, c mSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() ); topLayout->addWidget( mSplitter ); - mIncidenceListView = new KListView( mSplitter ); + mIncidenceListView = new TDEListView( mSplitter ); mIncidenceListView->addColumn( i18n( "Summary" ) ); mIncidenceListView->addColumn( i18n( "Date, Time" ) ); mIncidenceListView->setSorting( 0, true ); diff --git a/korganizer/korgac/alarmdialog.h b/korganizer/korgac/alarmdialog.h index d3e3af411..949c17f7d 100644 --- a/korganizer/korgac/alarmdialog.h +++ b/korganizer/korgac/alarmdialog.h @@ -38,7 +38,7 @@ using namespace KCal; class AlarmListItem; class KOEventViewer; class KComboBox; -class KListView; +class TDEListView; class TQSpinBox; class TQSplitter; @@ -100,7 +100,7 @@ class AlarmDialog : public KDialogBase { TQValueList<AlarmListItem*> selectedItems() const; CalendarResources *mCalendar; - KListView *mIncidenceListView; + TDEListView *mIncidenceListView; KOEventViewer *mDetailView; TQSpinBox *mSuspendSpin; diff --git a/korganizer/korgac/alarmdockwindow.cpp b/korganizer/korgac/alarmdockwindow.cpp index 051fe446e..d20d30f9c 100644 --- a/korganizer/korgac/alarmdockwindow.cpp +++ b/korganizer/korgac/alarmdockwindow.cpp @@ -79,9 +79,9 @@ AlarmDockWindow::AlarmDockWindow( const char *name ) // Disable standard quit behaviour. We have to intercept the quit even, if the // main window is hidden. - KActionCollection *ac = actionCollection(); + TDEActionCollection *ac = actionCollection(); const char *quitName = KStdAction::name( KStdAction::Quit ); - KAction *quit = ac->action( quitName ); + TDEAction *quit = ac->action( quitName ); if ( !quit ) { kdDebug(5890) << "No Quit standard action." << endl; } else { diff --git a/korganizer/korganizer.h b/korganizer/korganizer.h index 4c15fb39e..76505f7f4 100644 --- a/korganizer/korganizer.h +++ b/korganizer/korganizer.h @@ -38,9 +38,9 @@ #include <tdeparts/mainwindow.h> class KTempFile; -class KRecentFilesAction; +class TDERecentFilesAction; class KOWindowList; -class KToggleAction; +class TDEToggleAction; class TDEProcess; class KONewStuff; class ActionManager; @@ -55,7 +55,7 @@ typedef KOrg::MainWindow KOrgMainWindow; typedef KParts::MainWindow KPartsMainWindow; /** - This is the main class for KOrganizer. It extends the KDE KMainWindow. + This is the main class for KOrganizer. It extends the KDE TDEMainWindow. it provides the main view that the user sees upon startup, as well as menus, buttons, etc. etc. @@ -78,7 +78,7 @@ class KOrganizer : public KPartsMainWindow, public KOrgMainWindow KOrg::CalendarViewBase *view() const; ActionManager *actionManager() { return mActionManager; } - KActionCollection *getActionCollection() const { return actionCollection(); } + TDEActionCollection *getActionCollection() const { return actionCollection(); } /** Open calendar file from URL. Merge into current calendar, if \a merge is diff --git a/korganizer/korganizer_part.h b/korganizer/korganizer_part.h index 416e39b90..21e96462c 100644 --- a/korganizer/korganizer_part.h +++ b/korganizer/korganizer_part.h @@ -81,7 +81,7 @@ class KOrganizerPart: public KParts::ReadOnlyPart, virtual KXMLGUIClient *mainGuiClient() { return this; } virtual TQWidget *topLevelWidget(); virtual ActionManager *actionManager(); - virtual KActionCollection *getActionCollection() const { return actionCollection(); } + virtual TDEActionCollection *getActionCollection() const { return actionCollection(); } virtual void showStatusMessage( const TQString &message ); virtual bool isCurrentlyActivePart(); diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp index f065d5777..703ec040b 100644 --- a/korganizer/kotodoview.cpp +++ b/korganizer/kotodoview.cpp @@ -101,7 +101,7 @@ void KOTodoListViewToolTip::maybeTip( const TQPoint & pos) KOTodoListView::KOTodoListView( TQWidget *parent, const char *name ) - : KListView( parent, name ), mCalendar( 0 ), mChanger( 0 ) + : TDEListView( parent, name ), mCalendar( 0 ), mChanger( 0 ) { mOldCurrent = 0; mMousePressed = false; @@ -128,7 +128,7 @@ bool KOTodoListView::event(TQEvent *e) if(e->type()==TQEvent::ApplicationPaletteChange) { - KListView::event(e); + TDEListView::event(e); i=(KOTodoViewItem *)itemAtIndex(tmp); while(i!=0) @@ -140,7 +140,7 @@ bool KOTodoListView::event(TQEvent *e) } - return (KListView::event(e) || e->type()==TQEvent::ApplicationPaletteChange); + return (TDEListView::event(e) || e->type()==TQEvent::ApplicationPaletteChange); } void KOTodoListView::contentsDragEnterEvent(TQDragEnterEvent *e) diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h index a7728159e..48a3da844 100644 --- a/korganizer/kotodoview.h +++ b/korganizer/kotodoview.h @@ -69,7 +69,7 @@ class KOTodoListViewToolTip : public TQToolTip }; -class KOTodoListView : public KListView +class KOTodoListView : public TDEListView { Q_OBJECT diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index e69d61adb..5d277ac8d 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp @@ -170,9 +170,9 @@ void KOViewManager::goMenu( bool enable ) { KOrg::MainWindow *w = ActionManager::findInstance( KURL() ); if ( w ) { - KActionCollection *ac = w->getActionCollection(); + TDEActionCollection *ac = w->getActionCollection(); if ( ac ) { - KAction *action; + TDEAction *action; action = ac->action( "go_today" ); if ( action ) { action->setEnabled( enable ); diff --git a/korganizer/plugins/exchange/exchange.cpp b/korganizer/plugins/exchange/exchange.cpp index e84ae08ba..dc4dfe4ca 100644 --- a/korganizer/plugins/exchange/exchange.cpp +++ b/korganizer/plugins/exchange/exchange.cpp @@ -69,10 +69,10 @@ Exchange::Exchange(KOrg::MainWindow *parent, const char *name) : setXMLFile("plugins/exchangeui.rc"); - new KAction(i18n("&Download..."), 0, this, TQT_SLOT(download()), + new TDEAction(i18n("&Download..."), 0, this, TQT_SLOT(download()), actionCollection(), "exchange_download"); - KAction *action = new KAction(i18n("&Upload Event..."), 0, this, TQT_SLOT(upload()), + TDEAction *action = new TDEAction(i18n("&Upload Event..."), 0, this, TQT_SLOT(upload()), actionCollection(), "exchange_upload"); TQObject::connect(mainWindow()->view(),TQT_SIGNAL(incidenceSelected(Incidence *)), this, TQT_SLOT(slotIncidenceSelected(Incidence *))); @@ -80,13 +80,13 @@ Exchange::Exchange(KOrg::MainWindow *parent, const char *name) : TQObject::connect(this,TQT_SIGNAL(enableIncidenceActions(bool)), action,TQT_SLOT(setEnabled(bool))); - action = new KAction(i18n("De&lete Event"), 0, this, TQT_SLOT(remove()), + action = new TDEAction(i18n("De&lete Event"), 0, this, TQT_SLOT(remove()), actionCollection(), "exchange_delete"); TQObject::connect(this,TQT_SIGNAL(enableIncidenceActions(bool)), action,TQT_SLOT(setEnabled(bool))); action->setEnabled( false ); - new KAction(i18n("&Configure..."), 0, this, TQT_SLOT(configure()), + new TDEAction(i18n("&Configure..."), 0, this, TQT_SLOT(configure()), actionCollection(), "exchange_configure"); connect( this, TQT_SIGNAL( calendarChanged() ), mainWindow()->view(), TQT_SLOT( updateView() ) ); diff --git a/korganizer/plugins/projectview/projectview.cpp b/korganizer/plugins/projectview/projectview.cpp index f7e35effb..8177e797a 100644 --- a/korganizer/plugins/projectview/projectview.cpp +++ b/korganizer/plugins/projectview/projectview.cpp @@ -52,7 +52,7 @@ ProjectView::ProjectView(KOrg::MainWindow *parent, const char *name) : setXMLFile("plugins/projectviewui.rc"); - new KAction(i18n("&Project"), "project", 0, this, TQT_SLOT(showView()), + new TDEAction(i18n("&Project"), "project", 0, this, TQT_SLOT(showView()), actionCollection(), "view_project"); } diff --git a/korganizer/plugins/timespanview/timespanview.cpp b/korganizer/plugins/timespanview/timespanview.cpp index d43cd8e60..21b073b38 100644 --- a/korganizer/plugins/timespanview/timespanview.cpp +++ b/korganizer/plugins/timespanview/timespanview.cpp @@ -51,7 +51,7 @@ TimespanView::TimespanView(KOrg::MainWindow *parent, const char *name) : setXMLFile( "plugins/timespanviewui.rc" ); - new KAction( i18n("&Timespan"), "timespan", 0, this, TQT_SLOT( showView() ), + new TDEAction( i18n("&Timespan"), "timespan", 0, this, TQT_SLOT( showView() ), actionCollection(), "view_timespan" ); } diff --git a/korganizer/resourceview.cpp b/korganizer/resourceview.cpp index c92915715..bdeb116d4 100644 --- a/korganizer/resourceview.cpp +++ b/korganizer/resourceview.cpp @@ -127,7 +127,7 @@ ResourceView *ResourceViewFactory::resourceView() const } ResourceItem::ResourceItem( ResourceCalendar *resource, ResourceView *view, - KListView *parent ) + TDEListView *parent ) : TQCheckListItem( parent, resource->resourceName(), CheckBox ), mResource( resource ), mResourceView( view ), mBlockStateChange( false ), mIsSubresource( false ), mResourceIdentifier( TQString() ), @@ -303,7 +303,7 @@ ResourceView::ResourceView( CalendarResources *calendar, mDeleteButton->setDisabled( true ); mEditButton->setDisabled( true ); - mListView = new KListView( this ); + mListView = new TDEListView( this ); mListView->header()->hide(); TQWhatsThis::add( mListView, i18n( "<qt><p>Select on this list the active KOrganizer " diff --git a/korganizer/resourceview.h b/korganizer/resourceview.h index b4d6a70b5..1a073c2b2 100644 --- a/korganizer/resourceview.h +++ b/korganizer/resourceview.h @@ -34,7 +34,7 @@ namespace KCal { class ResourceCalendar; } using namespace KCal; -class KListView; +class TDEListView; class ResourceView; class TQPushButton; @@ -57,7 +57,7 @@ class ResourceViewFactory : public CalendarViewExtension::Factory class ResourceItem : public TQCheckListItem { public: - ResourceItem( ResourceCalendar *resource, ResourceView *view, KListView *parent ); + ResourceItem( ResourceCalendar *resource, ResourceView *view, TDEListView *parent ); ResourceItem( ResourceCalendar *resource, const TQString &identifier, const TQString &label, ResourceView *view, ResourceItem *parent ); @@ -148,7 +148,7 @@ class ResourceView : public CalendarViewExtension void updateResourceList(); private: - KListView *mListView; + TDEListView *mListView; CalendarResources *mCalendar; CalendarView *mCalendarView; TQPushButton *mAddButton; diff --git a/korganizer/template_management_dialog_base.ui b/korganizer/template_management_dialog_base.ui index 7fd65a105..1732a775a 100644 --- a/korganizer/template_management_dialog_base.ui +++ b/korganizer/template_management_dialog_base.ui @@ -22,7 +22,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="KListBox" row="1" column="0" rowspan="3" colspan="1"> + <widget class="TDEListBox" row="1" column="0" rowspan="3" colspan="1"> <property name="name"> <cstring>m_listBox</cstring> </property> diff --git a/korn/boxcontaineritem.cpp b/korn/boxcontaineritem.cpp index 50daf1d0c..ad4c40bd1 100644 --- a/korn/boxcontaineritem.cpp +++ b/korn/boxcontaineritem.cpp @@ -192,7 +192,7 @@ void BoxContainerItem::mouseButtonPressed( TQt::ButtonState state ) doPopup(); } -void BoxContainerItem::fillKPopupMenu( KPopupMenu* popupMenu, KActionCollection* actions ) const +void BoxContainerItem::fillTDEPopupMenu( TDEPopupMenu* popupMenu, TDEActionCollection* actions ) const { /*popupMenu->insertItem( i18n( "&Configure" ), this, TQT_SLOT( slotConfigure() ) ); popupMenu->insertItem( i18n( "&Recheck" ), this, TQT_SLOT( slotRecheck() ) ); @@ -200,11 +200,11 @@ void BoxContainerItem::fillKPopupMenu( KPopupMenu* popupMenu, KActionCollection* popupMenu->insertItem( i18n( "&View Emails" ), this, TQT_SLOT( slotView() ) ); popupMenu->insertItem( i18n( "R&un Command" ), this, TQT_SLOT( slotRunCommand() ) );*/ - (new KAction( i18n("&Configure"), KShortcut(), this, TQT_SLOT( slotConfigure() ), actions ))->plug( popupMenu ); - (new KAction( i18n("&Recheck"), KShortcut(), this, TQT_SLOT( slotRecheck() ), actions ))->plug( popupMenu ); - (new KAction( i18n("R&eset Counter"), KShortcut(), this, TQT_SLOT( slotReset() ), actions ))->plug( popupMenu ); - (new KAction( i18n("&View Emails"), KShortcut(), this, TQT_SLOT( slotView() ), actions ))->plug( popupMenu ); - (new KAction( i18n("R&un Command"), KShortcut(), this, TQT_SLOT( slotRunCommand() ), actions ))->plug( popupMenu ); + (new TDEAction( i18n("&Configure"), TDEShortcut(), this, TQT_SLOT( slotConfigure() ), actions ))->plug( popupMenu ); + (new TDEAction( i18n("&Recheck"), TDEShortcut(), this, TQT_SLOT( slotRecheck() ), actions ))->plug( popupMenu ); + (new TDEAction( i18n("R&eset Counter"), TDEShortcut(), this, TQT_SLOT( slotReset() ), actions ))->plug( popupMenu ); + (new TDEAction( i18n("&View Emails"), TDEShortcut(), this, TQT_SLOT( slotView() ), actions ))->plug( popupMenu ); + (new TDEAction( i18n("R&un Command"), TDEShortcut(), this, TQT_SLOT( slotRunCommand() ), actions ))->plug( popupMenu ); popupMenu->insertSeparator(); KStdAction::help( this, TQT_SLOT( help() ), actions )->plug( popupMenu ); KStdAction::reportBug( this, TQT_SLOT( reportBug() ), actions )->plug( popupMenu ); diff --git a/korn/boxcontaineritem.h b/korn/boxcontaineritem.h index 8672e4309..a132c59e8 100644 --- a/korn/boxcontaineritem.h +++ b/korn/boxcontaineritem.h @@ -24,9 +24,9 @@ class KornMailSubject; -class KActionCollection; +class TDEActionCollection; class TDEConfig; -class KPopupMenu; +class TDEPopupMenu; class TDEProcess; class TQColor; @@ -112,14 +112,14 @@ public slots: void mouseButtonPressed( TQt::ButtonState button ); protected: /** - * This function filles a KPopupMenu-reference. The target is - * to set in all implementations the same KPopupMenu-content. - * Because some implementations (TQt::DockedItem) got a KPopupMenu - * by itself, this only changes a KPopupMenu instance. + * This function filles a TDEPopupMenu-reference. The target is + * to set in all implementations the same TDEPopupMenu-content. + * Because some implementations (TQt::DockedItem) got a TDEPopupMenu + * by itself, this only changes a TDEPopupMenu instance. * @param menu The menu to be changed. * @param actions The actions to which the items should be added. */ - void fillKPopupMenu( KPopupMenu* menu, KActionCollection* actions ) const; + void fillTDEPopupMenu( TDEPopupMenu* menu, TDEActionCollection* actions ) const; /** * This displays the passive popup. diff --git a/korn/dockeditem.cpp b/korn/dockeditem.cpp index 474ffb289..7e2b53a89 100644 --- a/korn/dockeditem.cpp +++ b/korn/dockeditem.cpp @@ -40,7 +40,7 @@ DockedItem::DockedItem( TQWidget * parent, const char * name ) : BoxContainerItem( TQT_TQOBJECT(parent), name ), _systemtray( new SystemTray( parent, "System tray" ) ) { - this->fillKPopupMenu( _systemtray->contextMenu(), _systemtray->actionCollection() ); + this->fillTDEPopupMenu( _systemtray->contextMenu(), _systemtray->actionCollection() ); connect( _systemtray, TQT_SIGNAL( quitSelected() ), kapp, TQT_SLOT( quit() ) ); connect( _systemtray, TQT_SIGNAL( mouseButtonPressed( TQt::ButtonState ) ), diff --git a/korn/dockeditem.h b/korn/dockeditem.h index e375bb97d..46513c9c6 100644 --- a/korn/dockeditem.h +++ b/korn/dockeditem.h @@ -83,7 +83,7 @@ public slots: protected: /** - * This function popup's the KPopupMenu inmideately. + * This function popup's the TDEPopupMenu inmideately. */ virtual void doPopup(); diff --git a/korn/hvitem.cpp b/korn/hvitem.cpp index d2453b64c..fef3dbefa 100644 --- a/korn/hvitem.cpp +++ b/korn/hvitem.cpp @@ -33,11 +33,11 @@ HVItem::HVItem( TQWidget *parent, const char *name ) : BoxContainerItem( 0, name ), _label( new Label( parent, "label" ) ), - _popup( new KPopupMenu( _label, "popupmenu" ) ), - _actions( new KActionCollection( _popup, "actions" ) ) + _popup( new TDEPopupMenu( _label, "popupmenu" ) ), + _actions( new TDEActionCollection( _popup, "actions" ) ) { _popup->insertTitle( kapp->miniIcon(), kapp->caption() ); - this->fillKPopupMenu( _popup, _actions ); + this->fillTDEPopupMenu( _popup, _actions ); _popup->insertSeparator(); KStdAction::quit( TQT_TQOBJECT(kapp), TQT_SLOT( quit() ), _actions )->plug( _popup ); diff --git a/korn/hvitem.h b/korn/hvitem.h index 550d19ba0..9e2045b16 100644 --- a/korn/hvitem.h +++ b/korn/hvitem.h @@ -21,8 +21,8 @@ #include <boxcontaineritem.h> -class KActionCollection; -class KPopupMenu; +class TDEActionCollection; +class TDEPopupMenu; class Label; @@ -74,8 +74,8 @@ public slots: virtual void doPopup(); private: Label *_label; - KPopupMenu *_popup; - KActionCollection *_actions; + TDEPopupMenu *_popup; + TDEActionCollection *_actions; }; #endif //MK_HVITEM_H diff --git a/korn/kornboxcfgimpl.cpp b/korn/kornboxcfgimpl.cpp index f7904b590..785b94fb7 100644 --- a/korn/kornboxcfgimpl.cpp +++ b/korn/kornboxcfgimpl.cpp @@ -301,7 +301,7 @@ void KornBoxCfgImpl::slotChangeNewAnim() void KornBoxCfgImpl::slotChangeNormalFont() { - KFontDialog fd( this, "font dialog" ); + TDEFontDialog fd( this, "font dialog" ); fd.setFont( *_fonts[ 0 ], false ); fd.exec(); *_fonts[ 0 ] = fd.font(); @@ -309,7 +309,7 @@ void KornBoxCfgImpl::slotChangeNormalFont() void KornBoxCfgImpl::slotChangeNewFont() { - KFontDialog fd( this, "font dialog" ); + TDEFontDialog fd( this, "font dialog" ); fd.setFont( *_fonts[ 1 ], false ); fd.exec(); *_fonts[ 1 ] = fd.font(); diff --git a/korn/subjectsdlg.cpp b/korn/subjectsdlg.cpp index d1cf39543..6a2ec1847 100644 --- a/korn/subjectsdlg.cpp +++ b/korn/subjectsdlg.cpp @@ -15,7 +15,7 @@ KornSubjectsDlg::SubjectListViewItem::SubjectListViewItem( TQListView *parent, KornMailSubject * item) // set the column strings except column 2 (date) - : KListViewItem(parent, item->getSender(), item->getSubject(), "", TDEGlobal::locale()->formatNumber(item->getSize(), 0)) + : TDEListViewItem(parent, item->getSender(), item->getSubject(), "", TDEGlobal::locale()->formatNumber(item->getSize(), 0)) , _mailSubject( new KornMailSubject( *item ) ) { // convert the date according to the user settings and show it in column 2 @@ -49,7 +49,7 @@ int KornSubjectsDlg::SubjectListViewItem::compare( TQListViewItem* item, int col else { // otherwise call default handling (i.e. string compare) - return KListViewItem::compare( item, column, ascending ); + return TDEListViewItem::compare( item, column, ascending ); } } @@ -72,7 +72,7 @@ KornSubjectsDlg::KornSubjectsDlg( TQWidget *parent ) showButton->setEnabled(false); TQVBoxLayout * topLayout = new TQVBoxLayout( page, 0, spacingHint() ); TQHBoxLayout * buttons = new TQHBoxLayout(); - _list = new KListView(page); + _list = new TDEListView(page); topLayout->addWidget(_list, 10); topLayout->addLayout(buttons, 0); buttons->addWidget(invertSelButton, 0); diff --git a/korn/subjectsdlg.h b/korn/subjectsdlg.h index 224d6e78f..189f1a70d 100644 --- a/korn/subjectsdlg.h +++ b/korn/subjectsdlg.h @@ -9,7 +9,7 @@ class KMailDrop; class KornMailSubject; class KornMailId; -class KListView; +class TDEListView; class KornMailDlg; class TQProgressDialog; class DoubleProgressDialog; @@ -30,7 +30,7 @@ class KornSubjectsDlg: public KDialogBase * SubjectListViewItem is a helper class representing one line in the list view. * It stores the mail subject the line represents and controls the sorting. */ - class SubjectListViewItem : public KListViewItem + class SubjectListViewItem : public TDEListViewItem { KornMailSubject * _mailSubject; public: @@ -80,7 +80,7 @@ class KornSubjectsDlg: public KDialogBase int totalNumberOfMessages; } *_delete; - KListView * _list; + TDEListView * _list; KPushButton * invertSelButton; KPushButton * clearSelButton; KPushButton * deleteButton; diff --git a/ktnef/gui/attachpropertydialogbase.ui b/ktnef/gui/attachpropertydialogbase.ui index 010dd9208..ce443f36d 100644 --- a/ktnef/gui/attachpropertydialogbase.ui +++ b/ktnef/gui/attachpropertydialogbase.ui @@ -176,7 +176,7 @@ </size> </property> </widget> - <widget class="KListView" row="7" column="0" rowspan="1" colspan="3"> + <widget class="TDEListView" row="7" column="0" rowspan="1" colspan="3"> <column> <property name="text"> <string>Name</string> diff --git a/ktnef/gui/ktnefmain.cpp b/ktnef/gui/ktnefmain.cpp index 149f43db1..ecd17bd22 100644 --- a/ktnef/gui/ktnefmain.cpp +++ b/ktnef/gui/ktnefmain.cpp @@ -58,7 +58,7 @@ #define NOT_IMPLEMENTED TQMessageBox::information(this, "ktnef", "Not implemented yet", TQMessageBox::Ok|TQMessageBox::Default, 0) KTNEFMain::KTNEFMain(TQWidget *parent, const char *name) - : KMainWindow(parent, name) + : TDEMainWindow(parent, name) { setupActions(); setupStatusbar(); @@ -89,15 +89,15 @@ void KTNEFMain::setupActions() KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection()); // Action menu - new KAction(i18n("View"), TQString("viewmag"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewFile()), actionCollection(), "view_file"); - new KAction(i18n("View With..."), TQString("package_applications"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewFileAs()), actionCollection(), "view_file_as"); - new KAction(i18n("Extract"), 0, TQT_TQOBJECT(this), TQT_SLOT(extractFile()), actionCollection(), "extract_file"); - new KAction(i18n("Extract To..."), TQString("ktnef_extract_to"), 0, TQT_TQOBJECT(this), TQT_SLOT(extractFileTo()), actionCollection(), "extract_file_to"); - new KAction(i18n("Extract All To..."), TQString("ktnef_extract_all_to"), 0, TQT_TQOBJECT(this), TQT_SLOT(extractAllFiles()), actionCollection(), "extract_all_files"); - new KAction( i18n( "Message Properties" ), "help", 0, TQT_TQOBJECT(this), TQT_SLOT( slotShowMessageProperties() ), actionCollection(), "msg_properties" ); - new KAction(i18n("Properties"), TQString("contents"), 0, TQT_TQOBJECT(this), TQT_SLOT(propertiesFile()), actionCollection(), "properties_file"); - new KAction( i18n( "Show Message Text" ), "mail_generic", 0, TQT_TQOBJECT(this), TQT_SLOT( slotShowMessageText() ), actionCollection(), "msg_text" ); - new KAction( i18n( "Save Message Text As..." ), "filesave", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSaveMessageText() ), actionCollection(), "msg_save" ); + new TDEAction(i18n("View"), TQString("viewmag"), 0, TQT_TQOBJECT(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("Extract"), 0, TQT_TQOBJECT(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 All To..."), TQString("ktnef_extract_all_to"), 0, TQT_TQOBJECT(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("Properties"), TQString("contents"), 0, TQT_TQOBJECT(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( "Save Message Text As..." ), "filesave", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSaveMessageText() ), actionCollection(), "msg_save" ); actionCollection()->action("view_file")->setEnabled(false); actionCollection()->action("view_file_as")->setEnabled(false); actionCollection()->action("extract_file")->setEnabled(false); @@ -106,7 +106,7 @@ void KTNEFMain::setupActions() actionCollection()->action("properties_file")->setEnabled(false); // Option menu - new KAction(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, TQT_TQOBJECT(this), TQT_SLOT(optionDefaultDir()), actionCollection(), "options_default_dir"); createStandardStatusBarAction(); setStandardToolBarMenuEnabled(true); diff --git a/ktnef/gui/ktnefmain.h b/ktnef/gui/ktnefmain.h index 8e751928f..3d7901b0e 100644 --- a/ktnef/gui/ktnefmain.h +++ b/ktnef/gui/ktnefmain.h @@ -26,7 +26,7 @@ class KTNEFView; class KTNEFParser; class KTNEFAttach; -class KTNEFMain : public KMainWindow +class KTNEFMain : public TDEMainWindow { Q_OBJECT diff --git a/ktnef/gui/ktnefview.cpp b/ktnef/gui/ktnefview.cpp index 05ff229db..be3000aac 100644 --- a/ktnef/gui/ktnefview.cpp +++ b/ktnef/gui/ktnefview.cpp @@ -64,7 +64,7 @@ Attachment::~Attachment() //------------------------------------------------------------------------------------------------------ KTNEFView::KTNEFView(TQWidget *parent, const char *name) - : KListView(parent,name) + : TDEListView(parent,name) { attachments_.setAutoDelete(false); addColumn(i18n("File Name")); diff --git a/ktnef/gui/ktnefview.h b/ktnef/gui/ktnefview.h index 2db54d1f4..f6ffc6f81 100644 --- a/ktnef/gui/ktnefview.h +++ b/ktnef/gui/ktnefview.h @@ -24,7 +24,7 @@ class KTNEFAttach; -class KDE_EXPORT KTNEFView : public KListView +class KDE_EXPORT KTNEFView : public TDEListView { Q_OBJECT diff --git a/ktnef/gui/messagepropertydialog.cpp b/ktnef/gui/messagepropertydialog.cpp index 7f4d61e6b..73aba4ff9 100644 --- a/ktnef/gui/messagepropertydialog.cpp +++ b/ktnef/gui/messagepropertydialog.cpp @@ -29,7 +29,7 @@ MessagePropertyDialog::MessagePropertyDialog( TQWidget *parent, KTNEFMessage *ms { m_message = msg; - m_listview = new KListView( this ); + m_listview = new TDEListView( this ); m_listview->addColumn( i18n( "Name" ) ); m_listview->addColumn( i18n( "Value" ) ); m_listview->setAllColumnsShowFocus( true ); diff --git a/ktnef/gui/messagepropertydialog.h b/ktnef/gui/messagepropertydialog.h index 1c46fbb21..98ddb3745 100644 --- a/ktnef/gui/messagepropertydialog.h +++ b/ktnef/gui/messagepropertydialog.h @@ -20,7 +20,7 @@ #include <kdialogbase.h> -class KListView; +class TDEListView; class KTNEFMessage; class MessagePropertyDialog : public KDialogBase @@ -35,7 +35,7 @@ protected slots: private: KTNEFMessage *m_message; - KListView *m_listview; + TDEListView *m_listview; }; #endif /* MESSAGEPROPERTYDIALOG_H */ diff --git a/libkcal/calselectdialog.cpp b/libkcal/calselectdialog.cpp index 9c346f483..b72a1627d 100644 --- a/libkcal/calselectdialog.cpp +++ b/libkcal/calselectdialog.cpp @@ -59,7 +59,7 @@ CalSelectDialog::CalSelectDialog( const TQString &caption, const TQString &label TQLabel *labelWidget = new TQLabel( label, frame ); layout->addWidget( labelWidget ); - mListBox = new KListBox( frame ); + mListBox = new TDEListBox( frame ); mListBox->insertStringList( list ); mListBox->setSelected( 0, true ); mListBox->ensureCurrentVisible(); diff --git a/libkcal/calselectdialog.h b/libkcal/calselectdialog.h index 40b2811b4..66d406a0e 100644 --- a/libkcal/calselectdialog.h +++ b/libkcal/calselectdialog.h @@ -61,7 +61,7 @@ class CalSelectDialog : public KDialogBase void reject(); private: - KListBox *mListBox; + TDEListBox *mListBox; }; } diff --git a/libkcal/confirmsavedialog.cpp b/libkcal/confirmsavedialog.cpp index 9b7f4d31d..88111073c 100644 --- a/libkcal/confirmsavedialog.cpp +++ b/libkcal/confirmsavedialog.cpp @@ -43,7 +43,7 @@ ConfirmSaveDialog::ConfirmSaveDialog( const TQString &destination, .arg( destination ), topFrame ); topLayout->addWidget( label ); - mListView = new KListView( topFrame ); + mListView = new TDEListView( topFrame ); mListView->addColumn( i18n("Operation") ); mListView->addColumn( i18n("Type") ); mListView->addColumn( i18n("Summary") ); @@ -57,7 +57,7 @@ void ConfirmSaveDialog::addIncidences( const Incidence::List &incidences, Incidence::List::ConstIterator it; for( it = incidences.begin(); it != incidences.end(); ++it ) { Incidence *i = *it; - KListViewItem *item = new KListViewItem( mListView ); + TDEListViewItem *item = new TDEListViewItem( mListView ); item->setText( 0, operation ); item->setText( 1, i->type() ); item->setText( 2, i->summary() ); diff --git a/libkcal/confirmsavedialog.h b/libkcal/confirmsavedialog.h index 2cdb6c8b1..f92d4ae5a 100644 --- a/libkcal/confirmsavedialog.h +++ b/libkcal/confirmsavedialog.h @@ -25,7 +25,7 @@ #include <kdialogbase.h> #include <tdepimmacros.h> -class KListView; +class TDEListView; namespace KCal { @@ -39,7 +39,7 @@ class KDE_EXPORT ConfirmSaveDialog : public KDialogBase const TQString &operation ); private: - KListView *mListView; + TDEListView *mListView; }; } diff --git a/libkpgp/kpgpui.cpp b/libkpgp/kpgpui.cpp index f468cb926..e8bc83f22 100644 --- a/libkpgp/kpgpui.cpp +++ b/libkpgp/kpgpui.cpp @@ -332,7 +332,7 @@ KeySelectionDialog::KeySelectionDialog( const KeyList& keyList, this, TQT_SLOT(slotSearch(const TQString&)) ); connect( mStartSearchTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotFilter()) ); - mListView = new KListView( page ); + mListView = new TDEListView( page ); mListView->addColumn( i18n("Key ID") ); mListView->addColumn( i18n("User ID") ); mListView->setAllColumnsShowFocus( true ); diff --git a/libkpgp/kpgpui.h b/libkpgp/kpgpui.h index 2f15f0c00..57c13fbaf 100644 --- a/libkpgp/kpgpui.h +++ b/libkpgp/kpgpui.h @@ -41,7 +41,7 @@ class TQPixmap; // needed by KeySelectionDialog class TQPushButton; // needed by KeyRequester class TQTimer; // needed by KeySelectionDialog -class KListView; // needed by KeySelectionDialog +class TDEListView; // needed by KeySelectionDialog class KPasswordEdit; // needed by PassphraseDialog namespace Kpgp { @@ -188,7 +188,7 @@ class KDE_EXPORT KeySelectionDialog: public KeySelectionDialogSuper bool checkKeys( const TQValueList<TQListViewItem*>& ) const; private: - KListView *mListView; + TDEListView *mListView; TQCheckBox *mRememberCB; TQPixmap *mKeyGoodPix, *mKeyBadPix, *mKeyUnknownPix, *mKeyValidPix; KeyIDList mKeyIds; diff --git a/libtdepim/addresseeemailselection.cpp b/libtdepim/addresseeemailselection.cpp index c2c6ff4f4..817e60327 100644 --- a/libtdepim/addresseeemailselection.cpp +++ b/libtdepim/addresseeemailselection.cpp @@ -28,7 +28,7 @@ #include "addresseeemailselection.h" using namespace KPIM; -using KRecentAddress::RecentAddresses; +using TDERecentAddress::RecentAddresses; AddresseeEmailSelection::AddresseeEmailSelection() : Selection() diff --git a/libtdepim/addresseelineedit.cpp b/libtdepim/addresseelineedit.cpp index dbe032b2c..68e79b2b2 100644 --- a/libtdepim/addresseelineedit.cpp +++ b/libtdepim/addresseelineedit.cpp @@ -217,12 +217,12 @@ void AddresseeLineEdit::keyPressEvent( TQKeyEvent *e ) { bool accept = false; - if ( KStdAccel::shortcut( KStdAccel::SubstringCompletion ).contains( KKey( e ) ) ) { + if ( TDEStdAccel::shortcut( TDEStdAccel::SubstringCompletion ).contains( KKey( e ) ) ) { //TODO: add LDAP substring lookup, when it becomes available in KPIM::LDAPSearch updateSearchString(); doCompletion( true ); accept = true; - } else if ( KStdAccel::shortcut( KStdAccel::TextCompletion ).contains( KKey( e ) ) ) { + } else if ( TDEStdAccel::shortcut( TDEStdAccel::TextCompletion ).contains( KKey( e ) ) ) { int len = text().length(); if ( len == cursorPosition() ) { // at End? diff --git a/libtdepim/addresseeselector.cpp b/libtdepim/addresseeselector.cpp index 38bec42df..4549d3768 100644 --- a/libtdepim/addresseeselector.cpp +++ b/libtdepim/addresseeselector.cpp @@ -293,7 +293,7 @@ void AddresseeSelector::initGUI() uint count = mSelection->fieldCount(); for ( uint i = 0; i < count; ++i, ++row ) { - KListView *listView = new KListView( this ); + TDEListView *listView = new TDEListView( this ); listView->addColumn( mSelection->fieldTitle( i ) ); listView->setFullWidth( true ); mSelectionViews.append( listView ); @@ -330,7 +330,7 @@ void AddresseeSelector::initGUI() layout->addWidget( listView, row, 2 ); } - mAddresseeView = new KListView( this ); + mAddresseeView = new TDEListView( this ); mAddresseeView->addColumn( "" ); mAddresseeView->header()->hide(); mAddresseeView->setFullWidth( true ); @@ -391,7 +391,7 @@ void AddresseeSelector::move( int index ) void AddresseeSelector::remove( int index ) { - KListView *view = mSelectionViews[ index ]; + TDEListView *view = mSelectionViews[ index ]; SelectionViewItem *item = dynamic_cast<SelectionViewItem*>( view->selectedItem() ); if ( item ) { @@ -447,7 +447,7 @@ void AddresseeSelector::setItemSelected( uint fieldIndex, const KABC::Addressee void AddresseeSelector::updateSelectionView( int index ) { - KListView *view = mSelectionViews[ index ]; + TDEListView *view = mSelectionViews[ index ]; view->clear(); SelectionItem::List::Iterator it; diff --git a/libtdepim/addresseeselector.h b/libtdepim/addresseeselector.h index c5e6b4934..f06c030bc 100644 --- a/libtdepim/addresseeselector.h +++ b/libtdepim/addresseeselector.h @@ -34,7 +34,7 @@ class KComboBox; class KLineEdit; -class KListView; +class TDEListView; class TQSignalMapper; namespace KPIM { @@ -200,10 +200,10 @@ class KDE_EXPORT AddresseeSelector : public TQWidget KComboBox *mAddressBookCombo; KLineEdit *mAddresseeFilter; - KListView *mAddresseeView; + TDEListView *mAddresseeView; SelectionItem::List mSelectionItems; - TQValueList<KListView*> mSelectionViews; + TQValueList<TDEListView*> mSelectionViews; TQSignalMapper *mMoveMapper; TQSignalMapper *mRemoveMapper; diff --git a/libtdepim/addresseeview.cpp b/libtdepim/addresseeview.cpp index ef754e819..dfe955403 100644 --- a/libtdepim/addresseeview.cpp +++ b/libtdepim/addresseeview.cpp @@ -73,19 +73,19 @@ AddresseeView::AddresseeView( TQWidget *parent, const char *name, setNotifyClick( true ); - mActionShowBirthday = new KToggleAction( i18n( "Show Birthday" ) ); + mActionShowBirthday = new TDEToggleAction( i18n( "Show Birthday" ) ); mActionShowBirthday->setCheckedState( i18n( "Hide Birthday" ) ); - mActionShowAddresses = new KToggleAction( i18n( "Show Postal Addresses" ) ); + mActionShowAddresses = new TDEToggleAction( i18n( "Show Postal Addresses" ) ); mActionShowAddresses->setCheckedState( i18n( "Hide Postal Addresses" ) ); - mActionShowEmails = new KToggleAction( i18n( "Show Email Addresses" ) ); + mActionShowEmails = new TDEToggleAction( i18n( "Show Email Addresses" ) ); mActionShowEmails->setCheckedState( i18n( "Hide Email Addresses" ) ); - mActionShowPhones = new KToggleAction( i18n( "Show Telephone Numbers" ) ); + mActionShowPhones = new TDEToggleAction( i18n( "Show Telephone Numbers" ) ); mActionShowPhones->setCheckedState( i18n( "Hide Telephone Numbers" ) ); - mActionShowURLs = new KToggleAction( i18n( "Show Web Pages (URLs)" ) ); + mActionShowURLs = new TDEToggleAction( i18n( "Show Web Pages (URLs)" ) ); mActionShowURLs->setCheckedState( i18n( "Hide Web Pages (URLs)" ) ); - mActionShowIMAddresses = new KToggleAction( i18n( "Show Instant Messaging Addresses" ) ); + mActionShowIMAddresses = new TDEToggleAction( i18n( "Show Instant Messaging Addresses" ) ); mActionShowIMAddresses->setCheckedState( i18n( "Hide Instant Messaging Addresses" ) ); - mActionShowCustomFields = new KToggleAction( i18n( "Show Custom Fields" ) ); + mActionShowCustomFields = new TDEToggleAction( i18n( "Show Custom Fields" ) ); mActionShowCustomFields->setCheckedState( i18n( "Hide Custom Fields" ) ); connect( mActionShowBirthday, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( configChanged() ) ); diff --git a/libtdepim/addresseeview.h b/libtdepim/addresseeview.h index 25b97487a..92760529a 100644 --- a/libtdepim/addresseeview.h +++ b/libtdepim/addresseeview.h @@ -32,7 +32,7 @@ namespace TDEIO { class Job; } -class KToggleAction; +class TDEToggleAction; class TQPopupMenu; @@ -184,13 +184,13 @@ class KDE_EXPORT AddresseeView : public KTextBrowser TQByteArray mImageData; TDEIO::Job *mImageJob; - KToggleAction *mActionShowBirthday; - KToggleAction *mActionShowAddresses; - KToggleAction *mActionShowEmails; - KToggleAction *mActionShowPhones; - KToggleAction *mActionShowURLs; - KToggleAction *mActionShowIMAddresses; - KToggleAction *mActionShowCustomFields; + TDEToggleAction *mActionShowBirthday; + TDEToggleAction *mActionShowAddresses; + TDEToggleAction *mActionShowEmails; + TDEToggleAction *mActionShowPhones; + TDEToggleAction *mActionShowURLs; + TDEToggleAction *mActionShowIMAddresses; + TDEToggleAction *mActionShowCustomFields; KABC::Addressee mAddressee; int mLinkMask; diff --git a/libtdepim/addressesdialog.cpp b/libtdepim/addressesdialog.cpp index d86995404..68fd906e3 100644 --- a/libtdepim/addressesdialog.cpp +++ b/libtdepim/addressesdialog.cpp @@ -93,7 +93,7 @@ struct AddressesDialog::AddressesDialogPrivate { AddresseeViewItem::AddresseeViewItem( AddresseeViewItem *parent, const KABC::Addressee& addr, int emailIndex ) - : TQObject( 0 ), KListViewItem( parent, addr.realName(), + : TQObject( 0 ), TDEListViewItem( parent, addr.realName(), ( emailIndex == 0 ? addr.preferredEmail() : addr.emails()[ emailIndex ] ) ) { d = new AddresseeViewItemPrivate; @@ -113,8 +113,8 @@ AddresseeViewItem::AddresseeViewItem( AddresseeViewItem *parent, const KABC::Add } } -AddresseeViewItem::AddresseeViewItem( KListView *lv, const TQString& name, Category cat ) - : TQObject(0), KListViewItem( lv, name ) +AddresseeViewItem::AddresseeViewItem( TDEListView *lv, const TQString& name, Category cat ) + : TQObject(0), TDEListViewItem( lv, name ) { d = new AddresseeViewItemPrivate; d->category = cat; @@ -122,7 +122,7 @@ AddresseeViewItem::AddresseeViewItem( KListView *lv, const TQString& name, Categ AddresseeViewItem::AddresseeViewItem( AddresseeViewItem *parent, const TQString& name, const KABC::Addressee::List &lst ) - : TQObject(0), KListViewItem( parent, name, i18n("<group>") ) + : TQObject(0), TDEListViewItem( parent, name, i18n("<group>") ) { d = new AddresseeViewItemPrivate; d->category = FilledGroup; @@ -130,7 +130,7 @@ AddresseeViewItem::AddresseeViewItem( AddresseeViewItem *parent, const TQString } AddresseeViewItem::AddresseeViewItem( AddresseeViewItem *parent, const TQString& name ) - : TQObject(0), KListViewItem( parent, name, i18n("<group>") ) + : TQObject(0), TDEListViewItem( parent, name, i18n("<group>") ) { d = new AddresseeViewItemPrivate; d->category = DistList; @@ -194,7 +194,7 @@ int AddresseeViewItem::compare( TQListViewItem * i, int col, bool ascending ) const { if ( category() == Group || category() == Entry ) - return KListViewItem::compare( i , col, ascending ); + return TDEListViewItem::compare( i , col, ascending ); AddresseeViewItem *item = static_cast<AddresseeViewItem*>( i ); int a = static_cast<int>( category() ); @@ -1063,7 +1063,7 @@ AddressesDialog::filterChanged( const TQString& txt ) } KABC::Addressee::List -AddressesDialog::allAddressee( KListView* view, bool onlySelected ) const +AddressesDialog::allAddressee( TDEListView* view, bool onlySelected ) const { KABC::Addressee::List lst; TQListViewItemIterator it( view ); diff --git a/libtdepim/addressesdialog.h b/libtdepim/addressesdialog.h index 7f751452d..44b4f50e2 100644 --- a/libtdepim/addressesdialog.h +++ b/libtdepim/addressesdialog.h @@ -35,7 +35,7 @@ namespace KPIM { - class AddresseeViewItem : public TQObject, public KListViewItem + class AddresseeViewItem : public TQObject, public TDEListViewItem { Q_OBJECT @@ -51,7 +51,7 @@ namespace KPIM { DistList =6 }; AddresseeViewItem( AddresseeViewItem *parent, const KABC::Addressee& addr, int emailIndex = 0 ); - AddresseeViewItem( KListView *lv, const TQString& name, Category cat=Group ); + AddresseeViewItem( TDEListView *lv, const TQString& name, Category cat=Group ); AddresseeViewItem( AddresseeViewItem *parent, const TQString& name, const KABC::Addressee::List &lst ); AddresseeViewItem( AddresseeViewItem *parent, const TQString& name ); ~AddresseeViewItem(); @@ -198,7 +198,7 @@ namespace KPIM { const TQPtrList<AddresseeViewItem>& addresses ); TQStringList entryToString( const KABC::Addressee::List& l ) const; KABC::Addressee::List allAddressee( AddresseeViewItem* parent ) const; - KABC::Addressee::List allAddressee( KListView* view, bool onlySelected = true ) const; + KABC::Addressee::List allAddressee( TDEListView* view, bool onlySelected = true ) const; TQStringList allDistributionLists( AddresseeViewItem* parent ) const; private: diff --git a/libtdepim/addresspicker.ui b/libtdepim/addresspicker.ui index 8469730a4..75d70011d 100644 --- a/libtdepim/addresspicker.ui +++ b/libtdepim/addresspicker.ui @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="KListView" row="1" column="0"> + <widget class="TDEListView" row="1" column="0"> <column> <property name="text"> <string>Name</string> @@ -244,7 +244,7 @@ </widget> </hbox> </widget> - <widget class="KListView" row="1" column="2"> + <widget class="TDEListView" row="1" column="2"> <column> <property name="text"> <string>Name</string> diff --git a/libtdepim/completionordereditor.cpp b/libtdepim/completionordereditor.cpp index 1796933f8..4a1ee29ca 100644 --- a/libtdepim/completionordereditor.cpp +++ b/libtdepim/completionordereditor.cpp @@ -211,7 +211,7 @@ CompletionOrderEditor::CompletionOrderEditor( KPIM::LdapSearch* ldapSearch, mItems.sort(); TQHBox* page = makeHBoxMainWidget(); - mListView = new KListView( page ); + mListView = new TDEListView( page ); mListView->setSorting( -1 ); mListView->addColumn( TQString() ); mListView->header()->hide(); diff --git a/libtdepim/completionordereditor.h b/libtdepim/completionordereditor.h index e13ce3130..53061f04f 100644 --- a/libtdepim/completionordereditor.h +++ b/libtdepim/completionordereditor.h @@ -35,7 +35,7 @@ #include <tdeconfig.h> class KPushButton; -class KListView; +class TDEListView; namespace KPIM { class LdapSearch; @@ -80,7 +80,7 @@ private slots: private: TDEConfig mConfig; CompletionItemList mItems; - KListView* mListView; + TDEListView* mListView; KPushButton* mUpButton; KPushButton* mDownButton; diff --git a/libtdepim/kcmdesignerfields.cpp b/libtdepim/kcmdesignerfields.cpp index 47d3b9102..00b2f0bb3 100644 --- a/libtdepim/kcmdesignerfields.cpp +++ b/libtdepim/kcmdesignerfields.cpp @@ -277,7 +277,7 @@ void KCMDesignerFields::initGUI() TQHBoxLayout *hbox = new TQHBoxLayout( layout, KDialog::spacingHint() ); - mPageView = new KListView( this ); + mPageView = new TDEListView( this ); mPageView->addColumn( i18n( "Available Pages" ) ); mPageView->setRootIsDecorated( true ); mPageView->setAllColumnsShowFocus( true ); diff --git a/libtdepim/kcmdesignerfields.h b/libtdepim/kcmdesignerfields.h index d1f749a5d..8ab575416 100644 --- a/libtdepim/kcmdesignerfields.h +++ b/libtdepim/kcmdesignerfields.h @@ -25,7 +25,7 @@ #include <tdecmodule.h> #include <tdepimmacros.h> -class KListView; +class TDEListView; class TQLabel; class TQListViewItem; @@ -68,7 +68,7 @@ class KDE_EXPORT KCMDesignerFields : public TDECModule private: void initGUI(); - KListView *mPageView; + TDEListView *mPageView; TQLabel *mPagePreview; TQLabel *mPageDetails; TQPushButton *mDeleteButton; diff --git a/libtdepim/kfoldertree.cpp b/libtdepim/kfoldertree.cpp index 58961ddc6..abc69fad4 100644 --- a/libtdepim/kfoldertree.cpp +++ b/libtdepim/kfoldertree.cpp @@ -14,7 +14,7 @@ //----------------------------------------------------------------------------- KFolderTreeItem::KFolderTreeItem( KFolderTree *parent, const TQString & label, Protocol protocol, Type type ) - : KListViewItem( parent, label ), mProtocol( protocol ), mType( type ), + : TDEListViewItem( parent, label ), mProtocol( protocol ), mType( type ), mUnread(-1), mTotal(0), mSize(0), mFolderIsCloseToQuota( false ) { } @@ -23,7 +23,7 @@ KFolderTreeItem::KFolderTreeItem( KFolderTree *parent, const TQString & label, KFolderTreeItem::KFolderTreeItem( KFolderTreeItem *parent, const TQString & label, Protocol protocol, Type type, int unread, int total ) - : KListViewItem( parent, label ), mProtocol( protocol ), mType( type ), + : TDEListViewItem( parent, label ), mProtocol( protocol ), mType( type ), mUnread( unread ), mTotal( total ), mSize(0), mFolderIsCloseToQuota( false ) { } @@ -265,7 +265,7 @@ void KFolderTreeItem::paintCell( TQPainter * p, const TQColorGroup & cg, } - // most cells can be handled by KListView::paintCell, we only need to + // most cells can be handled by TDEListView::paintCell, we only need to // deal with the folder column if the unread column is not shown /* The below is exceedingly silly, but Ingo insists that the unread @@ -274,16 +274,16 @@ void KFolderTreeItem::paintCell( TQPainter * p, const TQColorGroup & cg, * two painting passes which flickers. Since that flicker is not * needed when there is the unread column, special case that. */ if ( ft->isUnreadActive() || column != 0 ) { - KListViewItem::paintCell( p, mycg, column, width, align ); + TDEListViewItem::paintCell( p, mycg, column, width, align ); } else { TQListView *lv = listView(); TQString oldText = text(column); // set an empty text so that we can have our own implementation (see further down) - // but still benefit from KListView::paintCell + // but still benefit from TDEListView::paintCell setText( column, "" ); - KListViewItem::paintCell( p, mycg, column, width, align ); + TDEListViewItem::paintCell( p, mycg, column, width, align ); const TQPixmap *icon = pixmap( column ); int marg = lv ? lv->itemMargin() : 1; @@ -360,7 +360,7 @@ void KFolderTreeItem::setFolderIsCloseToQuota( bool v ) KFolderTree::KFolderTree( TQWidget *parent, const char* name ) - : KListView( parent, name ), mUnreadIndex(-1), mTotalIndex(-1), mSizeIndex(-1) + : TDEListView( parent, name ), mUnreadIndex(-1), mTotalIndex(-1), mSizeIndex(-1) { // GUI-options setStyleDependantFrameWidth(); @@ -404,7 +404,7 @@ void KFolderTree::setStyleDependantFrameWidth() void KFolderTree::styleChange( TQStyle& oldStyle ) { setStyleDependantFrameWidth(); - KListView::styleChange( oldStyle ); + TDEListView::styleChange( oldStyle ); } //----------------------------------------------------------------------------- @@ -413,7 +413,7 @@ void KFolderTree::drawContentsOffset( TQPainter * p, int ox, int oy, { bool oldUpdatesEnabled = isUpdatesEnabled(); setUpdatesEnabled(false); - KListView::drawContentsOffset( p, ox, oy, cx, cy, cw, ch ); + TDEListView::drawContentsOffset( p, ox, oy, cx, cy, cw, ch ); setUpdatesEnabled(oldUpdatesEnabled); } @@ -421,13 +421,13 @@ void KFolderTree::drawContentsOffset( TQPainter * p, int ox, int oy, void KFolderTree::contentsMousePressEvent( TQMouseEvent *e ) { setSelectionModeExt(Single); - KListView::contentsMousePressEvent(e); + TDEListView::contentsMousePressEvent(e); } //----------------------------------------------------------------------------- void KFolderTree::contentsMouseReleaseEvent( TQMouseEvent *e ) { - KListView::contentsMouseReleaseEvent(e); + TDEListView::contentsMouseReleaseEvent(e); setSelectionModeExt(Extended); } diff --git a/libtdepim/kfoldertree.h b/libtdepim/kfoldertree.h index c9f9425db..d8c6841ca 100644 --- a/libtdepim/kfoldertree.h +++ b/libtdepim/kfoldertree.h @@ -140,7 +140,7 @@ struct KPaintInfo { //========================================================================== -class KDE_EXPORT KFolderTreeItem : public KListViewItem +class KDE_EXPORT KFolderTreeItem : public TDEListViewItem { public: /** Protocol information */ @@ -239,7 +239,7 @@ class KDE_EXPORT KFolderTreeItem : public KListViewItem //========================================================================== -class KDE_EXPORT KFolderTree : public KListView +class KDE_EXPORT KFolderTree : public TDEListView { Q_OBJECT diff --git a/libtdepim/komposer/core/core.cpp b/libtdepim/komposer/core/core.cpp index a2f5fd003..87da5c00e 100644 --- a/libtdepim/komposer/core/core.cpp +++ b/libtdepim/komposer/core/core.cpp @@ -55,7 +55,7 @@ using namespace Komposer; Core::Core( TQWidget *parent, const char *name ) : KomposerIface( "KomposerIface" ), - KMainWindow( parent, name ), m_currentEditor( 0 ) + TDEMainWindow( parent, name ), m_currentEditor( 0 ) { initWidgets(); initCore(); @@ -248,29 +248,29 @@ Core::createActions() { KStdAction::close( this, TQT_SLOT(slotClose()), actionCollection() ); - (void) new KAction( i18n( "&Send" ), "mail_send", CTRL+Key_Return, + (void) new TDEAction( i18n( "&Send" ), "mail_send", CTRL+Key_Return, this, TQT_SLOT(slotSendNow()), actionCollection(), "send_default" ); - (void) new KAction( i18n( "&Queue" ), "queue", 0, + (void) new TDEAction( i18n( "&Queue" ), "queue", 0, this, TQT_SLOT(slotSendLater()), actionCollection(), "send_alternative" ); - (void) new KAction( i18n( "Save in &Drafts Folder" ), "filesave", 0, + (void) new TDEAction( i18n( "Save in &Drafts Folder" ), "filesave", 0, this, TQT_SLOT(slotSaveDraft()), actionCollection(), "save_in_drafts" ); - (void) new KAction( i18n( "&Insert File..." ), "fileopen", 0, + (void) new TDEAction( i18n( "&Insert File..." ), "fileopen", 0, this, TQT_SLOT(slotInsertFile()), actionCollection(), "insert_file" ); - (void) new KAction( i18n( "&Address Book" ), "contents",0, + (void) new TDEAction( i18n( "&Address Book" ), "contents",0, this, TQT_SLOT(slotAddrBook()), actionCollection(), "addressbook" ); - (void) new KAction( i18n( "&New Composer" ), "mail_new", - KStdAccel::shortcut( KStdAccel::New ), + (void) new TDEAction( i18n( "&New Composer" ), "mail_new", + TDEStdAccel::shortcut( TDEStdAccel::New ), this, TQT_SLOT(slotNewComposer()), actionCollection(), "new_composer" ); - (void) new KAction( i18n( "&Attach File..." ), "attach", + (void) new TDEAction( i18n( "&Attach File..." ), "attach", 0, this, TQT_SLOT(slotAttachFile()), actionCollection(), "attach_file" ); } diff --git a/libtdepim/komposer/core/core.h b/libtdepim/komposer/core/core.h index 98fee42aa..5259710ae 100644 --- a/libtdepim/komposer/core/core.h +++ b/libtdepim/komposer/core/core.h @@ -42,7 +42,7 @@ namespace Komposer /** * This class provides the interface to the Komposer core for the editor. */ - class Core : public KMainWindow, virtual public KomposerIface + class Core : public TDEMainWindow, virtual public KomposerIface { Q_OBJECT diff --git a/libtdepim/komposer/plugins/default/defaulteditor.cpp b/libtdepim/komposer/plugins/default/defaulteditor.cpp index 426e4c01b..88c4fb1ea 100644 --- a/libtdepim/komposer/plugins/default/defaulteditor.cpp +++ b/libtdepim/komposer/plugins/default/defaulteditor.cpp @@ -93,7 +93,7 @@ DefaultEditor::changeSignature( const TQString &sig ) } void -DefaultEditor::createActions( KActionCollection *ac ) +DefaultEditor::createActions( TDEActionCollection *ac ) { // // File Actions @@ -106,22 +106,22 @@ DefaultEditor::createActions( KActionCollection *ac ) // // Edit Actions // - KAction *actionUndo = KStdAction::undo( m_textEdit, TQT_SLOT(undo()), ac ); + TDEAction *actionUndo = KStdAction::undo( m_textEdit, TQT_SLOT(undo()), ac ); actionUndo->setEnabled( false ); connect( m_textEdit, TQT_SIGNAL(undoAvailable(bool)), actionUndo, TQT_SLOT(setEnabled(bool)) ); - KAction *actionRedo = KStdAction::redo( m_textEdit, TQT_SLOT(redo()), ac ); + TDEAction *actionRedo = KStdAction::redo( m_textEdit, TQT_SLOT(redo()), ac ); actionRedo->setEnabled( false ); connect( m_textEdit, TQT_SIGNAL(redoAvailable(bool)), actionRedo, TQT_SLOT(setEnabled(bool)) ); - KAction *action_cut = KStdAction::cut( m_textEdit, TQT_SLOT(cut()), ac ); + TDEAction *action_cut = KStdAction::cut( m_textEdit, TQT_SLOT(cut()), ac ); action_cut->setEnabled( false ); connect( m_textEdit, TQT_SIGNAL(copyAvailable(bool)), action_cut, TQT_SLOT(setEnabled(bool)) ); - KAction *action_copy = KStdAction::copy( m_textEdit, TQT_SLOT(copy()), ac ); + TDEAction *action_copy = KStdAction::copy( m_textEdit, TQT_SLOT(copy()), ac ); action_copy->setEnabled( false ); connect( m_textEdit, TQT_SIGNAL(copyAvailable(bool)), action_copy, TQT_SLOT(setEnabled(bool)) ); @@ -129,7 +129,7 @@ DefaultEditor::createActions( KActionCollection *ac ) (void) KStdAction::print( this, TQT_SLOT(print()), ac ); (void) KStdAction::paste( m_textEdit, TQT_SLOT(paste()), ac ); - (void) new KAction( i18n( "C&lear" ), 0, + (void) new TDEAction( i18n( "C&lear" ), 0, m_textEdit, TQT_SLOT(removeSelectedText()), ac, "edit_clear" ); @@ -144,37 +144,37 @@ DefaultEditor::createActions( KActionCollection *ac ) // // Character Formatting // - m_actionBold = new KToggleAction( i18n("&Bold"), "text_bold", CTRL+Key_B, + m_actionBold = new TDEToggleAction( i18n("&Bold"), "text_bold", CTRL+Key_B, ac, "format_bold" ); connect( m_actionBold, TQT_SIGNAL(toggled(bool)), m_textEdit, TQT_SLOT(setBold(bool)) ); - m_actionItalic = new KToggleAction( i18n("&Italic"), "text_italic", CTRL+Key_I, + m_actionItalic = new TDEToggleAction( i18n("&Italic"), "text_italic", CTRL+Key_I, ac, "format_italic" ); connect( m_actionItalic, TQT_SIGNAL(toggled(bool)), m_textEdit, TQT_SLOT(setItalic(bool) )); - m_actionUnderline = new KToggleAction( i18n("&Underline"), "text_under", CTRL+Key_U, + m_actionUnderline = new TDEToggleAction( i18n("&Underline"), "text_under", CTRL+Key_U, ac, "format_underline" ); connect( m_actionUnderline, TQT_SIGNAL(toggled(bool)), m_textEdit, TQT_SLOT(setUnderline(bool)) ); - (void) new KAction( i18n("Text &Color..."), "colorpicker", 0, + (void) new TDEAction( i18n("Text &Color..."), "colorpicker", 0, this, TQT_SLOT(formatColor()), ac, "format_color" ); // // Font // - m_actionFont = new KFontAction( i18n("&Font"), 0, + m_actionFont = new TDEFontAction( i18n("&Font"), 0, ac, "format_font" ); connect( m_actionFont, TQT_SIGNAL(activated(const TQString &)), m_textEdit, TQT_SLOT(setFamily(const TQString &)) ); - m_actionFontSize = new KFontSizeAction( i18n("Font &Size"), 0, + m_actionFontSize = new TDEFontSizeAction( i18n("Font &Size"), 0, ac, "format_font_size" ); connect( m_actionFontSize, TQT_SIGNAL(fontSizeChanged(int)), m_textEdit, TQT_SLOT(setPointSize(int)) ); @@ -182,22 +182,22 @@ DefaultEditor::createActions( KActionCollection *ac ) // // Alignment // - m_actionAlignLeft = new KToggleAction( i18n("Align &Left"), "text_left", 0, + m_actionAlignLeft = new TDEToggleAction( i18n("Align &Left"), "text_left", 0, ac, "format_align_left" ); connect( m_actionAlignLeft, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setAlignLeft(bool)) ); - m_actionAlignCenter = new KToggleAction( i18n("Align &Center"), "text_center", 0, + m_actionAlignCenter = new TDEToggleAction( i18n("Align &Center"), "text_center", 0, ac, "format_align_center" ); connect( m_actionAlignCenter, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setAlignCenter(bool)) ); - m_actionAlignRight = new KToggleAction( i18n("Align &Right"), "text_right", 0, + m_actionAlignRight = new TDEToggleAction( i18n("Align &Right"), "text_right", 0, ac, "format_align_right" ); connect( m_actionAlignRight, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setAlignRight(bool)) ); - m_actionAlignJustify = new KToggleAction( i18n("&Justify"), "text_block", 0, + m_actionAlignJustify = new TDEToggleAction( i18n("&Justify"), "text_block", 0, ac, "format_align_justify" ); connect( m_actionAlignJustify, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setAlignJustify(bool)) ); diff --git a/libtdepim/komposer/plugins/default/defaulteditor.h b/libtdepim/komposer/plugins/default/defaulteditor.h index d73953a67..5763b5542 100644 --- a/libtdepim/komposer/plugins/default/defaulteditor.h +++ b/libtdepim/komposer/plugins/default/defaulteditor.h @@ -25,10 +25,10 @@ #include "editor.h" class TQTextEdit; -class KFontAction; -class KFontSizeAction; -class KToggleAction; -class KActionCollection; +class TDEFontAction; +class TDEFontSizeAction; +class TDEToggleAction; +class TDEActionCollection; class DefaultEditor : public Komposer::Editor @@ -91,7 +91,7 @@ protected slots: /** * Creates the part's actions in the part's action collection. */ - void createActions( KActionCollection *ac ); + void createActions( TDEActionCollection *ac ); void updateActions(); @@ -102,17 +102,17 @@ protected slots: private: TQTextEdit *m_textEdit; - KToggleAction *m_actionBold; - KToggleAction *m_actionItalic; - KToggleAction *m_actionUnderline; + TDEToggleAction *m_actionBold; + TDEToggleAction *m_actionItalic; + TDEToggleAction *m_actionUnderline; - KFontAction *m_actionFont; - KFontSizeAction *m_actionFontSize; + TDEFontAction *m_actionFont; + TDEFontSizeAction *m_actionFontSize; - KToggleAction *m_actionAlignLeft; - KToggleAction *m_actionAlignRight; - KToggleAction *m_actionAlignCenter; - KToggleAction *m_actionAlignJustify; + TDEToggleAction *m_actionAlignLeft; + TDEToggleAction *m_actionAlignRight; + TDEToggleAction *m_actionAlignCenter; + TDEToggleAction *m_actionAlignJustify; }; #endif diff --git a/libtdepim/kpimurlrequesterdlg.cpp b/libtdepim/kpimurlrequesterdlg.cpp index 7f4a71f20..d733eab28 100644 --- a/libtdepim/kpimurlrequesterdlg.cpp +++ b/libtdepim/kpimurlrequesterdlg.cpp @@ -35,7 +35,7 @@ KURL KPimURLRequesterDlg::getURL( const TQString& dir, const TQString &label, const KURL& url = dlg.selectedURL(); if (url.isValid()) - KRecentDocument::add(url); + TDERecentDocument::add(url); return url; } diff --git a/libtdepim/kpixmapregionselectorwidget.cpp b/libtdepim/kpixmapregionselectorwidget.cpp index 0697f667d..21a1fc6f2 100644 --- a/libtdepim/kpixmapregionselectorwidget.cpp +++ b/libtdepim/kpixmapregionselectorwidget.cpp @@ -138,17 +138,17 @@ void KPixmapRegionSelectorWidget::updatePixmap() m_label->setPixmap(pixmap); } -KPopupMenu *KPixmapRegionSelectorWidget::createPopupMenu() +TDEPopupMenu *KPixmapRegionSelectorWidget::createPopupMenu() { - KPopupMenu *popup=new KPopupMenu(this, "PixmapRegionSelectorPopup"); + TDEPopupMenu *popup=new TDEPopupMenu(this, "PixmapRegionSelectorPopup"); popup->insertTitle(i18n("Image Operations")); - KAction *action = new KAction(i18n("&Rotate Clockwise"), "rotate_cw", + TDEAction *action = new TDEAction(i18n("&Rotate Clockwise"), "rotate_cw", 0, TQT_TQOBJECT(this), TQT_SLOT(rotateClockwise()), TQT_TQOBJECT(popup), "rotateclockwise"); action->plug(popup); - action = new KAction(i18n("Rotate &Counterclockwise"), "rotate_ccw", + action = new TDEAction(i18n("Rotate &Counterclockwise"), "rotate_ccw", 0, TQT_TQOBJECT(this), TQT_SLOT(rotateCounterclockwise()), TQT_TQOBJECT(popup), "rotatecounterclockwise"); action->plug(popup); @@ -220,7 +220,7 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev) if ( mev->button() == Qt::RightButton ) { - KPopupMenu *popup = createPopupMenu( ); + TDEPopupMenu *popup = createPopupMenu( ); popup->exec( mev->globalPos() ); delete popup; return TRUE; diff --git a/libtdepim/kpixmapregionselectorwidget.h b/libtdepim/kpixmapregionselectorwidget.h index caad8fc3f..9af02c2ce 100644 --- a/libtdepim/kpixmapregionselectorwidget.h +++ b/libtdepim/kpixmapregionselectorwidget.h @@ -28,7 +28,7 @@ #include <tqlabel.h> #include <kimageeffect.h> -class KPopupMenu; +class TDEPopupMenu; namespace KPIM { @@ -139,9 +139,9 @@ public slots: protected: /** - * Creates a KPopupMenu with the menu that appears when clicking with the right button on the label + * Creates a TDEPopupMenu with the menu that appears when clicking with the right button on the label */ - virtual KPopupMenu *createPopupMenu(); + virtual TDEPopupMenu *createPopupMenu(); private: diff --git a/libtdepim/kprefsdialog.cpp b/libtdepim/kprefsdialog.cpp index 230962cb2..fbfa21a6d 100644 --- a/libtdepim/kprefsdialog.cpp +++ b/libtdepim/kprefsdialog.cpp @@ -272,8 +272,8 @@ TQPushButton *KPrefsWidFont::button() void KPrefsWidFont::selectFont() { TQFont myFont(mPreview->font()); - int result = KFontDialog::getFont(myFont); - if (result == KFontDialog::Accepted) { + int result = TDEFontDialog::getFont(myFont); + if (result == TDEFontDialog::Accepted) { mPreview->setFont(myFont); emit changed(); } diff --git a/libtdepim/kscoringeditor.cpp b/libtdepim/kscoringeditor.cpp index d46343d6b..0eadb6709 100644 --- a/libtdepim/kscoringeditor.cpp +++ b/libtdepim/kscoringeditor.cpp @@ -600,7 +600,7 @@ RuleListWidget::RuleListWidget(KScoringManager *m, bool standalone, TQWidget *p, kdDebug(5100) << "RuleListWidget::RuleListWidget()" << endl; if (!n) setName("RuleListWidget"); TQVBoxLayout *topL = new TQVBoxLayout(this,standalone? 0:5,KDialog::spacingHint()); - ruleList = new KListBox(this); + ruleList = new TDEListBox(this); if (standalone) { connect(ruleList,TQT_SIGNAL(doubleClicked(TQListBoxItem*)), this,TQT_SLOT(slotEditRule(TQListBoxItem*))); diff --git a/libtdepim/kscoringeditor.h b/libtdepim/kscoringeditor.h index 4d4459845..0160a9e47 100644 --- a/libtdepim/kscoringeditor.h +++ b/libtdepim/kscoringeditor.h @@ -30,7 +30,7 @@ class KComboBox; class KLineEdit; class KIntSpinBox; -class KListBox; +class TDEListBox; class TQFrame; class TQLabel; class TQListBoxItem; @@ -235,7 +235,7 @@ protected slots: private: /** the list of rules */ - KListBox *ruleList; + TDEListBox *ruleList; /** the current group */ TQString group; /** marks if we're alone or together with the edit widget */ diff --git a/libtdepim/recentaddresses.cpp b/libtdepim/recentaddresses.cpp index eb4660a3b..35c52e35d 100644 --- a/libtdepim/recentaddresses.cpp +++ b/libtdepim/recentaddresses.cpp @@ -41,7 +41,7 @@ #include <tqlayout.h> -using namespace KRecentAddress; +using namespace TDERecentAddress; static KStaticDeleter<RecentAddresses> sd; diff --git a/libtdepim/recentaddresses.h b/libtdepim/recentaddresses.h index 08976a027..6adc65986 100644 --- a/libtdepim/recentaddresses.h +++ b/libtdepim/recentaddresses.h @@ -39,7 +39,7 @@ class TDEConfig; class KEditListBox; -namespace KRecentAddress { +namespace TDERecentAddress { class KDE_EXPORT RecentAddressDialog : public KDialogBase { diff --git a/plugins/kmail/bodypartformatter/text_calendar.cpp b/plugins/kmail/bodypartformatter/text_calendar.cpp index 551f61171..435f30836 100644 --- a/plugins/kmail/bodypartformatter/text_calendar.cpp +++ b/plugins/kmail/bodypartformatter/text_calendar.cpp @@ -876,7 +876,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler iCal = part->asText(); } - KPopupMenu *menu = new KPopupMenu(); + TDEPopupMenu *menu = new TDEPopupMenu(); menu->insertItem( i18n( "Open Attachment" ), 0 ); menu->insertItem( i18n( "Save Attachment As..." ), 1 ); diff --git a/plugins/kmail/bodypartformatter/text_vcard.cpp b/plugins/kmail/bodypartformatter/text_vcard.cpp index 853f6cd40..fcc3a7076 100644 --- a/plugins/kmail/bodypartformatter/text_vcard.cpp +++ b/plugins/kmail/bodypartformatter/text_vcard.cpp @@ -172,7 +172,7 @@ namespace { return true; } - KPopupMenu *menu = new KPopupMenu(); + TDEPopupMenu *menu = new TDEPopupMenu(); menu->insertItem( i18n( "View Business Card" ), 0 ); menu->insertItem( i18n( "Save Business Card As..." ), 1 ); diff --git a/plugins/kmail/bodypartformatter/ui_attendeeselector.ui b/plugins/kmail/bodypartformatter/ui_attendeeselector.ui index e74f4dce0..f719618ad 100644 --- a/plugins/kmail/bodypartformatter/ui_attendeeselector.ui +++ b/plugins/kmail/bodypartformatter/ui_attendeeselector.ui @@ -39,7 +39,7 @@ <string>Remove</string> </property> </widget> - <widget class="KListBox" row="1" column="0" rowspan="2" colspan="1"> + <widget class="TDEListBox" row="1" column="0" rowspan="2" colspan="1"> <property name="name"> <cstring>attendeeList</cstring> </property> diff --git a/tderesources/birthdays/resourcekabcconfig.cpp b/tderesources/birthdays/resourcekabcconfig.cpp index 2f7671dc7..24a79bf2b 100644 --- a/tderesources/birthdays/resourcekabcconfig.cpp +++ b/tderesources/birthdays/resourcekabcconfig.cpp @@ -55,7 +55,7 @@ ResourceKABCConfig::ResourceKABCConfig( TQWidget* parent, const char* name ) mUseCategories = new TQCheckBox( i18n( "Filter by categories" ), this ); topLayout->addMultiCellWidget( mUseCategories, 3, 3, 0, 1 ); - mCategoryView = new KListView( this ); + mCategoryView = new TDEListView( this ); mCategoryView->addColumn( "" ); mCategoryView->header()->hide(); mCategoryView->setEnabled( false ); diff --git a/tderesources/birthdays/resourcekabcconfig.h b/tderesources/birthdays/resourcekabcconfig.h index ff6178b70..4016c727c 100644 --- a/tderesources/birthdays/resourcekabcconfig.h +++ b/tderesources/birthdays/resourcekabcconfig.h @@ -57,7 +57,7 @@ class ResourceKABCConfig : public KRES::ConfigWidget KRestrictedLine *mAlarmTimeEdit; TQLabel *mALabel; TQCheckBox *mUseCategories; - KListView *mCategoryView; + TDEListView *mCategoryView; class Private; Private *d; diff --git a/tderesources/groupware/kabc_resourcegroupwareconfig.cpp b/tderesources/groupware/kabc_resourcegroupwareconfig.cpp index 956ee4321..4634495e9 100644 --- a/tderesources/groupware/kabc_resourcegroupwareconfig.cpp +++ b/tderesources/groupware/kabc_resourcegroupwareconfig.cpp @@ -39,7 +39,7 @@ using namespace KABC; class AddressBookItem : public TQCheckListItem { public: - AddressBookItem( KListView *parent, const TQString &id ) + AddressBookItem( TDEListView *parent, const TQString &id ) : TQCheckListItem( parent, "", CheckBox ), mId( id ) { @@ -90,7 +90,7 @@ ResourceGroupwareConfig::ResourceGroupwareConfig( TQWidget* parent, const char* TQPushButton *updateButton = new TQPushButton( i18n( "Retrieve Address Book List From Server" ), this ); mainLayout->addMultiCellWidget( updateButton, 4, 4, 0, 1 ); - mAddressBookView = new KListView( this ); + mAddressBookView = new TDEListView( this ); mAddressBookView->addColumn( i18n( "Address Book" ) ); #if 0 mAddressBookView->addColumn( i18n( "Personal" ) ); diff --git a/tderesources/groupware/kabc_resourcegroupwareconfig.h b/tderesources/groupware/kabc_resourcegroupwareconfig.h index bad560d17..c07c4d0b4 100644 --- a/tderesources/groupware/kabc_resourcegroupwareconfig.h +++ b/tderesources/groupware/kabc_resourcegroupwareconfig.h @@ -26,7 +26,7 @@ class KComboBox; class KLineEdit; -class KListView; +class TDEListView; class KURLRequester; namespace KABC { @@ -58,7 +58,7 @@ class ResourceGroupwareConfig : public KRES::ConfigWidget KLineEdit *mUser; KLineEdit *mPassword; - KListView *mAddressBookView; + TDEListView *mAddressBookView; KComboBox *mAddressBookBox; TQStringList mWriteAddressBookIds; diff --git a/tderesources/groupwise/groupwisesettingswidgetbase.ui b/tderesources/groupwise/groupwisesettingswidgetbase.ui index 49437ef4c..8ad33ea3b 100644 --- a/tderesources/groupwise/groupwisesettingswidgetbase.ui +++ b/tderesources/groupwise/groupwisesettingswidgetbase.ui @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="KListView" row="0" column="0"> + <widget class="TDEListView" row="0" column="0"> <column> <property name="text"> <string>Group</string> diff --git a/tderesources/groupwise/kabc_resourcegroupwiseconfig.cpp b/tderesources/groupwise/kabc_resourcegroupwiseconfig.cpp index 483268cc2..9f00dab9e 100644 --- a/tderesources/groupwise/kabc_resourcegroupwiseconfig.cpp +++ b/tderesources/groupwise/kabc_resourcegroupwiseconfig.cpp @@ -39,7 +39,7 @@ using namespace KABC; class AddressBookItem : public TQCheckListItem { public: - AddressBookItem( KListView *parent, GroupWise::AddressBook ab ) + AddressBookItem( TDEListView *parent, GroupWise::AddressBook ab ) : TQCheckListItem( parent, "", CheckBox ), mId( ab.id ) { @@ -88,7 +88,7 @@ ResourceGroupwiseConfig::ResourceGroupwiseConfig( TQWidget* parent, const char* TQPushButton *updateButton = new TQPushButton( i18n( "Retrieve Address Book List From Server" ), this ); mainLayout->addMultiCellWidget( updateButton, 4, 4, 0, 1 ); - mAddressBookView = new KListView( this ); + mAddressBookView = new TDEListView( this ); mAddressBookView->addColumn( i18n( "Address Book" ) ); mAddressBookView->addColumn( i18n( "Personal" ) ); mAddressBookView->addColumn( i18n( "Frequent Contacts" ) ); diff --git a/tderesources/groupwise/kabc_resourcegroupwiseconfig.h b/tderesources/groupwise/kabc_resourcegroupwiseconfig.h index a377ec681..eb54803c0 100644 --- a/tderesources/groupwise/kabc_resourcegroupwiseconfig.h +++ b/tderesources/groupwise/kabc_resourcegroupwiseconfig.h @@ -29,7 +29,7 @@ class KComboBox; class KLineEdit; -class KListView; +class TDEListView; class KURLRequester; namespace KABC { @@ -61,7 +61,7 @@ class KDE_EXPORT ResourceGroupwiseConfig : public KRES::ConfigWidget KLineEdit *mUser; KLineEdit *mPassword; - KListView *mAddressBookView; + TDEListView *mAddressBookView; KComboBox *mAddressBookBox; TQStringList mWriteAddressBookIds; diff --git a/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp b/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp index b23a81a1b..747b33547 100644 --- a/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp +++ b/tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp @@ -139,7 +139,7 @@ void ResourceGroupwiseConfig::slotViewUserSettings() groupName = TQString::fromUtf8( group->type->c_str() ); kdDebug() << "GROUP: " << groupName << endl;; } - KListViewItem * groupLVI = new KListViewItem( settingsWidget->m_settingsList, groupName ); + TDEListViewItem * groupLVI = new TDEListViewItem( settingsWidget->m_settingsList, groupName ); std::vector<ngwt__Custom * > setting = group->setting; std::vector<class ngwt__Custom *>::const_iterator it2; for( it2 = setting.begin(); it2 != setting.end(); ++it2 ) @@ -155,7 +155,7 @@ void ResourceGroupwiseConfig::slotViewUserSettings() locked = *((*it2)->locked); kdDebug() << " SETTING: " << setting << " value : " << value << (locked ? "locked" : " not locked " ) << endl; - KListViewItem * settingLVI = new KListViewItem( groupLVI, TQString(), setting, value, (locked ? "locked" : " not locked " ) ); + TDEListViewItem * settingLVI = new TDEListViewItem( groupLVI, TQString(), setting, value, (locked ? "locked" : " not locked " ) ); if ( !locked ) settingLVI->setRenameEnabled( 2, true ); } diff --git a/tderesources/lib/folderconfig.h b/tderesources/lib/folderconfig.h index 36a8d31a0..a9b4c714c 100644 --- a/tderesources/lib/folderconfig.h +++ b/tderesources/lib/folderconfig.h @@ -27,7 +27,7 @@ #include <tdepimmacros.h> #include <tqwidget.h> -// class KListView; +// class TDEListView; class TQComboBox; class FolderListView; diff --git a/tderesources/lib/folderlistview.cpp b/tderesources/lib/folderlistview.cpp index b29e61c9d..68995aef2 100644 --- a/tderesources/lib/folderlistview.cpp +++ b/tderesources/lib/folderlistview.cpp @@ -39,7 +39,7 @@ static const int BoxSize = 16; //BEGIN FolderListView FolderListView::FolderListView( TQWidget *parent, const TQValueList<Property> &types ) - : KListView( parent ) + : TDEListView( parent ) { setEnabledTypes( types ); @@ -95,7 +95,7 @@ void FolderListView::showPopupMenu( FolderListItem *i, const TQPoint &globalPos if ( !i ) return; KPIM::FolderLister::Entry folder( i->folder() ); - KPopupMenu m( this ); + TDEPopupMenu m( this ); int id; m.insertTitle( folder.name, 9999 ); @@ -154,7 +154,7 @@ void FolderListView::slotMousePressed(int btn, TQListViewItem* i, const TQPoint& // map pos to item/column and call FolderListItem::activate(col, pos) ((FolderListItem*)i)->activate( c, viewport()->mapFromGlobal( pos ) - TQPoint( 0, itemRect(i).top() ) ); // } else { -// KListView::slotMousePressed( btn, i, pos, c ); +// TDEListView::slotMousePressed( btn, i, pos, c ); } } } diff --git a/tderesources/lib/folderlistview.h b/tderesources/lib/folderlistview.h index 32f01199b..f4837ecf6 100644 --- a/tderesources/lib/folderlistview.h +++ b/tderesources/lib/folderlistview.h @@ -35,7 +35,7 @@ class FolderListCaption; TQListView that automatically adds columns for FolderListItems for selecting the default destination and a slot to edit the destinations using the keyboard. */ -class FolderListView : public KListView +class FolderListView : public TDEListView { Q_OBJECT diff --git a/tderesources/lib/folderselectdialog.cpp b/tderesources/lib/folderselectdialog.cpp index 9d0f48a5e..ab5991531 100644 --- a/tderesources/lib/folderselectdialog.cpp +++ b/tderesources/lib/folderselectdialog.cpp @@ -47,7 +47,7 @@ FolderSelectDialog::FolderSelectDialog( const TQString& caption, const TQString& TQLabel* labelWidget = new TQLabel( label, frame ); layout->addWidget( labelWidget ); - mListBox = new KListBox( frame ); + mListBox = new TDEListBox( frame ); mListBox->insertStringList( list ); mListBox->setSelected( 0, true ); mListBox->ensureCurrentVisible(); diff --git a/tderesources/lib/folderselectdialog.h b/tderesources/lib/folderselectdialog.h index e33ac80a4..5f04cd019 100644 --- a/tderesources/lib/folderselectdialog.h +++ b/tderesources/lib/folderselectdialog.h @@ -51,7 +51,7 @@ protected: virtual void closeEvent(TQCloseEvent *event); void reject(); private: - KListBox* mListBox; + TDEListBox* mListBox; }; } diff --git a/tderesources/scalix/scalixadmin/delegateview.cpp b/tderesources/scalix/scalixadmin/delegateview.cpp index 1031f460e..440fb66fa 100644 --- a/tderesources/scalix/scalixadmin/delegateview.cpp +++ b/tderesources/scalix/scalixadmin/delegateview.cpp @@ -41,7 +41,7 @@ class DelegateItem : public TQListViewItem }; DelegateView::DelegateView( DelegateManager *manager, TQWidget *parent ) - : KListView( parent ), mManager( manager ) + : TDEListView( parent ), mManager( manager ) { addColumn( i18n( "Delegate" ) ); addColumn( i18n( "Rights" ) ); diff --git a/tderesources/scalix/scalixadmin/delegateview.h b/tderesources/scalix/scalixadmin/delegateview.h index 5dfa379f7..aef034059 100644 --- a/tderesources/scalix/scalixadmin/delegateview.h +++ b/tderesources/scalix/scalixadmin/delegateview.h @@ -29,7 +29,7 @@ class Delegate; class DelegateManager; -class DelegateView : public KListView +class DelegateView : public TDEListView { Q_OBJECT diff --git a/tderesources/scalix/scalixadmin/ldapview.cpp b/tderesources/scalix/scalixadmin/ldapview.cpp index adf2fe3fa..0cdca1819 100644 --- a/tderesources/scalix/scalixadmin/ldapview.cpp +++ b/tderesources/scalix/scalixadmin/ldapview.cpp @@ -39,7 +39,7 @@ class LdapItem : public TQListViewItem LdapView::LdapView( TQWidget *parent ) - : KListView( parent ) + : TDEListView( parent ) { addColumn( i18n( "User" ) ); setFullWidth( true ); diff --git a/tderesources/scalix/scalixadmin/ldapview.h b/tderesources/scalix/scalixadmin/ldapview.h index 6af41aa75..cd71a17f6 100644 --- a/tderesources/scalix/scalixadmin/ldapview.h +++ b/tderesources/scalix/scalixadmin/ldapview.h @@ -27,7 +27,7 @@ class LdapClient; class LdapObject; } -class LdapView : public KListView +class LdapView : public TDEListView { Q_OBJECT diff --git a/tderesources/scalix/scalixadmin/mainwindow.cpp b/tderesources/scalix/scalixadmin/mainwindow.cpp index 04e396d78..a6a31a3df 100644 --- a/tderesources/scalix/scalixadmin/mainwindow.cpp +++ b/tderesources/scalix/scalixadmin/mainwindow.cpp @@ -33,7 +33,7 @@ #include "mainwindow.h" MainWindow::MainWindow() - : KMainWindow( 0 ) + : TDEMainWindow( 0 ) { KJanusWidget *wdg = new KJanusWidget( this, "", KJanusWidget::IconList ); diff --git a/tderesources/scalix/scalixadmin/mainwindow.h b/tderesources/scalix/scalixadmin/mainwindow.h index 38c955980..a682ec065 100644 --- a/tderesources/scalix/scalixadmin/mainwindow.h +++ b/tderesources/scalix/scalixadmin/mainwindow.h @@ -23,7 +23,7 @@ #include <kmainwindow.h> -class MainWindow : public KMainWindow +class MainWindow : public TDEMainWindow { public: MainWindow(); diff --git a/tderesources/scalix/scalixadmin/otheruserview.cpp b/tderesources/scalix/scalixadmin/otheruserview.cpp index 25a694287..06e69d41c 100644 --- a/tderesources/scalix/scalixadmin/otheruserview.cpp +++ b/tderesources/scalix/scalixadmin/otheruserview.cpp @@ -40,7 +40,7 @@ class OtherUserItem : public TQListViewItem }; OtherUserView::OtherUserView( OtherUserManager *manager, TQWidget *parent ) - : KListView( parent ), mManager( manager ) + : TDEListView( parent ), mManager( manager ) { addColumn( i18n( "Registered Accounts" ) ); setFullWidth( true ); diff --git a/tderesources/scalix/scalixadmin/otheruserview.h b/tderesources/scalix/scalixadmin/otheruserview.h index b5d3ff00e..89dbd8c0e 100644 --- a/tderesources/scalix/scalixadmin/otheruserview.h +++ b/tderesources/scalix/scalixadmin/otheruserview.h @@ -25,7 +25,7 @@ class OtherUserManager; -class OtherUserView : public KListView +class OtherUserView : public TDEListView { Q_OBJECT diff --git a/tderesources/slox/sloxfolder.h b/tderesources/slox/sloxfolder.h index e722dfd4c..6f6a6c938 100644 --- a/tderesources/slox/sloxfolder.h +++ b/tderesources/slox/sloxfolder.h @@ -23,7 +23,7 @@ #include <tqstring.h> #include <tdepimmacros.h> -class KListViewItem; +class TDEListViewItem; enum FolderType { Unbound, @@ -43,7 +43,7 @@ class KDE_EXPORT SloxFolder TQString name() const; bool isDefault() const { return mDefault; } - KListViewItem *item; + TDEListViewItem *item; private: TQString mId, mParentId; diff --git a/tderesources/slox/sloxfolderdialog.cpp b/tderesources/slox/sloxfolderdialog.cpp index 4d21c2307..0d6a756bb 100644 --- a/tderesources/slox/sloxfolderdialog.cpp +++ b/tderesources/slox/sloxfolderdialog.cpp @@ -30,7 +30,7 @@ SloxFolderDialog::SloxFolderDialog( SloxFolderManager *manager, FolderType type, mManager( manager ), mFolderType( type ) { - mListView = new KListView( this ); + mListView = new TDEListView( this ); mListView->setRootIsDecorated( true ); mListView->setShowSortIndicator( true ); mListView->addColumn( i18n("Folder") ); @@ -74,11 +74,11 @@ void SloxFolderDialog::createFolderViewItem( SloxFolder *folder ) SloxFolder *parent = mManager->folders()[folder->parentId()]; createFolderViewItem( parent ); if ( parent->item ) - folder->item = new KListViewItem( parent->item ); + folder->item = new TDEListViewItem( parent->item ); else - folder->item = new KListViewItem( mListView ); + folder->item = new TDEListViewItem( mListView ); } else { - folder->item = new KListViewItem( mListView ); + folder->item = new TDEListViewItem( mListView ); } folder->item->setText( 0, folder->name() ); folder->item->setText( 1, folder->id() ); diff --git a/tderesources/slox/sloxfolderdialog.h b/tderesources/slox/sloxfolderdialog.h index 69b8126bd..1a0749eaa 100644 --- a/tderesources/slox/sloxfolderdialog.h +++ b/tderesources/slox/sloxfolderdialog.h @@ -24,7 +24,7 @@ #include "sloxfolder.h" -class KListView; +class TDEListView; class SloxFolder; class SloxFolderManager; @@ -47,7 +47,7 @@ class SloxFolderDialog : public KDialogBase void createFolderViewItem( SloxFolder *folder ); private: - KListView *mListView; + TDEListView *mListView; SloxFolderManager *mManager; TQString mFolderId; FolderType mFolderType; diff --git a/wizards/overviewpage.cpp b/wizards/overviewpage.cpp index d1a12db9a..64e883175 100644 --- a/wizards/overviewpage.cpp +++ b/wizards/overviewpage.cpp @@ -101,7 +101,7 @@ OverViewPage::OverViewPage( TQWidget *parent, const char *name ) layout->setRowStretch( 7, 1 ); - KAcceleratorManager::manage( this ); + TDEAcceleratorManager::manage( this ); } OverViewPage::~OverViewPage() |