Rename a number of classes to enhance compatibility with KDE4

9 files changed, 139 insertions, 139 deletions

diff --git a/quanta/src/document.cpp b/quanta/src/document.cpp
index 8b3e34f0..22430940 100644
--- a/quanta/src/document.cpp
+++ b/quanta/src/document.cpp
@@ -109,7 +109,7 @@ Document::Document(KTextEditor::Document *doc,
   userTagList.setAutoDelete(true);
 
   // remove the unwanted actions
-  KAction *a = m_view->actionCollection()->action( "file_export" );
+  TDEAction *a = m_view->actionCollection()->action( "file_export" );
   if (a)
       m_view->actionCollection()->take(a);
   a =  m_view->actionCollection()->action( "file_save" );
@@ -148,7 +148,7 @@ Document::Document(KTextEditor::Document *doc,
   if (a)
     a->setShortcut(TQt::SHIFT + TQt::Key_F11);
 
-  KActionMenu *bookmarkAction = dynamic_cast<KActionMenu*>(m_view->actionCollection()->action( "bookmarks" ));
+  TDEActionMenu *bookmarkAction = dynamic_cast<TDEActionMenu*>(m_view->actionCollection()->action( "bookmarks" ));
   if (bookmarkAction)
   {
     m_view->actionCollection()->take(bookmarkAction);
diff --git a/quanta/src/quanta.cpp b/quanta/src/quanta.cpp
index 960f600a..9bbd2e1c 100644
--- a/quanta/src/quanta.cpp
+++ b/quanta/src/quanta.cpp
@@ -927,7 +927,7 @@ void QuantaApp::slotNewStatus()
 
     if (w->doc()->isReadWrite())
     {
-      KToggleAction *a = dynamic_cast<KToggleAction*>(w->view()->actionCollection()->action("set_insert"));
+      TDEToggleAction *a = dynamic_cast<TDEToggleAction*>(w->view()->actionCollection()->action("set_insert"));
       if (a)
       {
         statusBar()->changeItem(a->isChecked() ? i18n(" OVR ") : i18n(" INS "),IDS_INS_OVR);
@@ -979,8 +979,8 @@ void QuantaApp::slotOptionsConfigureKeys()
       {
         if (KTextEditor::Document *doc = dynamic_cast<KTextEditor::Document*>(part))
         {
-          KActionPtrList actionList = doc->actionCollection()->actions();
-          KActionPtrList::Iterator actionIt;
+          TDEActionPtrList actionList = doc->actionCollection()->actions();
+          TDEActionPtrList::Iterator actionIt;
           if (!w || w->doc() != doc)
           {
             for ( actionIt = actionList.begin(); actionIt != actionList.end(); ++actionIt)
@@ -1050,7 +1050,7 @@ void QuantaApp::slotConfigureToolbars(const TQString& defaultToolbar)
     dlg = new KEditToolbar(factory(), this);
 
   KMenuBar *mb = menuBar();
-  KActionCollection *ac = actionCollection();
+  TDEActionCollection *ac = actionCollection();
   //remove the manually added menus BEFORE the dlg shows up
   if (m_debugger->UI())
   {
@@ -1094,7 +1094,7 @@ void QuantaApp::slotConfigureToolbars(const TQString& defaultToolbar)
     nodeList = p_toolbar->guiClient->domDocument().elementsByTagName("Action");
     for (uint i = 0; i < nodeList.count(); i++)
     {
-      KAction *action = ac->action(nodeList.item(i).toElement().attribute("name").ascii());
+      TDEAction *action = ac->action(nodeList.item(i).toElement().attribute("name").ascii());
       if (action)
           action->plug(menu);
     }
@@ -1421,15 +1421,15 @@ void QuantaApp::slotShowPreviewWidget(bool show)
     }
   }
 
-  KToggleAction *ta = 0L;
+  TDEToggleAction *ta = 0L;
   int viewLayout = view->currentViewsLayout();
   if (viewLayout == QuantaView::SourceOnly)
-    ta = (KToggleAction *) actionCollection()->action( "show_quanta_editor" );
+    ta = (TDEToggleAction *) actionCollection()->action( "show_quanta_editor" );
   else if (viewLayout == QuantaView::VPLOnly)
-    ta = (KToggleAction *) actionCollection()->action( "show_kafka_view" );
+    ta = (TDEToggleAction *) actionCollection()->action( "show_kafka_view" );
   else if (viewLayout == QuantaView::SourceAndVPL)
   {
-    ta = (KToggleAction *) actionCollection()->action( "show_kafka_and_quanta" );
+    ta = (TDEToggleAction *) actionCollection()->action( "show_kafka_and_quanta" );
   }
   if (ta)
   {
@@ -1798,7 +1798,7 @@ TQWidget* QuantaApp::createContainer( TQWidget *parent, int index, const TQDomEl
     tb->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum);
 
   //kdDebug(24000) << "tb->iconSize() " << tb->iconSize() << endl;
-   if (toolbarTab->iconText() == KToolBar::IconTextBottom)
+   if (toolbarTab->iconText() == TDEToolBar::IconTextBottom)
    {
       tb->setGeometry(0,0, toolbarTab->width(), tb->iconSize() + TQFontMetrics(TDEGlobalSettings::toolBarFont()).height() + 10);
       toolbarTab->setFixedHeight(toolbarTab->tabHeight() + tb->height() + 3);
@@ -1822,7 +1822,7 @@ TQWidget* QuantaApp::createContainer( TQWidget *parent, int index, const TQDomEl
     return tb;
   }
 
-  return KMainWindow::createContainer( parent, index, element, id );
+  return TDEMainWindow::createContainer( parent, index, element, id );
 
 }
 
@@ -1833,7 +1833,7 @@ void QuantaApp::removeContainer( TQWidget *container, TQWidget *parent, TQDomEle
     ToolbarTabWidget::ref()->removePage(container);
   }
   else
-    KMainWindow::removeContainer( container, parent, element, id );
+    TDEMainWindow::removeContainer( container, parent, element, id );
 }
 
 void QuantaApp::slotBack()
@@ -1959,7 +1959,7 @@ void QuantaApp::slotContextMenuAboutToShow()
         }
       }
     }
-    KAction *action = actionCollection()->action("open_file_under_cursor");
+    TDEAction *action = actionCollection()->action("open_file_under_cursor");
     if (action)
     {
       if (!name.isEmpty())
@@ -2254,7 +2254,7 @@ void QuantaApp::slotLoadToolbarFile(const KURL& url)
       {
         tagAction->setModified(true);
         tagAction->data().setAttribute("shortcut", oldShortcuts[actionName]);
-        tagAction->setShortcut(KShortcut(oldShortcuts[actionName]));
+        tagAction->setShortcut(TDEShortcut(oldShortcuts[actionName]));
       }
     } else
     {
@@ -2273,7 +2273,7 @@ void QuantaApp::slotLoadToolbarFile(const KURL& url)
 
    //Plug in the actions & build the menu
    TQPopupMenu *menu = new TQPopupMenu;
-   KAction *action;
+   TDEAction *action;
    nodeList = toolbarGUI->domDocument().elementsByTagName("Action");
    for (uint i = 0; i < nodeList.count(); i++)
    {
@@ -2319,8 +2319,8 @@ void QuantaApp::showToolbarFile(const KURL &url)
   {
     TQDomNodeList nodeList;
     TQPopupMenu *menu = new TQPopupMenu;
-    KAction *action;
-    KActionCollection *ac = actionCollection();
+    TDEAction *action;
+    TDEActionCollection *ac = actionCollection();
     nodeList = p_toolbar->guiClient->domDocument().elementsByTagName("Action");
     for (uint i = 0; i < nodeList.count(); i++)
     {
@@ -2900,7 +2900,7 @@ bool QuantaApp::removeToolbars()
  return true;
 }
 
-void QuantaApp::slotDeleteAction(KAction *action)
+void QuantaApp::slotDeleteAction(TDEAction *action)
 {
 //remove all references to this action
   TQDomElement el = static_cast<TagAction*>(action)->data();
@@ -2934,10 +2934,10 @@ void QuantaApp::slotDeleteAction(KAction *action)
 
 void QuantaApp::slotRemoveAction(const TQString& toolbarName, const TQString& a_actionName)
 {
-  KAction *action = 0L;
+  TDEAction *action = 0L;
   TQString actionName = a_actionName;
   actionName.replace('&',"&&");
-  KActionCollection *ac = actionCollection();
+  TDEActionCollection *ac = actionCollection();
   uint actionCount = ac->count();
   TQString str;
   for (uint i = 0; i < actionCount; i++)
@@ -3253,7 +3253,7 @@ bool QuantaApp::slotRemoveToolbar(const TQString& a_name)
 
     if (toolbarGUI)
     {
-     KAction *action;
+     TDEAction *action;
     //Rename the _Separator_ tags back to Separator, so they are not treated
     //as changes
      TQDomNodeList nodeList = toolbarGUI->domDocument().elementsByTagName("_Separator_");
@@ -3641,7 +3641,7 @@ void QuantaApp::slotUploadDTEP()
 
 void QuantaApp::slotSmartTagInsertion()
 {
-  KAction *action = actionCollection()->action("smart_tag_insertion");
+  TDEAction *action = actionCollection()->action("smart_tag_insertion");
   if(!action)
     return;
   if(!ViewManager::ref()->activeDocument() || !ViewManager::ref()->activeView() ||
@@ -3649,10 +3649,10 @@ void QuantaApp::slotSmartTagInsertion()
   {
     KMessageBox::error(this, "Smart Tag Insertion is available only for (X)HTML for the moment.");
     qConfig.smartTagInsertion = false;
-    (static_cast<KToggleAction* >(action))->setChecked(false);
+    (static_cast<TDEToggleAction* >(action))->setChecked(false);
     return;
   }
-  qConfig.smartTagInsertion = (static_cast<KToggleAction* >(action))->isChecked();
+  qConfig.smartTagInsertion = (static_cast<TDEToggleAction* >(action))->isChecked();
 }
 
 void QuantaApp::slotDownloadTemplate()
@@ -5068,7 +5068,7 @@ void QuantaApp::slotShowVPLOnly()
 void QuantaApp::initTabWidget(bool closeButtonsOnly)
 {
     KTabWidget *tab = tabWidget();
-    KAcceleratorManager::setNoAccel(tab);
+    TDEAcceleratorManager::setNoAccel(tab);
     if (tab)
     {
         if (qConfig.showCloseButtons == "ShowAlways")
diff --git a/quanta/src/quanta.h b/quanta/src/quanta.h
index dd95cdfe..942195de 100644
--- a/quanta/src/quanta.h
+++ b/quanta/src/quanta.h
@@ -71,12 +71,12 @@ class TQPopupMenu;
 class WHTMLPart;
 class TDEHTMLView;
 
-class KAction;
-class KToggleAction;
+class TDEAction;
+class TDEToggleAction;
 class TDEProcess;
-class KSelectAction;
-class KRecentFilesAction;
-class KToolBarPoupAction;
+class TDESelectAction;
+class TDERecentFilesAction;
+class TDEToolBarPoupAction;
 class KTextEdit;
 
 class TagAction;
@@ -93,7 +93,7 @@ class TQDomDocument;
 class Document;
 class DebuggerManager;
 class QuantaInit;
-class KToolBarPopupAction;
+class TDEToolBarPopupAction;
 class KTempFile;
 namespace KTextEditor
 {
@@ -351,7 +351,7 @@ public slots:
   /** Rename the toolbar. */
   void slotRenameToolbar();
   /** Delete an action */
-  void slotDeleteAction(KAction *action);
+  void slotDeleteAction(TDEAction *action);
   /** Remove the action from toolbar*/
   void slotRemoveAction(const TQString&, const TQString& actionName);
   /** Edit the action */
@@ -587,14 +587,14 @@ private:
   TQTimer *statusbarTimer;
 
   // ACTIONS
-  KRecentFilesAction *projectToolbarFiles;
+  TDERecentFilesAction *projectToolbarFiles;
 
-  KToggleAction *showVPLAction, *showSourceAction, *showVPLSourceAction, *showDTDToolbar;
-  KToolBarPopupAction *showPreviewAction;
+  TDEToggleAction *showVPLAction, *showSourceAction, *showVPLSourceAction, *showDTDToolbar;
+  TDEToolBarPopupAction *showPreviewAction;
 
-  KAction *saveAction, *saveAllAction;
+  TDEAction *saveAction, *saveAllAction;
 
-  KAction *editTagAction, *selectTagAreaAction;
+  TDEAction *editTagAction, *selectTagAreaAction;
 
   TQDomDocument* m_actions;
 
@@ -646,7 +646,7 @@ protected: // Protected attributes
   TQDict<ToolbarEntry> m_toolbarList;
 
 public: //TODO: check if it's worth to make a read method for them
-  KRecentFilesAction *fileRecent;
+  TDERecentFilesAction *fileRecent;
   /** True when the whole quanta is initialized. */
   bool quantaStarted;
   bool m_loopStarted; //true if an internal event loop has been started
diff --git a/quanta/src/quanta_init.cpp b/quanta/src/quanta_init.cpp
index 08b73763..155a376b 100644
--- a/quanta/src/quanta_init.cpp
+++ b/quanta/src/quanta_init.cpp
@@ -248,7 +248,7 @@ void QuantaInit::initQuanta()
           break;
        }
   }
-  KActionMenu *toolviewMenu = (KActionMenu*)(m_quanta->actionCollection()->action("tdemdi_toolview_menu"));
+  TDEActionMenu *toolviewMenu = (TDEActionMenu*)(m_quanta->actionCollection()->action("tdemdi_toolview_menu"));
   if (toolviewMenu)
      toolviewMenu->plug(m_quanta->windowMenu());
 
@@ -464,8 +464,8 @@ void QuantaInit::initView()
 
   //set the toolview and close button style before the GUI is created
   m_config->setGroup("General Options");
-  int iconTextMode = m_config->readNumEntry("IconTextMode", KToolBar::IconOnly);
-  toolBarTab->setIconText(KToolBar::IconText(iconTextMode));
+  int iconTextMode = m_config->readNumEntry("IconTextMode", TDEToolBar::IconOnly);
+  toolBarTab->setIconText(TDEToolBar::IconText(iconTextMode));
   qConfig.toolviewTabs = m_config->readNumEntry("MDI style", KMdi::IconOnly);
   m_quanta->initTabWidget();
 
@@ -586,8 +586,8 @@ void QuantaInit::readOptions()
   qConfig.docPosition   = m_config->readEntry("Documentation area","Tab");
 
   qConfig.smartTagInsertion = m_config->readBoolEntry("Smart Tag Insertion", false);
-  KAction *action = quantaApp->actionCollection()->action("smart_tag_insertion");
-  (static_cast<KToggleAction* >(action))->setChecked(qConfig.smartTagInsertion);
+  TDEAction *action = quantaApp->actionCollection()->action("smart_tag_insertion");
+  (static_cast<TDEToggleAction* >(action))->setChecked(qConfig.smartTagInsertion);
 
   TQSize s(800,580);
   m_quanta->resize( m_config->readSizeEntry("Geometry", &s));
@@ -705,19 +705,19 @@ void QuantaInit::loadInitialProject(const TQString& url)
 
 void QuantaInit::initActions()
 {
-    KActionCollection *ac = m_quanta->actionCollection();
-    new KAction(i18n("Annotate..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotAnnotate()),ac, "annotate");
-    m_quanta->editTagAction = new KAction( i18n( "&Edit Current Tag..." ), CTRL+Key_E,
+    TDEActionCollection *ac = m_quanta->actionCollection();
+    new TDEAction(i18n("Annotate..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotAnnotate()),ac, "annotate");
+    m_quanta->editTagAction = new TDEAction( i18n( "&Edit Current Tag..." ), CTRL+Key_E,
                         TQT_TQOBJECT(m_quanta), TQT_SLOT( slotEditCurrentTag() ),
                         TQT_TQOBJECT(ac), "edit_current_tag" );
-    m_quanta->selectTagAreaAction = new KAction( i18n( "&Select Current Tag Area" ), 0,
+    m_quanta->selectTagAreaAction = new TDEAction( i18n( "&Select Current Tag Area" ), 0,
                         TQT_TQOBJECT(m_quanta), TQT_SLOT( slotSelectTagArea() ),
                         TQT_TQOBJECT(ac), "select_tag_area" );
-    new KAction( i18n( "E&xpand Abbreviation" ), CTRL+SHIFT+Key_J,
+    new TDEAction( i18n( "E&xpand Abbreviation" ), CTRL+SHIFT+Key_J,
                         TQT_TQOBJECT(m_quanta), TQT_SLOT( slotExpandAbbreviation() ),
                         TQT_TQOBJECT(ac), "expand_abbreviation" );
 
-    new KAction(i18n("&Report Bug..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotReportBug()), TQT_TQOBJECT(ac), "help_reportbug"); //needed, because quanta_be bugs should be reported for quanta
+    new TDEAction(i18n("&Report Bug..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotReportBug()), TQT_TQOBJECT(ac), "help_reportbug"); //needed, because quanta_be bugs should be reported for quanta
 
     //Kate actions
 
@@ -729,21 +729,21 @@ void QuantaInit::initActions()
     KStdAction::pasteText(TQT_TQOBJECT(m_quanta), TQT_SLOT(slotPaste()), ac);
 
 //help
-   (void) new KAction(i18n("Ti&p of the Day"), "idea", "", TQT_TQOBJECT(m_quanta),
+   (void) new TDEAction(i18n("Ti&p of the Day"), "idea", "", TQT_TQOBJECT(m_quanta),
       TQT_SLOT(slotHelpTip()), TQT_TQOBJECT(ac), "help_tip");
 
     // File actions
     //
     KStdAction::openNew( TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileNew()  ), ac);
     KStdAction::open   ( TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileOpen() ), ac, "file_open");
-    (void) new KAction(i18n("Close Other Tabs"), 0, ViewManager::ref(), TQT_SLOT(slotCloseOtherTabs()), TQT_TQOBJECT(ac), "close_other_tabs");
+    (void) new TDEAction(i18n("Close Other Tabs"), 0, ViewManager::ref(), TQT_SLOT(slotCloseOtherTabs()), TQT_TQOBJECT(ac), "close_other_tabs");
 
     m_quanta->fileRecent =  KStdAction::openRecent(TQT_TQOBJECT(m_quanta), TQT_SLOT(slotFileOpenRecent(const KURL&)),
                                          ac, "file_open_recent");
     m_quanta->fileRecent->setToolTip(i18n("Open / Open Recent"));
     connect(m_quanta->fileRecent, TQT_SIGNAL(activated()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotFileOpen()));
 
-    (void) new KAction( i18n( "Close All" ), 0, TQT_TQOBJECT(m_quanta),
+    (void) new TDEAction( i18n( "Close All" ), 0, TQT_TQOBJECT(m_quanta),
                         TQT_SLOT( slotFileCloseAll() ),
                         TQT_TQOBJECT(ac), "file_close_all" );
 
@@ -751,19 +751,19 @@ void QuantaInit::initActions()
 
     KStdAction::saveAs( TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileSaveAs() ), ac );
 
-    m_quanta->saveAllAction = new KAction( i18n( "Save All..." ), "save_all", SHIFT+KStdAccel::shortcut(KStdAccel::Save).keyCodeQt(),
+    m_quanta->saveAllAction = new TDEAction( i18n( "Save All..." ), "save_all", SHIFT+TDEStdAccel::shortcut(TDEStdAccel::Save).keyCodeQt(),
                         TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileSaveAll() ),
                         TQT_TQOBJECT(ac), "file_save_all" );
-    (void)  new KAction(i18n("Reloa&d"), "revert", SHIFT+Key_F5, TQT_TQOBJECT(m_quanta),
+    (void)  new TDEAction(i18n("Reloa&d"), "revert", SHIFT+Key_F5, TQT_TQOBJECT(m_quanta),
                         TQT_SLOT(slotFileReload()), TQT_TQOBJECT(ac), "file_reload");
-//    (void)  new KAction(i18n("Reload All "), 0, 0, m_quanta,
+//    (void)  new TDEAction(i18n("Reload All "), 0, 0, m_quanta,
 //                        TQT_SLOT(slotFileReloadAll()), TQT_TQOBJECT(ac), "file_reload_all");
 
-    (void) new KAction( i18n( "Save as Local Template..." ), 0,
+    (void) new TDEAction( i18n( "Save as Local Template..." ), 0,
                         TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileSaveAsLocalTemplate() ),
                         TQT_TQOBJECT(ac), "save_local_template" );
 
-    (void) new KAction( i18n( "Save Selection to Local Template File..." ), 0,
+    (void) new TDEAction( i18n( "Save Selection to Local Template File..." ), 0,
                         TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileSaveSelectionAsLocalTemplate() ),
                         TQT_TQOBJECT(ac), "save_selection_local_template" );
 
@@ -771,68 +771,68 @@ void QuantaInit::initActions()
 
     // Edit actions
 
-    (void) new KAction( i18n( "Find in Files..." ),
+    (void) new TDEAction( i18n( "Find in Files..." ),
                         SmallIcon("filefind"), CTRL+ALT+Key_F,
                         TQT_TQOBJECT(m_quanta), TQT_SLOT( slotEditFindInFiles() ),
                         TQT_TQOBJECT(ac), "find_in_files" );
 
-    KAction* aux = TagActionManager::self()->actionCollection()->action("apply_source_indentation");
+    TDEAction* aux = TagActionManager::self()->actionCollection()->action("apply_source_indentation");
     aux->setEnabled(false);
     ac->insert(aux);
 
     // Tool actions
 
-    (void) new KAction( i18n( "&Context Help..." ), CTRL+Key_H,
+    (void) new TDEAction( i18n( "&Context Help..." ), CTRL+Key_H,
                         TQT_TQOBJECT(m_quanta), TQT_SLOT( slotContextHelp() ),
                         TQT_TQOBJECT(ac), "context_help" );
 
-    (void) new KAction( i18n( "Tag &Attributes..." ), ALT+Key_Down,
+    (void) new TDEAction( i18n( "Tag &Attributes..." ), ALT+Key_Down,
                         m_quanta->m_doc, TQT_SLOT( slotAttribPopup() ),
                         TQT_TQOBJECT(ac), "tag_attributes" );
 
-    (void) new KAction( i18n( "&Change the DTD..." ), 0,
+    (void) new TDEAction( i18n( "&Change the DTD..." ), 0,
                         TQT_TQOBJECT(m_quanta), TQT_SLOT( slotChangeDTD() ),
                         TQT_TQOBJECT(ac), "change_dtd" );
 
-    (void) new KAction( i18n( "&Edit DTD Settings..." ), 0,
+    (void) new TDEAction( i18n( "&Edit DTD Settings..." ), 0,
     TQT_TQOBJECT(m_quanta), TQT_SLOT( slotEditDTD() ),
     TQT_TQOBJECT(ac), "edit_dtd" );
 
-    (void) new KAction( i18n( "&Load && Convert DTD..." ), 0,
+    (void) new TDEAction( i18n( "&Load && Convert DTD..." ), 0,
                         DTDs::ref(), TQT_SLOT( slotLoadDTD() ),
                         TQT_TQOBJECT(ac), "load_dtd" );
-    (void) new KAction( i18n( "Load DTD E&ntities..." ), 0,
+    (void) new TDEAction( i18n( "Load DTD E&ntities..." ), 0,
                         DTDs::ref(), TQT_SLOT( slotLoadEntities() ),
                         TQT_TQOBJECT(ac), "load_entities" );
 
-    (void) new KAction( i18n( "Load DTD &Package (DTEP)..." ), 0,
+    (void) new TDEAction( i18n( "Load DTD &Package (DTEP)..." ), 0,
                         TQT_TQOBJECT(m_quanta), TQT_SLOT( slotLoadDTEP() ),
                         TQT_TQOBJECT(ac), "load_dtep" );
 
-    (void) new KAction( i18n( "Send DTD Package (DTEP) in E&mail..." ), "mail_send", 0,
+    (void) new TDEAction( i18n( "Send DTD Package (DTEP) in E&mail..." ), "mail_send", 0,
                         TQT_TQOBJECT(m_quanta), TQT_SLOT( slotEmailDTEP() ),
                         TQT_TQOBJECT(ac), "send_dtep" );
 
-    (void) new KAction( i18n( "&Download DTD Package (DTEP)..." ), "network", 0,
+    (void) new TDEAction( i18n( "&Download DTD Package (DTEP)..." ), "network", 0,
                         TQT_TQOBJECT(m_quanta), TQT_SLOT( slotDownloadDTEP() ),
                         TQT_TQOBJECT(ac), "download_dtep" );
-    (void) new KAction( i18n( "&Upload DTD Package (DTEP)..." ), "network", 0,
+    (void) new TDEAction( i18n( "&Upload DTD Package (DTEP)..." ), "network", 0,
                         TQT_TQOBJECT(m_quanta), TQT_SLOT( slotUploadDTEP() ),
                         TQT_TQOBJECT(ac), "upload_dtep" );
 /*
-    (void) new KAction( i18n( "&Upload DTD Package (DTEP)..." ), 0,
+    (void) new TDEAction( i18n( "&Upload DTD Package (DTEP)..." ), 0,
                         TQT_TQOBJECT(m_quanta), TQT_SLOT( slotUploadDTEP() ),
                         TQT_TQOBJECT(ac), "send_dtep" );
 */
-    (void) new KAction( i18n( "&Document Properties" ), 0,
+    (void) new TDEAction( i18n( "&Document Properties" ), 0,
                         TQT_TQOBJECT(m_quanta), TQT_SLOT( slotDocumentProperties() ),
                         TQT_TQOBJECT(ac), "tools_document_properties" );
 
-    (void) new KAction ( i18n ("F&ormat XML Code"), 0,
+    (void) new TDEAction ( i18n ("F&ormat XML Code"), 0,
                         TQT_TQOBJECT(m_quanta), TQT_SLOT( slotCodeFormatting() ),
                         TQT_TQOBJECT(ac), "tools_code_formatting");
 
-    (void) new KAction( i18n( "&Convert Tag && Attribute Case..."), 0,
+    (void) new TDEAction( i18n( "&Convert Tag && Attribute Case..."), 0,
                         TQT_TQOBJECT(m_quanta), TQT_SLOT(slotConvertCase()),
                         TQT_TQOBJECT(ac), "tools_change_case");
 
@@ -840,23 +840,23 @@ void QuantaInit::initActions()
 
 
     m_quanta->showSourceAction =
-      new KToggleAction( i18n( "&Source Editor"), UserIcon ("view_text"), ALT+Key_F9,
+      new TDEToggleAction( i18n( "&Source Editor"), UserIcon ("view_text"), ALT+Key_F9,
                          TQT_TQOBJECT(m_quanta), TQT_SLOT( slotShowSourceEditor()),
                          TQT_TQOBJECT(ac), "show_quanta_editor");
     m_quanta->showSourceAction->setExclusiveGroup("view");
 
     m_quanta->showVPLAction =
-      new KToggleAction( i18n( "&VPL Editor"), UserIcon ("vpl"), CTRL+SHIFT+Key_F9,
+      new TDEToggleAction( i18n( "&VPL Editor"), UserIcon ("vpl"), CTRL+SHIFT+Key_F9,
       TQT_TQOBJECT(m_quanta), TQT_SLOT( slotShowVPLOnly() ),
                           TQT_TQOBJECT(ac), "show_kafka_view");
     m_quanta->showVPLAction->setExclusiveGroup("view");
 
     m_quanta->showVPLSourceAction =
-      new KToggleAction( i18n("VPL && So&urce Editors"), UserIcon ("vpl_text"), Key_F9,
+      new TDEToggleAction( i18n("VPL && So&urce Editors"), UserIcon ("vpl_text"), Key_F9,
                          TQT_TQOBJECT(m_quanta), TQT_SLOT( slotShowVPLAndSourceEditor() ),
                           TQT_TQOBJECT(ac), "show_kafka_and_quanta");
     m_quanta->showVPLSourceAction->setExclusiveGroup("view");
-    /**kafkaSelectAction = new KSelectAction(i18n("Main &View"), 0, ac,"show_kafka");
+    /**kafkaSelectAction = new TDESelectAction(i18n("Main &View"), 0, ac,"show_kafka");
     TQStringList list2;
     list2.append(i18n("&Source Editor"));
     list2.append(i18n("&VPL Editor (experimental)"));
@@ -865,23 +865,23 @@ void QuantaInit::initActions()
     connect(kafkaSelectAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotShowKafkaPartl(int)));*/
 
 
-    (void) new KAction( i18n( "&Reload Preview" ), "reload",
-                        KStdAccel::shortcut(KStdAccel::Reload).keyCodeQt(),
+    (void) new TDEAction( i18n( "&Reload Preview" ), "reload",
+                        TDEStdAccel::shortcut(TDEStdAccel::Reload).keyCodeQt(),
                         TQT_TQOBJECT(m_quanta), TQT_SLOT(slotRepaintPreview()),
                         TQT_TQOBJECT(ac), "reload" );
 
-    (void) new KAction( i18n( "&Previous File" ), "1leftarrow", KStdAccel::back(),
+    (void) new TDEAction( i18n( "&Previous File" ), "1leftarrow", TDEStdAccel::back(),
                         TQT_TQOBJECT(m_quanta), TQT_SLOT( slotBack() ),
                         TQT_TQOBJECT(ac), "previous_file" );
 
-    (void) new KAction( i18n( "&Next File" ), "1rightarrow", KStdAccel::forward(),
+    (void) new TDEAction( i18n( "&Next File" ), "1rightarrow", TDEStdAccel::forward(),
                         TQT_TQOBJECT(m_quanta), TQT_SLOT( slotForward() ),
                         TQT_TQOBJECT(ac), "next_file" );
 
     // Options actions
     //
 
-    (void) new KAction( i18n( "Configure &Actions..." ), UserIcon("ball"),0,
+    (void) new TDEAction( i18n( "Configure &Actions..." ), UserIcon("ball"),0,
                         TQT_TQOBJECT(m_quanta), TQT_SLOT( slotOptionsConfigureActions() ),
                         TQT_TQOBJECT(ac), "configure_actions" );
 
@@ -889,46 +889,46 @@ void QuantaInit::initActions()
     KStdAction::keyBindings(TQT_TQOBJECT(m_quanta), TQT_SLOT( slotOptionsConfigureKeys() ), ac, "configure_shortcuts");
     KStdAction::configureToolbars(TQT_TQOBJECT(m_quanta), TQT_SLOT( slotOptionsConfigureToolbars() ), ac, "options_configure_toolbars");
     KStdAction::preferences(TQT_TQOBJECT(m_quanta), TQT_SLOT( slotOptions() ), ac, "general_options");
-    new KAction(i18n("Configure Pre&view..."), SmallIcon("konqueror"), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotPreviewOptions()), TQT_TQOBJECT(ac), "preview_options");
+    new TDEAction(i18n("Configure Pre&view..."), SmallIcon("konqueror"), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotPreviewOptions()), TQT_TQOBJECT(ac), "preview_options");
 
     // Toolbars actions
-    m_quanta->projectToolbarFiles = new KRecentFilesAction(i18n("Load &Project Toolbar"),0,
+    m_quanta->projectToolbarFiles = new TDERecentFilesAction(i18n("Load &Project Toolbar"),0,
                                                            TQT_TQOBJECT(m_quanta), TQT_SLOT(slotLoadToolbarFile(const KURL&)),
                                                            TQT_TQOBJECT(ac), "toolbars_load_project");
 
-    new KAction(i18n("Load &Global Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotLoadGlobalToolbar()), TQT_TQOBJECT(ac), "toolbars_load_global");
-    new KAction(i18n("Load &Local Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotLoadToolbar()), TQT_TQOBJECT(ac), "toolbars_load_user");
-    new KAction(i18n("Save as &Local Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotSaveLocalToolbar()), TQT_TQOBJECT(ac), "toolbars_save_local");
-    new KAction(i18n("Save as &Project Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotSaveProjectToolbar()), TQT_TQOBJECT(ac), "toolbars_save_project");
-    new KAction(i18n("&New User Toolbar..."),  0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotAddToolbar()), TQT_TQOBJECT(ac), "toolbars_add");
-    new KAction(i18n("&Remove User Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotRemoveToolbar()), TQT_TQOBJECT(ac), "toolbars_remove");
-    new KAction(i18n("Re&name User Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotRenameToolbar()), TQT_TQOBJECT(ac), "toolbars_rename");
-    new KAction(i18n("Send Toolbar in E&mail..."), "mail_send", 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotSendToolbar()), TQT_TQOBJECT(ac), "toolbars_send");
-    new KAction(i18n("&Upload Toolbar..." ), "network", 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotUploadToolbar()), TQT_TQOBJECT(ac), "toolbars_upload" );
-    new KAction(i18n("&Download Toolbar..." ), "network", 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotDownloadToolbar()), TQT_TQOBJECT(ac), "toolbars_download" );
-
-    KToggleAction *toggle = new KToggleAction( i18n("Smart Tag Insertion"), 0, TQT_TQOBJECT(ac), "smart_tag_insertion");
+    new TDEAction(i18n("Load &Global Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotLoadGlobalToolbar()), TQT_TQOBJECT(ac), "toolbars_load_global");
+    new TDEAction(i18n("Load &Local Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotLoadToolbar()), TQT_TQOBJECT(ac), "toolbars_load_user");
+    new TDEAction(i18n("Save as &Local Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotSaveLocalToolbar()), TQT_TQOBJECT(ac), "toolbars_save_local");
+    new TDEAction(i18n("Save as &Project Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotSaveProjectToolbar()), TQT_TQOBJECT(ac), "toolbars_save_project");
+    new TDEAction(i18n("&New User Toolbar..."),  0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotAddToolbar()), TQT_TQOBJECT(ac), "toolbars_add");
+    new TDEAction(i18n("&Remove User Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotRemoveToolbar()), TQT_TQOBJECT(ac), "toolbars_remove");
+    new TDEAction(i18n("Re&name User Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotRenameToolbar()), TQT_TQOBJECT(ac), "toolbars_rename");
+    new TDEAction(i18n("Send Toolbar in E&mail..."), "mail_send", 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotSendToolbar()), TQT_TQOBJECT(ac), "toolbars_send");
+    new TDEAction(i18n("&Upload Toolbar..." ), "network", 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotUploadToolbar()), TQT_TQOBJECT(ac), "toolbars_upload" );
+    new TDEAction(i18n("&Download Toolbar..." ), "network", 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotDownloadToolbar()), TQT_TQOBJECT(ac), "toolbars_download" );
+
+    TDEToggleAction *toggle = new TDEToggleAction( i18n("Smart Tag Insertion"), 0, TQT_TQOBJECT(ac), "smart_tag_insertion");
     connect(toggle, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotSmartTagInsertion()));
 
-    m_quanta->showDTDToolbar=new KToggleAction(i18n("Show DTD Toolbar"), 0, TQT_TQOBJECT(ac), "view_dtd_toolbar");
+    m_quanta->showDTDToolbar=new TDEToggleAction(i18n("Show DTD Toolbar"), 0, TQT_TQOBJECT(ac), "view_dtd_toolbar");
 
     connect(m_quanta->showDTDToolbar, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotToggleDTDToolbar(bool)));
     m_quanta->showDTDToolbar->setCheckedState(i18n("Hide DTD Toolbar"));
 
-    new KAction(i18n("Complete Text"), CTRL+Key_Space,
+    new TDEAction(i18n("Complete Text"), CTRL+Key_Space,
                 TQT_TQOBJECT(m_quanta), TQT_SLOT(slotShowCompletion()), ac,"show_completion");
-    new KAction(i18n("Completion Hints"), CTRL+SHIFT+Key_Space,
+    new TDEAction(i18n("Completion Hints"), CTRL+SHIFT+Key_Space,
                 TQT_TQOBJECT(m_quanta), TQT_SLOT(slotShowCompletionHint()), ac,"show_completion_hint");
 
     KStdAction::back(TQT_TQOBJECT(m_quanta), TQT_SLOT( slotBack() ), ac, "w_back");
     KStdAction::forward(TQT_TQOBJECT(m_quanta), TQT_SLOT( slotForward() ), ac, "w_forward");
 
-    new KAction(i18n("Open File: none"), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotOpenFileUnderCursor()), TQT_TQOBJECT(ac), "open_file_under_cursor");
-    new KAction(i18n("Upload..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotUploadFile()), TQT_TQOBJECT(ac), "upload_file");
-    new KAction(i18n("Delete File"), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotDeleteFile()), TQT_TQOBJECT(ac), "delete_file");
+    new TDEAction(i18n("Open File: none"), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotOpenFileUnderCursor()), TQT_TQOBJECT(ac), "open_file_under_cursor");
+    new TDEAction(i18n("Upload..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotUploadFile()), TQT_TQOBJECT(ac), "upload_file");
+    new TDEAction(i18n("Delete File"), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotDeleteFile()), TQT_TQOBJECT(ac), "delete_file");
 
     TQString ss = i18n("Upload Opened Project Files...");
-/*    new KAction(i18n("Upload Opened Project Files"), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotUploadOpenedFiles()), TQT_TQOBJECT(ac), "upload_opened_files"); */
+/*    new TDEAction(i18n("Upload Opened Project Files"), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotUploadOpenedFiles()), TQT_TQOBJECT(ac), "upload_opened_files"); */
 
     TQString error;
     int el, ec;
@@ -988,16 +988,16 @@ void QuantaInit::initActions()
 
     // create the preview action
     m_quanta->showPreviewAction =
-      new KToolBarPopupAction( i18n( "&Preview" ), "preview", Key_F6,
+      new TDEToolBarPopupAction( i18n( "&Preview" ), "preview", Key_F6,
                          TQT_TQOBJECT(m_quanta), TQT_SLOT( slotToggleShowPreview() ),
                          TQT_TQOBJECT(ac), "show_preview" );
 
-    KAction *act = new KAction( i18n( "Preview Without Frames" ), "", 0,
+    TDEAction *act = new TDEAction( i18n( "Preview Without Frames" ), "", 0,
                                   TQT_TQOBJECT(m_quanta), TQT_SLOT(slotShowNoFramesPreview()),
                                   TQT_TQOBJECT(ac), "show_preview_no_frames" );
     act->plug(m_quanta->showPreviewAction->popupMenu());
 
-    act = new KAction( i18n( "View with &Konqueror" ), "konqueror", Key_F12,
+    act = new TDEAction( i18n( "View with &Konqueror" ), "konqueror", Key_F12,
                         TQT_TQOBJECT(m_quanta), TQT_SLOT( slotViewInKFM() ),
                         TQT_TQOBJECT(ac), "view_with_konqueror" );
     act->plug(m_quanta->showPreviewAction->popupMenu());
@@ -1019,51 +1019,51 @@ void QuantaInit::initActions()
     if (act)
       act->plug(m_quanta->showPreviewAction->popupMenu());
 
-    act = new KAction( i18n( "View with L&ynx" ), "terminal", 0,
+    act = new TDEAction( i18n( "View with L&ynx" ), "terminal", 0,
                         TQT_TQOBJECT(m_quanta), TQT_SLOT( slotViewInLynx() ),
                         TQT_TQOBJECT(ac), "view_with_lynx" );
     act->plug(m_quanta->showPreviewAction->popupMenu());
 
 
-    (void) new KAction( i18n( "Table Editor..." ), "quick_table", 0,
+    (void) new TDEAction( i18n( "Table Editor..." ), "quick_table", 0,
                         TQT_TQOBJECT(m_quanta), TQT_SLOT( slotTagEditTable() ),
                         TQT_TQOBJECT(ac), "tag_edit_table" );
 
-    (void) new KAction( i18n( "Quick List..." ), "quick_list", 0,
+    (void) new TDEAction( i18n( "Quick List..." ), "quick_list", 0,
                         TQT_TQOBJECT(m_quanta), TQT_SLOT( slotTagQuickList() ),
                         TQT_TQOBJECT(ac), "tag_quick_list" );
 
-    (void) new KAction( i18n( "Color..." ), "colorize", CTRL+SHIFT+Key_C,
+    (void) new TDEAction( i18n( "Color..." ), "colorize", CTRL+SHIFT+Key_C,
                         TQT_TQOBJECT(m_quanta), TQT_SLOT( slotTagColor() ),
                         TQT_TQOBJECT(ac), "tag_color" );
 
 
-    (void) new KAction( i18n( "Email..." ), "tag_mail", 0,
+    (void) new TDEAction( i18n( "Email..." ), "tag_mail", 0,
                         TQT_TQOBJECT(m_quanta), TQT_SLOT( slotTagMail() ),
                         TQT_TQOBJECT(ac), "tag_mail" );
 
-    (void) new KAction( i18n( "Misc. Tag..." ), "tag_misc", CTRL+SHIFT+Key_T,
+    (void) new TDEAction( i18n( "Misc. Tag..." ), "tag_misc", CTRL+SHIFT+Key_T,
                         TQT_TQOBJECT(m_quanta), TQT_SLOT( slotTagMisc() ),
                         TQT_TQOBJECT(ac), "tag_misc" );
 
-    (void) new KAction( i18n( "Frame Wizard..." ), "frame", 0,
+    (void) new TDEAction( i18n( "Frame Wizard..." ), "frame", 0,
                         TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFrameWizard() ),
                         TQT_TQOBJECT(ac), "tag_frame_wizard" );
 
-    (void) new KAction( i18n( "Paste &HTML Quoted" ), "editpaste", 0,
+    (void) new TDEAction( i18n( "Paste &HTML Quoted" ), "editpaste", 0,
                         TQT_TQOBJECT(m_quanta), TQT_SLOT( slotPasteHTMLQuoted() ),
                         TQT_TQOBJECT(ac), "edit_paste_html_quoted" );
 
-    (void) new KAction( i18n( "Paste &URL Encoded" ), "editpaste", 0,
+    (void) new TDEAction( i18n( "Paste &URL Encoded" ), "editpaste", 0,
                         TQT_TQOBJECT(m_quanta), TQT_SLOT( slotPasteURLEncoded() ),
                         TQT_TQOBJECT(ac), "edit_paste_url_encoded" );
 
-    (void) new KAction( i18n( "Insert CSS..." ),"css", 0,
+    (void) new TDEAction( i18n( "Insert CSS..." ),"css", 0,
                         TQT_TQOBJECT(m_quanta), TQT_SLOT( slotInsertCSS() ),
                         TQT_TQOBJECT(ac), "insert_css" );
 
     // special-character combo
-    KAction* char_action = new KAction(
+    TDEAction* char_action = new TDEAction(
                         i18n( "Insert Special Character" ), "charset", 0,
                         TQT_TQOBJECT(ac), "insert_char" );
     connect( char_action, TQT_SIGNAL(activated()),
diff --git a/quanta/src/quantadoc.cpp b/quanta/src/quantadoc.cpp
index eb463cf6..61a6db43 100644
--- a/quanta/src/quantadoc.cpp
+++ b/quanta/src/quantadoc.cpp
@@ -80,7 +80,7 @@ QuantaDoc::QuantaDoc(TQWidget *parent, const char *name) : TQObject(parent, name
 {
   fileWatcher = new KDirWatch(this);
 
-  attribMenu = new KPopupMenu();
+  attribMenu = new TDEPopupMenu();
   attribMenu->insertTitle(i18n("Tag"));
   connect( attribMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotInsertAttrib(int)));
 }
@@ -165,7 +165,7 @@ void QuantaDoc::openDocument(const KURL& urlToOpen, const TQString &a_encoding,
   if (readOnly)
   {
     //might work only with Kate part
-    KAction *writeLockAction =  w->view()->actionCollection()->action("tools_toggle_write_lock");
+    TDEAction *writeLockAction =  w->view()->actionCollection()->action("tools_toggle_write_lock");
     if (writeLockAction)
       writeLockAction->activate();
   }
@@ -365,7 +365,7 @@ void QuantaDoc::slotInsertAttrib( int id )
     }
 
     delete attribMenu;
-    attribMenu = new KPopupMenu();
+    attribMenu = new TDEPopupMenu();
     attribMenu->insertTitle(i18n("Tag"));
     connect( attribMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotInsertAttrib(int)));
   }
diff --git a/quanta/src/quantadoc.h b/quanta/src/quantadoc.h
index 276c3a8c..f2bb84d8 100644
--- a/quanta/src/quantadoc.h
+++ b/quanta/src/quantadoc.h
@@ -53,7 +53,7 @@ signals:
   void eventHappened(const TQString&, const TQString&, const TQString& );
 
 private:
-  KPopupMenu *attribMenu;
+  TDEPopupMenu *attribMenu;
   bool m_eventLoopStarted;
 };
 
diff --git a/quanta/src/quantaview.cpp b/quanta/src/quantaview.cpp
index 5e939222..d214bab6 100644
--- a/quanta/src/quantaview.cpp
+++ b/quanta/src/quantaview.cpp
@@ -356,7 +356,7 @@ void QuantaView::slotSetSourceLayout()
    if(m_currentViewsLayout == SourceAndVPL)
      m_splitterSizes = m_splitter->sizes();
 
-   KToggleAction *ta = (KToggleAction *) quantaApp->actionCollection()->action( "show_quanta_editor" );
+   TDEToggleAction *ta = (TDEToggleAction *) quantaApp->actionCollection()->action( "show_quanta_editor" );
    if (ta)
       ta->setChecked(true);
 
@@ -391,12 +391,12 @@ void QuantaView::slotSetSourceAndVPLLayout()
    if (m_currentViewsLayout == SourceAndVPL  || !m_document)
      return;
 
-   KToggleAction *ta = (KToggleAction *) quantaApp->actionCollection()->action( "show_kafka_and_quanta" );
+   TDEToggleAction *ta = (TDEToggleAction *) quantaApp->actionCollection()->action( "show_kafka_and_quanta" );
 
    if (m_document->defaultDTD()->name.contains("HTML", false) == 0)
    {
       KMessageBox::information(this, i18n("The VPL Mode does not support the current DTD, at the moment: %1").arg(m_document->defaultDTD()->nickName));
-      KToggleAction *ta2 = (KToggleAction *) quantaApp->actionCollection()->action( "show_quanta_editor" );
+      TDEToggleAction *ta2 = (TDEToggleAction *) quantaApp->actionCollection()->action( "show_quanta_editor" );
       if (ta2)
           ta2->setChecked(true);
       return;
@@ -440,12 +440,12 @@ void QuantaView::slotSetVPLOnlyLayout()
    if(m_currentViewsLayout == SourceAndVPL)
      m_splitterSizes = m_splitter->sizes();
 
-   KToggleAction *ta = (KToggleAction *) quantaApp->actionCollection()->action( "show_kafka_view" );
+   TDEToggleAction *ta = (TDEToggleAction *) quantaApp->actionCollection()->action( "show_kafka_view" );
 
    if (m_document->defaultDTD()->name.contains("HTML", false) == 0)
    {
       KMessageBox::information(this, i18n("The VPL Mode does not support the current DTD, at the moment: %1").arg(m_document->defaultDTD()->nickName));
-      KToggleAction *ta2 = (KToggleAction *) quantaApp->actionCollection()->action( "show_quanta_editor" );
+      TDEToggleAction *ta2 = (TDEToggleAction *) quantaApp->actionCollection()->action( "show_quanta_editor" );
       if (ta2)
           ta2->setChecked(true);
       return;
@@ -502,7 +502,7 @@ void QuantaView::slotVPLGetFocus(bool focus)
   kdDebug(25001)<< "slotVPLGetFocus(" << focus << ")" << endl;
 #endif
   int contentsX, contentsY;
-  KAction *action;
+  TDEAction *action;
 
   if(focus)
   {
@@ -570,7 +570,7 @@ void QuantaView::slotSourceGetFocus()
 #ifdef LIGHT_DEBUG
   kdDebug(25001)<< "slotSourceGetFocus(true)" << endl;
 #endif
-  KAction *action;
+  TDEAction *action;
 
   quantaApp->partManager()->setActivePart(m_document->doc(), m_document->view());
   //We reload the quanta view from the Node Tree.
@@ -1027,11 +1027,11 @@ void QuantaView::activated()
 
   //TEMP : If the activated document is not a (X)HTML document, disable smartTagInsertion
   //Will be removed when VPL will support every DTD
-  KAction *action = quantaApp->actionCollection()->action("smart_tag_insertion");
+  TDEAction *action = quantaApp->actionCollection()->action("smart_tag_insertion");
   if(action && m_document->defaultDTD()->name.contains("HTML", false) == 0)
   {
     qConfig.smartTagInsertion = false;
-    (static_cast<KToggleAction* >(action))->setChecked(false);
+    (static_cast<TDEToggleAction* >(action))->setChecked(false);
   }
 
   reloadLayout();
diff --git a/quanta/src/viewmanager.cpp b/quanta/src/viewmanager.cpp
index 7cf9a1ed..ae22d25e 100644
--- a/quanta/src/viewmanager.cpp
+++ b/quanta/src/viewmanager.cpp
@@ -66,7 +66,7 @@ ViewManager::ViewManager(TQObject *parent, const char *name) : TQObject(parent,
     m_lastActiveView = 0L;
     m_lastActiveEditorView = 0L;
     m_documentationView = 0L;
-    m_tabPopup = new KPopupMenu(quantaApp);
+    m_tabPopup = new TDEPopupMenu(quantaApp);
     m_tabPopup->insertItem(SmallIcon("fileclose"), i18n("&Close"), this, TQT_SLOT(slotCloseView()));
     m_tabPopup->insertItem(i18n("Close &Other Tabs"), this, TQT_SLOT(slotCloseOtherTabs()));
     m_tabPopup->insertItem(i18n("Close &All"), this, TQT_SLOT(closeAll()));
@@ -74,11 +74,11 @@ ViewManager::ViewManager(TQObject *parent, const char *name) : TQObject(parent,
     m_tabPopup->insertItem(SmallIcon("up"), i18n("&Upload File"), this, TQT_SLOT(slotUploadFile()), 0, UPLOAD_ID);
     m_tabPopup->insertItem(SmallIcon("editdelete"), i18n("&Delete File"), this, TQT_SLOT(slotDeleteFile()), 0, DELETE_ID);
     m_tabPopup->insertSeparator();
-    m_fileListPopup = new KPopupMenu(quantaApp);
+    m_fileListPopup = new TDEPopupMenu(quantaApp);
     connect(m_fileListPopup, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotFileListPopupAboutToShow()));
     connect(m_fileListPopup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotFileListPopupItemActivated(int)));
     m_bookmarks = new QuantaBookmarks(this, QuantaBookmarks::Position, true);
-    m_bookmarksMenu = new KPopupMenu(quantaApp);
+    m_bookmarksMenu = new TDEPopupMenu(quantaApp);
     m_bookmarks->setBookmarksMenu(m_bookmarksMenu);
     connect(m_bookmarks, TQT_SIGNAL(gotoFileAndLine(const TQString&, int, int)), quantaApp, TQT_SLOT(gotoFileAndLine(const TQString&, int, int)));
     m_bookmarksMenuId = m_tabPopup->insertItem(SmallIconSet("bookmark"), i18n("&Bookmarks"), m_bookmarksMenu);
diff --git a/quanta/src/viewmanager.h b/quanta/src/viewmanager.h
index 3e755534..1fc3d642 100644
--- a/quanta/src/viewmanager.h
+++ b/quanta/src/viewmanager.h
@@ -22,7 +22,7 @@ class Document;
 class QuantaView;
 class QuantaBookmarks;
 class KafkaDocument;
-class KPopupMenu;
+class TDEPopupMenu;
 
 class KMdiChildView;
 
@@ -131,9 +131,9 @@ private:
   QuantaView *m_lastActiveView; ///< Holds the last active view. Used to deactivate it when a new view is selected
   QuantaView *m_lastActiveEditorView; ///< Contains the last active view which has an editor inside
   QuantaView *m_documentationView; ///< Contains the view which holds the documentation browser
-  KPopupMenu *m_tabPopup; ///< the menu which pops up when the user clicks on a view tab
-  KPopupMenu *m_fileListPopup; ///< a menu containing the opened views as menu items
-  KPopupMenu *m_bookmarksMenu;
+  TDEPopupMenu *m_tabPopup; ///< the menu which pops up when the user clicks on a view tab
+  TDEPopupMenu *m_fileListPopup; ///< a menu containing the opened views as menu items
+  TDEPopupMenu *m_bookmarksMenu;
   QuantaBookmarks *m_bookmarks;
     
   QuantaView *m_contextView; ///<the tab where the context menu was requested