summaryrefslogtreecommitdiffstats
path: root/akregator
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 15:14:12 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 15:14:12 -0600
commitfd5d099065a748cac49e20a13481f85666c53c71 (patch)
treea0f1672cd88eb0e69b9ddc2ed9b08ecd98538bd3 /akregator
parentb440a9c608596cd88efdb3bfa4661c5e37efbe4b (diff)
downloadtdepim-fd5d099065a748cac49e20a13481f85666c53c71.tar.gz
tdepim-fd5d099065a748cac49e20a13481f85666c53c71.zip
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'akregator')
-rw-r--r--akregator/src/actionmanager.h4
-rw-r--r--akregator/src/actionmanagerimpl.cpp144
-rw-r--r--akregator/src/actionmanagerimpl.h10
-rw-r--r--akregator/src/akregator_view.cpp8
-rw-r--r--akregator/src/akregator_view.h6
-rw-r--r--akregator/src/articlelistview.cpp26
-rw-r--r--akregator/src/articlelistview.h6
-rw-r--r--akregator/src/articleviewer.cpp4
-rw-r--r--akregator/src/feeditem.cpp4
-rw-r--r--akregator/src/feeditem.h4
-rw-r--r--akregator/src/feedlistview.cpp20
-rw-r--r--akregator/src/feedlistview.h6
-rw-r--r--akregator/src/folderitem.cpp6
-rw-r--r--akregator/src/folderitem.h4
-rw-r--r--akregator/src/frame.cpp2
-rw-r--r--akregator/src/main.cpp2
-rw-r--r--akregator/src/mainwindow.cpp4
-rw-r--r--akregator/src/mainwindow.h6
-rw-r--r--akregator/src/pageviewer.cpp34
-rw-r--r--akregator/src/pageviewer.h4
-rw-r--r--akregator/src/settings_appearance.ui8
-rw-r--r--akregator/src/simplenodeselector.cpp10
-rw-r--r--akregator/src/tagaction.cpp10
-rw-r--r--akregator/src/tagaction.h4
-rw-r--r--akregator/src/tagfolderitem.cpp4
-rw-r--r--akregator/src/tagfolderitem.h4
-rw-r--r--akregator/src/tagnodeitem.cpp4
-rw-r--r--akregator/src/tagnodeitem.h4
-rw-r--r--akregator/src/treenodeitem.cpp20
-rw-r--r--akregator/src/treenodeitem.h6
-rw-r--r--akregator/src/viewer.cpp12
31 files changed, 195 insertions, 195 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);
}