Rename a number of classes to enhance compatibility with KDE4

3 files changed, 36 insertions, 36 deletions

diff --git a/konq-plugins/rellinks/TODO b/konq-plugins/rellinks/TODO
index 28f206b..47f6f54 100644
--- a/konq-plugins/rellinks/TODO
+++ b/konq-plugins/rellinks/TODO
@@ -3,7 +3,7 @@ Rellinks :
 
 * Support multiple same relations for all relations in a beautiful way 
   (as FireFox Link Toolbar Extension do) : 
-  by transfoming buttons (KAction) in menus (KActionMenu) if more than one item is found for a relation ?
+  by transfoming buttons (TDEAction) in menus (TDEActionMenu) if more than one item is found for a relation ?
 * Possibility to configure keyboard shortcuts
 * Manage "rel" and "rev" differently
 * Manage "media"
diff --git a/konq-plugins/rellinks/plugin_rellinks.cpp b/konq-plugins/rellinks/plugin_rellinks.cpp
index 6bb3cbd..880a448 100644
--- a/konq-plugins/rellinks/plugin_rellinks.cpp
+++ b/konq-plugins/rellinks/plugin_rellinks.cpp
@@ -70,102 +70,102 @@ RelLinksPlugin::RelLinksPlugin(TQObject *parent, const char *name, const TQStrin
     setInstance(RelLinksFactory::instance());
 
     // ------------- Navigation links --------------
-    kaction_map["home"] =  new KAction( i18n("&Top"), "2uparrow", KShortcut("Ctrl+Alt+T"), this, TQT_SLOT(goHome()), actionCollection(), "rellinks_top" );
+    kaction_map["home"] =  new TDEAction( i18n("&Top"), "2uparrow", TDEShortcut("Ctrl+Alt+T"), this, TQT_SLOT(goHome()), actionCollection(), "rellinks_top" );
     kaction_map["home"]->setWhatsThis( i18n("<p>This link references a home page or the top of some hierarchy.</p>") );
 
-    kaction_map["up"] =  new KAction( i18n("&Up"), "1uparrow", KShortcut("Ctrl+Alt+U"), this, TQT_SLOT(goUp()), actionCollection(), "rellinks_up" );
+    kaction_map["up"] =  new TDEAction( i18n("&Up"), "1uparrow", TDEShortcut("Ctrl+Alt+U"), this, TQT_SLOT(goUp()), actionCollection(), "rellinks_up" );
     kaction_map["up"]->setWhatsThis( i18n("<p>This link references the immediate parent of the current document.</p>") );
 
     bool isRTL = TQApplication::reverseLayout();
 
-    kaction_map["begin"] =  new KAction( i18n("&First"), isRTL ? "2rightarrow" : "2leftarrow", KShortcut("Ctrl+Alt+F"), this,  TQT_SLOT(goFirst()), actionCollection(), "rellinks_first" );
+    kaction_map["begin"] =  new TDEAction( i18n("&First"), isRTL ? "2rightarrow" : "2leftarrow", TDEShortcut("Ctrl+Alt+F"), this,  TQT_SLOT(goFirst()), actionCollection(), "rellinks_first" );
     kaction_map["begin"]->setWhatsThis( i18n("<p>This link type tells search engines which document is considered by the author to be the starting point of the collection.</p>") );
 
-    kaction_map["prev"] =  new KAction( i18n("&Previous"), isRTL ? "1rightarrow" : "1leftarrow", KShortcut("Ctrl+Alt+P"), this,  TQT_SLOT(goPrevious()), actionCollection(), "rellinks_previous" );
+    kaction_map["prev"] =  new TDEAction( i18n("&Previous"), isRTL ? "1rightarrow" : "1leftarrow", TDEShortcut("Ctrl+Alt+P"), this,  TQT_SLOT(goPrevious()), actionCollection(), "rellinks_previous" );
     kaction_map["prev"]->setWhatsThis( i18n("<p>This link references the previous document in an ordered series of documents.</p>") );
 
-    kaction_map["next"] =  new KAction( i18n("&Next"), isRTL ? "1leftarrow" : "1rightarrow", KShortcut("Ctrl+Alt+N"), this,  TQT_SLOT(goNext()), actionCollection(), "rellinks_next" );
+    kaction_map["next"] =  new TDEAction( i18n("&Next"), isRTL ? "1leftarrow" : "1rightarrow", TDEShortcut("Ctrl+Alt+N"), this,  TQT_SLOT(goNext()), actionCollection(), "rellinks_next" );
     kaction_map["next"]->setWhatsThis( i18n("<p>This link references the next document in an ordered series of documents.</p>") );
 
-    kaction_map["last"] =  new KAction( i18n("&Last"), isRTL ? "2leftarrow" : "2rightarrow", KShortcut("Ctrl+Alt+L"), this,  TQT_SLOT(goLast()), actionCollection(), "rellinks_last" );
+    kaction_map["last"] =  new TDEAction( i18n("&Last"), isRTL ? "2leftarrow" : "2rightarrow", TDEShortcut("Ctrl+Alt+L"), this,  TQT_SLOT(goLast()), actionCollection(), "rellinks_last" );
     kaction_map["last"]->setWhatsThis( i18n("<p>This link references the end of a sequence of documents.</p>") );
 
     // ------------ special items --------------------------
-    kaction_map["search"]  = new KAction( i18n("&Search"), "filefind", KShortcut("Ctrl+Alt+S"), this, TQT_SLOT(goSearch()), actionCollection(), "rellinks_search" );
+    kaction_map["search"]  = new TDEAction( i18n("&Search"), "filefind", TDEShortcut("Ctrl+Alt+S"), this, TQT_SLOT(goSearch()), actionCollection(), "rellinks_search" );
     kaction_map["search"]->setWhatsThis( i18n("<p>This link references the search.</p>") );
 
     // ------------ Document structure links ---------------
-    m_document = new KActionMenu( i18n("Document"),  "contents", actionCollection(), "rellinks_document" );
+    m_document = new TDEActionMenu( i18n("Document"),  "contents", actionCollection(), "rellinks_document" );
     m_document->setWhatsThis( i18n("<p>This menu contains the links referring the document information.</p>") );
     m_document->setDelayed(false);
 
-    kaction_map["contents"] = new KAction( i18n("Table of &Contents"), "contents", KShortcut("Ctrl+Alt+C"),  this,  TQT_SLOT(goContents()), actionCollection(), "rellinks_toc" );
+    kaction_map["contents"] = new TDEAction( i18n("Table of &Contents"), "contents", TDEShortcut("Ctrl+Alt+C"),  this,  TQT_SLOT(goContents()), actionCollection(), "rellinks_toc" );
     m_document->insert(kaction_map["contents"]);
     kaction_map["contents"]->setWhatsThis( i18n("<p>This link references the table of contents.</p>") );
 
-    kactionmenu_map["chapter"] = new KActionMenu( i18n("Chapters"), "fileopen", actionCollection(), "rellinks_chapters" );
+    kactionmenu_map["chapter"] = new TDEActionMenu( i18n("Chapters"), "fileopen", actionCollection(), "rellinks_chapters" );
     m_document->insert(kactionmenu_map["chapter"]);
     connect( kactionmenu_map["chapter"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT(goChapter(int)));
     kactionmenu_map["chapter"]->setWhatsThis( i18n("<p>This menu references the chapters of the document.</p>") );
     kactionmenu_map["chapter"]->setDelayed(false);
 
-    kactionmenu_map["section"] = new KActionMenu( i18n("Sections"), "fileopen", actionCollection(), "rellinks_sections" );
+    kactionmenu_map["section"] = new TDEActionMenu( i18n("Sections"), "fileopen", actionCollection(), "rellinks_sections" );
     m_document->insert(kactionmenu_map["section"]);
     connect( kactionmenu_map["section"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goSection( int ) ) );
     kactionmenu_map["section"]->setWhatsThis( i18n("<p>This menu references the sections of the document.</p>") );
     kactionmenu_map["section"]->setDelayed(false);
 
-    kactionmenu_map["subsection"] = new KActionMenu( i18n("Subsections"), "fileopen", actionCollection(), "rellinks_subsections" );
+    kactionmenu_map["subsection"] = new TDEActionMenu( i18n("Subsections"), "fileopen", actionCollection(), "rellinks_subsections" );
     m_document->insert(kactionmenu_map["subsection"]);
     connect( kactionmenu_map["subsection"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goSubsection( int ) ) );
     kactionmenu_map["subsection"]->setWhatsThis( i18n("<p>This menu references the subsections of the document.</p>") );
     kactionmenu_map["subsection"]->setDelayed(false);
 
-    kactionmenu_map["appendix"] = new KActionMenu( i18n("Appendix"), "edit", actionCollection(), "rellinks_appendix" );
+    kactionmenu_map["appendix"] = new TDEActionMenu( i18n("Appendix"), "edit", actionCollection(), "rellinks_appendix" );
     m_document->insert(kactionmenu_map["appendix"]);
     connect( kactionmenu_map["appendix"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goAppendix( int ) ) );
     kactionmenu_map["appendix"]->setWhatsThis( i18n("<p>This link references the appendix.</p>") );
     kactionmenu_map["appendix"]->setDelayed(false);
 
-    kaction_map["glossary"] = new KAction( i18n("&Glossary"), "flag", KShortcut("Ctrl+Alt+G"), this, TQT_SLOT(goGlossary()), actionCollection(), "rellinks_glossary" );
+    kaction_map["glossary"] = new TDEAction( i18n("&Glossary"), "flag", TDEShortcut("Ctrl+Alt+G"), this, TQT_SLOT(goGlossary()), actionCollection(), "rellinks_glossary" );
     m_document->insert(kaction_map["glossary"]);
     kaction_map["glossary"]->setWhatsThis( i18n("<p>This link references the glossary.</p>") );
 
-    kaction_map["index"] = new KAction( i18n("&Index"), "info", KShortcut("Ctrl+Alt+I"), this, TQT_SLOT(goIndex()), actionCollection(), "rellinks_index" );
+    kaction_map["index"] = new TDEAction( i18n("&Index"), "info", TDEShortcut("Ctrl+Alt+I"), this, TQT_SLOT(goIndex()), actionCollection(), "rellinks_index" );
     m_document->insert(kaction_map["index"]);
     kaction_map["index"]->setWhatsThis( i18n("<p>This link references the index.</p>") );
 
     // Other links
-    m_more  = new KActionMenu( i18n("More"), "misc", actionCollection(), "rellinks_more" );
+    m_more  = new TDEActionMenu( i18n("More"), "misc", actionCollection(), "rellinks_more" );
     m_more->setWhatsThis( i18n("<p>This menu contains other important links.</p>") );
     m_more->setDelayed(false);
 
-    kaction_map["help"] = new KAction( i18n("&Help"), "help", KShortcut("Ctrl+Alt+H"), this, TQT_SLOT(goHelp()), actionCollection(), "rellinks_help" );
+    kaction_map["help"] = new TDEAction( i18n("&Help"), "help", TDEShortcut("Ctrl+Alt+H"), this, TQT_SLOT(goHelp()), actionCollection(), "rellinks_help" );
     m_more->insert(kaction_map["help"]);
     kaction_map["help"]->setWhatsThis( i18n("<p>This link references the help.</p>") );
 
-    kaction_map["author"]  = new KAction( i18n("&Authors"), "mail_new", KShortcut("Ctrl+Alt+A"), this, TQT_SLOT(goAuthor()), actionCollection(), "rellinks_authors" );
+    kaction_map["author"]  = new TDEAction( i18n("&Authors"), "mail_new", TDEShortcut("Ctrl+Alt+A"), this, TQT_SLOT(goAuthor()), actionCollection(), "rellinks_authors" );
     m_more->insert(kaction_map["author"]);
     kaction_map["author"]->setWhatsThis( i18n("<p>This link references the author.</p>") );
 
-    kaction_map["copyright"]   = new KAction( i18n("Copy&right"), "signature", KShortcut("Ctrl+Alt+R"), this, TQT_SLOT(goCopyright()), actionCollection(), "rellinks_copyright" );
+    kaction_map["copyright"]   = new TDEAction( i18n("Copy&right"), "signature", TDEShortcut("Ctrl+Alt+R"), this, TQT_SLOT(goCopyright()), actionCollection(), "rellinks_copyright" );
     m_more->insert(kaction_map["copyright"]);
     kaction_map["copyright"]->setWhatsThis( i18n("<p>This link references the copyright.</p>") );
 
-    kactionmenu_map["bookmark"] = new KActionMenu( i18n("Bookmarks"), "bookmark_folder", actionCollection(), "rellinks_bookmarks" );
+    kactionmenu_map["bookmark"] = new TDEActionMenu( i18n("Bookmarks"), "bookmark_folder", actionCollection(), "rellinks_bookmarks" );
     m_more->insert(kactionmenu_map["bookmark"]);
     kactionmenu_map["bookmark"]->setWhatsThis( i18n("<p>This menu references the bookmarks.</p>") );
     connect( kactionmenu_map["bookmark"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goBookmark( int ) ) );
     kactionmenu_map["bookmark"]->setDelayed(false);
 
-    kactionmenu_map["alternate"] = new KActionMenu( i18n("Other Versions"), "attach", actionCollection(), "rellinks_other_versions" );
+    kactionmenu_map["alternate"] = new TDEActionMenu( i18n("Other Versions"), "attach", actionCollection(), "rellinks_other_versions" );
     m_more->insert(kactionmenu_map["alternate"]);
     kactionmenu_map["alternate"]->setWhatsThis( i18n("<p>This link references the alternate versions of this document.</p>") );
     connect( kactionmenu_map["alternate"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goAlternate( int ) ) );
     kactionmenu_map["alternate"]->setDelayed(false);
 
     // Unclassified menu
-    m_links = new KActionMenu( i18n("Miscellaneous"), "rellinks", actionCollection(), "rellinks_links" );
+    m_links = new TDEActionMenu( i18n("Miscellaneous"), "rellinks", actionCollection(), "rellinks_links" );
     kactionmenu_map["unclassified"] = m_links;
     kactionmenu_map["unclassified"]->setWhatsThis( i18n("<p>Miscellaneous links.</p>") );
     connect( kactionmenu_map["unclassified"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goAllElements( int ) ) );
@@ -532,7 +532,7 @@ void RelLinksPlugin::disableAll() {
     element_map.clear();
 
     // Clear actions
-    KActionMap::Iterator it;
+    TDEActionMap::Iterator it;
     for ( it = kaction_map.begin(); it != kaction_map.end(); ++it ) {
         // If I don't test it crash :(
         if (it.data()) {
@@ -542,7 +542,7 @@ void RelLinksPlugin::disableAll() {
     }
 
     // Clear actions
-    KActionMenuMap::Iterator itmenu;
+    TDEActionMenuMap::Iterator itmenu;
     for ( itmenu = kactionmenu_map.begin(); itmenu != kactionmenu_map.end(); ++itmenu ) {
         // If I don't test it crash :(
         if (itmenu.data()) {
diff --git a/konq-plugins/rellinks/plugin_rellinks.h b/konq-plugins/rellinks/plugin_rellinks.h
index e8e5adb..d82402e 100644
--- a/konq-plugins/rellinks/plugin_rellinks.h
+++ b/konq-plugins/rellinks/plugin_rellinks.h
@@ -39,14 +39,14 @@
 
 // type definitions
 typedef TQMap<int,DOM::Element> DOMElementMap;
-typedef TQMap<TQString, KAction*> KActionMap;
-typedef TQMap<TQString, KActionMenu*> KActionMenuMap;
+typedef TQMap<TQString, TDEAction*> TDEActionMap;
+typedef TQMap<TQString, TDEActionMenu*> TDEActionMenuMap;
 
 // forward declarations
-class KActionMenu;
+class TDEActionMenu;
 class TDEHTMLPart;
 class TDEHTMLView;
-class KToolBar;
+class TDEToolBar;
 class KURL;
 class TQTimer;
 
@@ -153,14 +153,14 @@ private:
     TDEHTMLView* m_view;
 	bool m_viewVisible;
 
-    KActionMenu *m_document;
-    KActionMenu *m_more;
-    KActionMenu *m_links;
+    TDEActionMenu *m_document;
+    TDEActionMenu *m_more;
+    TDEActionMenu *m_links;
 
-    /** Map of KAction */
-    KActionMap kaction_map;
-    /** Map of KActionMenu */
-    KActionMenuMap kactionmenu_map;
+    /** Map of TDEAction */
+    TDEActionMap kaction_map;
+    /** Map of TDEActionMenu */
+    TDEActionMenuMap kactionmenu_map;
 
     /** Map of all the link element which can be managed by rellinks */
     TQMap<TQString,DOMElementMap> element_map;