Browse Source

Rename a number of classes to enhance compatibility with KDE4

tags/r14.0.0
Timothy Pearson 6 years ago
parent
commit
fd5d099065
100 changed files with 457 additions and 457 deletions
  1. 2
    2
      akregator/src/actionmanager.h
  2. 72
    72
      akregator/src/actionmanagerimpl.cpp
  3. 5
    5
      akregator/src/actionmanagerimpl.h
  4. 4
    4
      akregator/src/akregator_view.cpp
  5. 3
    3
      akregator/src/akregator_view.h
  6. 13
    13
      akregator/src/articlelistview.cpp
  7. 3
    3
      akregator/src/articlelistview.h
  8. 2
    2
      akregator/src/articleviewer.cpp
  9. 2
    2
      akregator/src/feeditem.cpp
  10. 2
    2
      akregator/src/feeditem.h
  11. 10
    10
      akregator/src/feedlistview.cpp
  12. 3
    3
      akregator/src/feedlistview.h
  13. 3
    3
      akregator/src/folderitem.cpp
  14. 2
    2
      akregator/src/folderitem.h
  15. 1
    1
      akregator/src/frame.cpp
  16. 1
    1
      akregator/src/main.cpp
  17. 2
    2
      akregator/src/mainwindow.cpp
  18. 3
    3
      akregator/src/mainwindow.h
  19. 17
    17
      akregator/src/pageviewer.cpp
  20. 2
    2
      akregator/src/pageviewer.h
  21. 4
    4
      akregator/src/settings_appearance.ui
  22. 5
    5
      akregator/src/simplenodeselector.cpp
  23. 5
    5
      akregator/src/tagaction.cpp
  24. 2
    2
      akregator/src/tagaction.h
  25. 2
    2
      akregator/src/tagfolderitem.cpp
  26. 2
    2
      akregator/src/tagfolderitem.h
  27. 2
    2
      akregator/src/tagnodeitem.cpp
  28. 2
    2
      akregator/src/tagnodeitem.h
  29. 10
    10
      akregator/src/treenodeitem.cpp
  30. 3
    3
      akregator/src/treenodeitem.h
  31. 6
    6
      akregator/src/viewer.cpp
  32. 28
    28
      certmanager/certmanager.cpp
  33. 14
    14
      certmanager/certmanager.h
  34. 2
    2
      certmanager/conf/appearanceconfigwidget.cpp
  35. 18
    18
      certmanager/customactions.cpp
  36. 6
    6
      certmanager/customactions.h
  37. 5
    5
      certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
  38. 1
    1
      certmanager/kwatchgnupg/kwatchgnupgmainwin.h
  39. 3
    3
      certmanager/lib/ui/backendconfigwidget.cpp
  40. 1
    1
      certmanager/lib/ui/cryptoconfigdialog.cpp
  41. 9
    9
      certmanager/lib/ui/keylistview.cpp
  42. 2
    2
      certmanager/lib/ui/keylistview.h
  43. 1
    1
      kaddressbook/addresseditwidget.cpp
  44. 1
    1
      kaddressbook/addresseditwidget.h
  45. 1
    1
      kaddressbook/addresseeeditorwidget.cpp
  46. 1
    1
      kaddressbook/customfieldswidget.cpp
  47. 1
    1
      kaddressbook/distributionlistpicker.cpp
  48. 2
    2
      kaddressbook/distributionlistpicker.h
  49. 1
    1
      kaddressbook/editors/imeditorbase.ui
  50. 3
    3
      kaddressbook/editors/imeditorwidget.cpp
  51. 2
    2
      kaddressbook/editors/imeditorwidget.h
  52. 1
    1
      kaddressbook/emaileditwidget.cpp
  53. 1
    1
      kaddressbook/emaileditwidget.h
  54. 4
    4
      kaddressbook/extensionmanager.cpp
  55. 4
    4
      kaddressbook/extensionmanager.h
  56. 3
    3
      kaddressbook/features/distributionlistngwidget.cpp
  57. 1
    1
      kaddressbook/features/distributionlistngwidget.h
  58. 2
    2
      kaddressbook/features/distributionlistwidget.cpp
  59. 1
    1
      kaddressbook/features/distributionlistwidget.h
  60. 2
    2
      kaddressbook/features/resourceselection.cpp
  61. 1
    1
      kaddressbook/features/resourceselection.h
  62. 2
    2
      kaddressbook/filtereditdialog.cpp
  63. 4
    4
      kaddressbook/filtereditdialog.h
  64. 1
    1
      kaddressbook/geowidget.cpp
  65. 1
    1
      kaddressbook/imeditwidget.h
  66. 3
    3
      kaddressbook/interfaces/core.h
  67. 2
    2
      kaddressbook/interfaces/xxport.cpp
  68. 21
    21
      kaddressbook/kabcore.cpp
  69. 22
    22
      kaddressbook/kabcore.h
  70. 2
    2
      kaddressbook/kaddressbookmain.cpp
  71. 1
    1
      kaddressbook/kaddressbookmain.h
  72. 2
    2
      kaddressbook/kaddressbookview.h
  73. 1
    1
      kaddressbook/kcmconfigs/addhostdialog.cpp
  74. 1
    1
      kaddressbook/kcmconfigs/kabconfigwidget.h
  75. 1
    1
      kaddressbook/kcmconfigs/ldapoptionswidget.cpp
  76. 2
    2
      kaddressbook/kcmconfigs/ldapoptionswidget.h
  77. 3
    3
      kaddressbook/main.cpp
  78. 1
    1
      kaddressbook/nameeditdialog.cpp
  79. 5
    5
      kaddressbook/printing/ds_appearance.ui
  80. 7
    7
      kaddressbook/viewmanager.cpp
  81. 4
    4
      kaddressbook/viewmanager.h
  82. 1
    1
      kaddressbook/views/colorlistbox.cpp
  83. 1
    1
      kaddressbook/views/colorlistbox.h
  84. 2
    2
      kaddressbook/views/configurecardviewdialog.cpp
  85. 7
    7
      kaddressbook/views/contactlistview.cpp
  86. 2
    2
      kaddressbook/views/contactlistview.h
  87. 3
    3
      kaddressbook/views/kaddressbooktableview.cpp
  88. 2
    2
      kaddressbook/views/kaddressbooktableview.h
  89. 4
    4
      kalarm/birthdaydlg.cpp
  90. 2
    2
      kalarm/birthdaydlg.h
  91. 3
    3
      kalarm/daemon.cpp
  92. 4
    4
      kalarm/daemon.h
  93. 5
    5
      kalarm/eventlistviewbase.cpp
  94. 3
    3
      kalarm/eventlistviewbase.h
  95. 1
    1
      kalarm/fontcolour.cpp
  96. 1
    1
      kalarm/fontcolour.h
  97. 5
    5
      kalarm/functions.cpp
  98. 6
    6
      kalarm/functions.h
  99. 2
    2
      kalarm/kalarmapp.cpp
  100. 0
    0
      kalarm/mainwindow.cpp

+ 2
- 2
akregator/src/actionmanager.h View File

@@ -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:

+ 72
- 72
akregator/src/actionmanagerimpl.cpp View File

@@ -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;
}

+ 5
- 5
akregator/src/actionmanagerimpl.h View File

@@ -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:


+ 4
- 4
akregator/src/akregator_view.cpp View File

@@ -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;

+ 3
- 3
akregator/src/akregator_view.h View File

@@ -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();

+ 13
- 13
akregator/src/articlelistview.cpp View File

@@ -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);

+ 3
- 3
akregator/src/articlelistview.h View File

@@ -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

+ 2
- 2
akregator/src/articleviewer.cpp View File

@@ -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()));


+ 2
- 2
akregator/src/feeditem.cpp View File

@@ -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);
}

+ 2
- 2
akregator/src/feeditem.h View File

@@ -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();

+ 10
- 10
akregator/src/feedlistview.cpp View File

@@ -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);
}

+ 3
- 3
akregator/src/feedlistview.h View File

@@ -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);

+ 3
- 3
akregator/src/folderitem.cpp View File

@@ -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()

+ 2
- 2
akregator/src/folderitem.h View File

@@ -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();

+ 1
- 1
akregator/src/frame.cpp View File

@@ -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 & ) ),

+ 1
- 1
akregator/src/main.cpp View File

@@ -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++;}}


+ 2
- 2
akregator/src/mainwindow.cpp View File

@@ -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()

+ 3
- 3
akregator/src/mainwindow.h View File

@@ -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);


+ 17
- 17
akregator/src/pageviewer.cpp View File

@@ -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()));

+ 2
- 2
akregator/src/pageviewer.h View File

@@ -29,8 +29,8 @@
#include "viewer.h"


class KAction;
class KToolBarPopupAction;
class TDEAction;
class TDEToolBarPopupAction;
class TQString;

namespace Akregator

+ 4
- 4
akregator/src/settings_appearance.ui View File

@@ -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>

+ 5
- 5
akregator/src/simplenodeselector.cpp View File

@@ -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"));

+ 5
- 5
akregator/src/tagaction.cpp View File

@@ -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);

+ 2
- 2
akregator/src/tagaction.h View File

@@ -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

+ 2
- 2
akregator/src/tagfolderitem.cpp View File

@@ -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)
{
}


+ 2
- 2
akregator/src/tagfolderitem.h View File

@@ -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();

+ 2
- 2
akregator/src/tagnodeitem.cpp View File

@@ -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);
}

+ 2
- 2
akregator/src/tagnodeitem.h View File

@@ -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();

+ 10
- 10
akregator/src/treenodeitem.cpp View File

@@ -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);


+ 3
- 3
akregator/src/treenodeitem.h View File

@@ -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();

+ 6
- 6
akregator/src/viewer.cpp View File

@@ -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);
}

+ 28
- 28
certmanager/certmanager.cpp View File

@@ -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() )

+ 14
- 14
certmanager/certmanager.h View File

@@ -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;

+ 2
- 2
certmanager/conf/appearanceconfigwidget.cpp View File

@@ -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();

+ 18
- 18
certmanager/customactions.cpp View File

@@ -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"

+ 6
- 6
certmanager/customactions.h View File

@@ -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 );


+ 5
- 5
certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp View File

@@ -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"

+ 1
- 1
certmanager/kwatchgnupg/kwatchgnupgmainwin.h View File

@@ -40,7 +40,7 @@ class KWatchGnuPGConfig;
class KProcIO;
class TQTextEdit;

class KWatchGnuPGMainWindow : public KMainWindow {
class KWatchGnuPGMainWindow : public TDEMainWindow {
Q_OBJECT
public:

+ 3
- 3
certmanager/lib/ui/backendconfigwidget.cpp View File

@@ -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 )
{}


+ 1
- 1
certmanager/lib/ui/cryptoconfigdialog.cpp View File

@@ -54,7 +54,7 @@ Kleo::CryptoConfigDialog::CryptoConfigDialog( Kleo::CryptoConfig* config, TQWidg
}

// Automatically assign accelerators
KAcceleratorManager::manage( this );
TDEAcceleratorManager::manage( this );
}

void Kleo::CryptoConfigDialog::slotOk()

+ 9
- 9
certmanager/lib/ui/keylistview.cpp View File

@@ -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 ) {

+ 2
- 2
certmanager/lib/ui/keylistview.h View File

@@ -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:

+ 1
- 1
kaddressbook/addresseditwidget.cpp View File

@@ -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;


+ 1
- 1
kaddressbook/addresseditwidget.h View File

@@ -42,7 +42,7 @@ class TQToolButton;
class KActiveLabel;
class KComboBox;
class KLineEdit;
class KListView;
class TDEListView;

typedef TypeCombo<KABC::Address> AddressTypeCombo;


+ 1
- 1
kaddressbook/addresseeeditorwidget.cpp View File

@@ -847,7 +847,7 @@ void AddresseeEditorWidget::invalidDate()
void AddresseeEditorWidget::pageChanged( TQWidget *wdg )
{
if ( wdg )
KAcceleratorManager::manage( wdg );
TDEAcceleratorManager::manage( wdg );
}

void AddresseeEditorWidget::setInitialFocus()

+ 1
- 1
kaddressbook/customfieldswidget.cpp View File

@@ -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" ) );

+ 1
- 1
kaddressbook/distributionlistpicker.cpp View File

@@ -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& ) ) );

+ 2
- 2
kaddressbook/distributionlistpicker.h View File

@@ -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;
};

+ 1
- 1
kaddressbook/editors/imeditorbase.ui View File

@@ -82,7 +82,7 @@
<string>&amp;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>

+ 3
- 3
kaddressbook/editors/imeditorwidget.cpp View File

@@ -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 )

+ 2
- 2
kaddressbook/editors/imeditorwidget.h View File