Browse Source

Rename a number of classes to enhance compatibility with KDE4

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 @@
29 29
 
30 30
 class TQWidget;
31 31
 
32
-class KAction;
32
+class TDEAction;
33 33
 
34 34
 namespace Akregator {
35 35
 
@@ -46,7 +46,7 @@ class ActionManager : public TQObject
46 46
         ActionManager(TQObject* parent=0, const char* name=0);
47 47
         virtual ~ActionManager();
48 48
 
49
-        virtual KAction* action(const char* name, const char* classname=0) = 0;
49
+        virtual TDEAction* action(const char* name, const char* classname=0) = 0;
50 50
         virtual TQWidget* container(const char* name) = 0;
51 51
         
52 52
     private:

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

@@ -71,10 +71,10 @@ class ActionManagerImpl::NodeSelectVisitor : public TreeNodeVisitor
71 71
 
72 72
     virtual bool visitFeed(Feed* node)
73 73
     {
74
-        KAction* remove = m_manager->action("feed_remove");
74
+        TDEAction* remove = m_manager->action("feed_remove");
75 75
         if (remove)
76 76
             remove->setEnabled(true);
77
-        KAction* hp = m_manager->action("feed_homepage");
77
+        TDEAction* hp = m_manager->action("feed_homepage");
78 78
         if (hp)
79 79
             hp->setEnabled(!node->htmlUrl().isEmpty());
80 80
         m_manager->action("feed_fetch")->setText(i18n("&Fetch Feed"));
@@ -87,10 +87,10 @@ class ActionManagerImpl::NodeSelectVisitor : public TreeNodeVisitor
87 87
 
88 88
     virtual bool visitFolder(Folder* node)
89 89
     {
90
-        KAction* remove = m_manager->action("feed_remove");
90
+        TDEAction* remove = m_manager->action("feed_remove");
91 91
         if (remove)
92 92
             remove->setEnabled(node->parent()); // root nodes must not be deleted
93
-        KAction* hp = m_manager->action("feed_homepage");
93
+        TDEAction* hp = m_manager->action("feed_homepage");
94 94
         if (hp)
95 95
             hp->setEnabled(false);
96 96
 
@@ -104,10 +104,10 @@ class ActionManagerImpl::NodeSelectVisitor : public TreeNodeVisitor
104 104
 
105 105
     virtual bool visitTagNode(TagNode* /*node*/)
106 106
     {
107
-        KAction* remove = m_manager->action("feed_remove");
107
+        TDEAction* remove = m_manager->action("feed_remove");
108 108
         if (remove)
109 109
             remove->setEnabled(true);
110
-        KAction* hp = m_manager->action("feed_homepage");
110
+        TDEAction* hp = m_manager->action("feed_homepage");
111 111
         if (hp)
112 112
             hp->setEnabled(false);
113 113
         m_manager->action("feed_mark_all_as_read")->setText(i18n("&Mark Articles as Read"));
@@ -131,12 +131,12 @@ public:
131 131
     ArticleViewer* articleViewer;
132 132
     Part* part;
133 133
     TrayIcon* trayIcon;
134
-    KActionMenu* tagMenu;
135
-    KActionCollection* actionCollection;
134
+    TDEActionMenu* tagMenu;
135
+    TDEActionCollection* actionCollection;
136 136
     TagSet* tagSet;
137 137
     TQMap<TQString, TagAction*> tagActions;
138 138
     TabWidget* tabWidget;
139
-    KAction* speakSelectedArticlesAction;
139
+    TDEAction* speakSelectedArticlesAction;
140 140
 };
141 141
 
142 142
 void ActionManagerImpl::slotUpdateTagActions(bool enabled, const TQStringList& tagIds)
@@ -252,7 +252,7 @@ void ActionManagerImpl::initTrayIcon(TrayIcon* trayIcon)
252 252
         return;
253 253
     else d->trayIcon = trayIcon;
254 254
 
255
-    KPopupMenu* traypop = trayIcon->contextMenu();
255
+    TDEPopupMenu* traypop = trayIcon->contextMenu();
256 256
 
257 257
     if (actionCollection()->action("feed_fetch_all"))
258 258
         actionCollection()->action("feed_fetch_all")->plug(traypop, 1);
@@ -262,15 +262,15 @@ void ActionManagerImpl::initTrayIcon(TrayIcon* trayIcon)
262 262
 
263 263
 void ActionManagerImpl::initPart()
264 264
 {
265
-    new KAction(i18n("&Import Feeds..."), "", "", d->part, TQT_SLOT(fileImport()), d->actionCollection, "file_import");
266
-    new KAction(i18n("&Export Feeds..."), "", "", d->part, TQT_SLOT(fileExport()), d->actionCollection, "file_export");
267
-    //new KAction(i18n("&Get Feeds From Web..."), "", "", d->part, TQT_SLOT(fileGetFeeds()), d->actionCollection, "file_getfromweb");
265
+    new TDEAction(i18n("&Import Feeds..."), "", "", d->part, TQT_SLOT(fileImport()), d->actionCollection, "file_import");
266
+    new TDEAction(i18n("&Export Feeds..."), "", "", d->part, TQT_SLOT(fileExport()), d->actionCollection, "file_export");
267
+    //new TDEAction(i18n("&Get Feeds From Web..."), "", "", d->part, TQT_SLOT(fileGetFeeds()), d->actionCollection, "file_getfromweb");
268 268
 
269
-    new KAction(i18n("Send &Link Address..."), "mail_generic", "", d->part, TQT_SLOT(fileSendLink()), d->actionCollection, "file_sendlink");
270
-    new KAction(i18n("Send &File..."), "mail_generic", "", d->part, TQT_SLOT(fileSendFile()), d->actionCollection, "file_sendfile");
269
+    new TDEAction(i18n("Send &Link Address..."), "mail_generic", "", d->part, TQT_SLOT(fileSendLink()), d->actionCollection, "file_sendlink");
270
+    new TDEAction(i18n("Send &File..."), "mail_generic", "", d->part, TQT_SLOT(fileSendFile()), d->actionCollection, "file_sendfile");
271 271
 
272 272
     KStdAction::configureNotifications(d->part, TQT_SLOT(showKNotifyOptions()), d->actionCollection); // options_configure_notifications
273
-    new KAction( i18n("Configure &Akregator..."), "configure", "", d->part, TQT_SLOT(showOptions()), d->actionCollection, "akregator_configure_akregator" );
273
+    new TDEAction( i18n("Configure &Akregator..."), "configure", "", d->part, TQT_SLOT(showOptions()), d->actionCollection, "akregator_configure_akregator" );
274 274
 }
275 275
 
276 276
 void ActionManagerImpl::initView(View* view)
@@ -281,93 +281,93 @@ void ActionManagerImpl::initView(View* view)
281 281
         d->view = view;
282 282
 
283 283
     // tag actions
284
-    new KAction(i18n("&New Tag..."), "", "",  TQT_TQOBJECT(d->view), TQT_SLOT(slotNewTag()), actionCollection(), "tag_new");
284
+    new TDEAction(i18n("&New Tag..."), "", "",  TQT_TQOBJECT(d->view), TQT_SLOT(slotNewTag()), actionCollection(), "tag_new");
285 285
 
286 286
     // Feed/Feed Group popup menu
287
-    new KAction(i18n("&Open Homepage"), "", "Ctrl+H",  TQT_TQOBJECT(d->view), TQT_SLOT(slotOpenHomepage()), actionCollection(), "feed_homepage");
288
-    new KAction(i18n("&Add Feed..."), "bookmark_add", "Insert", TQT_TQOBJECT(d->view), TQT_SLOT(slotFeedAdd()), actionCollection(), "feed_add");
289
-    new KAction(i18n("Ne&w Folder..."), "folder_new", "Shift+Insert", TQT_TQOBJECT(d->view), TQT_SLOT(slotFeedAddGroup()), actionCollection(), "feed_add_group");
290
-    new KAction(i18n("&Delete Feed"), "editdelete", "Alt+Delete", TQT_TQOBJECT(d->view), TQT_SLOT(slotFeedRemove()), actionCollection(), "feed_remove");
291
-    new KAction(i18n("&Edit Feed..."), "edit", "F2", TQT_TQOBJECT(d->view), TQT_SLOT(slotFeedModify()), actionCollection(), "feed_modify");
292
-        KActionMenu* vm = new KActionMenu( i18n( "&View Mode" ), actionCollection(), "view_mode" );
293
-
294
-    KRadioAction *ra = new KRadioAction(i18n("&Normal View"), "view_top_bottom", "Ctrl+Shift+1", TQT_TQOBJECT(d->view), TQT_SLOT(slotNormalView()), actionCollection(), "normal_view");
287
+    new TDEAction(i18n("&Open Homepage"), "", "Ctrl+H",  TQT_TQOBJECT(d->view), TQT_SLOT(slotOpenHomepage()), actionCollection(), "feed_homepage");
288
+    new TDEAction(i18n("&Add Feed..."), "bookmark_add", "Insert", TQT_TQOBJECT(d->view), TQT_SLOT(slotFeedAdd()), actionCollection(), "feed_add");
289
+    new TDEAction(i18n("Ne&w Folder..."), "folder_new", "Shift+Insert", TQT_TQOBJECT(d->view), TQT_SLOT(slotFeedAddGroup()), actionCollection(), "feed_add_group");
290
+    new TDEAction(i18n("&Delete Feed"), "editdelete", "Alt+Delete", TQT_TQOBJECT(d->view), TQT_SLOT(slotFeedRemove()), actionCollection(), "feed_remove");
291
+    new TDEAction(i18n("&Edit Feed..."), "edit", "F2", TQT_TQOBJECT(d->view), TQT_SLOT(slotFeedModify()), actionCollection(), "feed_modify");
292
+        TDEActionMenu* vm = new TDEActionMenu( i18n( "&View Mode" ), actionCollection(), "view_mode" );
293
+
294
+    TDERadioAction *ra = new TDERadioAction(i18n("&Normal View"), "view_top_bottom", "Ctrl+Shift+1", TQT_TQOBJECT(d->view), TQT_SLOT(slotNormalView()), actionCollection(), "normal_view");
295 295
     ra->setExclusiveGroup( "ViewMode" );
296 296
     vm->insert(ra);
297 297
 
298
-    ra = new KRadioAction(i18n("&Widescreen View"), "view_left_right", "Ctrl+Shift+2", TQT_TQOBJECT(d->view), TQT_SLOT(slotWidescreenView()), actionCollection(), "widescreen_view");
298
+    ra = new TDERadioAction(i18n("&Widescreen View"), "view_left_right", "Ctrl+Shift+2", TQT_TQOBJECT(d->view), TQT_SLOT(slotWidescreenView()), actionCollection(), "widescreen_view");
299 299
     ra->setExclusiveGroup( "ViewMode" );
300 300
     vm->insert(ra);
301 301
 
302
-    ra = new KRadioAction(i18n("C&ombined View"), "view_text", "Ctrl+Shift+3", TQT_TQOBJECT(d->view), TQT_SLOT(slotCombinedView()), actionCollection(), "combined_view");
302
+    ra = new TDERadioAction(i18n("C&ombined View"), "view_text", "Ctrl+Shift+3", TQT_TQOBJECT(d->view), TQT_SLOT(slotCombinedView()), actionCollection(), "combined_view");
303 303
     ra->setExclusiveGroup( "ViewMode" );
304 304
     vm->insert(ra);
305 305
 
306 306
     // toolbar / feed menu
307
-    new KAction(i18n("&Fetch Feed"), "down", KStdAccel::shortcut(KStdAccel::Reload), TQT_TQOBJECT(d->view), TQT_SLOT(slotFetchCurrentFeed()), actionCollection(), "feed_fetch");
308
-    new KAction(i18n("Fe&tch All Feeds"), "bottom", "Ctrl+L", TQT_TQOBJECT(d->view), TQT_SLOT(slotFetchAllFeeds()), actionCollection(), "feed_fetch_all");
307
+    new TDEAction(i18n("&Fetch Feed"), "down", TDEStdAccel::shortcut(TDEStdAccel::Reload), TQT_TQOBJECT(d->view), TQT_SLOT(slotFetchCurrentFeed()), actionCollection(), "feed_fetch");
308
+    new TDEAction(i18n("Fe&tch All Feeds"), "bottom", "Ctrl+L", TQT_TQOBJECT(d->view), TQT_SLOT(slotFetchAllFeeds()), actionCollection(), "feed_fetch_all");
309 309
 
310
-    KAction* stopAction = new KAction(i18n( "&Abort Fetches" ), "stop", Key_Escape, Kernel::self()->fetchQueue(), TQT_SLOT(slotAbort()), actionCollection(), "feed_stop");
310
+    TDEAction* stopAction = new TDEAction(i18n( "&Abort Fetches" ), "stop", Key_Escape, Kernel::self()->fetchQueue(), TQT_SLOT(slotAbort()), actionCollection(), "feed_stop");
311 311
     stopAction->setEnabled(false);
312 312
 
313
-    new KAction(i18n("&Mark Feed as Read"), "goto", "Ctrl+R", TQT_TQOBJECT(d->view), TQT_SLOT(slotMarkAllRead()), actionCollection(), "feed_mark_all_as_read");
314
-    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");
313
+    new TDEAction(i18n("&Mark Feed as Read"), "goto", "Ctrl+R", TQT_TQOBJECT(d->view), TQT_SLOT(slotMarkAllRead()), actionCollection(), "feed_mark_all_as_read");
314
+    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");
315 315
 
316 316
     // Settings menu
317
-    KToggleAction* sqf = new KToggleAction(i18n("Show Quick Filter"), TQString(), 0, TQT_TQOBJECT(d->view), TQT_SLOT(slotToggleShowQuickFilter()), actionCollection(), "show_quick_filter");
317
+    TDEToggleAction* sqf = new TDEToggleAction(i18n("Show Quick Filter"), TQString(), 0, TQT_TQOBJECT(d->view), TQT_SLOT(slotToggleShowQuickFilter()), actionCollection(), "show_quick_filter");
318 318
     sqf->setChecked( Settings::showQuickFilter() );
319 319
 
320
-    new KAction( i18n("Open in Tab"), "tab_new", "Shift+Return", TQT_TQOBJECT(d->view), TQT_SLOT(slotOpenCurrentArticle()), actionCollection(), "article_open" );
321
-    new KAction( i18n("Open in Background Tab"), TQString(), "tab_new", TQT_TQOBJECT(d->view), TQT_SLOT(slotOpenCurrentArticleBackgroundTab()), actionCollection(), "article_open_background_tab" );
322
-    new KAction( i18n("Open in External Browser"), "window_new", "Ctrl+Shift+Return", TQT_TQOBJECT(d->view), TQT_SLOT(slotOpenCurrentArticleExternal()), actionCollection(), "article_open_external" );
323
-    new KAction( i18n("Copy Link Address"), TQString(), TQString(), TQT_TQOBJECT(d->view), TQT_SLOT(slotCopyLinkAddress()), actionCollection(), "article_copy_link_address" );
320
+    new TDEAction( i18n("Open in Tab"), "tab_new", "Shift+Return", TQT_TQOBJECT(d->view), TQT_SLOT(slotOpenCurrentArticle()), actionCollection(), "article_open" );
321
+    new TDEAction( i18n("Open in Background Tab"), TQString(), "tab_new", TQT_TQOBJECT(d->view), TQT_SLOT(slotOpenCurrentArticleBackgroundTab()), actionCollection(), "article_open_background_tab" );
322
+    new TDEAction( i18n("Open in External Browser"), "window_new", "Ctrl+Shift+Return", TQT_TQOBJECT(d->view), TQT_SLOT(slotOpenCurrentArticleExternal()), actionCollection(), "article_open_external" );
323
+    new TDEAction( i18n("Copy Link Address"), TQString(), TQString(), TQT_TQOBJECT(d->view), TQT_SLOT(slotCopyLinkAddress()), actionCollection(), "article_copy_link_address" );
324 324
 
325
-    new KAction(i18n("Pre&vious Unread Article"), "", Key_Minus, TQT_TQOBJECT(d->view), TQT_SLOT(slotPrevUnreadArticle()),actionCollection(), "go_prev_unread_article");
326
-    new KAction(i18n("Ne&xt Unread Article"), "", Key_Plus, TQT_TQOBJECT(d->view), TQT_SLOT(slotNextUnreadArticle()),actionCollection(), "go_next_unread_article");
325
+    new TDEAction(i18n("Pre&vious Unread Article"), "", Key_Minus, TQT_TQOBJECT(d->view), TQT_SLOT(slotPrevUnreadArticle()),actionCollection(), "go_prev_unread_article");
326
+    new TDEAction(i18n("Ne&xt Unread Article"), "", Key_Plus, TQT_TQOBJECT(d->view), TQT_SLOT(slotNextUnreadArticle()),actionCollection(), "go_next_unread_article");
327 327
 
328
-    new KAction(i18n("&Delete"), "editdelete", "Delete", TQT_TQOBJECT(d->view), TQT_SLOT(slotArticleDelete()), actionCollection(), "article_delete");
328
+    new TDEAction(i18n("&Delete"), "editdelete", "Delete", TQT_TQOBJECT(d->view), TQT_SLOT(slotArticleDelete()), actionCollection(), "article_delete");
329 329
 
330 330
     if (Settings::showTaggingGUI())
331 331
     {
332
-        d->tagMenu = new KActionMenu ( i18n( "&Set Tags" ), "rss_tag",  actionCollection(), "article_tagmenu" );
332
+        d->tagMenu = new TDEActionMenu ( i18n( "&Set Tags" ), "rss_tag",  actionCollection(), "article_tagmenu" );
333 333
         d->tagMenu->setEnabled(false); // only enabled when articles are selected
334 334
     }
335
-    KActionMenu* statusMenu = new KActionMenu ( i18n( "&Mark As" ),
335
+    TDEActionMenu* statusMenu = new TDEActionMenu ( i18n( "&Mark As" ),
336 336
                                     actionCollection(), "article_set_status" );
337 337
 
338
-    d->speakSelectedArticlesAction = new KAction(i18n("&Speak Selected Articles"), "kttsd", "", TQT_TQOBJECT(d->view), TQT_SLOT(slotTextToSpeechRequest()), actionCollection(), "akr_texttospeech");
338
+    d->speakSelectedArticlesAction = new TDEAction(i18n("&Speak Selected Articles"), "kttsd", "", TQT_TQOBJECT(d->view), TQT_SLOT(slotTextToSpeechRequest()), actionCollection(), "akr_texttospeech");
339 339
 
340
-    KAction* abortTTS = new KAction(i18n( "&Stop Speaking" ), "player_stop", Key_Escape, SpeechClient::self(), TQT_SLOT(slotAbortJobs()), actionCollection(), "akr_aborttexttospeech");
340
+    TDEAction* abortTTS = new TDEAction(i18n( "&Stop Speaking" ), "player_stop", Key_Escape, SpeechClient::self(), TQT_SLOT(slotAbortJobs()), actionCollection(), "akr_aborttexttospeech");
341 341
     abortTTS->setEnabled(false);
342 342
 
343 343
     connect(SpeechClient::self(), TQT_SIGNAL(signalActivated(bool)),
344 344
     abortTTS, TQT_SLOT(setEnabled(bool)));
345 345
 
346
-    statusMenu->insert(new KAction(KGuiItem(i18n("as in: mark as read","&Read"), "",
346
+    statusMenu->insert(new TDEAction(KGuiItem(i18n("as in: mark as read","&Read"), "",
347 347
                        i18n("Mark selected article as read")),
348 348
     "Ctrl+E", TQT_TQOBJECT(d->view), TQT_SLOT(slotSetSelectedArticleRead()),
349 349
     actionCollection(), "article_set_status_read"));
350 350
 
351
-    statusMenu->insert(new KAction(KGuiItem(i18n("&New"), "",
351
+    statusMenu->insert(new TDEAction(KGuiItem(i18n("&New"), "",
352 352
                         i18n("Mark selected article as new")),
353 353
     "Ctrl+N", TQT_TQOBJECT(d->view), TQT_SLOT(slotSetSelectedArticleNew()),
354 354
     actionCollection(), "article_set_status_new" ));
355 355
 
356 356
 
357
-    statusMenu->insert(new KAction(KGuiItem(i18n("&Unread"), "",
357
+    statusMenu->insert(new TDEAction(KGuiItem(i18n("&Unread"), "",
358 358
                        i18n("Mark selected article as unread")),
359 359
     "Ctrl+U", TQT_TQOBJECT(d->view), TQT_SLOT(slotSetSelectedArticleUnread()),
360 360
     actionCollection(), "article_set_status_unread"));
361 361
 
362
-    KToggleAction* importantAction = new KToggleAction(i18n("&Mark as Important"), "flag", "Ctrl+I", actionCollection(), "article_set_status_important");
362
+    TDEToggleAction* importantAction = new TDEToggleAction(i18n("&Mark as Important"), "flag", "Ctrl+I", actionCollection(), "article_set_status_important");
363 363
     importantAction->setCheckedState(i18n("Remove &Important Mark"));
364 364
     connect(importantAction, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(d->view), TQT_SLOT(slotArticleToggleKeepFlag(bool)));
365 365
 
366 366
 
367
-    new KAction( i18n("Move Node Up"), TQString(), "Shift+Alt+Up", TQT_TQOBJECT(view), TQT_SLOT(slotMoveCurrentNodeUp()), d->actionCollection, "feedstree_move_up" );
368
-    new KAction( i18n("Move Node Down"), TQString(),  "Shift+Alt+Down", TQT_TQOBJECT(view), TQT_SLOT(slotMoveCurrentNodeDown()), d->actionCollection, "feedstree_move_down" );
369
-    new KAction( i18n("Move Node Left"), TQString(), "Shift+Alt+Left", TQT_TQOBJECT(view), TQT_SLOT(slotMoveCurrentNodeLeft()), d->actionCollection, "feedstree_move_left" );
370
-    new KAction( i18n("Move Node Right"), TQString(), "Shift+Alt+Right", TQT_TQOBJECT(view), TQT_SLOT(slotMoveCurrentNodeRight()), d->actionCollection, "feedstree_move_right");
367
+    new TDEAction( i18n("Move Node Up"), TQString(), "Shift+Alt+Up", TQT_TQOBJECT(view), TQT_SLOT(slotMoveCurrentNodeUp()), d->actionCollection, "feedstree_move_up" );
368
+    new TDEAction( i18n("Move Node Down"), TQString(),  "Shift+Alt+Down", TQT_TQOBJECT(view), TQT_SLOT(slotMoveCurrentNodeDown()), d->actionCollection, "feedstree_move_down" );
369
+    new TDEAction( i18n("Move Node Left"), TQString(), "Shift+Alt+Left", TQT_TQOBJECT(view), TQT_SLOT(slotMoveCurrentNodeLeft()), d->actionCollection, "feedstree_move_left" );
370
+    new TDEAction( i18n("Move Node Right"), TQString(), "Shift+Alt+Right", TQT_TQOBJECT(view), TQT_SLOT(slotMoveCurrentNodeRight()), d->actionCollection, "feedstree_move_right");
371 371
 }
372 372
 
373 373
 void ActionManagerImpl::initArticleViewer(ArticleViewer* articleViewer)
@@ -385,8 +385,8 @@ void ActionManagerImpl::initArticleListView(ArticleListView* articleList)
385 385
     else
386 386
         d->articleList = articleList;
387 387
 
388
-    new KAction( i18n("&Previous Article"), TQString(), "Left", TQT_TQOBJECT(articleList), TQT_SLOT(slotPreviousArticle()), actionCollection(), "go_previous_article" );
389
-    new KAction( i18n("&Next Article"), TQString(), "Right", TQT_TQOBJECT(articleList), TQT_SLOT(slotNextArticle()), actionCollection(), "go_next_article" );
388
+    new TDEAction( i18n("&Previous Article"), TQString(), "Left", TQT_TQOBJECT(articleList), TQT_SLOT(slotPreviousArticle()), actionCollection(), "go_previous_article" );
389
+    new TDEAction( i18n("&Next Article"), TQString(), "Right", TQT_TQOBJECT(articleList), TQT_SLOT(slotNextArticle()), actionCollection(), "go_next_article" );
390 390
 }
391 391
 
392 392
 void ActionManagerImpl::initListTabWidget(ListTabWidget* listTabWidget)
@@ -396,17 +396,17 @@ void ActionManagerImpl::initListTabWidget(ListTabWidget* listTabWidget)
396 396
     else
397 397
         d->listTabWidget = listTabWidget;
398 398
 
399
-    new KAction(i18n("&Previous Feed"), "", "P", TQT_TQOBJECT(listTabWidget),  TQT_SLOT(slotPrevFeed()),actionCollection(), "go_prev_feed");
400
-    new KAction(i18n("&Next Feed"), "", "N", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotNextFeed()),actionCollection(), "go_next_feed");
401
-    new KAction(i18n("N&ext Unread Feed"), "", "Alt+Plus", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotNextUnreadFeed()),actionCollection(), "go_next_unread_feed");
402
-    new KAction(i18n("Prev&ious Unread Feed"), "", "Alt+Minus", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotPrevUnreadFeed()),actionCollection(), "go_prev_unread_feed");
403
-
404
-    new KAction( i18n("Go to Top of Tree"), TQString(), "Ctrl+Home", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemBegin()), d->actionCollection, "feedstree_home" );
405
-    new KAction( i18n("Go to Bottom of Tree"), TQString(), "Ctrl+End", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemEnd()), d->actionCollection, "feedstree_end" );
406
-    new KAction( i18n("Go Left in Tree"), TQString(), "Ctrl+Left", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemLeft()), d->actionCollection, "feedstree_left" );
407
-    new KAction( i18n("Go Right in Tree"), TQString(), "Ctrl+Right", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemRight()), d->actionCollection, "feedstree_right" );
408
-    new KAction( i18n("Go Up in Tree"), TQString(), "Ctrl+Up", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemUp()), d->actionCollection, "feedstree_up" );
409
-    new KAction( i18n("Go Down in Tree"), TQString(), "Ctrl+Down", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemDown()), d->actionCollection, "feedstree_down" );
399
+    new TDEAction(i18n("&Previous Feed"), "", "P", TQT_TQOBJECT(listTabWidget),  TQT_SLOT(slotPrevFeed()),actionCollection(), "go_prev_feed");
400
+    new TDEAction(i18n("&Next Feed"), "", "N", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotNextFeed()),actionCollection(), "go_next_feed");
401
+    new TDEAction(i18n("N&ext Unread Feed"), "", "Alt+Plus", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotNextUnreadFeed()),actionCollection(), "go_next_unread_feed");
402
+    new TDEAction(i18n("Prev&ious Unread Feed"), "", "Alt+Minus", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotPrevUnreadFeed()),actionCollection(), "go_prev_unread_feed");
403
+
404
+    new TDEAction( i18n("Go to Top of Tree"), TQString(), "Ctrl+Home", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemBegin()), d->actionCollection, "feedstree_home" );
405
+    new TDEAction( i18n("Go to Bottom of Tree"), TQString(), "Ctrl+End", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemEnd()), d->actionCollection, "feedstree_end" );
406
+    new TDEAction( i18n("Go Left in Tree"), TQString(), "Ctrl+Left", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemLeft()), d->actionCollection, "feedstree_left" );
407
+    new TDEAction( i18n("Go Right in Tree"), TQString(), "Ctrl+Right", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemRight()), d->actionCollection, "feedstree_right" );
408
+    new TDEAction( i18n("Go Up in Tree"), TQString(), "Ctrl+Up", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemUp()), d->actionCollection, "feedstree_up" );
409
+    new TDEAction( i18n("Go Down in Tree"), TQString(), "Ctrl+Down", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemDown()), d->actionCollection, "feedstree_down" );
410 410
 }
411 411
 
412 412
 void ActionManagerImpl::initTabWidget(TabWidget* tabWidget)
@@ -416,11 +416,11 @@ void ActionManagerImpl::initTabWidget(TabWidget* tabWidget)
416 416
     else
417 417
         d->tabWidget = tabWidget;
418 418
 
419
-    new KAction(i18n("Select Next Tab"), "", "Ctrl+Period", TQT_TQOBJECT(d->tabWidget), TQT_SLOT(slotNextTab()),actionCollection(), "select_next_tab");
420
-    new KAction(i18n("Select Previous Tab"), "", "Ctrl+Comma", TQT_TQOBJECT(d->tabWidget), TQT_SLOT(slotPreviousTab()),actionCollection(), "select_previous_tab");
421
-    new KAction( i18n("Detach Tab"), "tab_breakoff", CTRL+SHIFT+Key_B, TQT_TQOBJECT(d->tabWidget), TQT_SLOT(slotDetachTab()), actionCollection(), "tab_detach" );
422
-    new KAction( i18n("Copy Link Address"), TQString(), TQString(), TQT_TQOBJECT(d->tabWidget), TQT_SLOT(slotCopyLinkAddress()), actionCollection(), "tab_copylinkaddress" );
423
-    new KAction( i18n("&Close Tab"), "tab_remove", KStdAccel::close(), TQT_TQOBJECT(d->tabWidget), TQT_SLOT(slotCloseTab()), actionCollection(), "tab_remove" );
419
+    new TDEAction(i18n("Select Next Tab"), "", "Ctrl+Period", TQT_TQOBJECT(d->tabWidget), TQT_SLOT(slotNextTab()),actionCollection(), "select_next_tab");
420
+    new TDEAction(i18n("Select Previous Tab"), "", "Ctrl+Comma", TQT_TQOBJECT(d->tabWidget), TQT_SLOT(slotPreviousTab()),actionCollection(), "select_previous_tab");
421
+    new TDEAction( i18n("Detach Tab"), "tab_breakoff", CTRL+SHIFT+Key_B, TQT_TQOBJECT(d->tabWidget), TQT_SLOT(slotDetachTab()), actionCollection(), "tab_detach" );
422
+    new TDEAction( i18n("Copy Link Address"), TQString(), TQString(), TQT_TQOBJECT(d->tabWidget), TQT_SLOT(slotCopyLinkAddress()), actionCollection(), "tab_copylinkaddress" );
423
+    new TDEAction( i18n("&Close Tab"), "tab_remove", TDEStdAccel::close(), TQT_TQOBJECT(d->tabWidget), TQT_SLOT(slotCloseTab()), actionCollection(), "tab_remove" );
424 424
 }
425 425
 
426 426
 TQWidget* ActionManagerImpl::container(const char* name)
@@ -429,11 +429,11 @@ TQWidget* ActionManagerImpl::container(const char* name)
429 429
 }
430 430
 
431 431
 
432
-KActionCollection* ActionManagerImpl::actionCollection()
432
+TDEActionCollection* ActionManagerImpl::actionCollection()
433 433
 {
434 434
     return d->actionCollection;
435 435
 }
436
-KAction* ActionManagerImpl::action(const char* name, const char* classname)
436
+TDEAction* ActionManagerImpl::action(const char* name, const char* classname)
437 437
 {
438 438
     return d->actionCollection != 0 ? d->actionCollection->action(name, classname) : 0;
439 439
 }

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

@@ -29,9 +29,9 @@
29 29
 
30 30
 class TQStringList;
31 31
 class TQWidget;
32
-class KAction;
33
-class KActionMenu;
34
-class KActionCollection;
32
+class TDEAction;
33
+class TDEActionMenu;
34
+class TDEActionCollection;
35 35
 
36 36
 namespace Akregator {
37 37
 
@@ -56,7 +56,7 @@ class ActionManagerImpl : public ActionManager
56 56
         ActionManagerImpl(Part* part, TQObject* parent=0, const char* name=0);
57 57
         virtual ~ActionManagerImpl();
58 58
 
59
-        virtual KAction* action(const char* name, const char* classname=0);
59
+        virtual TDEAction* action(const char* name, const char* classname=0);
60 60
         virtual TQWidget* container(const char* name);
61 61
 
62 62
         void initView(View* view);
@@ -80,7 +80,7 @@ class ActionManagerImpl : public ActionManager
80 80
         
81 81
     protected:
82 82
     
83
-        KActionCollection* actionCollection();
83
+        TDEActionCollection* actionCollection();
84 84
         
85 85
     private:
86 86
 

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

@@ -249,7 +249,7 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons
249 249
     m_feedListView = new NodeListView( this, "feedtree" );
250 250
     m_listTabWidget->addView(m_feedListView, i18n("Feeds"), TDEGlobal::iconLoader()->loadIcon("folder", KIcon::Small));
251 251
 
252
-    connect(m_feedListView, TQT_SIGNAL(signalContextMenu(KListView*, TreeNode*, const TQPoint&)), this, TQT_SLOT(slotFeedTreeContextMenu(KListView*, TreeNode*, const TQPoint&)));
252
+    connect(m_feedListView, TQT_SIGNAL(signalContextMenu(TDEListView*, TreeNode*, const TQPoint&)), this, TQT_SLOT(slotFeedTreeContextMenu(TDEListView*, TreeNode*, const TQPoint&)));
253 253
 
254 254
     connect(m_feedListView, TQT_SIGNAL(signalDropped (KURL::List &, TreeNode*,
255 255
             Folder*)), this, TQT_SLOT(slotFeedURLDropped (KURL::List &,
@@ -258,7 +258,7 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons
258 258
     m_tagNodeListView = new NodeListView(this);
259 259
     m_listTabWidget->addView(m_tagNodeListView, i18n("Tags"), TDEGlobal::iconLoader()->loadIcon("rss_tag", KIcon::Small));
260 260
 
261
-    connect(m_tagNodeListView, TQT_SIGNAL(signalContextMenu(KListView*, TreeNode*, const TQPoint&)), this, TQT_SLOT(slotFeedTreeContextMenu(KListView*, TreeNode*, const TQPoint&)));
261
+    connect(m_tagNodeListView, TQT_SIGNAL(signalContextMenu(TDEListView*, TreeNode*, const TQPoint&)), this, TQT_SLOT(slotFeedTreeContextMenu(TDEListView*, TreeNode*, const TQPoint&)));
262 262
 
263 263
 
264 264
     ProgressManager::self()->setFeedList(m_feedList);
@@ -714,7 +714,7 @@ void View::slotFrameChanged(Frame *f)
714 714
     }
715 715
 }
716 716
 
717
-void View::slotFeedTreeContextMenu(KListView*, TreeNode* /*node*/, const TQPoint& /*p*/)
717
+void View::slotFeedTreeContextMenu(TDEListView*, TreeNode* /*node*/, const TQPoint& /*p*/)
718 718
 {
719 719
     m_tabs->showPage(m_mainTab);
720 720
 }
@@ -1190,7 +1190,7 @@ void View::slotArticleSelected(const Article& article)
1190 1190
         }
1191 1191
     }
1192 1192
 
1193
-    KToggleAction*  maai = dynamic_cast<KToggleAction*>(m_actionManager->action("article_set_status_important"));
1193
+    TDEToggleAction*  maai = dynamic_cast<TDEToggleAction*>(m_actionManager->action("article_set_status_important"));
1194 1194
     maai->setChecked(a.keep());
1195 1195
 
1196 1196
     kdDebug() << "selected: " << a.guid() << endl;

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

@@ -45,8 +45,8 @@ class KComboBox;
45 45
 class TDEConfig;
46 46
 class KFileItem;
47 47
 class KLineEdit;
48
-class KListView;
49
-class KListViewItem;
48
+class TDEListView;
49
+class TDEListViewItem;
50 50
 class KTabWidget;
51 51
 class Viewer;
52 52
 
@@ -151,7 +151,7 @@ namespace Akregator {
151 151
             void slotArticleSelected(const Article&);
152 152
 
153 153
             /** Shows requested popup menu for feed tree */
154
-            void slotFeedTreeContextMenu(KListView*, TreeNode*, const TQPoint&);
154
+            void slotFeedTreeContextMenu(TDEListView*, TreeNode*, const TQPoint&);
155 155
 
156 156
             /** emits @ref signalUnreadCountChanged(int) */
157 157
             void slotSetTotalUnread();

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

@@ -126,7 +126,7 @@ class ArticleListView::ColumnLayoutVisitor : public TreeNodeVisitor
126 126
     
127 127
 };
128 128
 
129
-class ArticleListView::ArticleItem : public KListViewItem
129
+class ArticleListView::ArticleItem : public TDEListViewItem
130 130
     {
131 131
         friend class ArticleListView;
132 132
 
@@ -141,9 +141,9 @@ class ArticleListView::ArticleItem : public KListViewItem
141 141
 
142 142
             void updateItem(const Article& article);
143 143
 
144
-            virtual ArticleItem* itemAbove() { return static_cast<ArticleItem*>(KListViewItem::itemAbove()); }
144
+            virtual ArticleItem* itemAbove() { return static_cast<ArticleItem*>(TDEListViewItem::itemAbove()); }
145 145
             
146
-            virtual ArticleItem* nextSibling() { return static_cast<ArticleItem*>(KListViewItem::nextSibling()); }
146
+            virtual ArticleItem* nextSibling() { return static_cast<ArticleItem*>(TDEListViewItem::nextSibling()); }
147 147
 
148 148
         private:
149 149
             Article m_article;
@@ -156,7 +156,7 @@ class ArticleListView::ArticleItem : public KListViewItem
156 156
 
157 157
 // FIXME: Remove resolveEntities for KDE 4.0, it's now done in the parser
158 158
 ArticleListView::ArticleItem::ArticleItem( TQListView *parent, const Article& a)
159
-    : 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())
159
+    : 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())
160 160
 {
161 161
     if (a.keep())
162 162
         setPixmap(0, keepFlag());
@@ -175,7 +175,7 @@ Article& ArticleListView::ArticleItem::article()
175 175
 void ArticleListView::ArticleItem::paintCell ( TQPainter * p, const TQColorGroup & cg, int column, int width, int align )
176 176
 {
177 177
     if (article().status() == Article::Read)
178
-        KListViewItem::paintCell( p, cg, column, width, align );
178
+        TDEListViewItem::paintCell( p, cg, column, width, align );
179 179
     else
180 180
     {
181 181
         // 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
186 186
         else // New
187 187
             cg2.setColor(TQColorGroup::Text, TQt::red);
188 188
     
189
-        KListViewItem::paintCell( p, cg2, column, width, align );
189
+        TDEListViewItem::paintCell( p, cg2, column, width, align );
190 190
     }
191 191
 
192 192
 }
@@ -208,13 +208,13 @@ int ArticleListView::ArticleItem::compare(TQListViewItem *i, int col, bool ascen
208 208
             return 0;
209 209
         return (m_pubDate > item->m_pubDate) ? 1 : -1;
210 210
     }
211
-    return KListViewItem::compare(i, col, ascending);
211
+    return TDEListViewItem::compare(i, col, ascending);
212 212
 }
213 213
 
214 214
 /* ==================================================================================== */
215 215
 
216 216
 ArticleListView::ArticleListView(TQWidget *parent, const char *name)
217
-    : KListView(parent, name)
217
+    : TDEListView(parent, name)
218 218
 {
219 219
     d = new ArticleListViewPrivate(this);
220 220
     d->noneSelected = true;
@@ -274,15 +274,15 @@ ArticleListView::ArticleListView(TQWidget *parent, const char *name)
274 274
     connect(this, TQT_SIGNAL(currentChanged(TQListViewItem*)), this, TQT_SLOT(slotCurrentChanged(TQListViewItem* )));
275 275
     connect(this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()));
276 276
     connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)),  this, TQT_SLOT(slotDoubleClicked(TQListViewItem*, const TQPoint&, int)) );
277
-    connect(this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)),
278
-            this, TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*, const TQPoint&)));
277
+    connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
278
+            this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
279 279
 
280 280
     connect(this, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem *, const TQPoint &, int)), this, TQT_SLOT(slotMouseButtonPressed(int, TQListViewItem *, const TQPoint &, int)));
281 281
 }
282 282
 
283 283
 Article ArticleListView::currentArticle() const
284 284
 {
285
-    ArticleItem* ci = dynamic_cast<ArticleItem*>(KListView::currentItem());
285
+    ArticleItem* ci = dynamic_cast<ArticleItem*>(TDEListView::currentItem());
286 286
     return (ci && !selectedItems().isEmpty()) ? ci->article() : Article();
287 287
 }
288 288
 
@@ -572,7 +572,7 @@ void ArticleListView::paintInfoBox(const TQString &message)
572 572
 void ArticleListView::viewportPaintEvent(TQPaintEvent *e)
573 573
 {
574 574
 
575
-    KListView::viewportPaintEvent(e);
575
+    TDEListView::viewportPaintEvent(e);
576 576
     
577 577
     if(!e)
578 578
         return;
@@ -770,7 +770,7 @@ void ArticleListView::slotDoubleClicked(TQListViewItem* item, const TQPoint& p,
770 770
         emit signalDoubleClicked(ali->article(), p, i);
771 771
 }
772 772
 
773
-void ArticleListView::slotContextMenu(KListView* /*list*/, TQListViewItem* /*item*/, const TQPoint& p)
773
+void ArticleListView::slotContextMenu(TDEListView* /*list*/, TQListViewItem* /*item*/, const TQPoint& p)
774 774
 {
775 775
     TQWidget* w = ActionManager::getInstance()->container("article_popup");
776 776
     TQPopupMenu* popup = static_cast<TQPopupMenu *>(w);

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

@@ -40,7 +40,7 @@ namespace Akregator
40 40
         class ArticleMatcher;
41 41
     }
42 42
 
43
-    class ArticleListView : public KListView
43
+    class ArticleListView : public TDEListView
44 44
     {
45 45
         Q_OBJECT
46 46
   
@@ -84,7 +84,7 @@ namespace Akregator
84 84
         signals:
85 85
             void signalArticleChosen(const Article& article);
86 86
             void signalDoubleClicked(const Article&, const TQPoint&, int);
87
-            //void signalContextMenu(KListView*, ArticleItem*, const TQPoint&);
87
+            //void signalContextMenu(TDEListView*, ArticleItem*, const TQPoint&);
88 88
             void signalMouseButtonPressed(int, const Article&, const TQPoint &, int);
89 89
              
90 90
         protected:
@@ -120,7 +120,7 @@ namespace Akregator
120 120
             virtual void slotCurrentChanged(TQListViewItem* item);
121 121
             virtual void slotSelectionChanged();
122 122
             virtual void slotDoubleClicked(TQListViewItem* item, const TQPoint& p, int i);
123
-            virtual void slotContextMenu(KListView* list, TQListViewItem* item, const TQPoint& p);
123
+            virtual void slotContextMenu(TDEListView* list, TQListViewItem* item, const TQPoint& p);
124 124
             virtual void slotMouseButtonPressed(int, TQListViewItem *, const TQPoint &, int);
125 125
             
126 126
         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)
169 169
 
170 170
     generateNormalModeCSS();
171 171
     generateCombinedModeCSS();
172
-    new KAction( i18n("&Scroll Up"), TQString(), "Up", this, TQT_SLOT(slotScrollUp()), actionCollection(), "articleviewer_scroll_up" );
173
-    new KAction( i18n("&Scroll Down"), TQString(), "Down", this, TQT_SLOT(slotScrollDown()), actionCollection(), "articleviewer_scroll_down" );
172
+    new TDEAction( i18n("&Scroll Up"), TQString(), "Up", this, TQT_SLOT(slotScrollUp()), actionCollection(), "articleviewer_scroll_up" );
173
+    new TDEAction( i18n("&Scroll Down"), TQString(), "Down", this, TQT_SLOT(slotScrollDown()), actionCollection(), "articleviewer_scroll_down" );
174 174
     
175 175
     connect(this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()));
176 176
 

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

@@ -39,12 +39,12 @@ FeedItem::FeedItem(FolderItem* parent, Feed* node) : TreeNodeItem(parent, node)
39 39
     initialize(node);
40 40
 }
41 41
 
42
-FeedItem::FeedItem(KListView* parent, Feed* node) : TreeNodeItem(parent, node)
42
+FeedItem::FeedItem(TDEListView* parent, Feed* node) : TreeNodeItem(parent, node)
43 43
 {
44 44
     initialize(node);
45 45
 }
46 46
 
47
-FeedItem::FeedItem(KListView* parent, TreeNodeItem* after, Feed* node) : TreeNodeItem(parent, after, node)
47
+FeedItem::FeedItem(TDEListView* parent, TreeNodeItem* after, Feed* node) : TreeNodeItem(parent, after, node)
48 48
 {
49 49
     initialize(node);
50 50
 }

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

@@ -42,8 +42,8 @@ class FeedItem : public TreeNodeItem
42 42
     
43 43
     FeedItem(FolderItem* parent, Feed* node);
44 44
     FeedItem(FolderItem* parent, TreeNodeItem* after, Feed* node);
45
-    FeedItem(KListView* parent, Feed* node);
46
-    FeedItem(KListView* parent, TreeNodeItem* after, Feed* node);
45
+    FeedItem(TDEListView* parent, Feed* node);
46
+    FeedItem(TDEListView* parent, TreeNodeItem* after, Feed* node);
47 47
 
48 48
     virtual ~FeedItem();
49 49
     virtual Feed* node();

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

@@ -353,7 +353,7 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor
353 353
 };
354 354
 
355 355
 NodeListView::NodeListView( TQWidget *parent, const char *name)
356
-        : KListView(parent, name), d(new NodeListViewPrivate)
356
+        : TDEListView(parent, name), d(new NodeListViewPrivate)
357 357
 {
358 358
     d->showTagFolders = true;
359 359
     d->connectNodeVisitor = new ConnectNodeVisitor(this),
@@ -380,7 +380,7 @@ NodeListView::NodeListView( TQWidget *parent, const char *name)
380 380
     connect( this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*)), this, TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*)) );
381 381
     connect( this, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotSelectionChanged(TQListViewItem*)) );
382 382
     connect( this, TQT_SIGNAL(itemRenamed(TQListViewItem*, int, const TQString&)), this, TQT_SLOT(slotItemRenamed(TQListViewItem*, int, const TQString&)) );
383
-    connect( this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), this, TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*, const TQPoint&)) );
383
+    connect( this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) );
384 384
     connect( &(d->autoopentimer), TQT_SIGNAL( timeout() ), this, TQT_SLOT( openFolder() ) );
385 385
 
386 386
     clear();
@@ -462,7 +462,7 @@ TreeNodeItem* NodeListView::findNodeItem(TreeNode* node)
462 462
 
463 463
 TreeNodeItem* NodeListView::findItemByTitle(const TQString& text, int column, ComparisonFlags compare) const
464 464
 { 
465
-    return dynamic_cast<TreeNodeItem*> (KListView::findItem(text, column, compare)); 
465
+    return dynamic_cast<TreeNodeItem*> (TDEListView::findItem(text, column, compare)); 
466 466
 }
467 467
 
468 468
 void NodeListView::ensureNodeVisible(TreeNode* node)
@@ -487,7 +487,7 @@ void NodeListView::clear()
487 487
     d->itemDict.clear();
488 488
     d->nodeList = 0;
489 489
     
490
-    KListView::clear();
490
+    TDEListView::clear();
491 491
 }
492 492
 
493 493
 void NodeListView::drawContentsOffset( TQPainter * p, int ox, int oy,
@@ -495,7 +495,7 @@ void NodeListView::drawContentsOffset( TQPainter * p, int ox, int oy,
495 495
 {
496 496
     bool oldUpdatesEnabled = isUpdatesEnabled();
497 497
     setUpdatesEnabled(false);
498
-    KListView::drawContentsOffset( p, ox, oy, cx, cy, cw, ch );
498
+    TDEListView::drawContentsOffset( p, ox, oy, cx, cy, cw, ch );
499 499
     setUpdatesEnabled(oldUpdatesEnabled);
500 500
 }
501 501
 
@@ -543,7 +543,7 @@ void NodeListView::movableDropEvent(TQListViewItem* /*parent*/, TQListViewItem*
543 543
 
544 544
         current->parent()->removeChild(current);
545 545
         parentNode->insertChild(current, afterMeNode);
546
-        KListView::movableDropEvent(d->parent, d->afterme);
546
+        TDEListView::movableDropEvent(d->parent, d->afterme);
547 547
     }    
548 548
 }
549 549
 
@@ -649,8 +649,8 @@ void NodeListView::contentsDragMoveEvent(TQDragMoveEvent* event)
649 649
         d->autoopentimer.stop();
650 650
     }
651 651
 
652
-    // the rest is handled by KListView.
653
-    KListView::contentsDragMoveEvent(event);
652
+    // the rest is handled by TDEListView.
653
+    TDEListView::contentsDragMoveEvent(event);
654 654
 }
655 655
 
656 656
 bool NodeListView::acceptDrag(TQDropEvent *e) const
@@ -876,7 +876,7 @@ void NodeListView::slotItemRenamed(TQListViewItem* item, int col, const TQString
876 876
         }
877 877
     }
878 878
 }
879
-void NodeListView::slotContextMenu(KListView* list, TQListViewItem* item, const TQPoint& p)
879
+void NodeListView::slotContextMenu(TDEListView* list, TQListViewItem* item, const TQPoint& p)
880 880
 {    
881 881
     TreeNodeItem* ti = dynamic_cast<TreeNodeItem*>(item);
882 882
     emit signalContextMenu(list, ti ? ti->node() : 0, p);
@@ -995,7 +995,7 @@ void NodeListView::slotNodeChanged(TreeNode* node)
995 995
 TQDragObject *NodeListView::dragObject()
996 996
 {
997 997
     KMultipleDrag *md = new KMultipleDrag(viewport());
998
-    TQDragObject *obj = KListView::dragObject();
998
+    TQDragObject *obj = TDEListView::dragObject();
999 999
     if (obj) {
1000 1000
         md->addDragObject(obj);
1001 1001
     }

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

@@ -36,7 +36,7 @@ class TreeNode;
36 36
 class TreeNodeItem;
37 37
 class TagNodeList;
38 38
 
39
-class NodeListView : public KListView
39
+class NodeListView : public TDEListView
40 40
 {
41 41
 Q_OBJECT
42 42
   
@@ -106,7 +106,7 @@ signals:
106 106
     void signalDropped (KURL::List &, TreeNode*, Folder*);
107 107
     void signalNodeSelected(TreeNode*);
108 108
     void signalRootNodeChanged(NodeListView*, TreeNode*);
109
-    void signalContextMenu(KListView*, TreeNode*, const TQPoint&);
109
+    void signalContextMenu(TDEListView*, TreeNode*, const TQPoint&);
110 110
 
111 111
 public:         // compat with KDE-3.x assertions, remove for KDE 4
112 112
 // protected:
@@ -144,7 +144,7 @@ protected slots:
144 144
     void slotDropped(TQDropEvent *e, TQListViewItem* after);
145 145
     void slotRootNodeChanged(TreeNode*);
146 146
     virtual void slotSelectionChanged(TQListViewItem* item);
147
-    virtual void slotContextMenu(KListView* list, TQListViewItem* item, const TQPoint& p);
147
+    virtual void slotContextMenu(TDEListView* list, TQListViewItem* item, const TQPoint& p);
148 148
     virtual void slotItemRenamed(TQListViewItem* item, int col, const TQString& text);
149 149
     virtual void slotFeedFetchStarted(Feed* feed);
150 150
     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) :
43 43
     initialize(node);
44 44
 }
45 45
 
46
-FolderItem::FolderItem(KListView* parent, Folder* node) : TreeNodeItem(parent, node)
46
+FolderItem::FolderItem(TDEListView* parent, Folder* node) : TreeNodeItem(parent, node)
47 47
 {
48 48
     initialize(node);
49 49
 }
50 50
 
51
-FolderItem::FolderItem(KListView* parent, TreeNodeItem* after, Folder* node) : TreeNodeItem(parent, after, node)
51
+FolderItem::FolderItem(TDEListView* parent, TreeNodeItem* after, Folder* node) : TreeNodeItem(parent, after, node)
52 52
 {
53 53
     initialize(node);
54 54
 }
@@ -69,7 +69,7 @@ Folder* FolderItem::node()
69 69
 void FolderItem::setOpen(bool open)
70 70
 {
71 71
     node()->setOpen(open);
72
-    KListViewItem::setOpen(open);
72
+    TDEListViewItem::setOpen(open);
73 73
 }
74 74
 
75 75
 FolderItem::~FolderItem()

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

@@ -43,8 +43,8 @@ class FolderItem : public TreeNodeItem
43 43
 public:
44 44
     FolderItem(FolderItem* parent, Folder* node);
45 45
     FolderItem(FolderItem* parent, TreeNodeItem* after, Folder* node);
46
-    FolderItem(KListView* parent, Folder* node);
47
-    FolderItem(KListView* parent, TreeNodeItem* after, Folder* node);
46
+    FolderItem(TDEListView* parent, Folder* node);
47
+    FolderItem(TDEListView* parent, TreeNodeItem* after, Folder* node);
48 48
     virtual ~FolderItem();
49 49
     
50 50
     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
62 62
         connect(p, TQT_SIGNAL(canceled(const TQString &)), this, TQT_SLOT(setCanceled(const TQString&)));
63 63
         connect(p, TQT_SIGNAL(completed(bool)), this, TQT_SLOT(setCompleted()));
64 64
 
65
-/*        KActionCollection *coll=p->actionCollection();
65
+/*        TDEActionCollection *coll=p->actionCollection();
66 66
         if (coll)
67 67
         {
68 68
             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)
102 102
     {
103 103
 #undef RESTORE
104 104
 #define RESTORE(type) { int n = 1;\
105
-    while (KMainWindow::canBeRestored(n)){\
105
+    while (TDEMainWindow::canBeRestored(n)){\
106 106
         (new type)->restore(n, false);\
107 107
             n++;}}
108 108
 

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

@@ -223,7 +223,7 @@ KParts::BrowserExtension *MainWindow::browserExtension(KParts::ReadOnlyPart *p)
223 223
 
224 224
 
225 225
 // from konqmainwindow
226
-void MainWindow::connectActionCollection( KActionCollection *coll )
226
+void MainWindow::connectActionCollection( TDEActionCollection *coll )
227 227
 {
228 228
     if (!coll) return;
229 229
     connect( coll, TQT_SIGNAL( actionStatusText( const TQString & ) ),
@@ -243,7 +243,7 @@ bool MainWindow::queryExit()
243 243
     else
244 244
         kdDebug("MainWindow::queryExit(): saving session");
245 245
 
246
-    return KMainWindow::queryExit();
246
+    return TDEMainWindow::queryExit();
247 247
 }
248 248
 
249 249
 void MainWindow::slotQuit()

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

@@ -35,8 +35,8 @@
35 35
 #include <tdeparts/browserextension.h>
36 36
 #include <tdeio/job.h>
37 37
 
38
-class KActionCollection;
39
-class KToggleAction;
38
+class TDEActionCollection;
39
+class TDEToggleAction;
40 40
 class KSqueezedTextLabel;
41 41
 class KProgress;
42 42
 
@@ -127,7 +127,7 @@ protected slots:
127 127
 private:
128 128
 
129 129
     void setupActions();
130
-    void connectActionCollection(KActionCollection *coll);
130
+    void connectActionCollection(TDEActionCollection *coll);
131 131
     
132 132
     KParts::BrowserExtension *browserExtension(KParts::ReadOnlyPart *p);
133 133
 

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

@@ -86,10 +86,10 @@ class PageViewer::PageViewerPrivate
86 86
     TQValueList<HistoryEntry> history;
87 87
     TQValueList<HistoryEntry>::Iterator current;
88 88
     
89
-    KToolBarPopupAction* backAction;
90
-    KToolBarPopupAction* forwardAction;
91
-    KAction* reloadAction;
92
-    KAction* stopAction;
89
+    TDEToolBarPopupAction* backAction;
90
+    TDEToolBarPopupAction* forwardAction;
91
+    TDEAction* reloadAction;
92
+    TDEAction* stopAction;
93 93
     
94 94
     TQString caption;
95 95
 };           
@@ -107,8 +107,8 @@ PageViewer::PageViewer(TQWidget *parent, const char *name)
107 107
 
108 108
     TQPair< KGuiItem, KGuiItem > backForward = KStdGuiItem::backAndForward();
109 109
 
110
-    d->backAction = new KToolBarPopupAction(backForward.first, 
111
-                                KStdAccel::shortcut(KStdAccel::Back), this, 
110
+    d->backAction = new TDEToolBarPopupAction(backForward.first, 
111
+                                TDEStdAccel::shortcut(TDEStdAccel::Back), this, 
112 112
                                 TQT_SLOT(slotBack()), actionCollection(), 
113 113
                                 "pageviewer_back");
114 114
 
@@ -118,8 +118,8 @@ PageViewer::PageViewer(TQWidget *parent, const char *name)
118 118
             this, TQT_SLOT(slotPopupActivated(int)));
119 119
 
120 120
     
121
-    d->forwardAction = new KToolBarPopupAction(backForward.second, 
122
-                                KStdAccel::shortcut(KStdAccel::Forward),this, 
121
+    d->forwardAction = new TDEToolBarPopupAction(backForward.second, 
122
+                                TDEStdAccel::shortcut(TDEStdAccel::Forward),this, 
123 123
                                 TQT_SLOT(slotForward()), actionCollection(), 
124 124
                                 "pageviewer_forward");
125 125
 
@@ -128,10 +128,10 @@ PageViewer::PageViewer(TQWidget *parent, const char *name)
128 128
     connect(d->forwardAction->popupMenu(), TQT_SIGNAL(activated(int)),
129 129
             this, TQT_SLOT(slotPopupActivated(int)));
130 130
 
131
-    d->reloadAction = new KAction(i18n("Reload"), "reload", 0,
131
+    d->reloadAction = new TDEAction(i18n("Reload"), "reload", 0,
132 132
                             this, TQT_SLOT(slotReload()),
133 133
                             actionCollection(), "pageviewer_reload");
134
-    d->stopAction = new KAction(KStdGuiItem::guiItem(KStdGuiItem::Stop), 0,
134
+    d->stopAction = new TDEAction(KStdGuiItem::guiItem(KStdGuiItem::Stop), 0,
135 135
                                  this, TQT_SLOT(slotStop()),
136 136
                                  actionCollection(), "pageviewer_stop");
137 137
  
@@ -185,7 +185,7 @@ void PageViewer::slotForward()
185 185
 
186 186
 void PageViewer::slotBackAboutToShow()
187 187
 {
188
-    KPopupMenu *popup = d->backAction->popupMenu();
188
+    TDEPopupMenu *popup = d->backAction->popupMenu();
189 189
     popup->clear();
190 190
 
191 191
     if ( d->current == d->history.begin() )
@@ -211,7 +211,7 @@ void PageViewer::slotBackAboutToShow()
211 211
 
212 212
 void PageViewer::slotForwardAboutToShow()
213 213
 {
214
-    KPopupMenu *popup = d->forwardAction->popupMenu();
214
+    TDEPopupMenu *popup = d->forwardAction->popupMenu();
215 215
     popup->clear();
216 216
 
217 217
     if ( d->current == d->history.fromLast() )
@@ -424,7 +424,7 @@ void PageViewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kur
424 424
     const bool isLink = (kpf & (KParts::BrowserExtension::ShowNavigationItems | KParts::BrowserExtension::ShowTextSelectionItems)) == 0;
425 425
     const bool isSelection = (kpf & KParts::BrowserExtension::ShowTextSelectionItems) != 0;
426 426
         
427
-    KPopupMenu popup(this->widget());
427
+    TDEPopupMenu popup(this->widget());
428 428
 
429 429
     int idNewWindow = -2;
430 430
     if (isLink)
@@ -435,7 +435,7 @@ void PageViewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kur
435 435
                 
436 436
         popup.insertSeparator();
437 437
         action("savelinkas")->plug(&popup);    
438
-        KAction* copylinkaddress = action("copylinkaddress");
438
+        TDEAction* copylinkaddress = action("copylinkaddress");
439 439
         if (copylinkaddress)
440 440
         {
441 441
             copylinkaddress->plug( &popup);
@@ -463,8 +463,8 @@ void PageViewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kur
463 463
             popup.insertSeparator();
464 464
         }
465 465
 
466
-        KAction* incFontAction = this->action("incFontSizes");
467
-        KAction* decFontAction = this->action("decFontSizes");
466
+        TDEAction* incFontAction = this->action("incFontSizes");
467
+        TDEAction* decFontAction = this->action("decFontSizes");
468 468
         if ( incFontAction && decFontAction )
469 469
         {
470 470
             incFontAction->plug( &popup );
@@ -477,7 +477,7 @@ void PageViewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kur
477 477
         action("viewer_print")->plug(&popup);
478 478
         popup.insertSeparator();
479 479
         
480
-        KAction *ac = action("setEncoding");
480
+        TDEAction *ac = action("setEncoding");
481 481
         if (ac)
482 482
             ac->plug(&popup);
483 483
         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 @@
29 29
 #include "viewer.h"
30 30
 
31 31
 
32
-class KAction;
33
-class KToolBarPopupAction;
32
+class TDEAction;
33
+class TDEToolBarPopupAction;
34 34
 class TQString;
35 35
 
36 36
 namespace Akregator

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

@@ -133,7 +133,7 @@
133 133
                         <string>Standard font:</string>
134 134
                     </property>
135 135
                 </widget>
136
-                <widget class="KFontCombo" row="0" column="1">
136
+                <widget class="TDEFontCombo" row="0" column="1">
137 137
                     <property name="name">
138 138
                         <cstring>kcfg_StandardFont</cstring>
139 139
                     </property>
@@ -146,7 +146,7 @@
146 146
                         <string>Fixed font:</string>
147 147
                     </property>
148 148
                 </widget>
149
-                <widget class="KFontCombo" row="1" column="1">
149
+                <widget class="TDEFontCombo" row="1" column="1">
150 150
                     <property name="name">
151 151
                         <cstring>kcfg_FixedFont</cstring>
152 152
                     </property>
@@ -159,7 +159,7 @@
159 159
                         <string>Serif font:</string>
160 160
                     </property>
161 161
                 </widget>
162
-                <widget class="KFontCombo" row="2" column="1">
162
+                <widget class="TDEFontCombo" row="2" column="1">
163 163
                     <property name="name">
164 164
                         <cstring>kcfg_SerifFont</cstring>
165 165
                     </property>
@@ -172,7 +172,7 @@
172 172
                         <string>Sans serif font:</string>
173 173
                     </property>
174 174
                 </widget>
175
-                <widget class="KFontCombo" row="3" column="1">
175
+                <widget class="TDEFontCombo" row="3" column="1">
176 176
                     <property name="name">
177 177
                         <cstring>kcfg_SansSerifFont</cstring>
178 178
                     </property>

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

@@ -81,7 +81,7 @@ void SelectNodeDialog::slotNodeSelected(TreeNode* node)
81 81
 class SimpleNodeSelector::SimpleNodeSelectorPrivate
82 82
 {
83 83
     public:
84
-    KListView* view;
84
+    TDEListView* view;
85 85
     FeedList* list;
86 86
     NodeVisitor* visitor;
87 87
     TQMap<TreeNode*,TQListViewItem*> nodeToItem;
@@ -113,11 +113,11 @@ class SimpleNodeSelector::NodeVisitor : public TreeNodeVisitor
113 113
     {
114 114
         TQListViewItem* pi = node->parent() ? m_view->d->nodeToItem[node->parent()] : 0;
115 115
          
116
-        KListViewItem* item = 0;
116
+        TDEListViewItem* item = 0;
117 117
         if (pi != 0)
118
-             item = new KListViewItem(pi, node->title());
118
+             item = new TDEListViewItem(pi, node->title());
119 119
         else
120
-             item = new KListViewItem(m_view->d->view, node->title());
120
+             item = new TDEListViewItem(m_view->d->view, node->title());
121 121
         item->setExpandable(false);
122 122
         m_view->d->nodeToItem.insert(node, item);
123 123
         m_view->d->itemToNode.insert(item, node);
@@ -136,7 +136,7 @@ SimpleNodeSelector::SimpleNodeSelector(FeedList* feedList, TQWidget* parent, con
136 136
     d->list = feedList;
137 137
     connect(feedList, TQT_SIGNAL(signalDestroyed(FeedList*)), this, TQT_SLOT(slotFeedListDestroyed(FeedList*)));
138 138
 
139
-    d->view = new KListView(this);
139
+    d->view = new TDEListView(this);
140 140
     d->view->setRootIsDecorated(true);
141 141
     d->view->addColumn(i18n("Feeds"));
142 142
     

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

@@ -45,8 +45,8 @@ class TagAction::TagActionPrivate
45 45
 };
46 46
  
47 47
 TagAction::TagAction(const Tag& tag, const TQObject *receiver, const char *slot, TQObject *parent)
48
-//KAction (const TQString &text, const KShortcut &cut, const TQObject *receiver, const char *slot, TQObject *parent, const char *name=0)
49
-       : KToggleAction(tag.name(), KShortcut(), 0, 0, parent), d(new TagActionPrivate)
48
+//TDEAction (const TQString &text, const TDEShortcut &cut, const TQObject *receiver, const char *slot, TQObject *parent, const char *name=0)
49
+       : TDEToggleAction(tag.name(), TDEShortcut(), 0, 0, parent), d(new TagActionPrivate)
50 50
 {
51 51
      d->tag = tag;
52 52
      connect(this, TQT_SIGNAL(toggled(const Tag&, bool)), receiver, slot);
@@ -67,7 +67,7 @@ Tag TagAction::tag() const
67 67
 /*
68 68
 void TagAction::unplug(TQWidget* widget)
69 69
 {
70
-    KToggleAction::unplug(widget);
70
+    TDEToggleAction::unplug(widget);
71 71
 
72 72
     TQPopupMenu* popup = ::tqt_cast<TQPopupMenu *>(widget);
73 73
     if (popup)
@@ -83,10 +83,10 @@ int TagAction::plug(TQWidget* widget, int index)
83 83
     TQPopupMenu* popup = ::tqt_cast<TQPopupMenu *>( widget );
84 84
     if (!popup)
85 85
     {
86
-        kdWarning() << "Can not plug KToggleAction in " << widget->className() << endl;
86
+        kdWarning() << "Can not plug TDEToggleAction in " << widget->className() << endl;
87 87
         return -1;
88 88
     }
89
-    if (kapp && !kapp->authorizeKAction(name()))
89
+    if (kapp && !kapp->authorizeTDEAction(name()))
90 90
         return -1;
91 91
     
92 92
    TagMenuItem* item = new TagMenuItem(d->tag);

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

@@ -34,8 +34,8 @@ namespace Akregator {
34 34
 
35 35
 class Tag;
36 36
 
37
-/** a KToggleAction for assigning and removing tags. Displays the tag name and emits the tag when activated */
38
-class TagAction : public KToggleAction
37
+/** a TDEToggleAction for assigning and removing tags. Displays the tag name and emits the tag when activated */
38
+class TagAction : public TDEToggleAction
39 39
 {
40 40
     Q_OBJECT
41 41
   

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

@@ -41,11 +41,11 @@ TagFolderItem::TagFolderItem(FolderItem* parent, TreeNodeItem* after, TagFolder*
41 41
 {
42 42
 }
43 43
 
44
-TagFolderItem::TagFolderItem(KListView* parent, TagFolder* node) : FolderItem(parent, node)
44
+TagFolderItem::TagFolderItem(TDEListView* parent, TagFolder* node) : FolderItem(parent, node)
45 45
 {
46 46
 }
47 47
 
48
-TagFolderItem::TagFolderItem(KListView* parent, TreeNodeItem* after, TagFolder* node) : FolderItem(parent, after, node)
48
+TagFolderItem::TagFolderItem(TDEListView* parent, TreeNodeItem* after, TagFolder* node) : FolderItem(parent, after, node)
49 49
 {
50 50
 }
51 51
 

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

@@ -42,8 +42,8 @@ class TagFolderItem : public FolderItem
42 42
 public:
43 43
     TagFolderItem(FolderItem* parent, TagFolder* node);
44 44
     TagFolderItem(FolderItem* parent, TreeNodeItem* after, TagFolder* node);
45
-    TagFolderItem(KListView* parent, TagFolder* node);
46
-    TagFolderItem(KListView* parent, TreeNodeItem* after, TagFolder* node);
45
+    TagFolderItem(TDEListView* parent, TagFolder* node);
46
+    TagFolderItem(TDEListView* parent, TreeNodeItem* after, TagFolder* node);
47 47
     virtual ~TagFolderItem();
48 48
     
49 49
     virtual TagFolder* node();

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

@@ -45,12 +45,12 @@ TagNodeItem::TagNodeItem(FolderItem* parent, TreeNodeItem* after, TagNode* node)
45 45
     initialize(node);
46 46
 }
47 47
 
48
-TagNodeItem::TagNodeItem(KListView* parent, TagNode* node) : TreeNodeItem(parent, node)
48
+TagNodeItem::TagNodeItem(TDEListView* parent, TagNode* node) : TreeNodeItem(parent, node)
49 49
 {
50 50
     initialize(node);
51 51
 }
52 52
 
53
-TagNodeItem::TagNodeItem(KListView* parent, TreeNodeItem* after, TagNode* node) : TreeNodeItem(parent, after, node)
53
+TagNodeItem::TagNodeItem(TDEListView* parent, TreeNodeItem* after, TagNode* node) : TreeNodeItem(parent, after, node)
54 54
 {
55 55
     initialize(node);
56 56
 }

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

@@ -39,8 +39,8 @@ class TagNodeItem : public TreeNodeItem
39 39
 public:
40 40
     TagNodeItem(FolderItem* parent, TagNode* node);
41 41
     TagNodeItem(FolderItem* parent, TreeNodeItem* after, TagNode* node);
42
-    TagNodeItem(KListView* parent, TagNode* node);
43
-    TagNodeItem(KListView* parent, TreeNodeItem* after, TagNode* node);
42
+    TagNodeItem(TDEListView* parent, TagNode* node);
43
+    TagNodeItem(TDEListView* parent, TreeNodeItem* after, TagNode* node);
44 44
     virtual ~TagNodeItem();
45 45
     virtual void nodeChanged();
46 46
     

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

@@ -37,24 +37,24 @@
37 37
 namespace Akregator {
38 38
 
39 39
 TreeNodeItem::TreeNodeItem(FolderItem* parent, TreeNode* node)
40
-    : KListViewItem(parent), m_node(node)
40
+    : TDEListViewItem(parent), m_node(node)
41 41
 {
42 42
     initialize(node);
43 43
 }
44 44
 
45
-TreeNodeItem::TreeNodeItem(KListView* parent, TreeNode* node) 
46
-    : KListViewItem(parent), m_node(node)
45
+TreeNodeItem::TreeNodeItem(TDEListView* parent, TreeNode* node) 
46
+    : TDEListViewItem(parent), m_node(node)
47 47
 {
48 48
     initialize(node);
49 49
 }
50 50
 
51
-TreeNodeItem::TreeNodeItem(KListView* parent, TreeNodeItem* after, TreeNode* node) : KListViewItem(parent, after), m_node(node)
51
+TreeNodeItem::TreeNodeItem(TDEListView* parent, TreeNodeItem* after, TreeNode* node) : TDEListViewItem(parent, after), m_node(node)
52 52
 {
53 53
     initialize(node);
54 54
 }
55 55
 
56 56
 TreeNodeItem::TreeNodeItem(FolderItem* parent, TreeNodeItem* after, TreeNode* node)
57
-    : KListViewItem(parent, after), m_node(node)
57
+    : TDEListViewItem(parent, after), m_node(node)
58 58
 {
59 59
     initialize(node);
60 60
 }
@@ -91,17 +91,17 @@ void TreeNodeItem::nodeChanged()
91 91
 
92 92
 TreeNodeItem* TreeNodeItem::firstChild() const 
93 93
 { 
94
-    return static_cast<TreeNodeItem*>(KListViewItem::firstChild()); 
94
+    return static_cast<TreeNodeItem*>(TDEListViewItem::firstChild()); 
95 95
 } 
96 96
 
97 97
 TreeNodeItem* TreeNodeItem::nextSibling() const 
98 98
 { 
99
-    return static_cast<TreeNodeItem*>(KListViewItem::nextSibling()); 
99
+    return static_cast<TreeNodeItem*>(TDEListViewItem::nextSibling()); 
100 100
 } 
101 101
 
102 102
 FolderItem* TreeNodeItem::parent() const 
103 103
 { 
104
-    return static_cast<FolderItem*>(KListViewItem::parent()); 
104
+    return static_cast<FolderItem*>(TDEListViewItem::parent()); 
105 105
 } 
106 106
     
107 107
 
@@ -114,7 +114,7 @@ void TreeNodeItem::paintCell( TQPainter * p, const TQColorGroup & cg,
114 114
 
115 115
     if (u <= 0)
116 116
     {
117
-        KListViewItem::paintCell(p,cg,column,width,align);
117
+        TDEListViewItem::paintCell(p,cg,column,width,align);
118 118
         return;
119 119
     }
120 120
 
@@ -123,7 +123,7 @@ void TreeNodeItem::paintCell( TQPainter * p, const TQColorGroup & cg,
123 123
     setText( column, " " );
124 124
 
125 125
     // draw bg
126
-    KListViewItem::paintCell(p,cg,column,width,align);
126
+    TDEListViewItem::paintCell(p,cg,column,width,align);
127 127
 
128 128
     setText( column, oldText);
129 129
 

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

@@ -38,15 +38,15 @@ class TreeNode;
38 38
 /**
39 39
     abstract base class for all items in the feeds tree
40 40
 */
41
-class TreeNodeItem : public KListViewItem
41
+class TreeNodeItem : public TDEListViewItem
42 42
 {
43 43
     
44 44
 public:
45 45
      
46 46
     TreeNodeItem(FolderItem* parent, TreeNode* node);
47 47
     TreeNodeItem(FolderItem* parent, TreeNodeItem* after, TreeNode* node);
48
-    TreeNodeItem(KListView* parent, TreeNode* node);
49
-    TreeNodeItem(KListView* parent, TreeNodeItem* after, TreeNode* node);
48
+    TreeNodeItem(TDEListView* parent, TreeNode* node);
49
+    TreeNodeItem(TDEListView* parent, TreeNodeItem* after, TreeNode* node);
50 50
     virtual ~TreeNodeItem();
51 51
     virtual TreeNode* node();
52 52
     

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

@@ -67,17 +67,17 @@ Viewer::Viewer(TQWidget *parent, const char *name)
67 67
     KStdAction::print(this, TQT_SLOT(slotPrint()), actionCollection(), "viewer_print");
68 68
     KStdAction::copy(this, TQT_SLOT(slotCopy()), actionCollection(), "viewer_copy");
69 69
     
70
-    new KAction( i18n("&Increase Font Sizes"), "viewmag+", "Ctrl+Plus", this, TQT_SLOT(slotZoomIn()), actionCollection(), "incFontSizes" );
71
-    new KAction( i18n("&Decrease Font Sizes"), "viewmag-", "Ctrl+Minus", this, TQT_SLOT(slotZoomOut()), actionCollection(), "decFontSizes" );
70
+    new TDEAction( i18n("&Increase Font Sizes"), "viewmag+", "Ctrl+Plus", this, TQT_SLOT(slotZoomIn()), actionCollection(), "incFontSizes" );
71
+    new TDEAction( i18n("&Decrease Font Sizes"), "viewmag-", "Ctrl+Minus", this, TQT_SLOT(slotZoomOut()), actionCollection(), "decFontSizes" );
72 72
 
73 73
     connect(this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()));
74 74
 
75 75
     connect( browserExtension(), TQT_SIGNAL(openURLRequestDelayed(const KURL&, const KParts::URLArgs&)), this, TQT_SLOT(slotOpenURLRequest(const KURL&, const KParts::URLArgs& )) );
76 76
 
77
-    new KAction(i18n("Copy &Link Address"), "", 0,
77
+    new TDEAction(i18n("Copy &Link Address"), "", 0,
78 78
                                  this, TQT_SLOT(slotCopyLinkAddress()),
79 79
                                  actionCollection(), "copylinkaddress");
80
-    new KAction(i18n("&Save Link As..."), "", 0,
80
+    new TDEAction(i18n("&Save Link As..."), "", 0,
81 81
                                  this, TQT_SLOT(slotSaveLinkAs()),
82 82
                                  actionCollection(), "savelinkas");
83 83
 }
@@ -173,7 +173,7 @@ void Viewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kurl, c
173 173
    TQString url = kurl.url();
174 174
    
175 175
    m_url = url;
176
-   KPopupMenu popup;
176
+   TDEPopupMenu popup;
177 177
    
178 178
    if (isLink && !isSelection)
179 179
    {
@@ -191,7 +191,7 @@ void Viewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kurl, c
191 191
             popup.insertSeparator();
192 192
        }
193 193
        action("viewer_print")->plug(&popup);
194
-       //KAction *ac = action("setEncoding");
194
+       //TDEAction *ac = action("setEncoding");
195 195
        //if (ac)
196 196
        //     ac->plug(&popup);
197 197
    }

+ 28
- 28
certmanager/certmanager.cpp View File

@@ -162,7 +162,7 @@ namespace {
162 162
 
163 163
 CertManager::CertManager( bool remote, const TQString& query, const TQString & import,
164 164
 			  TQWidget* parent, const char* name, WFlags f )
165
-  : KMainWindow( parent, name, f|WDestructiveClose ),
165
+  : TDEMainWindow( parent, name, f|WDestructiveClose ),
166 166
     mCrlView( 0 ),
167 167
     mDirmngrProc( 0 ),
168 168
     mHierarchyAnalyser( 0 ),
@@ -250,104 +250,104 @@ static inline void connectEnableOperationSignal( TQObject * s, TQObject * d ) {
250 250
 
251 251
 
252 252
 void CertManager::createActions() {
253
-  KAction * action = 0;
253
+  TDEAction * action = 0;
254 254
 
255 255
   (void)KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection() );
256 256
 
257 257
   action = KStdAction::redisplay( TQT_TQOBJECT(this), TQT_SLOT(slotRedisplay()), actionCollection() );
258 258
   // work around the fact that the stdaction has no shortcut
259
-  KShortcut reloadShortcut = KStdAccel::shortcut(KStdAccel::Reload);
259
+  TDEShortcut reloadShortcut = TDEStdAccel::shortcut(TDEStdAccel::Reload);
260 260
   reloadShortcut.append(KKey(CTRL + Key_R));
261 261
   action->setShortcut( reloadShortcut );
262 262
 
263 263
   connectEnableOperationSignal( TQT_TQOBJECT(this), action );
264 264
 
265
-  action = new KAction( i18n("Stop Operation"), "stop", Key_Escape,
265
+  action = new TDEAction( i18n("Stop Operation"), "stop", Key_Escape,
266 266
 			TQT_TQOBJECT(this), TQT_SIGNAL(stopOperations()),
267 267
 			actionCollection(), "view_stop_operations" );
268 268
   action->setEnabled( false );
269 269
 
270
-  (void)   new KAction( i18n("New Key Pair..."), "filenew", 0,
270
+  (void)   new TDEAction( i18n("New Key Pair..."), "filenew", 0,
271 271
 			TQT_TQOBJECT(this), TQT_SLOT(newCertificate()),
272 272
 			actionCollection(), "file_new_certificate" );
273 273
 
274
-  connect( new KToggleAction( i18n("Hierarchical Key List"), 0,
274
+  connect( new TDEToggleAction( i18n("Hierarchical Key List"), 0,
275 275
 			      actionCollection(), "view_hierarchical" ),
276 276
 	   TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggleHierarchicalView(bool)) );
277 277
 
278
-  action = new KAction( i18n("Expand All"), 0, CTRL+Key_Period,
278
+  action = new TDEAction( i18n("Expand All"), 0, CTRL+Key_Period,
279 279
 			TQT_TQOBJECT(this), TQT_SLOT(slotExpandAll()),
280 280
 			actionCollection(), "view_expandall" );
281
-  action = new KAction( i18n("Collapse All"), 0, CTRL+Key_Comma,
281
+  action = new TDEAction( i18n("Collapse All"), 0, CTRL+Key_Comma,
282 282
 			TQT_TQOBJECT(this), TQT_SLOT(slotCollapseAll()),
283 283
 			actionCollection(), "view_collapseall" );
284 284
 
285
-  (void)   new KAction( i18n("Refresh CRLs"), 0, 0,
285
+  (void)   new TDEAction( i18n("Refresh CRLs"), 0, 0,
286 286
 			TQT_TQOBJECT(this), TQT_SLOT(slotRefreshKeys()),
287 287
 			actionCollection(), "certificates_refresh_clr" );
288 288
 
289 289
 #ifdef NOT_IMPLEMENTED_ANYWAY
290
-  mRevokeCertificateAction = new KAction( i18n("Revoke"), 0,
290
+  mRevokeCertificateAction = new TDEAction( i18n("Revoke"), 0,
291 291
                                           TQT_TQOBJECT(this), TQT_SLOT(revokeCertificate()),
292 292
                                           actionCollection(), "edit_revoke_certificate" );
293 293
   connectEnableOperationSignal( this, mRevokeCertificateAction );
294 294
 
295
-  mExtendCertificateAction = new KAction( i18n("Extend"), 0,
295
+  mExtendCertificateAction = new TDEAction( i18n("Extend"), 0,
296 296
                                           TQT_TQOBJECT(this), TQT_SLOT(extendCertificate()),
297 297
                                           actionCollection(), "edit_extend_certificate" );
298 298
   connectEnableOperationSignal( this, mExtendCertificateAction );
299 299
 #endif
300 300
 
301
-  mDeleteCertificateAction = new KAction( i18n("Delete"), "editdelete", Key_Delete,
301
+  mDeleteCertificateAction = new TDEAction( i18n("Delete"), "editdelete", Key_Delete,
302 302
                                     TQT_TQOBJECT(this), TQT_SLOT(slotDeleteCertificate()),
303 303
                                     actionCollection(), "edit_delete_certificate" );
304 304
   connectEnableOperationSignal( TQT_TQOBJECT(this), mDeleteCertificateAction );
305 305
 
306
-  mValidateCertificateAction = new KAction( i18n("Validate"), "reload", SHIFT + Key_F5,
306
+  mValidateCertificateAction = new TDEAction( i18n("Validate"), "reload", SHIFT + Key_F5,
307 307
 					    TQT_TQOBJECT(this), TQT_SLOT(slotValidate()),
308 308
 					    actionCollection(), "certificates_validate" );
309 309
   connectEnableOperationSignal( TQT_TQOBJECT(this), mValidateCertificateAction );
310 310
 
311
-  mImportCertFromFileAction = new KAction( i18n("Import Certificates..."), 0,
311
+  mImportCertFromFileAction = new TDEAction( i18n("Import Certificates..."), 0,
312 312
 					   TQT_TQOBJECT(this), TQT_SLOT(slotImportCertFromFile()),
313 313
 					   actionCollection(), "file_import_certificates" );
314 314
   connectEnableOperationSignal( TQT_TQOBJECT(this), mImportCertFromFileAction );
315 315
 
316
-  mImportCRLFromFileAction = new KAction( i18n("Import CRLs..."), 0,
316
+  mImportCRLFromFileAction = new TDEAction( i18n("Import CRLs..."), 0,
317 317
 					  TQT_TQOBJECT(this), TQT_SLOT(importCRLFromFile()),
318 318
 					  actionCollection(), "file_import_crls" );
319 319
   connectEnableOperationSignal( TQT_TQOBJECT(this), mImportCRLFromFileAction );
320 320
 
321
-  mExportCertificateAction = new KAction( i18n("Export Certificates..."), "export", 0,
321
+  mExportCertificateAction = new TDEAction( i18n("Export Certificates..."), "export", 0,
322 322
 					  TQT_TQOBJECT(this), TQT_SLOT(slotExportCertificate()),
323 323
 					  actionCollection(), "file_export_certificate" );
324 324
 
325
-  mExportSecretKeyAction = new KAction( i18n("Export Secret Key..."), "export", 0,
325
+  mExportSecretKeyAction = new TDEAction( i18n("Export Secret Key..."), "export", 0,
326 326
                                         TQT_TQOBJECT(this), TQT_SLOT(slotExportSecretKey()),
327 327
                                         actionCollection(), "file_export_secret_keys" );
328 328
   connectEnableOperationSignal( TQT_TQOBJECT(this), mExportSecretKeyAction );
329 329
 
330
-  mViewCertDetailsAction = new KAction( i18n("Certificate Details..."), 0, 0,
330
+  mViewCertDetailsAction = new TDEAction( i18n("Certificate Details..."), 0, 0,
331 331
                                         TQT_TQOBJECT(this), TQT_SLOT(slotViewDetails()), actionCollection(),
332 332
                                         "view_certificate_details" );
333
-  mDownloadCertificateAction = new KAction( i18n( "Download"), 0, 0,
333
+  mDownloadCertificateAction = new TDEAction( i18n( "Download"), 0, 0,
334 334
                                         TQT_TQOBJECT(this), TQT_SLOT(slotDownloadCertificate()), actionCollection(),
335 335
                                         "download_certificate" );
336 336
 
337 337
   const TQString dirmngr = TDEStandardDirs::findExe( "gpgsm" );
338 338
   mDirMngrFound = !dirmngr.isEmpty();
339 339
 
340
-  action = new KAction( i18n("Dump CRL Cache..."), 0,
340
+  action = new TDEAction( i18n("Dump CRL Cache..."), 0,
341 341
 			TQT_TQOBJECT(this), TQT_SLOT(slotViewCRLs()),
342 342
 			actionCollection(), "crl_dump_crl_cache" );
343 343
   action->setEnabled( mDirMngrFound ); // we also need dirmngr for this
344 344
 
345
-  action = new KAction( i18n("Clear CRL Cache..."), 0,
345
+  action = new TDEAction( i18n("Clear CRL Cache..."), 0,
346 346
 			TQT_TQOBJECT(this), TQT_SLOT(slotClearCRLs()),
347 347
 			actionCollection(), "crl_clear_crl_cache" );
348 348
   action->setEnabled( mDirMngrFound ); // we also need dirmngr for this
349 349
 
350
-  action = new KAction( i18n("GnuPG Log Viewer..."), "pgp-keys", 0, TQT_TQOBJECT(this),
350
+  action = new TDEAction( i18n("GnuPG Log Viewer..."), "pgp-keys", 0, TQT_TQOBJECT(this),
351 351
                         TQT_SLOT(slotStartWatchGnuPG()), actionCollection(), "tools_start_kwatchgnupg");
352 352
   // disable action if no kwatchgnupg binary is around
353 353
   if (TDEStandardDirs::findExe("kwatchgnupg").isEmpty()) action->setEnabled(false);
@@ -363,13 +363,13 @@ void CertManager::createActions() {
363 363
   mComboAction = new ComboAction( lst, actionCollection(), TQT_TQOBJECT(this), TQT_SLOT( slotToggleRemote(int) ),
364 364
                                   "location_combo_action", mNextFindRemote? 1 : 0 );
365 365
 
366
-  mFindAction = new KAction( i18n("Find"), "find", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSearch()),
366
+  mFindAction = new TDEAction( i18n("Find"), "find", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSearch()),
367 367
 			     actionCollection(), "find" );
368 368
 
369 369
   KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT(slotEditKeybindings()), actionCollection() );
370 370
   KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT(slotShowConfigurationDialog()), actionCollection() );
371 371
 
372
-  new KAction( i18n( "Configure &GpgME Backend" ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigureGpgME()),
372
+  new TDEAction( i18n( "Configure &GpgME Backend" ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigureGpgME()),
373 373
                actionCollection(), "configure_gpgme" );
374 374
 
375 375
   createStandardStatusBarAction();
@@ -423,12 +423,12 @@ void CertManager::slotToggleHierarchicalView( bool hier ) {
423 423
   mHierarchicalView = hier;
424 424
   mKeyListView->setHierarchical( hier );
425 425
   mKeyListView->setRootIsDecorated( hier );
426
-  if ( KAction * act = action("view_expandall") )
426
+  if ( TDEAction * act = action("view_expandall") )
427 427
     act->setEnabled( hier );
428
-  if ( KAction * act = action("view_collapseall" ) )
428
+  if ( TDEAction * act = action("view_collapseall" ) )
429 429
     act->setEnabled( hier );
430
-  if ( KToggleAction * act =
431
-      static_cast<KToggleAction*>( action("view_hierarchical") ) )
430
+  if ( TDEToggleAction * act =
431
+      static_cast<TDEToggleAction*>( action("view_hierarchical") ) )
432 432
     act->setChecked( hier );
433 433
 
434 434
   if ( hier && !mCurrentQuery.isEmpty() )

+ 14
- 14
certmanager/certmanager.h View File

@@ -55,8 +55,8 @@ namespace TDEIO {
55 55
   class Job;
56 56
 }
57 57
 class TDEProcess;
58
-class KToolBar;
59
-class KAction;
58
+class TDEToolBar;
59
+class TDEAction;
60 60
 
61 61
 class CRLView;
62 62
 class HierarchyAnalyser;
@@ -76,7 +76,7 @@ namespace GpgME {
76 76
   class Key;
77 77
 }
78 78
 
79
-class KDE_EXPORT CertManager : public KMainWindow {
79
+class KDE_EXPORT CertManager : public TDEMainWindow {
80 80
   Q_OBJECT
81 81
   
82 82
 public:
@@ -192,19 +192,19 @@ private:
192 192
 
193 193
     LineEditAction * mLineEditAction;
194 194
     ComboAction * mComboAction;
195
-    KAction * mFindAction;
196
-    KAction * mImportCertFromFileAction;
197
-    KAction * mImportCRLFromFileAction;
198
-    KAction * mExportCertificateAction;
199
-    KAction * mViewCertDetailsAction;
200
-    KAction * mDeleteCertificateAction;
195
+    TDEAction * mFindAction;
196
+    TDEAction * mImportCertFromFileAction;
197
+    TDEAction * mImportCRLFromFileAction;
198
+    TDEAction * mExportCertificateAction;
199
+    TDEAction * mViewCertDetailsAction;
200
+    TDEAction * mDeleteCertificateAction;
201 201
 #ifdef NOT_IMPLEMENTED_ANYWAY
202
-    KAction * mRevokeCertificateAction;
203
-    KAction * mExtendCertificateAction;
202
+    TDEAction * mRevokeCertificateAction;
203
+    TDEAction * mExtendCertificateAction;
204 204
 #endif
205
-    KAction * mExportSecretKeyAction;
206
-    KAction * mDownloadCertificateAction;
207
-    KAction * mValidateCertificateAction;
205
+    TDEAction * mExportSecretKeyAction;
206
+    TDEAction * mDownloadCertificateAction;
207
+    TDEAction * mValidateCertificateAction;
208 208
 
209 209
     TQString mImportCRLTempFile;
210 210
     TQString mCurrentQuery;

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

@@ -305,8 +305,8 @@ void AppearanceConfigWidget::slotFontClicked() {
305 305
   if( !item )
306 306
     return;
307 307
   TQFont font = item->font();
308
-  int result = KFontDialog::getFont( font );
309
-  if ( result == KFontDialog::Accepted ) {
308
+  int result = TDEFontDialog::getFont( font );
309
+  if ( result == TDEFontDialog::Accepted ) {
310 310
     item->setFont( font );
311 311
     item->repaint();
312 312
     emit changed();

+ 18
- 18
certmanager/customactions.cpp View File

@@ -39,18 +39,18 @@
39 39
 #include <tqlabel.h>
40 40
 
41 41
 
42
-LabelAction::LabelAction( const TQString & text,  KActionCollection * parent,
42
+LabelAction::LabelAction( const TQString & text,  TDEActionCollection * parent,
43 43
 			  const char* name )
44
-  : KAction( text, TQIconSet(), KShortcut(), 0, 0, parent, name )
44
+  : TDEAction( text, TQIconSet(), TDEShortcut(), 0, 0, parent, name )
45 45
 {
46 46
 
47 47
 }
48 48
 
49 49
 int LabelAction::plug( TQWidget * widget, int index ) {
50
-  if ( kapp && !kapp->authorizeKAction( name() ) )
50
+  if ( kapp && !kapp->authorizeTDEAction( name() ) )
51 51
     return -1;
52
-  if ( widget->inherits( "KToolBar" ) ) {
53
-    KToolBar * bar = (KToolBar *)widget;
52
+  if ( widget->inherits( "TDEToolBar" ) ) {
53
+    TDEToolBar * bar = (TDEToolBar *)widget;
54 54
     int id_ = getToolButtonID();
55 55
     TQLabel* label = new TQLabel( text(), bar, "kde toolbar widget" );
56 56
     bar->insertWidget( id_, label->width(), label, index );
@@ -59,22 +59,22 @@ int LabelAction::plug( TQWidget * widget, int index ) {
59 59
     return containerCount() - 1;
60 60
   }
61 61
 
62
-  return KAction::plug( widget, index );
62
+  return TDEAction::plug( widget, index );
63 63
 }
64 64
 
65
-LineEditAction::LineEditAction( const TQString & text, KActionCollection * parent,
65
+LineEditAction::LineEditAction( const TQString & text, TDEActionCollection * parent,
66 66
 				TQObject * receiver, const char * member, const char * name )
67
-  : KAction( text, TQIconSet(), KShortcut(), 0, 0, parent, name ),
67
+  : TDEAction( text, TQIconSet(), TDEShortcut(), 0, 0, parent, name ),
68 68
     _le(0), _receiver(receiver), _member(member)
69 69
 {
70 70
 
71 71
 }
72 72
 
73 73
 int LineEditAction::plug( TQWidget * widget, int index ) {
74
-  if ( kapp && !kapp->authorizeKAction( name() ) )
74
+  if ( kapp && !kapp->authorizeTDEAction( name() ) )
75 75
     return -1;
76
-  if ( widget->inherits( "KToolBar" ) ) {
77
-    KToolBar *bar = (KToolBar *)widget;
76
+  if ( widget->inherits( "TDEToolBar" ) ) {
77
+    TDEToolBar *bar = (TDEToolBar *)widget;
78 78
     int id_ = getToolButtonID();
79 79
     // The toolbar trick doesn't seem to work for lineedits
80 80
     //_le = new TQLineEdit( bar, "kde toolbar widget" );
@@ -87,7 +87,7 @@ int LineEditAction::plug( TQWidget * widget, int index ) {
87 87
     return containerCount() - 1;
88 88
   }
89 89
 
90
-  return KAction::plug( widget, index );
90
+  return TDEAction::plug( widget, index );
91 91
 }
92 92
 
93 93
 void LineEditAction::clear() {
@@ -108,20 +108,20 @@ void LineEditAction::setText( const TQString & txt ) {
108 108
 }
109 109
 
110 110
 
111
-ComboAction::ComboAction( const TQStringList & lst,  KActionCollection * parent,
111
+ComboAction::ComboAction( const TQStringList & lst,  TDEActionCollection * parent,
112 112
 			  TQObject * receiver, const char * member, const char * name,
113 113
                           int selectedID )
114
-  : KAction( TQString(), TQIconSet(), KShortcut(), 0, 0, parent, name ),
114
+  : TDEAction( TQString(), TQIconSet(), TDEShortcut(), 0, 0, parent, name ),
115 115
     _lst(lst), _receiver(receiver), _member(member), _selectedId( selectedID )
116 116
 {
117 117
 
118 118
 }
119 119
 
120 120
 int ComboAction::plug( TQWidget * widget, int index ) {
121
-  if ( kapp && !kapp->authorizeKAction( name() ) )
121
+  if ( kapp && !kapp->authorizeTDEAction( name() ) )
122 122
     return -1;
123
-  if ( widget->inherits( "KToolBar" ) ) {
124
-    KToolBar *bar = (KToolBar *)widget;
123
+  if ( widget->inherits( "TDEToolBar" ) ) {
124
+    TDEToolBar *bar = (TDEToolBar *)widget;
125 125
     int id_ = getToolButtonID();
126 126
     bar->insertCombo( _lst, id_, false, TQT_SIGNAL( highlighted(int) ), _receiver, _member );
127 127
     bar->setCurrentComboItem( id_,_selectedId );
@@ -130,7 +130,7 @@ int ComboAction::plug( TQWidget * widget, int index ) {
130 130
     return containerCount() - 1;
131 131
   }
132 132
 
133
-  return KAction::plug( widget, index );
133
+  return TDEAction::plug( widget, index );
134 134
 }
135 135
 
136 136
 #include "customactions.moc"

+ 6
- 6
certmanager/customactions.h View File

@@ -39,21 +39,21 @@
39 39
 
40 40
 class TQLineEdit;
41 41
 
42
-class LabelAction : public KAction {
42
+class LabelAction : public TDEAction {
43 43
   Q_OBJECT
44 44
   
45 45
 public:
46
-  LabelAction( const TQString & text, KActionCollection * parent,
46
+  LabelAction( const TQString & text, TDEActionCollection * parent,
47 47
 	       const char* name );
48 48
 
49 49
   int plug( TQWidget * widget, int index=-1 );
50 50
 };
51 51
 
52
-class LineEditAction : public KAction {
52
+class LineEditAction : public TDEAction {
53 53
   Q_OBJECT
54 54
   
55 55
 public:
56
-  LineEditAction( const TQString & text, KActionCollection * parent,
56
+  LineEditAction( const TQString & text, TDEActionCollection * parent,
57 57
 		  TQObject * receiver, const char * member, const char * name );
58 58
 
59 59
   int plug( TQWidget * widget, int index=-1 );
@@ -67,11 +67,11 @@ private:
67 67
   const char * _member;
68 68
 };
69 69
 
70
-class ComboAction : public KAction {
70
+class ComboAction : public TDEAction {
71 71
   Q_OBJECT
72 72
   
73 73
 public:
74
-  ComboAction( const TQStringList & lst,  KActionCollection * parent,
74
+  ComboAction( const TQStringList & lst,  TDEActionCollection * parent,
75 75
 	       TQObject * receiver, const char * member, const char * name,
76 76
                int selectedID );
77 77
 

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

@@ -59,7 +59,7 @@
59 59
 #define WATCHGNUPGSOCKET ( TQDir::home().canonicalPath() + "/.gnupg/log-socket")
60 60
 
61 61
 KWatchGnuPGMainWindow::KWatchGnuPGMainWindow( TQWidget* parent, const char* name )
62
-  : KMainWindow( parent, name, WType_TopLevel ), mConfig(0)
62
+  : TDEMainWindow( parent, name, WType_TopLevel ), mConfig(0)
63 63
 {
64 64
   createActions();
65 65
   createGUI();
@@ -95,7 +95,7 @@ void KWatchGnuPGMainWindow::slotClear()
95 95
 
96 96
 void KWatchGnuPGMainWindow::createActions()
97 97
 {
98
-  (void)new KAction( i18n("C&lear History"), "history_clear", CTRL+Key_L,
98
+  (void)new TDEAction( i18n("C&lear History"), "history_clear", CTRL+Key_L,
99 99
 		     TQT_TQOBJECT(this), TQT_SLOT( slotClear() ),
100 100
 		     actionCollection(), "clear_log" );
101 101
   (void)KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs()), actionCollection() );
@@ -106,7 +106,7 @@ void KWatchGnuPGMainWindow::createActions()
106 106
   (void)KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureToolbars()), actionCollection());
107 107
 
108 108
 #if 0
109
-  (void)new KAction( i18n("Configure KWatchGnuPG..."), TQString::fromLatin1("configure"),
109
+  (void)new TDEAction( i18n("Configure KWatchGnuPG..."), TQString::fromLatin1("configure"),
110 110
 					 0, this, TQT_SLOT( slotConfigure() ),
111 111
 					 actionCollection(), "configure" );
112 112
 #endif
@@ -224,7 +224,7 @@ void KWatchGnuPGMainWindow::slotAckRead() {
224 224
 void KWatchGnuPGMainWindow::show()
225 225
 {
226 226
   mSysTray->setAttention(false);
227
-  KMainWindow::show();
227
+  TDEMainWindow::show();
228 228
 }
229 229
 
230 230
 void KWatchGnuPGMainWindow::slotSaveAs()
@@ -286,7 +286,7 @@ bool KWatchGnuPGMainWindow::queryClose()
286 286
     hide();
287 287
     return false;
288 288
   }
289
-  return KMainWindow::queryClose();
289
+  return TDEMainWindow::queryClose();
290 290
 }
291 291
 
292 292
 #include "kwatchgnupgmainwin.moc"

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

@@ -40,7 +40,7 @@ class KWatchGnuPGConfig;
40 40
 class KProcIO;
41 41
 class TQTextEdit;
42 42
 
43
-class KWatchGnuPGMainWindow : public KMainWindow {
43
+class KWatchGnuPGMainWindow : public TDEMainWindow {
44 44
   Q_OBJECT
45 45
   
46 46
 public:

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

@@ -73,11 +73,11 @@ namespace Kleo {
73 73
   class ProtocolCheckListItem;
74 74
 }
75 75
 
76
-class Kleo::BackendListView : public KListView
76
+class Kleo::BackendListView : public TDEListView
77 77
 {
78 78
 public:
79 79
   BackendListView( BackendConfigWidget* parent, const char* name = 0 )
80
-    : KListView( parent, name ) {}
80
+    : TDEListView( parent, name ) {}
81 81
 
82 82
   /// return backend for currently selected (/current) item. Used by Configure button.
83 83
   const Kleo::CryptoBackend* currentBackend() const;
@@ -95,7 +95,7 @@ public:
95 95
 class Kleo::BackendListViewItem : public TQListViewItem
96 96
 {
97 97
 public:
98
-  BackendListViewItem( KListView* lv, TQListViewItem *prev, const CryptoBackend *cryptoBackend )
98
+  BackendListViewItem( TDEListView* lv, TQListViewItem *prev, const CryptoBackend *cryptoBackend )
99 99
     : TQListViewItem( lv, prev, cryptoBackend->displayName() ), mCryptoBackend( cryptoBackend )
100 100
     {}
101 101
 

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

@@ -54,7 +54,7 @@ Kleo::CryptoConfigDialog::CryptoConfigDialog( Kleo::CryptoConfig* config, TQWidg
54 54
   }
55 55
 
56 56
   // Automatically assign accelerators
57
-  KAcceleratorManager::manage( this );
57
+  TDEAcceleratorManager::manage( this );
58 58
 }
59 59
 
60 60
 void Kleo::CryptoConfigDialog::slotOk()

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

@@ -129,14 +129,14 @@ static const struct {
129 129
     TQT_SLOT(slotEmitReturnPressed(TQListViewItem*)) },
130 130
   { TQT_SIGNAL(selectionChanged(TQListViewItem*)),
131 131
     TQT_SLOT(slotEmitSelectionChanged(TQListViewItem*)) },
132
-  { TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*,const TQPoint&)),
133
-    TQT_SLOT(slotEmitContextMenu(KListView*, TQListViewItem*,const TQPoint&)) },
132
+  { TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*,const TQPoint&)),
133
+    TQT_SLOT(slotEmitContextMenu(TDEListView*, TQListViewItem*,const TQPoint&)) },
134 134
 };
135 135
 static const int numSignalReplacements = sizeof signalReplacements / sizeof *signalReplacements;
136 136
 
137 137
 
138 138
 Kleo::KeyListView::KeyListView( const ColumnStrategy * columnStrategy, const DisplayStrategy * displayStrategy, TQWidget * parent, const char * name, WFlags f )
139
-  : KListView( parent, name ),
139
+  : TDEListView( parent, name ),
140 140
     mColumnStrategy( columnStrategy ),
141 141
     mDisplayStrategy ( displayStrategy  ),
142 142
     mHierarchical( false )
@@ -187,7 +187,7 @@ Kleo::KeyListView::~KeyListView() {
187 187
 
188 188
 void Kleo::KeyListView::insertItem( TQListViewItem * qlvi ) {
189 189
   //kdDebug() << "Kleo::KeyListView::insertItem( " << qlvi << " )" << endl;
190
-  KListView::insertItem( qlvi );
190
+  TDEListView::insertItem( qlvi );
191 191
   if ( KeyListViewItem * item = lvi_cast<KeyListViewItem>( qlvi ) )
192 192
     registerItem( item );
193 193
 }
@@ -196,7 +196,7 @@ void Kleo::KeyListView::takeItem( TQListViewItem * qlvi ) {
196 196
   //kdDebug() << "Kleo::KeyListView::takeItem( " << qlvi << " )" << endl;
197 197
   if ( KeyListViewItem * item = lvi_cast<KeyListViewItem>( qlvi ) )
198 198
     deregisterItem( item );
199
-  KListView::takeItem( qlvi );
199
+  TDEListView::takeItem( qlvi );
200 200
 }
201 201
 
202 202
 
@@ -244,7 +244,7 @@ void Kleo::KeyListView::slotUpdateTimeout() {
244 244
 void Kleo::KeyListView::clear() {
245 245
   d->updateTimer->stop();
246 246
   d->keyBuffer.clear();
247
-  KListView::clear();
247
+  TDEListView::clear();
248 248
 }
249 249
 
250 250
 void Kleo::KeyListView::registerItem( KeyListViewItem * item ) {
@@ -359,7 +359,7 @@ void Kleo::KeyListView::slotEmitSelectionChanged( TQListViewItem * item ) {
359 359
     emit selectionChanged( static_cast<KeyListViewItem*>( item ) );
360 360
 }
361 361
 
362
-void Kleo::KeyListView::slotEmitContextMenu( KListView*, TQListViewItem * item, const TQPoint & p ) {
362
+void Kleo::KeyListView::slotEmitContextMenu( TDEListView*, TQListViewItem * item, const TQPoint & p ) {
363 363
   if ( !item || lvi_cast<KeyListViewItem>( item ) )
364 364
     emit contextMenu( static_cast<KeyListViewItem*>( item ), p );
365 365
 }
@@ -833,11 +833,11 @@ Kleo::KeyListViewItem * Kleo::KeyListViewItem::nextSibling() const {
833 833
 }
834 834
 
835 835
 Kleo::KeyListViewItem * Kleo::KeyListView::firstChild() const {
836
-  return static_cast<Kleo::KeyListViewItem*>( KListView::firstChild() );
836
+  return static_cast<Kleo::KeyListViewItem*>( TDEListView::firstChild() );
837 837
 }
838 838
 
839 839
 Kleo::KeyListViewItem * Kleo::KeyListView::selectedItem() const {
840
-  return static_cast<Kleo::KeyListViewItem*>( KListView::selectedItem() );
840
+  return static_cast<Kleo::KeyListViewItem*>( TDEListView::selectedItem() );
841 841
 }
842 842
 
843 843
 static void selectedItems( TQPtrList<Kleo::KeyListViewItem> & result, TQListViewItem * start ) {

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

@@ -198,7 +198,7 @@ namespace Kleo {
198 198
   };
199 199
 
200 200
 
201
-  class KDE_EXPORT KeyListView : public KListView {
201
+  class KDE_EXPORT KeyListView : public TDEListView {
202 202
     Q_OBJECT
203 203
   
204 204
     friend class KeyListViewItem;
@@ -287,7 +287,7 @@ namespace Kleo {
287 287
     void slotEmitDoubleClicked( TQListViewItem*, const TQPoint&, int );
288 288
     void slotEmitReturnPressed( TQListViewItem* );
289 289
     void slotEmitSelectionChanged( TQListViewItem* );
290
-    void slotEmitContextMenu( KListView*, TQListViewItem*, const TQPoint& );
290
+    void slotEmitContextMenu( TDEListView*, TQListViewItem*, const TQPoint& );
291 291
     void slotUpdateTimeout();
292 292
 
293 293
   public:

+ 1
- 1
kaddressbook/addresseditwidget.cpp View File

@@ -358,7 +358,7 @@ AddressEditDialog::AddressEditDialog( const KABC::Address::List &list,
358 358
   connect( mCountryCombo, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( modified() ) );
359 359
   connect( mPreferredCheckBox, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) );
360 360
 
361
-  KAcceleratorManager::manage( this );
361
+  TDEAcceleratorManager::manage( this );
362 362
 
363 363
   mChanged = false;
364 364
 

+ 1
- 1
kaddressbook/addresseditwidget.h View File

@@ -42,7 +42,7 @@ class TQToolButton;
42 42
 class KActiveLabel;
43 43
 class KComboBox;
44 44
 class KLineEdit;
45
-class KListView;
45
+class TDEListView;
46 46
 
47 47
 typedef TypeCombo<KABC::Address> AddressTypeCombo;
48 48
 

+ 1
- 1
kaddressbook/addresseeeditorwidget.cpp View File

@@ -847,7 +847,7 @@ void AddresseeEditorWidget::invalidDate()
847 847
 void AddresseeEditorWidget::pageChanged( TQWidget *wdg )
848 848
 {
849 849
   if ( wdg )
850
-    KAcceleratorManager::manage( wdg );
850
+    TDEAcceleratorManager::manage( wdg );
851 851
 }
852 852
 
853 853
 void AddresseeEditorWidget::setInitialFocus()

+ 1
- 1
kaddressbook/customfieldswidget.cpp View File

@@ -72,7 +72,7 @@ AddFieldDialog::AddFieldDialog( TQWidget *parent, const char *name )
72 72
   connect( mTitle, TQT_SIGNAL( textChanged( const TQString& ) ),
73 73
            this, TQT_SLOT( nameChanged( const TQString& ) ) );
74 74
 
75
-  KAcceleratorManager::manage( this );
75
+  TDEAcceleratorManager::manage( this );
76 76
 
77 77
   mTypeList.append( "text" );
78 78
   mTypeName.append( i18n( "Text" ) );

+ 1
- 1
kaddressbook/distributionlistpicker.cpp View File

@@ -52,7 +52,7 @@ KPIM::DistributionListPickerDialog::DistributionListPickerDialog( KABC::AddressB
52 52
     layout->setSpacing( KDialog::spacingHint() );
53 53
     m_label = new TQLabel( main );
54 54
     layout->addWidget( m_label, 0, 0 );
55
-    m_listBox = new KListBox( main );
55
+    m_listBox = new TDEListBox( main );
56 56
     layout->addWidget( m_listBox, 1, 0 );
57 57
     connect( m_listBox, TQT_SIGNAL( highlighted( const TQString& ) ),
58 58
              this, TQT_SLOT( entrySelected( const TQString& ) ) ); 

+ 2
- 2
kaddressbook/distributionlistpicker.h View File

@@ -27,7 +27,7 @@
27 27
 
28 28
 #include <tqstring.h>
29 29
 
30
-class KListBox;
30
+class TDEListBox;
31 31
 
32 32
 namespace KABC {
33 33
     class AddressBook;
@@ -61,7 +61,7 @@ private slots:
61 61
 private:
62 62
     KABC::AddressBook* m_book;
63 63
     TQLabel* m_label;
64
-    KListBox* m_listBox;
64
+    TDEListBox* m_listBox;
65 65
     TQString m_selectedDistributionList;
66 66
 };
67 67
     

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

@@ -82,7 +82,7 @@
82 82
                 <string>&amp;Add...</string>
83 83
             </property>
84 84
         </widget>
85
-        <widget class="KListView" row="0" column="0" rowspan="5" colspan="1">
85
+        <widget class="TDEListView" row="0" column="0" rowspan="5" colspan="1">
86 86
             <column>
87 87
                 <property name="text">
88 88
                     <string>Protocol</string>

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

@@ -43,9 +43,9 @@
43 43
 #include "imeditorwidget.h"
44 44
 
45 45
 
46
-IMAddressLVI::IMAddressLVI( KListView *parent, KPluginInfo *protocol,
46
+IMAddressLVI::IMAddressLVI( TDEListView *parent, KPluginInfo *protocol,
47 47
                             const TQString &address, const IMContext &context )
48
-  : KListViewItem( parent )
48
+  : TDEListViewItem( parent )
49 49
 {
50 50
   setProtocol( protocol );
51 51
   setAddress( address );
@@ -72,7 +72,7 @@ void IMAddressLVI::paintCell( TQPainter *p, const TQColorGroup &cg,
72 72
     p->setFont( font );
73 73
   }
74 74
 
75
-  KListViewItem::paintCell( p, cg, column, width, alignment );
75
+  TDEListViewItem::paintCell( p, cg, column, width, alignment );
76 76
 }
77 77
 
78 78
 void IMAddressLVI::setAddress( const TQString &address )

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

@@ -97,10 +97,10 @@ class IMEditorWidget : public KDialogBase
97 97
  */
98 98
 
99 99
 // VCard has been disabled as there is no standard VCard location to store IM addresses yet.
100
-class IMAddressLVI : public KListViewItem
100
+class IMAddressLVI : public TDEListViewItem
101 101
 {
102 102
   public:
103
-    IMAddressLVI( KListView *parent, KPluginInfo * protocol,
103
+    IMAddressLVI( TDEListView *parent, KPluginInfo * protocol,
104 104
                   const TQString &address, const IMContext &context = Any );
105 105
 
106 106
     void setAddress( const TQString &address );

+ 1
- 1
kaddressbook/emaileditwidget.cpp View File

@@ -224,7 +224,7 @@ EmailEditDialog::EmailEditDialog( const TQStringList &list, TQWidget *parent,
224 224
 
225 225
   // set default state
226 226
   selectionChanged( -1 );
227
-  KAcceleratorManager::manage( this );
227
+  TDEAcceleratorManager::manage( this );
228 228
 
229 229
   setInitialSize( TQSize( 400, 200 ) );
230 230
 }

+ 1
- 1
kaddressbook/emaileditwidget.h View File

@@ -35,7 +35,7 @@ class TQToolButton;
35 35
 
36 36
 class KComboBox;
37 37
 class KLineEdit;
38
-class KListView;
38
+class TDEListView;
39 39
 
40 40
 /**
41 41
   This widget displays a list box of the email addresses as well as buttons

+ 4
- 4
kaddressbook/extensionmanager.cpp View File

@@ -57,7 +57,7 @@ ExtensionManager::ExtensionManager( TQWidget* extensionBar, TQWidgetStack* detai
57 57
 
58 58
   createExtensionWidgets();
59 59
 
60
-  mActionCollection = new KActionCollection( this, "ActionCollection" );
60
+  mActionCollection = new TDEActionCollection( this, "ActionCollection" );
61 61
 
62 62
   extensionBar->setShown( false );
63 63
   TQTimer::singleShot( 0, this, TQT_SLOT( createActions() ) );
@@ -75,7 +75,7 @@ void ExtensionManager::restoreSettings()
75 75
   typedef TQMap<TQString, ExtensionData>::ConstIterator ConstIterator;
76 76
   for ( ConstIterator it = mExtensionMap.begin(), end = mExtensionMap.end(); it != end; ++it ) {
77 77
     if ( activeExtensions.contains( it.data().identifier ) ) {
78
-      KToggleAction *action = static_cast<KToggleAction*>( it.data().action );
78
+      TDEToggleAction *action = static_cast<TDEToggleAction*>( it.data().action );
79 79
       if ( action )
80 80
         action->setChecked( true );
81 81
       setExtensionActive( it.data().identifier, true );
@@ -168,7 +168,7 @@ void ExtensionManager::createActions()
168 168
   ExtensionData::List::ConstIterator it;
169 169
   for ( TQMap<TQString, ExtensionData>::Iterator it = mExtensionMap.begin(), end = mExtensionMap.end(); it != end; ++it ) {
170 170
     ExtensionData& data = it.data();
171
-    data.action = new KToggleAction( data.title, 0, mMapper, TQT_SLOT( map() ),
171
+    data.action = new TDEToggleAction( data.title, 0, mMapper, TQT_SLOT( map() ),
172 172
                                                mActionCollection,
173 173
                                                TQString( data.identifier + "_extension" ).latin1() );
174 174
     mMapper->setMapping( data.action, data.identifier );
@@ -178,7 +178,7 @@ void ExtensionManager::createActions()
178 178
       data.action->setChecked( true );
179 179
   }
180 180
 
181
-  mActionList.append( new KActionSeparator( mActionCollection ) );
181
+  mActionList.append( new TDEActionSeparator( mActionCollection ) );
182 182
   mCore->guiClient()->plugActionList( "extensions_list", mActionList );
183 183
 }
184 184
 

+ 4
- 4
kaddressbook/extensionmanager.h View File

@@ -33,7 +33,7 @@
33 33
 
34 34
 class TQSignalMapper;
35 35
 class TQWidgetStack;
36
-class KActionCollection;
36
+class TDEActionCollection;
37 37
 
38 38
 namespace KAB {
39 39
 class Core;
@@ -45,7 +45,7 @@ class ExtensionData
45 45
     ExtensionData();
46 46
     typedef TQValueList<ExtensionData> List;
47 47
 
48
-    KToggleAction* action;
48
+    TDEToggleAction* action;
49 49
     KAB::ExtensionWidget *widget;
50 50
     TQString identifier;
51 51
     TQString title;
@@ -109,8 +109,8 @@ class ExtensionManager : public TQObject
109 109
     TQMap<TQString, ExtensionData> mExtensionMap;
110 110
     TQStringList mActiveExtensions;
111 111
     TQSignalMapper *mMapper;
112
-    TQPtrList<KAction> mActionList;
113
-    KActionCollection *mActionCollection;
112
+    TQPtrList<TDEAction> mActionList;
113
+    TDEActionCollection *mActionCollection;
114 114
     TQSplitter *mSplitter;
115 115
     TQWidgetStack *mDetailsStack; 
116 116
     TQWidget *mActiveDetailsWidget;

+ 3
- 3
kaddressbook/features/distributionlistngwidget.cpp View File

@@ -44,7 +44,7 @@
44 44
 #include <tqpushbutton.h>
45 45
 #include <tqtooltip.h>
46 46
 
47
-KAB::DistributionListNg::ListBox::ListBox( TQWidget* parent ) : KListBox( parent )
47
+KAB::DistributionListNg::ListBox::ListBox( TQWidget* parent ) : TDEListBox( parent )
48 48
 {
49 49
     setAcceptDrops( true );
50 50
 }
@@ -62,7 +62,7 @@ void KAB::DistributionListNg::ListBox::dragMoveEvent( TQDragMoveEvent *event )
62 62
 
63 63
 void KAB::DistributionListNg::ListBox::dragEnterEvent( TQDragEnterEvent *event )
64 64
 {
65
-    KListBox::dragEnterEvent( event );
65
+    TDEListBox::dragEnterEvent( event );
66 66
 }
67 67
 
68 68
 void KAB::DistributionListNg::ListBox::dropEvent( TQDropEvent *event )
@@ -170,7 +170,7 @@ KAB::DistributionListNg::MainWidget::MainWidget( KAB::Core *core, TQWidget *pare
170 170
 
171 171
 void KAB::DistributionListNg::MainWidget::contextMenuRequested( TQListBoxItem *item, const TQPoint &point )
172 172
 {
173
-    TQGuardedPtr<KPopupMenu> menu = new KPopupMenu( this );
173
+    TQGuardedPtr<TDEPopupMenu> menu = new TDEPopupMenu( this );
174 174
     menu->insertItem( i18n( "New Distribution List..." ), core(), TQT_SLOT( newDistributionList() ) );
175 175
     if ( item && ( item->text() !=i18n( "All Contacts" ) ) )
176 176
     {

+ 1
- 1
kaddressbook/features/distributionlistngwidget.h View File

@@ -44,7 +44,7 @@ namespace KABC {
44 44
 namespace KAB {
45 45
 namespace DistributionListNg {
46 46
 
47
-class ListBox : public KListBox
47
+class ListBox : public TDEListBox
48 48
 {
49 49
     Q_OBJECT
50 50
   

+ 2
- 2
kaddressbook/features/distributionlistwidget.cpp View File

@@ -223,7 +223,7 @@ DistributionListWidget::DistributionListWidget( KAB::Core *core, TQWidget *paren
223 223
 
224 224
   mContactView->restoreLayout( TDEGlobal::config(), "DistributionListViewColumns" );
225 225
 
226
-  KAcceleratorManager::manage( this );
226
+  TDEAcceleratorManager::manage( this );
227 227
 }
228 228
 
229 229
 DistributionListWidget::~DistributionListWidget()
@@ -591,7 +591,7 @@ void DistributionListWidget::changed()
591 591
 #endif
592 592
 
593 593
 DistributionListView::DistributionListView( TQWidget *parent, const char* name )
594
-  : KListView( parent, name )
594
+  : TDEListView( parent, name )
595 595
 {
596 596
   setDragEnabled( true );
597 597
   setAcceptDrops( true );

+ 1
- 1
kaddressbook/features/distributionlistwidget.h View File

@@ -105,7 +105,7 @@ class DistributionListWidget : public KAB::ExtensionWidget
105 105
 /**
106 106
   @short Helper class
107 107
 */
108
-class DistributionListView : public KListView
108
+class DistributionListView : public TDEListView
109 109
 {
110 110
   Q_OBJECT
111 111
   

+ 2
- 2
kaddressbook/features/resourceselection.cpp View File

@@ -57,7 +57,7 @@ class AddressBookWrapper : public KABC::AddressBook
57 57
 class ResourceItem : public TQCheckListItem
58 58
 {
59 59
   public:
60
-    ResourceItem( KListView *parent, KABC::Resource *resource )
60
+    ResourceItem( TDEListView *parent, KABC::Resource *resource )
61 61
       : TQCheckListItem( parent, resource->resourceName(), CheckBox ),
62 62
         mResource( resource ), mChecked( false ),
63 63
         mIsSubresource( false ), mSubItemsCreated( false ),
@@ -510,7 +510,7 @@ void ResourceSelection::initGUI()
510 510
   TQToolTip::add( mRemoveButton, i18n( "Remove addressbook" ) );
511 511
   buttonLayout->addWidget( mRemoveButton );
512 512
 
513
-  mListView = new KListView( this );
513
+  mListView = new TDEListView( this );
514 514
   mListView->header()->hide();
515 515
   mListView->addColumn( i18n( "Address Books" ) );
516 516
   mListView->setFullWidth( true );

+ 1
- 1
kaddressbook/features/resourceselection.h View File

@@ -80,7 +80,7 @@ class ResourceSelection : public KAB::ExtensionWidget
80 80
     ResourceItem* selectedItem() const;
81 81
     ResourceItem* findSubResourceItem( KPIM::ResourceABC *resource, const TQString &subResource );
82 82
 
83
-    KListView *mListView;
83
+    TDEListView *mListView;
84 84
     TQPushButton *mAddButton;
85 85
     TQPushButton *mEditButton;
86 86
     TQPushButton *mRemoveButton;

+ 2
- 2
kaddressbook/filtereditdialog.cpp View File

@@ -127,7 +127,7 @@ void FilterEditDialog::initGUI()
127 127
   connect( mNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
128 128
            TQT_SLOT( filterNameTextChanged( const TQString&) ) );
129 129
 
130
-  mCategoriesView = new KListView( page );
130
+  mCategoriesView = new TDEListView( page );
131 131
   mCategoriesView->addColumn( i18n( "Category" ) );
132 132
   mCategoriesView->setFullWidth( true );
133 133
   topLayout->addMultiCellWidget( mCategoriesView, 1, 1, 0, 1 );
@@ -258,7 +258,7 @@ void FilterDialog::initGUI()
258 258
 
259 259
   TQGridLayout *topLayout = new TQGridLayout( page, 1, 2, 0, spacingHint() );
260 260
 
261
-  mFilterListBox = new KListBox( page );
261
+  mFilterListBox = new TDEListBox( page );
262 262
   topLayout->addWidget( mFilterListBox, 0, 0 );
263 263
   connect( mFilterListBox, TQT_SIGNAL( selectionChanged( TQListBoxItem * ) ),
264 264
            TQT_SLOT( selectionChanged( TQListBoxItem * ) ) );

+ 4
- 4
kaddressbook/filtereditdialog.h View File

@@ -30,8 +30,8 @@ class TQToolButton;
30 30
 class TQWidget;
31 31
 
32 32
 class KLineEdit;
33
-class KListBox;
34
-class KListView;
33
+class TDEListBox;
34
+class TDEListView;
35 35
 
36 36
 #include <kdialogbase.h>
37 37
 
@@ -62,7 +62,7 @@ class FilterDialog : public KDialogBase
62 62
     Filter::List mFilterList;
63 63
     Filter::List mInternalFilterList;
64 64
 
65
-    KListBox *mFilterListBox;
65
+    TDEListBox *mFilterListBox;
66 66
     TQPushButton *mAddButton;
67 67
     TQPushButton *mEditButton;
68 68
     TQPushButton *mRemoveButton;
@@ -89,7 +89,7 @@ class FilterEditDialog : public KDialogBase
89 89
     Filter mFilter;
90 90
 
91 91
     KLineEdit *mNameEdit;
92
-    KListView *mCategoriesView;
92
+    TDEListView *mCategoriesView;
93 93
     TQButtonGroup *mMatchRuleGroup;
94 94
     TQPushButton *mEditButton;
95 95
     TQPushButton *mRemoveButton;

+ 1
- 1
kaddressbook/geowidget.cpp View File

@@ -246,7 +246,7 @@ GeoDialog::GeoDialog( TQWidget *parent, const char *name )
246 246
   connect( mLongDirection, TQT_SIGNAL( activated( int ) ),
247 247
            TQT_SLOT( sexagesimalInputChanged() ) );
248 248
 
249
-  KAcceleratorManager::manage( this );
249
+  TDEAcceleratorManager::manage( this );
250 250
 }
251 251
 
252 252
 GeoDialog::~GeoDialog()

+ 1
- 1
kaddressbook/imeditwidget.h View File

@@ -35,7 +35,7 @@ class TQToolButton;
35 35
 
36 36
 class KComboBox;
37 37
 class KLineEdit;
38
-class KListView;
38
+class TDEListView;
39 39
 
40 40
 /**
41 41
   This widget displays a list box of the instant messaging addresses as well as buttons

+ 3
- 3
kaddressbook/interfaces/core.h View File

@@ -44,7 +44,7 @@ class Resource;
44 44
 
45 45
 class TQWidget;
46 46
 
47
-class KActionCollection;
47
+class TDEActionCollection;
48 48
 class TDEConfig;
49 49
 class KURL;
50 50
 
@@ -71,10 +71,10 @@ class KDE_EXPORT Core : public TQObject
71 71
     virtual TDEConfig *config() const = 0;
72 72
 
73 73
     /**
74
-      Returns a pointer to the global KActionCollection object. So
74
+      Returns a pointer to the global TDEActionCollection object. So
75 75
       other classes can register their actions easily.
76 76
      */
77
-    virtual KActionCollection *actionCollection() const = 0;
77
+    virtual TDEActionCollection *actionCollection() const = 0;
78 78
 
79 79
     /**
80 80
       Returns a pointer to the gui client.

+ 2
- 2
kaddressbook/interfaces/xxport.cpp View File

@@ -77,7 +77,7 @@ KABC::AddresseeList XXPort::importContacts( const TQString& ) const
77 77
 void XXPort::createImportAction( const TQString &label, const TQString &data )
78 78
 {
79 79
   TQString id = "file_import_" + identifier() + ( data.isEmpty() ? TQString( "" ) : "_" + data );
80
-  KAction *action = new KAction( label, 0, d->mImportMapper, TQT_SLOT( map() ), actionCollection(), id.latin1() );
80
+  TDEAction *action = new TDEAction( label, 0, d->mImportMapper, TQT_SLOT( map() ), actionCollection(), id.latin1() );
81 81
 
82 82
   d->mImportMapper->setMapping( action, ( data.isEmpty() ? TQString( "<empty>" ) : data ) );
83 83
 
@@ -87,7 +87,7 @@ void XXPort::createImportAction( const TQString &label, const TQString &data )
87 87
 void XXPort::createExportAction( const TQString &label, const TQString &data )
88 88
 {
89 89
   TQString id = "file_export_" + identifier() + ( data.isEmpty() ? TQString( "" ) : "_" + data );
90
-  KAction *action = new KAction( label, 0, d->mExportMapper, TQT_SLOT( map() ), actionCollection(), id.latin1() );
90
+  TDEAction *action = new TDEAction( label, 0, d->mExportMapper, TQT_SLOT( map() ), actionCollection(), id.latin1() );
91 91
 
92 92
   d->mExportMapper->setMapping( action, ( data.isEmpty() ? TQString( "<empty>" ) : data ) );
93 93
 

+ 21
- 21
kaddressbook/kabcore.cpp View File

@@ -190,7 +190,7 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *parent,
190 190
 
191 191
   setModified( false );
192 192
 
193
-  KAcceleratorManager::manage( mWidget );
193
+  TDEAcceleratorManager::manage( mWidget );
194 194
 
195 195
   mKIMProxy = ::KIMProxy::instance( kapp->dcopClient() );
196 196
 }
@@ -255,7 +255,7 @@ TDEConfig *KABCore::config() const
255 255
   return KABPrefs::instance()->config();
256 256
 }
257 257
 
258