Rename a number of classes to enhance compatibility with KDE4

176 files changed, 1116 insertions, 1116 deletions

diff --git a/doc/kommander/tutorials.docbook b/doc/kommander/tutorials.docbook
index e4fd5054..ba051e78 100644
--- a/doc/kommander/tutorials.docbook
+++ b/doc/kommander/tutorials.docbook
@@ -325,7 +325,7 @@ The examples are installed to <command>$TDEDIR/share/apps/kmdr-editor/editor</co
 <para>
 The little dialog that grew into a Mainwindow. As &kommander; does not have a native MainWindow widget it has been assumed it only does dialogs. In fact only dialogs are officially supported... but you can run MainWindows in &kommander;. This is an example editor. If you want to create a MainWindow application in &kommander; just open Qt Designer and make one, save it and rename the *.ui file to a *.kmdr file. Now open it in &kommander; and do what you would do normally.
 </para>
-<note><para>As of this writing what is known not to work on the &kommander; side is the settings read and write. There is no Initialize or Destroy section as there is no &kommander; Text, however there are signals for this on the window, so the functionality is intact. On the MainWindow side it is not possible to talk to any actions via DCOP as these are QActions from Designer and KActions are not derived from QActions in KDE 3.x. This means a DCOP call to list actions or set states will not work. It is also not possible to talk to the Statusbar. Also submenus on the menubar and dropdown actions on the Toolbar will not work. Even though this is not a &kommander; widget, or officicially supported, it seems suitable for many small application uses.</para></note>
+<note><para>As of this writing what is known not to work on the &kommander; side is the settings read and write. There is no Initialize or Destroy section as there is no &kommander; Text, however there are signals for this on the window, so the functionality is intact. On the MainWindow side it is not possible to talk to any actions via DCOP as these are QActions from Designer and TDEActions are not derived from QActions in KDE 3.x. This means a DCOP call to list actions or set states will not work. It is also not possible to talk to the Statusbar. Also submenus on the menubar and dropdown actions on the Toolbar will not work. Even though this is not a &kommander; widget, or officicially supported, it seems suitable for many small application uses.</para></note>
 <para>
 There is a quick help dialog this editor launches that discusses in depth what is happening inside.
 </para>
diff --git a/doc/kommander/widgets.docbook b/doc/kommander/widgets.docbook
index fa187cfc..1596d25e 100644
--- a/doc/kommander/widgets.docbook
+++ b/doc/kommander/widgets.docbook
@@ -132,7 +132,7 @@ A ListBox has only one state, default.
 The widget text for a ListBox is the items contained in the ListBox.  @selectedWidgetText will return only the items that are currently selected.
 </para>
 <para>
-See the KListBox documentation to learn more about it.
+See the TDEListBox documentation to learn more about it.
 </para>
 </listitem>
 </varlistentry>
@@ -172,7 +172,7 @@ TreeWidget
 A widget that provides a list in the form of a tree structure. You can add child items and multi-column data. The current limitation is that you cannot modify columns. To add a child node use <quote>/</quote> as a separator. To add column data use the escaped tab <quote>\t</quote> character between columns.
 </para>
 <para>
-See the KListView documentation to learn more about it.
+See the TDEListView documentation to learn more about it.
 </para>
 
 </listitem>
@@ -316,7 +316,7 @@ RadioButton has 2 states checked and unchecked.
 There is no widget text associated with a RadioButton.
 </para>
 <para>
-See the KRadioButton documentation to learn more about it.
+See the TDERadioButton documentation to learn more about it.
 </para>
 </listitem>
 </varlistentry>
diff --git a/kimagemapeditor/arealistview.cpp b/kimagemapeditor/arealistview.cpp
index 203a741f..3739114a 100644
--- a/kimagemapeditor/arealistview.cpp
+++ b/kimagemapeditor/arealistview.cpp
@@ -34,7 +34,7 @@
 AreaListView::AreaListView(TQWidget *parent, const char *name)
   : TQVBox(parent, name)
 {
-  listView = new KListView(this);
+  listView = new TDEListView(this);
   listView->addColumn(i18n("Areas"));
   listView->addColumn(i18n("Preview"));
 
diff --git a/kimagemapeditor/arealistview.h b/kimagemapeditor/arealistview.h
index cd2c1c43..48f495f4 100644
--- a/kimagemapeditor/arealistview.h
+++ b/kimagemapeditor/arealistview.h
@@ -21,7 +21,7 @@
 #include <tqwidget.h>
 #include <tqvbox.h>
 
-class KListView;
+class TDEListView;
 class TQPushButton;
 class Area;
 
@@ -39,7 +39,7 @@ public:
   AreaListView(TQWidget *parent, const char *name);
   ~AreaListView();
   
-  KListView* listView;
+  TDEListView* listView;
 	TQPushButton *upBtn;
 	TQPushButton *downBtn;
   
diff --git a/kimagemapeditor/imageslistview.cpp b/kimagemapeditor/imageslistview.cpp
index 7db15e1e..ff14a98a 100644
--- a/kimagemapeditor/imageslistview.cpp
+++ b/kimagemapeditor/imageslistview.cpp
@@ -52,7 +52,7 @@ ImageTag* ImagesListViewItem::imageTag() {
 
 
 ImagesListView::ImagesListView(TQWidget *parent, const char *name)
-  : KListView(parent, name)
+  : TDEListView(parent, name)
 {
   addColumn(i18n("Images"));
   addColumn(i18n("Usemap"));
diff --git a/kimagemapeditor/imageslistview.h b/kimagemapeditor/imageslistview.h
index fe2784ec..1a118d2f 100644
--- a/kimagemapeditor/imageslistview.h
+++ b/kimagemapeditor/imageslistview.h
@@ -44,7 +44,7 @@ class ImagesListViewItem : public TQListViewItem
  * Simple class that shows a list of imagenames with a preview
  * Jan Schaefer
  **/
-class ImagesListView : public KListView
+class ImagesListView : public TDEListView
 {
   Q_OBJECT
   
diff --git a/kimagemapeditor/kimagemapeditor.cpp b/kimagemapeditor/kimagemapeditor.cpp
index 199b757b..bccccc7c 100644
--- a/kimagemapeditor/kimagemapeditor.cpp
+++ b/kimagemapeditor/kimagemapeditor.cpp
@@ -322,7 +322,7 @@ void KImageMapEditor::setReadWrite(bool)
 void KImageMapEditor::setModified(bool modified)
 {
     // get a handle on our Save action and make sure it is valid
-    KAction *save = actionCollection()->action(KStdAction::stdName(KStdAction::Save));
+    TDEAction *save = actionCollection()->action(KStdAction::stdName(KStdAction::Save));
     if (!save)
         return;
 
@@ -431,7 +431,7 @@ void KImageMapEditor::saveLastURL(TDEConfig* config) {
 void KImageMapEditor::setupActions()
 {
 	// File Open
-  KAction *temp=KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection());
+  TDEAction *temp=KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection());
   TQMimeSourceFactory::defaultFactory()->setPixmap( "openimage", SmallIcon("fileopen") );
 	temp->setWhatsThis(i18n("<h3>Open File</h3>Click this to <em>open</em> a new picture or HTML file."));
 	temp->setToolTip(i18n("Open new picture or HTML file"));
@@ -478,7 +478,7 @@ void KImageMapEditor::setupActions()
 
 
   // Edit Delete
-  deleteAction=new KAction(i18n("&Delete"), "editdelete",
+  deleteAction=new TDEAction(i18n("&Delete"), "editdelete",
               Key_Delete,this,TQT_SLOT (slotDelete()),actionCollection(), "edit_delete");
   TQMimeSourceFactory::defaultFactory()->setPixmap( "editdeleteimage", SmallIcon("editdelete") );
   deleteAction->setWhatsThis(i18n("<h3>Delete</h3>"
@@ -489,7 +489,7 @@ void KImageMapEditor::setupActions()
   _commandHistory = new KCommandHistory( actionCollection(), true);
 
   // Edit Properties
-  areaPropertiesAction= new KAction(i18n("Pr&operties"),0,this,TQT_SLOT(showTagEditor()),
+  areaPropertiesAction= new TDEAction(i18n("Pr&operties"),0,this,TQT_SLOT(showTagEditor()),
     actionCollection(), "edit_properties");
   areaPropertiesAction->setEnabled(false);
 
@@ -499,7 +499,7 @@ void KImageMapEditor::setupActions()
   zoomOutAction=KStdAction::zoomOut(this, TQT_SLOT(slotZoomOut()), actionCollection());
 
   // View Zoom
-  zoomAction=new KSelectAction(i18n("Zoom"), 0,this,TQT_SLOT (slotZoom()),
+  zoomAction=new TDESelectAction(i18n("Zoom"), 0,this,TQT_SLOT (slotZoom()),
       actionCollection(), "view_zoom");
   zoomAction->setWhatsThis(i18n("<h3>Zoom</h3>"
                           "Choose the desired zoom level."));
@@ -517,55 +517,55 @@ void KImageMapEditor::setupActions()
 
   zoomAction->setCurrentItem(2);
 
-  highlightAreasAction = new KToggleAction(i18n("Highlight Areas"),0, this, TQT_SLOT (slotHightlightAreas()),
+  highlightAreasAction = new TDEToggleAction(i18n("Highlight Areas"),0, this, TQT_SLOT (slotHightlightAreas()),
       actionCollection(), "view_highlightareas");
 
-  showAltAction = new KToggleAction(i18n("Show Alt Tag"),0, this, TQT_SLOT (slotShowAltTag()),
+  showAltAction = new TDEToggleAction(i18n("Show Alt Tag"),0, this, TQT_SLOT (slotShowAltTag()),
       actionCollection(), "view_showalt");
 #if KDE_IS_VERSION(3,2,90)
   showAltAction->setCheckedState(i18n("Hide Alt Tag"));
 #endif
 
-  mapNameAction= new KAction(i18n("Map &Name..."),0,this,TQT_SLOT(mapEditName()),
+  mapNameAction= new TDEAction(i18n("Map &Name..."),0,this,TQT_SLOT(mapEditName()),
     actionCollection(), "map_name");
 
-  mapNewAction = new KAction(i18n("Ne&w Map..."),0,this,TQT_SLOT(mapNew()),
+  mapNewAction = new TDEAction(i18n("Ne&w Map..."),0,this,TQT_SLOT(mapNew()),
     actionCollection(), "map_new");
   mapNewAction->setToolTip(i18n("Create a new map"));
 
-  mapDeleteAction = new KAction(i18n("D&elete Map"),0,this,TQT_SLOT(mapDelete()),
+  mapDeleteAction = new TDEAction(i18n("D&elete Map"),0,this,TQT_SLOT(mapDelete()),
     actionCollection(), "map_delete");
   mapDeleteAction->setToolTip(i18n("Delete the current active map"));
 
-  mapDefaultAreaAction = new KAction(i18n("Edit &Default Area..."),0,this,TQT_SLOT(mapDefaultArea()),
+  mapDefaultAreaAction = new TDEAction(i18n("Edit &Default Area..."),0,this,TQT_SLOT(mapDefaultArea()),
     actionCollection(), "map_defaultarea");
   mapDefaultAreaAction->setToolTip(i18n("Edit the default area of the current active map"));
 
-  temp = new KAction(i18n("&Preview"),0,this,TQT_SLOT(mapPreview()),
+  temp = new TDEAction(i18n("&Preview"),0,this,TQT_SLOT(mapPreview()),
     actionCollection(), "map_preview");
   temp->setToolTip(i18n("Show a preview"));
 
   // IMAGE
   i18n("&Image");
 
-  imageAddAction = new KAction(i18n("Add Image..."),0,this,TQT_SLOT(imageAdd()),
+  imageAddAction = new TDEAction(i18n("Add Image..."),0,this,TQT_SLOT(imageAdd()),
     actionCollection(), "image_add");
   imageAddAction->setToolTip(i18n("Add a new image"));
 
-  imageRemoveAction = new KAction(i18n("Remove Image"),0,this,TQT_SLOT(imageRemove()),
+  imageRemoveAction = new TDEAction(i18n("Remove Image"),0,this,TQT_SLOT(imageRemove()),
     actionCollection(), "image_remove");
   imageRemoveAction->setToolTip(i18n("Remove the current visible image"));
 
-  imageUsemapAction = new KAction(i18n("Edit Usemap..."),0,this,TQT_SLOT(imageUsemap()),
+  imageUsemapAction = new TDEAction(i18n("Edit Usemap..."),0,this,TQT_SLOT(imageUsemap()),
     actionCollection(), "image_usemap");
   imageUsemapAction->setToolTip(i18n("Edit the usemap tag of the current visible image"));
 
-  temp= new KAction(i18n("Show &HTML"),0,this,TQT_SLOT(mapShowHTML()),
+  temp= new TDEAction(i18n("Show &HTML"),0,this,TQT_SLOT(mapShowHTML()),
     actionCollection(), "map_showhtml");
 
 
   // Selection Tool
-  arrowAction=new KRadioAction(i18n("&Selection"), "arrow",
+  arrowAction=new TDERadioAction(i18n("&Selection"), "arrow",
             0,this,TQT_SLOT (slotDrawArrow()),
       actionCollection(), "tool_arrow");
   TQMimeSourceFactory::defaultFactory()->setPixmap( "arrowimage", SmallIcon("arrow") );
@@ -575,7 +575,7 @@ void KImageMapEditor::setupActions()
   arrowAction->setChecked(true);
 
   // Circle
-  circleAction=new KRadioAction(i18n("&Circle"), "circle",
+  circleAction=new TDERadioAction(i18n("&Circle"), "circle",
             0,this,TQT_SLOT (slotDrawCircle()),
       actionCollection(), "tool_circle");
   TQMimeSourceFactory::defaultFactory()->setPixmap( "circleimage", SmallIcon("drawcircle") );
@@ -584,7 +584,7 @@ void KImageMapEditor::setupActions()
   circleAction->setExclusiveGroup("drawing");
 
   // Rectangle
-  rectangleAction=new KRadioAction(i18n("&Rectangle"), "rectangle",
+  rectangleAction=new TDERadioAction(i18n("&Rectangle"), "rectangle",
             0,this,TQT_SLOT (slotDrawRectangle()),
       actionCollection(), "tool_rectangle");
   TQMimeSourceFactory::defaultFactory()->setPixmap( "rectangleimage", SmallIcon("drawrectangle") );
@@ -593,7 +593,7 @@ void KImageMapEditor::setupActions()
   rectangleAction->setExclusiveGroup("drawing");
 
   // Polygon
-  polygonAction=new KRadioAction(i18n("&Polygon"), "polygon",
+  polygonAction=new TDERadioAction(i18n("&Polygon"), "polygon",
             0,this,TQT_SLOT (slotDrawPolygon()),
       actionCollection(), "tool_polygon");
   TQMimeSourceFactory::defaultFactory()->setPixmap( "polygonimage", SmallIcon("drawpolygon") );
@@ -602,7 +602,7 @@ void KImageMapEditor::setupActions()
   polygonAction->setExclusiveGroup("drawing");
 
   // Freehand
-  freehandAction=new KRadioAction(i18n("&Freehand Polygon"), "freehand",
+  freehandAction=new TDERadioAction(i18n("&Freehand Polygon"), "freehand",
             0,this,TQT_SLOT (slotDrawFreehand()),
       actionCollection(), "tool_freehand");
   TQMimeSourceFactory::defaultFactory()->setPixmap( "freehandimage", SmallIcon("freehand") );
@@ -611,7 +611,7 @@ void KImageMapEditor::setupActions()
   freehandAction->setExclusiveGroup("drawing");
 
   // Add Point
-  addPointAction=new KRadioAction(i18n("&Add Point"), "addpoint",
+  addPointAction=new TDERadioAction(i18n("&Add Point"), "addpoint",
             0,this,TQT_SLOT (slotDrawAddPoint()),
       actionCollection(), "tool_addpoint");
   TQMimeSourceFactory::defaultFactory()->setPixmap( "addpointimage", SmallIcon("addpoint") );
@@ -620,7 +620,7 @@ void KImageMapEditor::setupActions()
   addPointAction->setExclusiveGroup("drawing");
 
   // Remove Point
-  removePointAction=new KRadioAction(i18n("&Remove Point"), "removepoint",
+  removePointAction=new TDERadioAction(i18n("&Remove Point"), "removepoint",
             0,this,TQT_SLOT (slotDrawRemovePoint()),
       actionCollection(), "tool_removepoint");
   TQMimeSourceFactory::defaultFactory()->setPixmap( "removepointimage", SmallIcon("removepoint") );
@@ -629,36 +629,36 @@ void KImageMapEditor::setupActions()
   removePointAction->setExclusiveGroup("drawing");
 
 #if TDE_VERSION < 300
-    KAction *cancelAction =
+    TDEAction *cancelAction =
 #endif
-      new KAction(i18n("Cancel Drawing"), Key_Escape, this, TQT_SLOT( slotCancelDrawing() ),
+      new TDEAction(i18n("Cancel Drawing"), Key_Escape, this, TQT_SLOT( slotCancelDrawing() ),
                               actionCollection(), "canceldrawing" );
 
-  moveLeftAction = new KAction(i18n("Move Left"), Key_Left, this, TQT_SLOT( slotMoveLeft() ),
+  moveLeftAction = new TDEAction(i18n("Move Left"), Key_Left, this, TQT_SLOT( slotMoveLeft() ),
                               actionCollection() , "moveleft" );
 
-  moveRightAction = new KAction(i18n("Move Right"), Key_Right, this, TQT_SLOT( slotMoveRight() ),
+  moveRightAction = new TDEAction(i18n("Move Right"), Key_Right, this, TQT_SLOT( slotMoveRight() ),
                               actionCollection() , "moveright" );
 
-  moveUpAction = new KAction(i18n("Move Up"), Key_Up, this, TQT_SLOT( slotMoveUp() ),
+  moveUpAction = new TDEAction(i18n("Move Up"), Key_Up, this, TQT_SLOT( slotMoveUp() ),
                               actionCollection() , "moveup" );
 
-  moveDownAction = new KAction(i18n("Move Down"), Key_Down, this, TQT_SLOT( slotMoveDown() ),
+  moveDownAction = new TDEAction(i18n("Move Down"), Key_Down, this, TQT_SLOT( slotMoveDown() ),
                               actionCollection() , "movedown" );
 
-  increaseWidthAction = new KAction(i18n("Increase Width"), Key_Right + SHIFT, this, TQT_SLOT( slotIncreaseWidth() ),
+  increaseWidthAction = new TDEAction(i18n("Increase Width"), Key_Right + SHIFT, this, TQT_SLOT( slotIncreaseWidth() ),
                               actionCollection() , "increasewidth" );
 
-  decreaseWidthAction = new KAction(i18n("Decrease Width"), Key_Left + SHIFT, this, TQT_SLOT( slotDecreaseWidth() ),
+  decreaseWidthAction = new TDEAction(i18n("Decrease Width"), Key_Left + SHIFT, this, TQT_SLOT( slotDecreaseWidth() ),
                               actionCollection() , "decreasewidth" );
 
-  increaseHeightAction = new KAction(i18n("Increase Height"), Key_Up + SHIFT, this, TQT_SLOT( slotIncreaseHeight() ),
+  increaseHeightAction = new TDEAction(i18n("Increase Height"), Key_Up + SHIFT, this, TQT_SLOT( slotIncreaseHeight() ),
                               actionCollection() , "increaseheight" );
 
-  decreaseHeightAction = new KAction(i18n("Decrease Height"), Key_Down + SHIFT, this, TQT_SLOT( slotDecreaseHeight() ),
+  decreaseHeightAction = new TDEAction(i18n("Decrease Height"), Key_Down + SHIFT, this, TQT_SLOT( slotDecreaseHeight() ),
                               actionCollection() , "decreaseheight" );
 #if TDE_VERSION < 300
-    accel = new KAccel(widget());
+    accel = new TDEAccel(widget());
     cancelAction->plugAccel(accel, true);
     moveLeftAction->plugAccel(accel, true);
     moveRightAction->plugAccel(accel, true);
@@ -670,15 +670,15 @@ void KImageMapEditor::setupActions()
     decreaseHeightAction->plugAccel(accel, true);
 #endif
 
-  toFrontAction = new KAction(i18n("Bring to Front"), 0 , this, TQT_SLOT( slotToFront() ),
+  toFrontAction = new TDEAction(i18n("Bring to Front"), 0 , this, TQT_SLOT( slotToFront() ),
                               actionCollection() , "tofront" );
 
-  toBackAction  = new KAction(i18n("Send to Back"), 0 , this, TQT_SLOT( slotToBack() ),
+  toBackAction  = new TDEAction(i18n("Send to Back"), 0 , this, TQT_SLOT( slotToBack() ),
                               actionCollection() , "toback" );
 
-  forwardOneAction  = new KAction(i18n("Bring Forward One"), "raise" ,0, this, TQT_SLOT( slotForwardOne() ),
+  forwardOneAction  = new TDEAction(i18n("Bring Forward One"), "raise" ,0, this, TQT_SLOT( slotForwardOne() ),
                               actionCollection() , "forwardone" );
-  backOneAction = new KAction(i18n("Send Back One"), "lower" ,0, this, TQT_SLOT( slotBackOne() ),
+  backOneAction = new TDEAction(i18n("Send Back One"), "lower" ,0, this, TQT_SLOT( slotBackOne() ),
                               actionCollection() , "backone" );
 
   forwardOneAction->plug(areaListView->upBtn);
@@ -687,20 +687,20 @@ void KImageMapEditor::setupActions()
   connect( areaListView->upBtn, TQT_SIGNAL(pressed()), forwardOneAction, TQT_SLOT(activate()));
   connect( areaListView->downBtn, TQT_SIGNAL(pressed()), backOneAction, TQT_SLOT(activate()));
 
-  new KAction( i18n("Configure KImageMapEditor..."), "configure", 0,
+  new TDEAction( i18n("Configure KImageMapEditor..."), "configure", 0,
                         this, TQT_SLOT(slotShowPreferences()),
                         actionCollection(), "configure_kimagemapeditor" );
 
   if (areaDock) {
-    configureShowAreaListAction = new KToggleAction( i18n("Show Area List"), 0L, 0,
+    configureShowAreaListAction = new TDEToggleAction( i18n("Show Area List"), 0L, 0,
                         this, TQT_SLOT(configureShowAreaList()),
                         actionCollection(), "configure_show_arealist" );
 
-    configureShowMapListAction = new KToggleAction( i18n("Show Map List"), 0L, 0,
+    configureShowMapListAction = new TDEToggleAction( i18n("Show Map List"), 0L, 0,
                         this, TQT_SLOT(configureShowMapList()),
                         actionCollection(), "configure_show_maplist" );
 
-    configureShowImageListAction = new KToggleAction( i18n("Show Image List"), 0L, 0,
+    configureShowImageListAction = new TDEToggleAction( i18n("Show Image List"), 0L, 0,
                         this, TQT_SLOT(configureShowImageList()),
                         actionCollection(), "configure_show_imagelist" );
 #if KDE_IS_VERSION(3,2,90)
diff --git a/kimagemapeditor/kimagemapeditor.h b/kimagemapeditor/kimagemapeditor.h
index 17401b29..d500c099 100644
--- a/kimagemapeditor/kimagemapeditor.h
+++ b/kimagemapeditor/kimagemapeditor.h
@@ -41,7 +41,7 @@ class TQPushButton;
 class DrawZone;
 class TQComboBox;
 class TQListViewItem;
-class KToggleAction;
+class TDEToggleAction;
 
 
 
@@ -107,12 +107,12 @@ class HtmlContent : public TQPtrList<HtmlElement> {}
 ;
 
 
-class KSelectAction;
-class KRadioAction;
-class KRecentFilesAction;
-class KAction;
+class TDESelectAction;
+class TDERadioAction;
+class TDERecentFilesAction;
+class TDEAction;
 #if TDE_VERSION < 300
-  class KAccel;
+  class TDEAccel;
 #endif
 ///class TQListViewItem;
 class KCommandHistory;
@@ -257,60 +257,60 @@ private:
     //
     // Actions
     //
-    KSelectAction* zoomAction;
-    KRadioAction *arrowAction;
-    KRadioAction *circleAction;
-    KRadioAction *rectangleAction;
-    KRadioAction *polygonAction;
-    KRadioAction *freehandAction;
-    KRadioAction *addPointAction;
-    KRadioAction *removePointAction;
-
-    KAction *cutAction;
-    KAction *deleteAction;
-    KAction *copyAction;
-    KAction *pasteAction;
-    KAction *zoomInAction;
-    KAction *zoomOutAction;
-
-    KAction *mapNewAction;
-    KAction *mapDeleteAction;
-    KAction *mapNameAction;
-    KAction *mapDefaultAreaAction;
-
-    KAction *imageAddAction;
-    KAction *imageRemoveAction;
-    KAction *imageUsemapAction;
-
-    KToggleAction *highlightAreasAction;
-    KToggleAction *showAltAction;
-
-    KAction *areaPropertiesAction;
-
-    KAction *moveLeftAction;
-    KAction *moveRightAction;
-    KAction *moveUpAction;
-    KAction *moveDownAction;
-
-    KAction *increaseWidthAction;
-    KAction *decreaseWidthAction;
-    KAction *increaseHeightAction;
-    KAction *decreaseHeightAction;
-
-    KAction *toFrontAction;
-    KAction *toBackAction;
-    KAction *forwardOneAction;
-    KAction *backOneAction;
-
-    KToggleAction* configureShowAreaListAction;
-    KToggleAction* configureShowMapListAction;
-    KToggleAction* configureShowImageListAction;
-
-
-  	KRecentFilesAction* recentFilesAction;
+    TDESelectAction* zoomAction;
+    TDERadioAction *arrowAction;
+    TDERadioAction *circleAction;
+    TDERadioAction *rectangleAction;
+    TDERadioAction *polygonAction;
+    TDERadioAction *freehandAction;
+    TDERadioAction *addPointAction;
+    TDERadioAction *removePointAction;
+
+    TDEAction *cutAction;
+    TDEAction *deleteAction;
+    TDEAction *copyAction;
+    TDEAction *pasteAction;
+    TDEAction *zoomInAction;
+    TDEAction *zoomOutAction;
+
+    TDEAction *mapNewAction;
+    TDEAction *mapDeleteAction;
+    TDEAction *mapNameAction;
+    TDEAction *mapDefaultAreaAction;
+
+    TDEAction *imageAddAction;
+    TDEAction *imageRemoveAction;
+    TDEAction *imageUsemapAction;
+
+    TDEToggleAction *highlightAreasAction;
+    TDEToggleAction *showAltAction;
+
+    TDEAction *areaPropertiesAction;
+
+    TDEAction *moveLeftAction;
+    TDEAction *moveRightAction;
+    TDEAction *moveUpAction;
+    TDEAction *moveDownAction;
+
+    TDEAction *increaseWidthAction;
+    TDEAction *decreaseWidthAction;
+    TDEAction *increaseHeightAction;
+    TDEAction *decreaseHeightAction;
+
+    TDEAction *toFrontAction;
+    TDEAction *toBackAction;
+    TDEAction *forwardOneAction;
+    TDEAction *backOneAction;
+
+    TDEToggleAction* configureShowAreaListAction;
+    TDEToggleAction* configureShowMapListAction;
+    TDEToggleAction* configureShowImageListAction;
+
+
+  	TDERecentFilesAction* recentFilesAction;
 
     #if TDE_VERSION < 300
-      KAccel *accel;
+      TDEAccel *accel;
     #endif
 
     KDockMainWindow *mainDock;
diff --git a/kimagemapeditor/mapslistview.cpp b/kimagemapeditor/mapslistview.cpp
index 252afdb8..399ad2b5 100644
--- a/kimagemapeditor/mapslistview.cpp
+++ b/kimagemapeditor/mapslistview.cpp
@@ -25,7 +25,7 @@
 
 MapsListView::MapsListView(TQWidget *parent, const char *name)
 : TQVBox(parent, name) {
-    _listView = new KListView(this);
+    _listView = new TDEListView(this);
     _listView->addColumn(i18n("Maps"));
     _listView->setFullWidth(true);
     _listView->setSelectionMode(TQListView::Single);
diff --git a/kimagemapeditor/mapslistview.h b/kimagemapeditor/mapslistview.h
index c256888a..aff57761 100644
--- a/kimagemapeditor/mapslistview.h
+++ b/kimagemapeditor/mapslistview.h
@@ -21,7 +21,7 @@
 #include <tqvbox.h>
 
 #include "kimagemapeditor.h"
-class KListView;
+class TDEListView;
 
 /**
  * Simple class that shows all map tags of the current open html file in a ListView
@@ -99,9 +99,9 @@ public:
    */
   uint count();
   
-  KListView* listView() { return _listView; }
+  TDEListView* listView() { return _listView; }
 protected:
-  KListView* _listView;   
+  TDEListView* _listView;   
 
 protected slots:
   void slotSelectionChanged(TQListViewItem*);  
diff --git a/klinkstatus/src/actionmanager.cpp b/klinkstatus/src/actionmanager.cpp
index 3a775cf4..7034c840 100644
--- a/klinkstatus/src/actionmanager.cpp
+++ b/klinkstatus/src/actionmanager.cpp
@@ -56,7 +56,7 @@ public:
             : part(0), tabWidgetSession(0), sessionWidget(0)
     {}
 
-    KActionCollection* actionCollection;
+    TDEActionCollection* actionCollection;
 
     KLinkStatusPart* part;
     TabWidgetSession* tabWidgetSession;
@@ -83,21 +83,21 @@ void ActionManager::initPart(KLinkStatusPart* part)
     d->part = part;
     d->actionCollection = part->actionCollection();
 
-    KAction* action = 0;
+    TDEAction* action = 0;
 
     // *************** File menu *********************
 
-    new KAction(i18n("New Link Check"), "filenew",
+    new TDEAction(i18n("New Link Check"), "filenew",
                 0,
                 d->part, TQT_SLOT(slotNewLinkCheck()),
                 TQT_TQOBJECT(d->actionCollection), "new_link_check");
 
-    new KAction(i18n("Open URL..."), "fileopen",
+    new TDEAction(i18n("Open URL..."), "fileopen",
                 0,
                 d->part, TQT_SLOT(slotOpenLink()),
                 TQT_TQOBJECT(d->actionCollection), "open_link");
 
-    action = new KAction(i18n("Close Tab"), "fileclose",
+    action = new TDEAction(i18n("Close Tab"), "fileclose",
                          0,
                          d->part, TQT_SLOT(slotClose()),
                          TQT_TQOBJECT(d->actionCollection), "close_tab");
@@ -105,17 +105,17 @@ void ActionManager::initPart(KLinkStatusPart* part)
 
     // *************** Settings menu *********************
 
-    (void) new KAction(i18n("Configure KLinkStatus..."), "configure",
+    (void) new TDEAction(i18n("Configure KLinkStatus..."), "configure",
                        0, d->part, TQT_SLOT(slotConfigureKLinkStatus()),
                        TQT_TQOBJECT(d->actionCollection), "configure_klinkstatus");
 
     // *************** Help menu *********************
 
-    (void) new KAction(i18n("About KLinkStatus"), "klinkstatus",
+    (void) new TDEAction(i18n("About KLinkStatus"), "klinkstatus",
                        0, d->part, TQT_SLOT(slotAbout()),
                        TQT_TQOBJECT(d->actionCollection), "about_klinkstatus");
 
-    (void) new KAction(i18n("&Report Bug..."), 0, 0, d->part,
+    (void) new TDEAction(i18n("&Report Bug..."), 0, 0, d->part,
                        TQT_SLOT(slotReportBug()), TQT_TQOBJECT(d->actionCollection), "report_bug");
 
     // *************** View menu *********************
@@ -132,7 +132,7 @@ void ActionManager::initTabWidget(TabWidgetSession* tabWidgetSession)
     
     // *************** File menu *********************
 
-    KAction* action = new KAction(i18n("E&xport Results as HTML..."), "filesave", 0,
+    TDEAction* action = new TDEAction(i18n("E&xport Results as HTML..."), "filesave", 0,
                                   TQT_TQOBJECT(d->tabWidgetSession), TQT_SLOT(slotExportAsHTML()),
                                   TQT_TQOBJECT(d->actionCollection), "file_export_html");
     action->setEnabled(false);
@@ -140,38 +140,38 @@ void ActionManager::initTabWidget(TabWidgetSession* tabWidgetSession)
     // *************** View menu *********************
 
     //     this action must be in the tabwidget because the slot can't be connected to a particular sessionWidget
-    KToggleAction* toggle_action = new KToggleAction(i18n("&Follow last Link checked"),
+    TDEToggleAction* toggle_action = new TDEToggleAction(i18n("&Follow last Link checked"),
                                    "make_tdevelop", "Ctrl+f",
                                    TQT_TQOBJECT(d->tabWidgetSession), TQT_SLOT(slotFollowLastLinkChecked()),
                                    TQT_TQOBJECT(d->actionCollection), "follow_last_link_checked");
     toggle_action->setChecked(KLSConfig::followLastLinkChecked());
 
     //     this action must be in the tabwidget because the slot can't be connected to a particular sessionWidget
-    toggle_action = new KToggleAction(i18n("&Hide Search Panel"), "bottom", "Ctrl+h",
+    toggle_action = new TDEToggleAction(i18n("&Hide Search Panel"), "bottom", "Ctrl+h",
                                       TQT_TQOBJECT(d->tabWidgetSession), TQT_SLOT(slotHideSearchPanel()),
                                       TQT_TQOBJECT(d->actionCollection), "hide_search_bar");
     KGuiItem item(i18n("&Show Search Panel"), "top", "Show Search Panel");
     toggle_action->setCheckedState(item);
     
-    new KAction(i18n("&Reset Search Options"), "reload", "F5",
+    new TDEAction(i18n("&Reset Search Options"), "reload", "F5",
                 TQT_TQOBJECT(d->tabWidgetSession), TQT_SLOT(slotResetSearchOptions()),
                 TQT_TQOBJECT(d->actionCollection), "reset_search_bar");
 
     // *************** Search menu *********************
     
-    toggle_action = new KToggleAction(i18n("&Start Search"),
+    toggle_action = new TDEToggleAction(i18n("&Start Search"),
                                       "player_play", "Ctrl+s",
                                       TQT_TQOBJECT(d->tabWidgetSession), TQT_SLOT(slotStartSearch()),
                                       TQT_TQOBJECT(d->actionCollection), "start_search");
     toggle_action->setEnabled(false);
     
-    toggle_action = new KToggleAction(i18n("&Pause Search"),
+    toggle_action = new TDEToggleAction(i18n("&Pause Search"),
                                       "player_pause", "Ctrl+p",
                                       TQT_TQOBJECT(d->tabWidgetSession), TQT_SLOT(slotPauseSearch()),
                                       TQT_TQOBJECT(d->actionCollection), "pause_search");    
     toggle_action->setEnabled(false);
     
-    action = new KAction(i18n("St&op Search"),
+    action = new TDEAction(i18n("St&op Search"),
                                   "player_stop", "Ctrl+c",
                                   TQT_TQOBJECT(d->tabWidgetSession), TQT_SLOT(slotStopSearch()),
                                   TQT_TQOBJECT(d->actionCollection), "stop_search");
@@ -194,21 +194,21 @@ TQWidget* ActionManager::container(const char* name)
     return d->part->factory()->container(name, d->part);
 }
 
-KActionCollection* ActionManager::actionCollection()
+TDEActionCollection* ActionManager::actionCollection()
 {
     return d->actionCollection;
 }
 
-KAction* ActionManager::action(const char* name, const char* classname)
+TDEAction* ActionManager::action(const char* name, const char* classname)
 {
     return d->actionCollection != 0 ? d->actionCollection->action(name, classname) : 0;
 }
 
 void ActionManager::slotUpdateSessionWidgetActions(SessionWidget* page)
 {
-    KToggleAction* start_search_action_ = static_cast<KToggleAction*> (action("start_search"));
-    KToggleAction* pause_search_action_ = static_cast<KToggleAction*> (action("pause_search"));
-    KAction* stop_search_action_ = action("stop_search");
+    TDEToggleAction* start_search_action_ = static_cast<TDEToggleAction*> (action("start_search"));
+    TDEToggleAction* pause_search_action_ = static_cast<TDEToggleAction*> (action("pause_search"));
+    TDEAction* stop_search_action_ = action("stop_search");
     
     if(page->inProgress())
     {
@@ -250,17 +250,17 @@ void ActionManager::slotUpdateSessionWidgetActions(SessionWidget* page)
     
 //     ____________________________________________________________________
     
-    KToggleAction* toggleAction = static_cast<KToggleAction*> (action("follow_last_link_checked"));
+    TDEToggleAction* toggleAction = static_cast<TDEToggleAction*> (action("follow_last_link_checked"));
 
     if(!toggleAction) // the first sessionWidget is created before initSessionWidget is called
     {
         initSessionWidget(page);
-        toggleAction = static_cast<KToggleAction*> (action("follow_last_link_checked"));
+        toggleAction = static_cast<TDEToggleAction*> (action("follow_last_link_checked"));
     }
     Q_ASSERT(toggleAction);
     toggleAction->setChecked(page->followLastLinkChecked());
 
-    toggleAction = static_cast<KToggleAction*> (action("hide_search_bar"));
+    toggleAction = static_cast<TDEToggleAction*> (action("hide_search_bar"));
     Q_ASSERT(toggleAction);
     toggleAction->setChecked(page->buttongroup_search->isHidden());
     
diff --git a/klinkstatus/src/actionmanager.h b/klinkstatus/src/actionmanager.h
index 4fafcd8f..fd77b215 100644
--- a/klinkstatus/src/actionmanager.h
+++ b/klinkstatus/src/actionmanager.h
@@ -22,8 +22,8 @@
 
 #include <tqobject.h>
 
-class KAction;
-class KActionCollection;
+class TDEAction;
+class TDEActionCollection;
 
 class SessionWidget;
 class KLinkStatusPart;
@@ -45,7 +45,7 @@ public:
     static ActionManager* getInstance();
     static void setInstance(ActionManager* manager);
 
-    virtual KAction* action(const char* name, const char* classname=0);
+    virtual TDEAction* action(const char* name, const char* classname=0);
     virtual TQWidget* container(const char* name);
 
     void initPart(KLinkStatusPart* part);
@@ -57,7 +57,7 @@ public slots:
 
 protected:
 
-    KActionCollection* actionCollection();
+    TDEActionCollection* actionCollection();
 
 private:
 
diff --git a/klinkstatus/src/klinkstatus.cpp b/klinkstatus/src/klinkstatus.cpp
index 8309cb19..b344e95d 100644
--- a/klinkstatus/src/klinkstatus.cpp
+++ b/klinkstatus/src/klinkstatus.cpp
@@ -125,17 +125,17 @@ void KLinkStatus::setupActions()
 void KLinkStatus::setupPartActions()
 {
     Q_ASSERT(m_part);
-    KActionCollection* part_action_collection = m_part->actionCollection();
-    part_action_collection->action("new_link_check")->setShortcut(KStdAccel::shortcut(KStdAccel::New));
-    part_action_collection->action("open_link")->setShortcut(KStdAccel::shortcut(KStdAccel::Open));
-    part_action_collection->action("close_tab")->setShortcut(KStdAccel::shortcut(KStdAccel::Close));
+    TDEActionCollection* part_action_collection = m_part->actionCollection();
+    part_action_collection->action("new_link_check")->setShortcut(TDEStdAccel::shortcut(TDEStdAccel::New));
+    part_action_collection->action("open_link")->setShortcut(TDEStdAccel::shortcut(TDEStdAccel::Open));
+    part_action_collection->action("close_tab")->setShortcut(TDEStdAccel::shortcut(TDEStdAccel::Close));
 }
 
 void KLinkStatus::removeDuplicatedActions()
 {
-    KActionCollection* part_action_collection = m_part->actionCollection();
-    KAction* part_about_action = part_action_collection->action("about_klinkstatus");
-    KAction* part_report_action = part_action_collection->action("report_bug");
+    TDEActionCollection* part_action_collection = m_part->actionCollection();
+    TDEAction* part_about_action = part_action_collection->action("about_klinkstatus");
+    TDEAction* part_report_action = part_action_collection->action("report_bug");
 
     TQWidget* container = part_about_action->container(0); // call this only once or segfault
     part_about_action->unplug(container);
diff --git a/klinkstatus/src/klinkstatus.h b/klinkstatus/src/klinkstatus.h
index 4025d820..fd9a116b 100644
--- a/klinkstatus/src/klinkstatus.h
+++ b/klinkstatus/src/klinkstatus.h
@@ -28,7 +28,7 @@
 #include <kapplication.h>
 #include <tdeparts/mainwindow.h>
 
-class KToggleAction;
+class TDEToggleAction;
 
 /**
  * This is the application "Shell".  It has a menubar, toolbar, and
@@ -80,8 +80,8 @@ private:
 private:
     KParts::ReadOnlyPart *m_part;
 
-    KToggleAction *m_toolbarAction;
-    KToggleAction *m_statusbarAction;
+    TDEToggleAction *m_toolbarAction;
+    TDEToggleAction *m_statusbarAction;
 };
 
 #endif // _KLINKSTATUS_H_
diff --git a/klinkstatus/src/klinkstatus_part.cpp b/klinkstatus/src/klinkstatus_part.cpp
index a6a9fd8c..be6f9f76 100644
--- a/klinkstatus/src/klinkstatus_part.cpp
+++ b/klinkstatus/src/klinkstatus_part.cpp
@@ -90,7 +90,7 @@ void KLinkStatusPart::initGUI()
 void KLinkStatusPart::setModified(bool modified)
 {
     // get a handle on our Save action and make sure it is valid
-    KAction *save = actionCollection()->action(KStdAction::stdName(KStdAction::Save));
+    TDEAction *save = actionCollection()->action(KStdAction::stdName(KStdAction::Save));
     if (!save)
         return;
 
diff --git a/klinkstatus/src/klinkstatus_part.h b/klinkstatus/src/klinkstatus_part.h
index f7402dc1..58ee4833 100644
--- a/klinkstatus/src/klinkstatus_part.h
+++ b/klinkstatus/src/klinkstatus_part.h
@@ -32,7 +32,7 @@ class TQPainter;
 class KURL;
 class TDEAboutData;
 class KAboutApplication;
-class KAction;
+class TDEAction;
 
 class KLinkStatusPart: public KParts::ReadOnlyPart
 {
diff --git a/klinkstatus/src/ui/klshistorycombo.cpp b/klinkstatus/src/ui/klshistorycombo.cpp
index 13c8a16d..d1bbf780 100644
--- a/klinkstatus/src/ui/klshistorycombo.cpp
+++ b/klinkstatus/src/ui/klshistorycombo.cpp
@@ -92,8 +92,8 @@ bool KLSHistoryCombo::eventFilter( TQObject *o, TQEvent *ev )
                 return false;
             }
 
-            int delete_word_back = KStdAccel::deleteWordBack().keyCodeQt();
-            int delete_word_forward = KStdAccel::deleteWordForward().keyCodeQt();
+            int delete_word_back = TDEStdAccel::deleteWordBack().keyCodeQt();
+            int delete_word_forward = TDEStdAccel::deleteWordForward().keyCodeQt();
 
             if ( KKey( e ) == KKey(delete_word_back) ||
                     KKey( e ) == KKey(delete_word_forward) ||
diff --git a/klinkstatus/src/ui/sessionwidget.cpp b/klinkstatus/src/ui/sessionwidget.cpp
index a761499d..6567b7db 100644
--- a/klinkstatus/src/ui/sessionwidget.cpp
+++ b/klinkstatus/src/ui/sessionwidget.cpp
@@ -111,7 +111,7 @@ void SessionWidget::init()
     
     resultsSearchBar->hide();
 
-    start_search_action_ = static_cast<KToggleAction*> (action_manager_->action("start_search"));
+    start_search_action_ = static_cast<TDEToggleAction*> (action_manager_->action("start_search"));
     
     connect(resultsSearchBar, TQT_SIGNAL(signalSearch(LinkMatcher)), 
             this, TQT_SLOT(slotApplyFilter(LinkMatcher)));
diff --git a/klinkstatus/src/ui/sessionwidget.h b/klinkstatus/src/ui/sessionwidget.h
index 111b059d..49b5b2a3 100644
--- a/klinkstatus/src/ui/sessionwidget.h
+++ b/klinkstatus/src/ui/sessionwidget.h
@@ -36,7 +36,7 @@ class TQListViewItem;
 
 class KURL;
 class TDEConfig;
-class KToggleAction;
+class TDEToggleAction;
 
 #include <vector>
 
@@ -142,7 +142,7 @@ private:
     int time_out_;
     bool tree_display_; // tree/flat result display
     bool follow_last_link_checked_;
-    KToggleAction* start_search_action_;
+    TDEToggleAction* start_search_action_;
 };
 
 
diff --git a/klinkstatus/src/ui/treeview.cpp b/klinkstatus/src/ui/treeview.cpp
index 882ca58f..bb24ac65 100644
--- a/klinkstatus/src/ui/treeview.cpp
+++ b/klinkstatus/src/ui/treeview.cpp
@@ -40,7 +40,7 @@
 
 
 TreeView::TreeView(TQWidget *parent, const char *name)
-        : KListView(parent, name),
+        : TDEListView(parent, name),
         ResultView(),
         current_column_(0)
 {
@@ -106,7 +106,7 @@ double TreeView::columnsWidth() const
 
 void TreeView::clear()
 {
-    KListView::clear();
+    TDEListView::clear();
 }
 
 void TreeView::removeColunas()
@@ -116,7 +116,7 @@ void TreeView::removeColunas()
 
 void TreeView::show(ResultView::Status const& status)
 {
-    TQListViewItemIterator it(static_cast<KListView*> (this));
+    TQListViewItemIterator it(static_cast<TDEListView*> (this));
     while(it.current())
     {
         TreeViewItem* item = myItem(it.current());
@@ -197,7 +197,7 @@ bool TreeView::isEmpty() const
 
 void TreeView::resizeEvent(TQResizeEvent *e)
 {
-    KListView::resizeEvent(e);
+    TDEListView::resizeEvent(e);
     resetColumns();
     clipper()->repaint();
 }
@@ -394,7 +394,7 @@ TreeViewItem* TreeView::myItem(TQListViewItem* item) const
 
 TreeViewItem::TreeViewItem(TreeView* parent, TQListViewItem* after,
                            LinkStatus const* linkstatus)
-        : KListViewItem(parent, after),
+        : TDEListViewItem(parent, after),
         last_child_(0), root_(parent)
 {
     init(linkstatus);
@@ -402,7 +402,7 @@ TreeViewItem::TreeViewItem(TreeView* parent, TQListViewItem* after,
 
 TreeViewItem::TreeViewItem(TreeView* root, TQListViewItem* listview_item, TQListViewItem* after,
                            LinkStatus const* linkstatus)
-        : KListViewItem(listview_item, after),
+        : TDEListViewItem(listview_item, after),
         last_child_(0), root_(root)
 
 {
@@ -470,7 +470,7 @@ void TreeViewItem::paintCell(TQPainter * p, const TQColorGroup & cg, int column,
     TQColor color(item.textStatusColor());
     m_cg.setColor(TQColorGroup::Text, color);
 
-    KListViewItem::paintCell(p, m_cg, column, width, align);
+    TDEListViewItem::paintCell(p, m_cg, column, width, align);
 
     setHeight(22);
 }
diff --git a/klinkstatus/src/ui/treeview.h b/klinkstatus/src/ui/treeview.h
index de2eb9a2..3481108d 100644
--- a/klinkstatus/src/ui/treeview.h
+++ b/klinkstatus/src/ui/treeview.h
@@ -26,7 +26,7 @@ because of ResultView. ResultView class was to be the base interface to
 a TQTable and a TQListView, but the APIs are a little diferent... then I realize 
 that a TQTable view isn't needed at all so some day I will clean this up.
 */
-class TreeView : public KListView, public ResultView
+class TreeView : public TDEListView, public ResultView
 {
     Q_OBJECT
   
@@ -87,7 +87,7 @@ inline void TreeView::setTreeDisplay(bool tree_display) {
 
 /* ******************************* TreeViewItem ******************************* */
 
-class TreeViewItem: public KListViewItem
+class TreeViewItem: public TDEListViewItem
 {
 public:
 
diff --git a/kommander/ChangeLog b/kommander/ChangeLog
index b6aadfc5..4813f4d9 100644
--- a/kommander/ChangeLog
+++ b/kommander/ChangeLog
@@ -217,7 +217,7 @@ Tue 16 Nov 2004 23:28:16 CET - Michal Rudolf <mrudolf@tdewebdev.org>
 
 Sun 14 Nov 2004 22:39:38 CET - Michal Rudolf <mrudolf@tdewebdev.org>
 	o massive cleanup and KDE-ification of Editor
-	o most actions converted to KActions, some were standarized
+	o most actions converted to TDEActions, some were standarized
 	o some obsolete dialogs removed
 	o About dialog changed to use KAboutDialog
 
diff --git a/kommander/editor/assoctexteditorimpl.cpp b/kommander/editor/assoctexteditorimpl.cpp
index 9fbfe938..f02b779c 100644
--- a/kommander/editor/assoctexteditorimpl.cpp
+++ b/kommander/editor/assoctexteditorimpl.cpp
@@ -96,8 +96,8 @@ AssocTextEditor::AssocTextEditor(TQWidget *a_widget, FormWindow* a_form,
   partManager->addPart(doc, true);
 
   //trick to import all the KatePart actions into the dialog
-  KPopupMenu *invisiblePopup = new KPopupMenu(this);
-  KActionCollection *ac = view->actionCollection();
+  TDEPopupMenu *invisiblePopup = new TDEPopupMenu(this);
+  TDEActionCollection *ac = view->actionCollection();
   uint count = ac->count();
   for (uint i = 0; i < count; i++)
   {
@@ -105,8 +105,8 @@ AssocTextEditor::AssocTextEditor(TQWidget *a_widget, FormWindow* a_form,
   }
 
   //add those KatePart actions to a popup menu that are important
-  KPopupMenu *popup = new KPopupMenu(this);
-  KAction *a = view->actionCollection()->action("edit_undo");
+  TDEPopupMenu *popup = new TDEPopupMenu(this);
+  TDEAction *a = view->actionCollection()->action("edit_undo");
   if (a)
     a->plug(popup);
   a = view->actionCollection()->action("edit_redo");
@@ -137,7 +137,7 @@ AssocTextEditor::AssocTextEditor(TQWidget *a_widget, FormWindow* a_form,
     a->plug(popup);
   readOnlyAction = view->actionCollection()->action("tools_toggle_write_lock");
   popup->insertSeparator();
-  highlightPopup = new KPopupMenu(popup);
+  highlightPopup = new TDEPopupMenu(popup);
   connect(highlightPopup, TQT_SIGNAL(activated(int)), TQT_SLOT(slotHighlightingChanged(int)));
 
   popup->insertItem(i18n("&Highlighting"), highlightPopup);
diff --git a/kommander/editor/assoctexteditorimpl.h b/kommander/editor/assoctexteditorimpl.h
index 532d61dd..845e9a1c 100644
--- a/kommander/editor/assoctexteditorimpl.h
+++ b/kommander/editor/assoctexteditorimpl.h
@@ -43,8 +43,8 @@ namespace KParts{
   class PartManager;
 }
 
-class KAction;
-class KPopupMenu;
+class TDEAction;
+class TDEPopupMenu;
 
 class AssocTextEditor : public AssocTextEditorBase
 {
@@ -125,10 +125,10 @@ private:
   KTextEditor::EditInterface *associatedTextEdit;
   KTextEditor::Document *doc;
   KTextEditor::View *view;
-  KPopupMenu *highlightPopup;
+  TDEPopupMenu *highlightPopup;
   int oldHlMode;
   bool readOnly;
-  KAction *readOnlyAction;
+  TDEAction *readOnlyAction;
 };
 
 #endif
diff --git a/kommander/editor/choosewidget.ui b/kommander/editor/choosewidget.ui
index 64970e5a..782a2b22 100644
--- a/kommander/editor/choosewidget.ui
+++ b/kommander/editor/choosewidget.ui
@@ -97,7 +97,7 @@
                 </spacer>
             </hbox>
         </widget>
-        <widget class="KListView" row="0" column="0">
+        <widget class="TDEListView" row="0" column="0">
             <property name="name">
                 <cstring>widgetView</cstring>
             </property>
diff --git a/kommander/editor/connectioneditor.ui b/kommander/editor/connectioneditor.ui
index 8603b9e2..29a33a56 100644
--- a/kommander/editor/connectioneditor.ui
+++ b/kommander/editor/connectioneditor.ui
@@ -50,7 +50,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="KListView" row="3" column="0" rowspan="1" colspan="2">
+        <widget class="TDEListView" row="3" column="0" rowspan="1" colspan="2">
             <column>
                 <property name="text">
                     <string>Sender</string>
@@ -111,7 +111,7 @@
                 <string>Displays the connections between the sender and the receiver.</string>
             </property>
         </widget>
-        <widget class="KListBox" row="1" column="1">
+        <widget class="TDEListBox" row="1" column="1">
             <property name="name">
                 <cstring>slotBox</cstring>
             </property>
@@ -119,7 +119,7 @@
                 <string>&lt;b&gt;A list of Q_SLOTS for the receiver.&lt;/b&gt;&lt;p&gt;The Q_SLOTS that are displayed are only those which have arguments that correspond with the arguments of the signal that is currently selected in the Signal-list.&lt;/b&gt;</string>
             </property>
         </widget>
-        <widget class="KListBox" row="1" column="0">
+        <widget class="TDEListBox" row="1" column="0">
             <property name="name">
                 <cstring>signalBox</cstring>
             </property>
diff --git a/kommander/editor/connectioneditorimpl.cpp b/kommander/editor/connectioneditorimpl.cpp
index 0719716f..7dc7978d 100644
--- a/kommander/editor/connectioneditorimpl.cpp
+++ b/kommander/editor/connectioneditorimpl.cpp
@@ -197,7 +197,7 @@ void ConnectionEditor::connectClicked()
   conn.signal = signalBox->currentText();
   conn.slot = slotBox->currentText();
   conn.receiver = m_receiver;
-  KListViewItem *i = new KListViewItem(connectionView, m_sender->name(), conn.signal, m_receiver->name(),
+  TDEListViewItem *i = new TDEListViewItem(connectionView, m_sender->name(), conn.signal, m_receiver->name(),
                                        conn.slot);                       
   i->setPixmap(0, PixmapChooser::loadPixmap("connecttool.xpm"));
   connectionView->setCurrentItem(i);
@@ -346,7 +346,7 @@ void ConnectionEditor::fillConnectionsList()
           !MetaDataBase::hasSlot(TQT_TQOBJECT(m_formWindow), MetaDataBase::normalizeSlot((*it).slot).latin1()))
         continue;
       MetaDataBase::Connection conn = *it;
-      KListViewItem *i = new KListViewItem(connectionView, conn.sender->name(), conn.signal, 
+      TDEListViewItem *i = new TDEListViewItem(connectionView, conn.sender->name(), conn.signal, 
                                            conn.receiver->name(), conn.slot);
       i->setPixmap(0, PixmapChooser::loadPixmap("connecttool.xpm"));
       m_connections.insert(i, conn);
diff --git a/kommander/editor/functions.ui b/kommander/editor/functions.ui
index 5930b06b..5e9686ff 100644
--- a/kommander/editor/functions.ui
+++ b/kommander/editor/functions.ui
@@ -100,7 +100,7 @@
                         <cstring>functionListBox</cstring>
                     </property>
                 </widget>
-                <widget class="KListBox">
+                <widget class="TDEListBox">
                     <property name="name">
                         <cstring>functionListBox</cstring>
                     </property>
diff --git a/kommander/editor/mainwindow.cpp b/kommander/editor/mainwindow.cpp
index fd3f0ecb..dcd1b393 100644
--- a/kommander/editor/mainwindow.cpp
+++ b/kommander/editor/mainwindow.cpp
@@ -143,8 +143,8 @@ MainWindow::MainWindow(bool asClient)
   setupMDI();
   setupFileActions();
   setupEditActions();
-  layoutToolBar = new KToolBar(this, "Layout");
-  ((KToolBar *) layoutToolBar)->setFullSize(false);
+  layoutToolBar = new TDEToolBar(this, "Layout");
+  ((TDEToolBar *) layoutToolBar)->setFullSize(false);
   addToolBar(layoutToolBar, i18n("Layout"));
   setupToolActions();
   setupLayoutActions();
@@ -356,9 +356,9 @@ void MainWindow::setupRMBMenus()
 
 void MainWindow::toolSelected()
 {
-  if (!(sender())->inherits("KAction"))
+  if (!(sender())->inherits("TDEAction"))
     return;
-  actionCurrentTool = (KAction*)sender();
+  actionCurrentTool = (TDEAction*)sender();
   emit currentToolChanged();
   if (formWindow())
     formWindow()->commandHistory()->emitUndoRedo();
diff --git a/kommander/editor/mainwindow.h b/kommander/editor/mainwindow.h
index 790f33b1..14a24c31 100644
--- a/kommander/editor/mainwindow.h
+++ b/kommander/editor/mainwindow.h
@@ -36,12 +36,12 @@ class FormFile;
 class FormWindow;
 class GotoLineDialog;
 class HierarchyView;
-class KAction;
-class KActionCollection;
+class TDEAction;
+class TDEActionCollection;
 class TDEProcess;
-class KRecentFilesAction;
-class KToggleAction;
-class KToolBar;
+class TDERecentFilesAction;
+class TDEToggleAction;
+class TDEToolBar;
 class KURL;
 class PropertyEditor;
 class TQCloseEvent;
@@ -264,24 +264,24 @@ private:
     bool splashScreen;
     TQString docPath;
     
-    KAction *actionEditUndo, *actionEditRedo, *actionEditCut, *actionEditCopy,
+    TDEAction *actionEditUndo, *actionEditRedo, *actionEditCut, *actionEditCopy,
       *actionEditPaste, *actionEditDelete, *actionEditAdjustSize,
       *actionEditHLayout, *actionEditVLayout, *actionEditGridLayout,
       *actionEditSplitHorizontal, *actionEditSplitVertical,
       *actionEditSelectAll, *actionEditBreakLayout, *actionEditConnections,
       *actionEditLower, *actionEditRaise, *actionEditFindGlobal;
     
-    KToggleAction* actionPointerTool, *actionConnectTool, *actionOrderTool;
-    KAction* actionCurrentTool;
-    KAction *actionEditFormSettings, *actionEditAccels;
-    KRecentFilesAction* actionRecent;
+    TDEToggleAction* actionPointerTool, *actionConnectTool, *actionOrderTool;
+    TDEAction* actionCurrentTool;
+    TDEAction *actionEditFormSettings, *actionEditAccels;
+    TDERecentFilesAction* actionRecent;
     
     TQPopupMenu *rmbWidgets;
     TQPopupMenu *rmbFormWindow;
     TQPopupMenu *windowMenu, *fileMenu;
 
     TQToolBar *layoutToolBar;
-    KToolBar *fileTb;
+    TDEToolBar *fileTb;
 
     Preferences *prefDia;
     TQMap<TQString,TQString> propertyDocumentation;
diff --git a/kommander/editor/mainwindowactions.cpp b/kommander/editor/mainwindowactions.cpp
index 8a217843..9f4a0ca8 100644
--- a/kommander/editor/mainwindowactions.cpp
+++ b/kommander/editor/mainwindowactions.cpp
@@ -123,7 +123,7 @@ void MainWindow::setupEditActions()
   actionEditPaste->setWhatsThis(whatsThisFrom("Edit|Paste"));
   actionEditPaste->setEnabled(false);
 
-  actionEditDelete = new KAction(i18n("Delete"), Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(editDelete()),
+  actionEditDelete = new TDEAction(i18n("Delete"), Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(editDelete()),
                                  actionCollection(), "edit_delete");
   actionEditDelete->setToolTip(i18n("Deletes the selected widgets"));
   actionEditDelete->setWhatsThis(whatsThisFrom("Edit|Delete"));
@@ -133,42 +133,42 @@ void MainWindow::setupEditActions()
   actionEditSelectAll->setToolTip(i18n("Selects all widgets"));
   actionEditSelectAll->setWhatsThis(whatsThisFrom("Edit|Select All"));
 
-  actionEditRaise = new KAction(i18n("Bring to Front"), createIconSet("editraise.xpm"),
-                                KShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(editRaise()), actionCollection(), "edit_raise");
+  actionEditRaise = new TDEAction(i18n("Bring to Front"), createIconSet("editraise.xpm"),
+                                TDEShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(editRaise()), actionCollection(), "edit_raise");
   actionEditRaise->setToolTip(i18n("Raises the selected widgets"));
   actionEditRaise->setEnabled(false);
 
-  actionEditLower = new KAction(i18n("Send to Back"), createIconSet("editlower.xpm"),
-                                KShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(editLower()), actionCollection(), "edit_lower");
+  actionEditLower = new TDEAction(i18n("Send to Back"), createIconSet("editlower.xpm"),
+                                TDEShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(editLower()), actionCollection(), "edit_lower");
   actionEditLower->setToolTip(i18n("Lowers the selected widgets"));
   actionEditLower->setWhatsThis(i18n("Lowers the selected widgets"));
   actionEditLower->setEnabled(false);
 
-  actionEditFindGlobal = new KAction(i18n("Find in Form..."), CTRL + ALT + Key_F, TQT_TQOBJECT(this), TQT_SLOT(editFindGlobal()), actionCollection(), "edit_find_global");
+  actionEditFindGlobal = new TDEAction(i18n("Find in Form..."), CTRL + ALT + Key_F, TQT_TQOBJECT(this), TQT_SLOT(editFindGlobal()), actionCollection(), "edit_find_global");
   actionEditFindGlobal->setToolTip(i18n("Search for a text in the whole form."));
   actionEditFindGlobal->setWhatsThis(whatsThisFrom("Edit|Find in Form"));
   connect(this, TQT_SIGNAL(hasActiveForm(bool)), actionEditFindGlobal, TQT_SLOT(setEnabled(bool)));
 
-  actionEditAccels = new KAction(i18n("Check Accelerators"), ALT + Key_R, TQT_TQOBJECT(this), TQT_SLOT(editAccels()),
+  actionEditAccels = new TDEAction(i18n("Check Accelerators"), ALT + Key_R, TQT_TQOBJECT(this), TQT_SLOT(editAccels()),
                                  actionCollection(), "edit_check_accel");
   actionEditAccels->setToolTip(i18n("Checks if the accelerators used in the form are unique"));
   actionEditAccels->setWhatsThis(whatsThisFrom("Edit|Check Accelerator"));
   connect(this, TQT_SIGNAL(hasActiveForm(bool)), actionEditAccels, TQT_SLOT(setEnabled(bool)));
 
-  actionEditConnections = new KAction(i18n("Connections"), createIconSet("connecttool.xpm"),
-                                      KShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(editConnections()), actionCollection(),
+  actionEditConnections = new TDEAction(i18n("Connections"), createIconSet("connecttool.xpm"),
+                                      TDEShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(editConnections()), actionCollection(),
                                       "edit_connections");
   actionEditConnections->setToolTip(i18n("Opens a dialog for editing connections"));
   actionEditConnections->setWhatsThis(whatsThisFrom("Edit|Connections"));
   connect(this, TQT_SIGNAL(hasActiveForm(bool)), actionEditConnections, TQT_SLOT(setEnabled(bool)));
 
-  actionEditFormSettings = new KAction(i18n("Form Settings..."), KShortcut::null(),
+  actionEditFormSettings = new TDEAction(i18n("Form Settings..."), TDEShortcut::null(),
                                        TQT_TQOBJECT(this), TQT_SLOT(editFormSettings()), actionCollection(), "edit_form");
   actionEditFormSettings->setToolTip(i18n("Opens a dialog to change the form's settings"));
   actionEditFormSettings->setWhatsThis(whatsThisFrom("Edit|Form Settings"));
   connect(this, TQT_SIGNAL(hasActiveForm(bool)), actionEditFormSettings, TQT_SLOT(setEnabled(bool)));
 
-  KToolBar *tb = new KToolBar(this, "Edit");
+  TDEToolBar *tb = new TDEToolBar(this, "Edit");
   tb->setFullSize(false);
   TQWhatsThis::add(tb, i18n("<b>The Edit toolbar</b>%1").arg(toolbarHelp));
   addToolBar(tb, i18n("Edit"));
@@ -201,51 +201,51 @@ void MainWindow::setupEditActions()
 
 void MainWindow::setupLayoutActions()
 {
-  actionEditAdjustSize = new KAction(i18n("Adjust Size"), createIconSet("adjustsize.xpm"),
+  actionEditAdjustSize = new TDEAction(i18n("Adjust Size"), createIconSet("adjustsize.xpm"),
                                      CTRL + Key_J, TQT_TQOBJECT(this), TQT_SLOT(editAdjustSize()), actionCollection(), "edit_adjust_size");
   actionEditAdjustSize->setToolTip(i18n("Adjusts the size of the selected widget"));
   actionEditAdjustSize->setWhatsThis(whatsThisFrom("Layout|Adjust Size"));
   actionEditAdjustSize->setEnabled(false);
 
-  actionEditHLayout = new KAction(i18n("Lay OutQt::Horizontally"), createIconSet("edithlayout.xpm"),
+  actionEditHLayout = new TDEAction(i18n("Lay OutQt::Horizontally"), createIconSet("edithlayout.xpm"),
                                   CTRL + Key_H, TQT_TQOBJECT(this), TQT_SLOT(editLayoutHorizontal()), actionCollection(), "edit_layout_h");
   actionEditHLayout->setToolTip(i18n("Lays out the selected widgets horizontally"));
   actionEditHLayout->setWhatsThis(whatsThisFrom("Layout|Lay OutQt::Horizontally"));
   actionEditHLayout->setEnabled(false);
 
-  actionEditVLayout = new KAction(i18n("Lay OutQt::Vertically"), createIconSet("editvlayout.xpm"),
+  actionEditVLayout = new TDEAction(i18n("Lay OutQt::Vertically"), createIconSet("editvlayout.xpm"),
                                   CTRL + Key_L, TQT_TQOBJECT(this), TQT_SLOT(editLayoutVertical()), actionCollection(), "edit_layout_v");
   actionEditVLayout->setToolTip(i18n("Lays out the selected widgets vertically"));
   actionEditVLayout->setWhatsThis(whatsThisFrom("Layout|Lay OutQt::Vertically"));
   actionEditVLayout->setEnabled(false);
 
-  actionEditGridLayout = new KAction(i18n("Lay Out in a Grid"), createIconSet("editgrid.xpm"),
+  actionEditGridLayout = new TDEAction(i18n("Lay Out in a Grid"), createIconSet("editgrid.xpm"),
                                      CTRL + Key_G, TQT_TQOBJECT(this), TQT_SLOT(editLayoutGrid()), actionCollection(), "edit_layout_grid");
   actionEditGridLayout->setToolTip(i18n("Lays out the selected widgets in a grid"));
   actionEditGridLayout->setWhatsThis(whatsThisFrom("Layout|Lay Out in a Grid"));
   actionEditGridLayout->setEnabled(false);
 
-  actionEditSplitHorizontal = new KAction(i18n("Lay OutQt::Horizontally in Splitter"), createIconSet("editvlayoutsplit.xpm"),
-                                          KShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(editLayoutHorizontalSplit()), actionCollection(),
+  actionEditSplitHorizontal = new TDEAction(i18n("Lay OutQt::Horizontally in Splitter"), createIconSet("editvlayoutsplit.xpm"),
+                                          TDEShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(editLayoutHorizontalSplit()), actionCollection(),
                                           "edit_split_h");
   actionEditSplitHorizontal->setToolTip(i18n("Lays out the selected widgets horizontally in a splitter"));
   actionEditSplitHorizontal->setWhatsThis(whatsThisFrom("Layout|Lay OutQt::Horizontally in Splitter"));
   actionEditSplitHorizontal->setEnabled(false);
 
-  actionEditSplitVertical = new KAction(i18n("Lay OutQt::Vertically in Splitter"), createIconSet("edithlayoutsplit.xpm"),
-                                        KShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(editLayoutVerticalSplit()), actionCollection(),
+  actionEditSplitVertical = new TDEAction(i18n("Lay OutQt::Vertically in Splitter"), createIconSet("edithlayoutsplit.xpm"),
+                                        TDEShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(editLayoutVerticalSplit()), actionCollection(),
                                         "edit_split_v");
   actionEditSplitVertical->setToolTip(i18n("Lays out the selected widgets vertically in a splitter"));
   actionEditSplitVertical->setWhatsThis(whatsThisFrom("Layout|Lay OutQt::Vertically (in Splitter)"));
   actionEditSplitVertical->setEnabled(false);
 
-  actionEditBreakLayout = new KAction(i18n("Break Layout"), createIconSet("editbreaklayout.xpm"),
+  actionEditBreakLayout = new TDEAction(i18n("Break Layout"), createIconSet("editbreaklayout.xpm"),
                                       CTRL + Key_B, TQT_TQOBJECT(this), TQT_SLOT(editBreakLayout()), actionCollection(), "edit_break_layout");
   actionEditBreakLayout->setToolTip(i18n("Breaks the selected layout"));
   actionEditBreakLayout->setWhatsThis(whatsThisFrom("Layout|Break Layout"));
 
   int id = WidgetDatabase::idFromClassName("Spacer");
-  KToggleAction *a = new KToggleAction(i18n("Spacer"), createIconSet("spacer.xpm"), KShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(toolSelected()),
+  TDEToggleAction *a = new TDEToggleAction(i18n("Spacer"), createIconSet("spacer.xpm"), TDEShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(toolSelected()),
                                        actionCollection(), TQString::number(id).latin1());
   a->setExclusiveGroup("tool");
   a->setText(i18n("Add ") + WidgetDatabase::className(id));
@@ -283,28 +283,28 @@ void MainWindow::setupLayoutActions()
 
 void MainWindow::setupToolActions()
 {
-  actionPointerTool = new KToggleAction(i18n("Pointer"), "arrow", Key_F2,
+  actionPointerTool = new TDEToggleAction(i18n("Pointer"), "arrow", Key_F2,
                                         TQT_TQOBJECT(this), TQT_SLOT(toolSelected()), actionCollection(),
                                         TQString::number(POINTER_TOOL).latin1());
   actionPointerTool->setToolTip(i18n("Selects the pointer tool"));
   actionPointerTool->setWhatsThis(whatsThisFrom("Tools|Pointer"));
   actionPointerTool->setExclusiveGroup("tool");
 
-  actionConnectTool = new KToggleAction(i18n("Connect Signal/Slots"), createIconSet("connecttool.xpm"),
+  actionConnectTool = new TDEToggleAction(i18n("Connect Signal/Slots"), createIconSet("connecttool.xpm"),
                                         Key_F3, TQT_TQOBJECT(this), TQT_SLOT(toolSelected()), actionCollection(),
                                         TQString::number(CONNECT_TOOL).latin1());
   actionConnectTool->setToolTip(i18n("Selects the connection tool"));
   actionConnectTool->setWhatsThis(whatsThisFrom("Tools|Connect Signals and Slots"));
   actionConnectTool->setExclusiveGroup("tool");
 
-  actionOrderTool = new KToggleAction(i18n("Tab Order"), createIconSet("ordertool.xpm"),
+  actionOrderTool = new TDEToggleAction(i18n("Tab Order"), createIconSet("ordertool.xpm"),
                                       Key_F4, TQT_TQOBJECT(this), TQT_SLOT(toolSelected()), actionCollection(),
                                       TQString::number(ORDER_TOOL).latin1());
   actionOrderTool->setToolTip(i18n("Selects the tab order tool"));
   actionOrderTool->setWhatsThis(whatsThisFrom("Tools|Tab Order"));
   actionOrderTool->setExclusiveGroup("tool");
 
-  KToolBar *tb = new KToolBar(this, "Tools");
+  TDEToolBar *tb = new TDEToolBar(this, "Tools");
   tb->setFullSize(false);
   TQWhatsThis::add(tb, i18n("<b>The Tools toolbar</b>%1").arg(toolbarHelp));
 
@@ -325,7 +325,7 @@ void MainWindow::setupToolActions()
     TQString grp = WidgetDatabase::widgetGroup(j);
     if (!WidgetDatabase::isGroupVisible(grp) || WidgetDatabase::isGroupEmpty(grp))
       continue;
-    KToolBar *tb = new KToolBar(this, grp.latin1());
+    TDEToolBar *tb = new TDEToolBar(this, grp.latin1());
     tb->setFullSize(false);
     bool plural = grp[(int) grp.length() - 1] == 's';
     if (plural)
@@ -347,7 +347,7 @@ void MainWindow::setupToolActions()
     {
       if (WidgetDatabase::group(i) != grp)
         continue;               // only widgets, i.e. not forms and temp stuff
-      KToggleAction *a = new KToggleAction(WidgetDatabase::className(i), KShortcut::null(),
+      TDEToggleAction *a = new TDEToggleAction(WidgetDatabase::className(i), TDEShortcut::null(),
                                            TQT_TQOBJECT(this), TQT_SLOT(toolSelected()), actionCollection(), TQString::number(i).latin1());
       a->setExclusiveGroup("tool");
       TQString atext = WidgetDatabase::className(i);
@@ -406,7 +406,7 @@ void MainWindow::setupToolActions()
 
 void MainWindow::setupFileActions()
 {
-  fileTb = new KToolBar(this, "File");
+  fileTb = new TDEToolBar(this, "File");
   fileTb->setFullSize(false);
 
   TQWhatsThis::add(fileTb, i18n("<b>The File toolbar</b>%1").arg(toolbarHelp));
@@ -414,7 +414,7 @@ void MainWindow::setupFileActions()
   fileMenu = new TQPopupMenu(this, "File");
   menuBar()->insertItem(i18n("&File"), fileMenu);
 
-  KAction *a = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(fileNew()), actionCollection());
+  TDEAction *a = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(fileNew()), actionCollection());
   a->setToolTip(i18n("Creates a new dialog"));
   a->setWhatsThis(whatsThisFrom("File|New"));
   a->plug(fileTb);
@@ -452,7 +452,7 @@ void MainWindow::setupFileActions()
   connect(this, TQT_SIGNAL(hasActiveWindow(bool)), a, TQT_SLOT(setEnabled(bool)));
   a->plug(fileMenu);
 
-  a = new KAction(i18n("Save All"), "save_all", KShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(fileSaveAll()),
+  a = new TDEAction(i18n("Save All"), "save_all", TDEShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(fileSaveAll()),
                   actionCollection(), "file_close_all");
   a->setToolTip(i18n("Saves all open dialogs"));
   a->setWhatsThis(whatsThisFrom("File|Save All"));
@@ -473,7 +473,7 @@ void MainWindow::setupRunActions()
   TQPopupMenu *menu = new TQPopupMenu(this, "Run");
   menuBar()->insertItem(i18n("&Run"), menu);
 
-  KAction* a = new KAction(i18n("Run Dialog"), "run", CTRL + Key_R,
+  TDEAction* a = new TDEAction(i18n("Run Dialog"), "run", CTRL + Key_R,
                            TQT_TQOBJECT(this), TQT_SLOT(runForm()), actionCollection(), "run");
   a->setToolTip(i18n("Executes dialog"));
   a->setWhatsThis(whatsThisFrom("Run|Run dialog"));
@@ -482,7 +482,7 @@ void MainWindow::setupRunActions()
   a->plug(menu);
   // add KDE4 executor
 
-  KAction* b = new KAction(i18n("Run Dialog K4"), "launch", CTRL + SHIFT  + TQt::Key_R,
+  TDEAction* b = new TDEAction(i18n("Run Dialog K4"), "launch", CTRL + SHIFT  + TQt::Key_R,
                            TQT_TQOBJECT(this), TQT_SLOT(runForm4()), actionCollection(), "run4");
   b->setToolTip(i18n("Executes dialog in KDE4"));
   b->setWhatsThis(whatsThisFrom("Run|Run dialog"));
@@ -497,37 +497,37 @@ void MainWindow::setupWindowActions()
   {
     windowActionsSetup = true;
 
-    KAction* actionWindowTile = new KAction(i18n("Tile"), KShortcut::null(), TQT_TQOBJECT(qworkspace),  TQT_SLOT(tile()),
+    TDEAction* actionWindowTile = new TDEAction(i18n("Tile"), TDEShortcut::null(), TQT_TQOBJECT(qworkspace),  TQT_SLOT(tile()),
                                    actionCollection(), "window_tile");
     actionWindowTile->setToolTip(i18n("Tiles the windows so that they are all visible"));
     actionWindowTile->setWhatsThis(whatsThisFrom("Window|Tile"));
 
-    KAction* actionWindowCascade = new KAction(i18n("Cascade"), KShortcut::null(), TQT_TQOBJECT(qworkspace),  TQT_SLOT(cascade()),
+    TDEAction* actionWindowCascade = new TDEAction(i18n("Cascade"), TDEShortcut::null(), TQT_TQOBJECT(qworkspace),  TQT_SLOT(cascade()),
                                       actionCollection(), "window_cascade");
     actionWindowCascade->setToolTip(i18n("Cascades the windows so that all their title bars are visible"));
     actionWindowCascade->setWhatsThis(whatsThisFrom("Window|Cascade"));
 
-    KAction* actionWindowClose = new KAction(i18n("Cascade"), KShortcut::null(), TQT_TQOBJECT(qworkspace),  TQT_SLOT(closeActiveWindow()),
+    TDEAction* actionWindowClose = new TDEAction(i18n("Cascade"), TDEShortcut::null(), TQT_TQOBJECT(qworkspace),  TQT_SLOT(closeActiveWindow()),
                                     actionCollection(), "window_close");
     actionWindowClose->setToolTip(i18n("Closes the active window"));
     actionWindowClose->setWhatsThis(whatsThisFrom("Window|Close"));
 
-    KAction* actionWindowCloseAll = new KAction(i18n("Close All"), KShortcut::null(), TQT_TQOBJECT(qworkspace), 
+    TDEAction* actionWindowCloseAll = new TDEAction(i18n("Close All"), TDEShortcut::null(), TQT_TQOBJECT(qworkspace), 
                                        TQT_SLOT(closeAllWindows()), actionCollection(), "window_close_all");
     actionWindowCloseAll->setToolTip(i18n("Closes all form windows"));
     actionWindowCloseAll->setWhatsThis(whatsThisFrom("Window|Close All"));
 
-    KAction* actionWindowNext = new KAction(i18n("Next"), Key_F6, TQT_TQOBJECT(qworkspace), 
+    TDEAction* actionWindowNext = new TDEAction(i18n("Next"), Key_F6, TQT_TQOBJECT(qworkspace), 
                                    TQT_SLOT(activateNextWindow()), actionCollection(), "window_next");
     actionWindowNext->setToolTip(i18n("Activates the next window"));
     actionWindowNext->setWhatsThis(whatsThisFrom("Window|Next"));
 
-    KAction* actionWindowPrevious = new KAction(i18n("Previous"), CTRL + SHIFT + Key_F6, TQT_TQOBJECT(qworkspace), 
+    TDEAction* actionWindowPrevious = new TDEAction(i18n("Previous"), CTRL + SHIFT + Key_F6, TQT_TQOBJECT(qworkspace), 
                                        TQT_SLOT(activatePreviousWindow()), actionCollection(), "window_prev");
     actionWindowPrevious->setToolTip(i18n("Activates the previous window"));
     actionWindowPrevious->setWhatsThis(whatsThisFrom("Window|Previous"));
 
-    windowMenu = new KPopupMenu(this, "Window");
+    windowMenu = new TDEPopupMenu(this, "Window");
     menuBar()->insertItem(i18n("&Window"), windowMenu);
     connect(windowMenu, TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(setupWindowActions()));
 
@@ -575,17 +575,17 @@ void MainWindow::setupWindowActions()
 
 void MainWindow::setupSettingsActions()
 {
-  KPopupMenu *settings = new KPopupMenu(this, "Settings");
-  KAction* a = KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(editShortcuts()), actionCollection());
+  TDEPopupMenu *settings = new TDEPopupMenu(this, "Settings");
+  TDEAction* a = KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(editShortcuts()), actionCollection());
   a->setToolTip(i18n("Opens a dialog to change shortcuts"));
   a->plug(settings);
 
-  a = new KAction(i18n("Configure &Plugins..."), KShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(editPlugins()),
+  a = new TDEAction(i18n("Configure &Plugins..."), TDEShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(editPlugins()),
                   actionCollection(), "configure_plugins");
   a->setToolTip(i18n("Opens a dialog to configure plugins"));
   a->plug(settings);
 
-  a = new KAction(i18n("&Configure Editor..."), KShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(configureEditor()),
+  a = new TDEAction(i18n("&Configure Editor..."), TDEShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(configureEditor()),
                   actionCollection(), "configure_editor");
   a->setToolTip(i18n("Configure various aspects of this editor."));
   a->plug(settings);
@@ -600,7 +600,7 @@ void MainWindow::setupSettingsActions()
 
 void MainWindow::setupHelpActions()
 {
-  KPopupMenu *help = helpMenu();
+  TDEPopupMenu *help = helpMenu();
   menuBar()->insertItem( i18n("&Help"), help);
 }
 
diff --git a/kommander/editor/messagelog.cpp b/kommander/editor/messagelog.cpp
index 33a385b3..e89e04f3 100644
--- a/kommander/editor/messagelog.cpp
+++ b/kommander/editor/messagelog.cpp
@@ -30,7 +30,7 @@
 
 MessageLog::MessageLog(TQWidget* parent, const char* name) : TQTabWidget(parent, name)
 {
-  m_popupMenu = new KPopupMenu(this);
+  m_popupMenu = new TDEPopupMenu(this);
   m_popupMenu->insertItem(SmallIconSet("editcopy"), i18n("Copy Current &Line"), this, TQT_SLOT(copyLine()));
   m_popupMenu->insertItem(SmallIconSet("editcopy"), i18n("&Copy Content"), this, TQT_SLOT(copyContent()));
   m_popupMenu->insertItem(SmallIconSet("filesaveas"), i18n("&Save As..."), this, TQT_SLOT(saveToFile()));
@@ -39,7 +39,7 @@ MessageLog::MessageLog(TQWidget* parent, const char* name) : TQTabWidget(parent,
   
   for (int i = 0; i < m_listCount; i++)
   {
-    m_lists[i] = new KListBox(this);
+    m_lists[i] = new TDEListBox(this);
     addTab(m_lists[i], m_listNames[i]);
     m_seenEOL[i] = false;
     connect(m_lists[i], TQT_SIGNAL(contextMenuRequested(TQListBoxItem*, const TQPoint&)),
@@ -72,7 +72,7 @@ void MessageLog::insertItem(InfoType i, TQString text)
 TQString MessageLog::content()
 {
   TQString p_content;
-  KListBox* list = m_lists[currentPageIndex()];
+  TDEListBox* list = m_lists[currentPageIndex()];
   for (uint i=0; i < list->count(); i++)
     p_content.append(list->text(i) + "\n");
   return p_content;
diff --git a/kommander/editor/messagelog.h b/kommander/editor/messagelog.h
index e9848bd1..f0c1edbc 100644
--- a/kommander/editor/messagelog.h
+++ b/kommander/editor/messagelog.h
@@ -21,9 +21,9 @@
 
 #include <klocale.h>
 
-class KListBox;
+class TDEListBox;
 class TDEProcess;
-class KPopupMenu;
+class TDEPopupMenu;
 class TQListBoxItem;
    
 class MessageLog : public TQTabWidget
@@ -48,9 +48,9 @@ public slots:
 private:
   static const int m_listCount = 2;
   static TQString m_listNames[m_listCount];
-  KListBox* m_lists[m_listCount];
+  TDEListBox* m_lists[m_listCount];
   bool m_seenEOL[m_listCount];
-  KPopupMenu* m_popupMenu;
+  TDEPopupMenu* m_popupMenu;
 };
 
 #endif
diff --git a/kommander/examples/current/editor-poc.kmdr b/kommander/examples/current/editor-poc.kmdr
index 7e9c9b03..18d8168e 100755
--- a/kommander/examples/current/editor-poc.kmdr
+++ b/kommander/examples/current/editor-poc.kmdr
@@ -303,7 +303,7 @@ debug("Clicked at: "+Self.Item(0)+" "+Self.Item(1))
         &lt;stringlist&gt;
             &lt;string&gt;&lt;/string&gt;
             &lt;string&gt;@Array.setValue(help, "Proof of concept", "&amp;lt;center&amp;gt;&amp;lt;h2&amp;gt;Kommander MainWindow frames!&amp;lt;/h2&amp;gt;&amp;lt;/center&amp;gt;&amp;lt;p&amp;gt;As Kommander took on functionality an attempt was made to make a MainWindow Kommander widget. Sadly it was a huge time loss for two developers who both gave up after days of trying. The problem was with the editor. However you can use a Qt Designer generated UI file renamed to a *.kmdr file. Into this frame you can place your widgets and make a working application where nearly everything works.&amp;lt;/p&amp;gt;")
-@Array.setValue(help, "Known limitations", "&amp;lt;center&amp;gt;&amp;lt;h2&amp;gt;Known limitations&amp;lt;/h2&amp;gt;&amp;lt;/center&amp;gt;&amp;lt;p&amp;gt;As of this writing what is known not to work on the Kommander side is the settings read and write. There is no Initialize or Destroy section as there is no Kommander Text, however there are Q_SIGNALS for this on the window, so the functionality is intact. On the MainWindow side it is not possible to talk to any Actions as these are QActions from Designer and KActions are not derived from QActions in KDE 3x. This means a DCOP call to list actions or set states will not work. It is also not possible to talk to the Statusbar. Also submenus on the menubar and dropdown actions on the Toolbar will not work. Given that this is an unsupported use of Kommander it everything that does work makes it suitable for probably most small application uses.. &amp;lt;/p&amp;gt;")
+@Array.setValue(help, "Known limitations", "&amp;lt;center&amp;gt;&amp;lt;h2&amp;gt;Known limitations&amp;lt;/h2&amp;gt;&amp;lt;/center&amp;gt;&amp;lt;p&amp;gt;As of this writing what is known not to work on the Kommander side is the settings read and write. There is no Initialize or Destroy section as there is no Kommander Text, however there are Q_SIGNALS for this on the window, so the functionality is intact. On the MainWindow side it is not possible to talk to any Actions as these are QActions from Designer and TDEActions are not derived from QActions in KDE 3x. This means a DCOP call to list actions or set states will not work. It is also not possible to talk to the Statusbar. Also submenus on the menubar and dropdown actions on the Toolbar will not work. Given that this is an unsupported use of Kommander it everything that does work makes it suitable for probably most small application uses.. &amp;lt;/p&amp;gt;")
 @Array.setValue(help, "Rolling your own", "&amp;lt;center&amp;gt;&amp;lt;h2&amp;gt;Rolling your own&amp;lt;/h2&amp;gt;&amp;lt;/center&amp;gt;&amp;lt;p&amp;gt;It is our intention to have a template in the 1.3 release of a MainWindow, but if you have Qt Designer for Qt 3x you can easily start a window design, save it, rename to *.kmdr and open in Kommander. Remember not to add widgets in Designer as Kommander will not recognize them.&amp;lt;/p&amp;gt;")
 @Array.setValue(help, "Using Actions", "&amp;lt;center&amp;gt;&amp;lt;h2&amp;gt;Using Actions&amp;lt;/h2&amp;gt;&amp;lt;/center&amp;gt;&amp;lt;p&amp;gt;If you want to get the goodies, menus, toolbars and accelerator keys, you need to use actions. Kommander has an Action editor on the window menu under Views. There you can add actions and there is a shortcut to connecting them with Q_SIGNALS and Q_SLOTS. To get everything working select an Action and look in the properties menu for settings like name, text and icon. For menus and toolbars try right clicking on them for context menus. Now from the Action View drag an Action to the menu or toolbar. See the visual feedback? Just connect your Action to a script and you have three different ways to call it.&amp;lt;/p&amp;gt;
 ")
diff --git a/kommander/pluginmanager/mainwindow.cpp b/kommander/pluginmanager/mainwindow.cpp
index 249aed75..d4a17ea4 100644
--- a/kommander/pluginmanager/mainwindow.cpp
+++ b/kommander/pluginmanager/mainwindow.cpp
@@ -29,15 +29,15 @@
 #include <kstandarddirs.h>
 
 MainWindow::MainWindow( TQWidget* parent, const char *name, WFlags f )
-    : KMainWindow( parent, name, f )
+    : TDEMainWindow( parent, name, f )
 {
-  KToolBar *toolBar = new KToolBar( this );
+  TDEToolBar *toolBar = new TDEToolBar( this );
   toolBar->insertButton("fileopen", Add, true, i18n("Add") );
   toolBar->insertButton("no", Remove, true, i18n("Remove") );
   toolBar->insertButton("reload", Refresh, true, i18n("Refresh") );
   connect( toolBar, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(toolButton(int)) );
 
-  m_list = new KListBox( this );
+  m_list = new TDEListBox( this );
   setCentralWidget(m_list);
   
   m_pluginManager = new PluginManager;
diff --git a/kommander/pluginmanager/mainwindow.h b/kommander/pluginmanager/mainwindow.h
index f37bb3e3..9f891d2c 100644
--- a/kommander/pluginmanager/mainwindow.h
+++ b/kommander/pluginmanager/mainwindow.h
@@ -20,10 +20,10 @@
 
 #include <kmainwindow.h>
 
-class KListBox;
+class TDEListBox;
 class PluginManager;
 
-class MainWindow : public KMainWindow
+class MainWindow : public TDEMainWindow
 {
   Q_OBJECT
   
@@ -49,7 +49,7 @@ private:
   void refresh();
   
   // ListBox of available plugins 
-  KListBox *m_list;
+  TDEListBox *m_list;
   // plugin manager
   PluginManager* m_pluginManager;
 };
diff --git a/kommander/widget/kmdrmainwindow.cpp b/kommander/widget/kmdrmainwindow.cpp
index 118fcade..bd6d491f 100644
--- a/kommander/widget/kmdrmainwindow.cpp
+++ b/kommander/widget/kmdrmainwindow.cpp
@@ -14,7 +14,7 @@
 #include <tqtimer.h>
 
 KmdrMainWindow::KmdrMainWindow(TQWidget *parent, const char *name, WFlags f)
- : KMainWindow(parent, name, f)
+ : TDEMainWindow(parent, name, f)
 {
   TQTimer::singleShot(10, this, TQT_SIGNAL(initialize()));
 }
@@ -26,7 +26,7 @@ KmdrMainWindow::~KmdrMainWindow()
 
 bool KmdrMainWindow::queryClose()
 {
-  bool quit = KMainWindow::queryClose();
+  bool quit = TDEMainWindow::queryClose();
   if (quit)
     emit destroy();
   return quit;
diff --git a/kommander/widget/kmdrmainwindow.h b/kommander/widget/kmdrmainwindow.h
index 5e31f122..f768552d 100644
--- a/kommander/widget/kmdrmainwindow.h
+++ b/kommander/widget/kmdrmainwindow.h
@@ -17,7 +17,7 @@
 /**
 	@author Andras Mantia <amantia@tdewebdev.org>
 */
-class KmdrMainWindow : public KMainWindow
+class KmdrMainWindow : public TDEMainWindow
 {
 Q_OBJECT
   
diff --git a/kommander/widgets/execbutton.cpp b/kommander/widgets/execbutton.cpp
index 4e88eb22..a9a906f0 100644
--- a/kommander/widgets/execbutton.cpp
+++ b/kommander/widgets/execbutton.cpp
@@ -209,7 +209,7 @@ TQString ExecButton::handleDCOP(int function, const TQStringList& args)
         ++it;
         if (w->name() == args[0] && ( strcmp(w->className(), "PopupMenu")) == 0 )
         {
-          TQPopupMenu *popup = dynamic_cast<TQPopupMenu*>(w->child("unnamed", "KPopupMenu"));
+          TQPopupMenu *popup = dynamic_cast<TQPopupMenu*>(w->child("unnamed", "TDEPopupMenu"));
           this->setPopup(popup);
         }
       }
diff --git a/kommander/widgets/fontdialog.cpp b/kommander/widgets/fontdialog.cpp
index fefd8d85..739fb0e0 100644
--- a/kommander/widgets/fontdialog.cpp
+++ b/kommander/widgets/fontdialog.cpp
@@ -140,8 +140,8 @@ TQString FontDialog::handleDCOP(int function, const TQStringList& args)
     }
     case DCOP::execute:
     {
-      int result = KFontDialog::getFont( m_font );
-      if ( result == KFontDialog::Accepted )
+      int result = TDEFontDialog::getFont( m_font );
+      if ( result == TDEFontDialog::Accepted )
       {
         return m_font.toString();
       } 
diff --git a/kommander/widgets/listbox.cpp b/kommander/widgets/listbox.cpp
index bf6f8b4a..9a84bd4b 100644
--- a/kommander/widgets/listbox.cpp
+++ b/kommander/widgets/listbox.cpp
@@ -30,7 +30,7 @@
 #include "listbox.h"
 
 ListBox::ListBox(TQWidget *a_parent, const char *a_name)
-  : KListBox(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this))
+  : TDEListBox(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this))
 {
   TQStringList states;
   states << "default";
diff --git a/kommander/widgets/listbox.h b/kommander/widgets/listbox.h
index 2b20f24b..b970c280 100644
--- a/kommander/widgets/listbox.h
+++ b/kommander/widgets/listbox.h
@@ -31,7 +31,7 @@
 class TQWidget;
 
 class TQShowEvent;
-class KOMMANDER_EXPORT ListBox : public KListBox, public KommanderWidget
+class KOMMANDER_EXPORT ListBox : public TDEListBox, public KommanderWidget
 {
   Q_OBJECT
   
diff --git a/kommander/widgets/popupmenu.cpp b/kommander/widgets/popupmenu.cpp
index dfa7b325..ba6c3781 100644
--- a/kommander/widgets/popupmenu.cpp
+++ b/kommander/widgets/popupmenu.cpp
@@ -49,7 +49,7 @@ PopupMenu::PopupMenu(TQWidget *parent, const char *name)
   else
     setHidden(true);
 
-  m_menu = new KPopupMenu(this);
+  m_menu = new TDEPopupMenu(this);
   connect(m_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuItemActivated(int)));
 
   KommanderPlugin::setDefaultGroup(Group::DCOP);
diff --git a/kommander/widgets/popupmenu.h b/kommander/widgets/popupmenu.h
index b044d74e..b7ed192a 100644
--- a/kommander/widgets/popupmenu.h
+++ b/kommander/widgets/popupmenu.h
@@ -17,7 +17,7 @@
 #include <kommanderwidget.h>
 
 
-class KPopupMenu;
+class TDEPopupMenu;
 
 /**
 	@author Andras Mantia <amantia@tdewebdev.org>
@@ -41,7 +41,7 @@ public:
   virtual void setAssociatedText(const TQStringList&);
   virtual TQString populationText() const;
   virtual void setPopulationText(const TQString&);
-  KPopupMenu *menu() {return m_menu;}
+  TDEPopupMenu *menu() {return m_menu;}
 
 public slots:
   virtual void setWidgetText(const TQString &);
@@ -54,7 +54,7 @@ private slots:
 private:
   TQString insertSubmenu(const TQString& title, const TQString &menuWidget, int index, const TQString& icon);
 
-  KPopupMenu *m_menu;
+  TDEPopupMenu *m_menu;
   TQMap<int, TQString> m_associations;
   TQStringList m_params;
 };
diff --git a/kommander/widgets/treewidget.cpp b/kommander/widgets/treewidget.cpp
index 8a1aabf6..7c1c989a 100644
--- a/kommander/widgets/treewidget.cpp
+++ b/kommander/widgets/treewidget.cpp
@@ -55,7 +55,7 @@ enum Functions {
 };
 
 TreeWidget::TreeWidget(TQWidget *a_parent, const char *a_name)
-  : KListView(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this))
+  : TDEListView(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this))
 {
   TQStringList states;
   states << "default";
@@ -243,7 +243,7 @@ bool TreeWidget::isKommanderWidget() const
 
 void TreeWidget::setCurrentItem(TQListViewItem* item)
 {
-  KListView::setCurrentItem(item);
+  TDEListView::setCurrentItem(item);
   setSelected(item, true);
   ensureItemVisible(item);
 }
@@ -458,10 +458,10 @@ TQString TreeWidget::handleDCOP(int function, const TQStringList& args)
       break;
     }
     case addColumnTree:
-      return TQString::number(KListView::addColumn(args[0], args[1].toInt()));
+      return TQString::number(TDEListView::addColumn(args[0], args[1].toInt()));
       break;
     case setSortCol:
-      KListView::setSorting(args[0].toInt(), args[1].toInt());
+      TDEListView::setSorting(args[0].toInt(), args[1].toInt());
       break;
     case DCOP::columnCount:
       return TQString::number(TQListView::columns() );
@@ -476,7 +476,7 @@ TQString TreeWidget::handleDCOP(int function, const TQStringList& args)
       setColAlign(args[0].toInt(), args[1]);
       break;
     case setAltBackground:
-      KListView::setAlternateBackground(TQColor(args[0]));
+      TDEListView::setAlternateBackground(TQColor(args[0]));
       break;
     case DCOP::removeColumn:
     {
diff --git a/kommander/widgets/treewidget.h b/kommander/widgets/treewidget.h
index d1055547..19cbcea6 100644
--- a/kommander/widgets/treewidget.h
+++ b/kommander/widgets/treewidget.h
@@ -32,7 +32,7 @@
 class TQWidget;
 
 class TQShowEvent;
-class KOMMANDER_EXPORT TreeWidget : public KListView, public KommanderWidget
+class KOMMANDER_EXPORT TreeWidget : public TDEListView, public KommanderWidget
 {
   Q_OBJECT
   
diff --git a/kxsldbg/kxsldbg.cpp b/kxsldbg/kxsldbg.cpp
index 5dab0044..34a82b28 100644
--- a/kxsldbg/kxsldbg.cpp
+++ b/kxsldbg/kxsldbg.cpp
@@ -90,7 +90,7 @@ bool KXsldbg::closeURL()
 
 void KXsldbg::setupActions()
 {
-    KAction *act = KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection());
+    TDEAction *act = KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection());
     connect(act, TQT_SIGNAL(activated()), this, TQT_SLOT(quit()));
 
     m_toolbarAction = KStdAction::showToolbar(TQT_TQOBJECT(this), TQT_SLOT(optionsShowToolbar()), actionCollection());
diff --git a/kxsldbg/kxsldbg.h b/kxsldbg/kxsldbg.h
index 16cf3592..36daab70 100644
--- a/kxsldbg/kxsldbg.h
+++ b/kxsldbg/kxsldbg.h
@@ -11,7 +11,7 @@
 #include <dcopclient.h> 
 #include "kxsldbgif.h"
 
-class KToggleAction;
+class TDEToggleAction;
 
 /**
  * This is the application "Shell".  It has a menubar, toolbar, and
@@ -78,8 +78,8 @@ private:
 private:
     KParts::ReadOnlyPart *m_part;
 
-    KToggleAction *m_toolbarAction;
-    KToggleAction *m_statusbarAction;
+    TDEToggleAction *m_toolbarAction;
+    TDEToggleAction *m_statusbarAction;
 };
 
 #endif // KXSLDBG_H
diff --git a/kxsldbg/kxsldbgpart/kxsldbg_part.cpp b/kxsldbg/kxsldbgpart/kxsldbg_part.cpp
index 6fbd6f46..edac344b 100644
--- a/kxsldbg/kxsldbgpart/kxsldbg_part.cpp
+++ b/kxsldbg/kxsldbgpart/kxsldbg_part.cpp
@@ -106,133 +106,133 @@ KXsldbgPart::KXsldbgPart( TQWidget *parentWidget, const char * /*widgetName*/,
 
     // set our XML-UI resource file
    setXMLFile("kxsldbg_part.rc");
-   (void) new KAction( i18n("Configure Editor..."),
+   (void) new TDEAction( i18n("Configure Editor..."),
 		       "configure", 0,
 		       this, TQT_SLOT(configureEditorCmd_activated()),
 		       actionCollection(), "configureEditorCmd" );
-   (void) new KAction( i18n("Configure..."),
+   (void) new TDEAction( i18n("Configure..."),
                         "configure", Key_C,
                         this, TQT_SLOT(configureCmd_activated()),
                         actionCollection(), "configureCmd" );
    
-    (void) new KAction( i18n("Inspect..."),
+    (void) new TDEAction( i18n("Inspect..."),
                         "find", Key_I,
                         this, TQT_SLOT(inspectorCmd_activated()),
                         actionCollection(), "inspectCmd" );
 
 
     // Motions commands
-    (void) new KAction( i18n("Run"),
+    (void) new TDEAction( i18n("Run"),
                         "run", Key_F5,
                         this, TQT_SLOT(runCmd_activated()),
                         actionCollection(), "runCmd" );
 
-    (void) new KAction( i18n("Continue"),
+    (void) new TDEAction( i18n("Continue"),
                         "1downarrow", Key_F4,
                         this, TQT_SLOT(continueCmd_activated()),
                         actionCollection(), "continueCmd" );
 
-    (void) new KAction( i18n("Step"),
+    (void) new TDEAction( i18n("Step"),
                         "step", Key_F8,
                         this, TQT_SLOT(stepCmd_activated()),
                         actionCollection(), "stepCmd" );
 
-    (void) new KAction( i18n("Next"),
+    (void) new TDEAction( i18n("Next"),
                         "next", Key_F10,
                         this, TQT_SLOT(nextCmd_activated()),
                         actionCollection(), "nextCmd" );
 
-    (void) new KAction( i18n("Step Up"),
+    (void) new TDEAction( i18n("Step Up"),
                         "xsldbg_stepup", Key_F6,
                         this, TQT_SLOT(stepupCmd_activated()),
                         actionCollection(), "stepupCmd" );
 
-    (void) new KAction( i18n("Step Down"),
+    (void) new TDEAction( i18n("Step Down"),
                         "xsldbg_stepdown", Key_F7,
                         this, TQT_SLOT(stepCmd_activated()),
                         actionCollection(), "stepdownCmd" );
 
     // Breakpoint commands
-    (void) new KAction( i18n("Break"),
+    (void) new TDEAction( i18n("Break"),
                         "xsldbg_break", Key_F2,
                         this, TQT_SLOT(breakCmd_activated()),
                         actionCollection(), "breakCmd" );
 
-    (void) new KAction( i18n("Enable/Disable"),
+    (void) new TDEAction( i18n("Enable/Disable"),
                         "xsldbg_enable", Key_F3,
                         this, TQT_SLOT(enableCmd_activated()),
                         actionCollection(), "enableCmd" );
 
-    (void) new KAction( i18n("Delete"),
+    (void) new TDEAction( i18n("Delete"),
                         "xsldbg_delete", Key_Delete,
                         this, TQT_SLOT(deleteCmd_activated()),
                         actionCollection(), "deleteCmd" );
 
-    (void) new KAction( i18n("&Source"),
+    (void) new TDEAction( i18n("&Source"),
                         "xsldbg_source", Key_S,
                         this, TQT_SLOT(sourceCmd_activated()),
                         actionCollection(), "sourceCmd" );
 
-    (void) new KAction( i18n("&Data"),
+    (void) new TDEAction( i18n("&Data"),
                         "xsldbg_data", Key_D,
                         this, TQT_SLOT(dataCmd_activated()),
                         actionCollection(), "dataCmd" );
 
-    (void) new KAction( i18n("&Output"),
+    (void) new TDEAction( i18n("&Output"),
                         "xsldbg_output", Key_O,
                         this, TQT_SLOT(outputCmd_activated()),
                         actionCollection(), "outputCmd" );
 
-    (void) new KAction( i18n("Reload Current File From Disk"),
+    (void) new TDEAction( i18n("Reload Current File From Disk"),
                         "xsldbg_refresh", CTRL + Key_F5,
                         this, TQT_SLOT(refreshCmd_activated()),
                         actionCollection(), "refreshCmd" );
 
     /* tracing and walking */
-    (void) new KAction( i18n("Walk Through Stylesheet..."),
+    (void) new TDEAction( i18n("Walk Through Stylesheet..."),
                         Key_W,
                         this, TQT_SLOT(walkCmd_activated()),
                         actionCollection(), "walkCmd" );
-    (void) new KAction( i18n("Stop Wal&king Through Stylesheet"),
+    (void) new TDEAction( i18n("Stop Wal&king Through Stylesheet"),
                         Key_K,
                         this, TQT_SLOT(walkStopCmd_activated()),
                         actionCollection(), "walkStopCmd" );
-    (void) new KAction( i18n("Tr&ace Execution of Stylesheet"),
+    (void) new TDEAction( i18n("Tr&ace Execution of Stylesheet"),
                         Key_A,
                         this, TQT_SLOT(traceCmd_activated()),
                         actionCollection(), "traceCmd" );
-    (void) new KAction( i18n("Stop Tracing of Stylesheet"),
+    (void) new TDEAction( i18n("Stop Tracing of Stylesheet"),
                         Key_K,
                         this, TQT_SLOT(traceStopCmd_activated()),
                         actionCollection(), "traceStopCmd" );
 
-    (void) new KAction( i18n("&Evaluate Expression..."),
+    (void) new TDEAction( i18n("&Evaluate Expression..."),
                         Key_E,
                         this, TQT_SLOT(evaluateCmd_activated()),
                         actionCollection(), "evaluateCmd" );
 
-    (void) new KAction( i18n("Goto &XPath..."),
+    (void) new TDEAction( i18n("Goto &XPath..."),
                         Key_X,
                         this, TQT_SLOT(gotoXPathCmd_activated()),
                         actionCollection(), "gotoXPathCmd" );
 
-    (void) new KAction( i18n("Lookup SystemID..."),
+    (void) new TDEAction( i18n("Lookup SystemID..."),
                         0,
                         this, TQT_SLOT(slotLookupSystemID()),
                         actionCollection(), "lookupSystemID" );
 
-    (void) new KAction( i18n("Lookup PublicID..."),
+    (void) new TDEAction( i18n("Lookup PublicID..."),
                         0,
                         this, TQT_SLOT(slotLookupPublicID()),
                         actionCollection(), "lookupPublicID" );
 
-    (void) new KAction( i18n("Quit"),
+    (void) new TDEAction( i18n("Quit"),
                         0, CTRL + Key_Q,
                         this, TQT_SLOT(quit()),
                         actionCollection(), "file_quit" );
 
     /*
-    (void) new KAction( i18n("Exit KXsldbg"),
+    (void) new TDEAction( i18n("Exit KXsldbg"),
                         "xsldbg_output", CTRL + Key_Q,
                         this, TQT_SLOT(exitCmd_activated()),
                         actionCollection(), "exitCmd" );
diff --git a/lib/compatibility/knewstuff/downloaddialog.cpp b/lib/compatibility/knewstuff/downloaddialog.cpp
index afc27b16..670d989e 100644
--- a/lib/compatibility/knewstuff/downloaddialog.cpp
+++ b/lib/compatibility/knewstuff/downloaddialog.cpp
@@ -46,11 +46,11 @@
 
 using namespace KNS;
 
-class NumSortListViewItem : public KListViewItem
+class NumSortListViewItem : public TDEListViewItem
 {
   public:
   NumSortListViewItem( TQListView * parent, TQString label1, TQString label2 = TQString(), TQString label3 = TQString(), TQString label4 = TQString(), TQString label5 = TQString(), TQString label6 = TQString(), TQString label7 = TQString(), TQString label8 = TQString() )  :
-  KListViewItem( parent, label1, label2, label3, label4, label5, label6, label7, label8 )  
+  TDEListViewItem( parent, label1, label2, label3, label4, label5, label6, label7, label8 )  
   {
   }
 
@@ -62,7 +62,7 @@ class NumSortListViewItem : public KListViewItem
       s.sprintf("%08d", text(col).toInt());
       return s;
     }
-    return KListViewItem::key( col, asc );
+    return TDEListViewItem::key( col, asc );
   }
 };
 
@@ -136,10 +136,10 @@ void DownloadDialog::load(TQString providerList)
 
 void DownloadDialog::clear()
 {
-  TQMap<TQWidget*, TQValueList<KListView*>* >::Iterator it;
+  TQMap<TQWidget*, TQValueList<TDEListView*>* >::Iterator it;
   for(it = m_map.begin(); it != m_map.end(); ++it)
   {
-    TQValueList<KListView*> *v = it.data();
+    TQValueList<TDEListView*> *v = it.data();
     kdDebug() << "clear listviews in " << v << endl;
     if(v)
     {
@@ -179,7 +179,7 @@ void DownloadDialog::addProvider(Provider *p)
   KTabCtl *ctl;
   TQWidget *w_d, *w_r, *w_l;
   TQWidget *w2;
-  KListView *lvtmp_r, *lvtmp_d, *lvtmp_l;
+  TDEListView *lvtmp_r, *lvtmp_d, *lvtmp_l;
   TQTextBrowser *rt;
   TQString tmp;
   int ret;
@@ -217,19 +217,19 @@ void DownloadDialog::addProvider(Provider *p)
   TQHBoxLayout *box = new TQHBoxLayout(frame);
   box->add(ctl);
 
-  lvtmp_r = new KListView(w_r);
+  lvtmp_r = new TDEListView(w_r);
   lvtmp_r->addColumn(i18n("Name"));
   lvtmp_r->addColumn(i18n("Version"));
   lvtmp_r->addColumn(i18n("Rating"));
   lvtmp_r->setSorting(2, false);
 
-  lvtmp_d = new KListView(w_d);
+  lvtmp_d = new TDEListView(w_d);
   lvtmp_d->addColumn(i18n("Name"));
   lvtmp_d->addColumn(i18n("Version"));
   lvtmp_d->addColumn(i18n("Downloads"));
   lvtmp_d->setSorting(2, false);
 
-  lvtmp_l = new KListView(w_l);
+  lvtmp_l = new TDEListView(w_l);
   lvtmp_l->addColumn(i18n("Name"));
   lvtmp_l->addColumn(i18n("Version"));
   lvtmp_l->addColumn(i18n("Release Date"));
@@ -264,7 +264,7 @@ void DownloadDialog::addProvider(Provider *p)
   TQVBoxLayout *box4 = new TQVBoxLayout(w_l);
   box4->add(lvtmp_l);
 
-  TQValueList<KListView*> *v = new TQValueList<KListView*>;
+  TQValueList<TDEListView*> *v = new TQValueList<TDEListView*>;
   *v << lvtmp_r << lvtmp_d << lvtmp_l;
   m_map[frame] = v;
   m_rts[frame] = rt;
@@ -363,11 +363,11 @@ void DownloadDialog::addEntry(Entry *entry)
   else if(installed < 0) pix = TDEGlobal::iconLoader()->loadIcon("history", KIcon::Small);
   else pix = TQPixmap();
 
-  KListViewItem *tmp_r = new KListViewItem(lv_r,
+  TDEListViewItem *tmp_r = new TDEListViewItem(lv_r,
     entry->name(), entry->version(), TQString("%1").arg(entry->rating()));
-  KListViewItem *tmp_d = new NumSortListViewItem(lv_d,
+  TDEListViewItem *tmp_d = new NumSortListViewItem(lv_d,
     entry->name(), entry->version(), TQString("%1").arg(entry->downloads()));
-  KListViewItem *tmp_l = new KListViewItem(lv_l,
+  TDEListViewItem *tmp_l = new TDEListViewItem(lv_l,
     entry->name(), entry->version(), TDEGlobal::locale()->formatDate(entry->releaseDate()));
 
   tmp_r->setPixmap(0, pix);
diff --git a/lib/compatibility/knewstuff/downloaddialog.h b/lib/compatibility/knewstuff/downloaddialog.h
index 3c7257d7..7f1fd602 100644
--- a/lib/compatibility/knewstuff/downloaddialog.h
+++ b/lib/compatibility/knewstuff/downloaddialog.h
@@ -28,7 +28,7 @@ namespace TDEIO
   class Job;
 }
 
-class KListView;
+class TDEListView;
 class TQTextBrowser;
 class TQFrame;
 class KNewStuffGeneric;
@@ -212,7 +212,7 @@ class KDE_EXPORT DownloadDialog : public KDialogBase
 
     ProviderLoader *m_loader;
     TQString m_entryname;
-    KListView *lv_r, *lv_d, *lv_l;
+    TDEListView *lv_r, *lv_d, *lv_l;
     TQTextBrowser *m_rt;
     TQFrame *m_frame;
     TQListViewItem *m_entryitem;
@@ -220,7 +220,7 @@ class KDE_EXPORT DownloadDialog : public KDialogBase
     Entry *m_entry;
     KNewStuffGeneric *m_s;
     int m_curtab;
-    TQMap<TQWidget*, TQValueList<KListView*>* > m_map;
+    TQMap<TQWidget*, TQValueList<TDEListView*>* > m_map;
     TQMap<TQWidget*, Provider*> m_providers;
     TQMap<TQWidget*, TQTextBrowser*> m_rts;
     TQMap<TQWidget*, TQValueList<TQPushButton*>* > m_buttons;
diff --git a/lib/compatibility/knewstuff/knewstuff.cpp b/lib/compatibility/knewstuff/knewstuff.cpp
index 6bfbb333..d36a1ef1 100644
--- a/lib/compatibility/knewstuff/knewstuff.cpp
+++ b/lib/compatibility/knewstuff/knewstuff.cpp
@@ -30,12 +30,12 @@
 
 using namespace KNS;
 
-KAction* KNS::standardAction(const TQString& what,
+TDEAction* KNS::standardAction(const TQString& what,
                              const TQObject *recvr,
-                             const char *slot, KActionCollection* parent,
+                             const char *slot, TDEActionCollection* parent,
                              const char *name)
 {
-    return new KAction(i18n("Download New %1").arg(what), "knewstuff",
+    return new TDEAction(i18n("Download New %1").arg(what), "knewstuff",
                        0, recvr, slot, parent, name);
 }
 
diff --git a/lib/compatibility/knewstuff/knewstuff.h b/lib/compatibility/knewstuff/knewstuff.h
index 455063a3..1e4f65c7 100644
--- a/lib/compatibility/knewstuff/knewstuff.h
+++ b/lib/compatibility/knewstuff/knewstuff.h
@@ -26,17 +26,17 @@
 
 class TQObject;
 class TQWidget;
-class KAction;
-class KActionCollection;
+class TDEAction;
+class TDEActionCollection;
 
 namespace KNS {
 class Engine;
 class Entry;
 
-KAction* standardAction(const TQString& what,
+TDEAction* standardAction(const TQString& what,
                         const TQObject *recvr,
                         const char *slot,
-                        KActionCollection* parent,
+                        TDEActionCollection* parent,
                         const char *name = 0);
 }
 
diff --git a/lib/compatibility/knewstuff/providerdialog.cpp b/lib/compatibility/knewstuff/providerdialog.cpp
index a6625870..23aa9438 100644
--- a/lib/compatibility/knewstuff/providerdialog.cpp
+++ b/lib/compatibility/knewstuff/providerdialog.cpp
@@ -34,11 +34,11 @@
 
 using namespace KNS;
 
-class ProviderItem : public KListViewItem
+class ProviderItem : public TDEListViewItem
 {
   public:
-    ProviderItem( KListView *parent, Provider *provider ) :
-      KListViewItem( parent ), mProvider( provider )
+    ProviderItem( TDEListView *parent, Provider *provider ) :
+      TDEListViewItem( parent ), mProvider( provider )
     {
       setText( 0, provider->name() );
     }
@@ -61,7 +61,7 @@ ProviderDialog::ProviderDialog( Engine *engine, TQWidget *parent ) :
   TQLabel *description = new TQLabel( i18n("Please select one of the providers listed below:"), topPage );
   topLayout->addWidget( description );
 
-  mListView = new KListView( topPage );
+  mListView = new TDEListView( topPage );
   mListView->addColumn( i18n("Name") );
   topLayout->addWidget( mListView );
 }
diff --git a/lib/compatibility/knewstuff/providerdialog.h b/lib/compatibility/knewstuff/providerdialog.h
index a17ddac3..c9002bb8 100644
--- a/lib/compatibility/knewstuff/providerdialog.h
+++ b/lib/compatibility/knewstuff/providerdialog.h
@@ -22,7 +22,7 @@
 
 #include <kdialogbase.h>
 
-class KListView;
+class TDEListView;
 
 namespace KNS {
 
@@ -69,7 +69,7 @@ class ProviderDialog : public KDialogBase
   private:
     Engine *mEngine;
 
-    KListView *mListView;
+    TDEListView *mListView;
 };
 
 }
diff --git a/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp b/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp
index b0f12173..64f5848f 100644
--- a/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp
@@ -91,7 +91,7 @@ static const char* const not_close_xpm[]={
 "#####"};
 
 /**
- * A special kind of KMainWindow that is able to have dockwidget child widgets.
+ * A special kind of TDEMainWindow that is able to have dockwidget child widgets.
  *
  * The main widget should be a dockwidget where other dockwidgets can be docked to
  * the left, right, top, bottom or to the middle.
@@ -100,7 +100,7 @@ static const char* const not_close_xpm[]={
  * @author Max Judin.
 */
 KDockMainWindow::KDockMainWindow( TQWidget* parent, const char *name, WFlags f)
-:KMainWindow( parent, name, f )
+:TDEMainWindow( parent, name, f )
 {
   TQString new_name = TQString(name) + TQString("_DockManager");
   dockManager = new KDockManager( this, new_name.latin1() );
@@ -126,7 +126,7 @@ void KDockMainWindow::setView( TQWidget *view )
   }
 
 #ifndef NO_KDE2
-  KMainWindow::setCentralWidget(view);
+  TDEMainWindow::setCentralWidget(view);
 #else
   TQMainWindow::setCentralWidget(view);
 #endif
@@ -1634,7 +1634,7 @@ KDockManager::KDockManager( TQWidget* mainWindow , const char* name )
   menuData->setAutoDelete( true );
 
 #ifndef NO_KDE2
-  menu = new KPopupMenu();
+  menu = new TDEPopupMenu();
 #else
   menu = new TQPopupMenu();
 #endif
@@ -3264,10 +3264,10 @@ void KDockManager::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
 void KDockMainWindow::virtual_hook( int id, void* data )
-{ KMainWindow::virtual_hook( id, data ); }
+{ TDEMainWindow::virtual_hook( id, data ); }
 
 void KDockArea::virtual_hook( int, void* )
-{ /*KMainWindow::virtual_hook( id, data );*/ }
+{ /*TDEMainWindow::virtual_hook( id, data );*/ }
 
 
 #ifndef NO_INCLUDE_MOCFILES // for TQt-only projects, because tmake doesn't take this name
diff --git a/lib/compatibility/tdemdi/qextmdi/kdockwidget.h b/lib/compatibility/tdemdi/qextmdi/kdockwidget.h
index 5b355867..69e5f7dc 100644
--- a/lib/compatibility/tdemdi/qextmdi/kdockwidget.h
+++ b/lib/compatibility/tdemdi/qextmdi/kdockwidget.h
@@ -36,7 +36,7 @@
    - KDockTabGroup                 - minor helper class
    - KDockWidget                   - IMPORTANT CLASS: the one and only dockwidget class
    - KDockManager                  - helper class
-   - KDockMainWindow               - IMPORTANT CLASS: a special KMainWindow that can have dockwidgets
+   - KDockMainWindow               - IMPORTANT CLASS: a special TDEMainWindow that can have dockwidgets
    - KDockArea                     - like KDockMainWindow but inherits just TQWidget
 
    IMPORTANT Note: This file compiles also in TQt-only mode by using the NO_KDE2 precompiler definition!
@@ -82,7 +82,7 @@ class TQHBoxLayout;
 class TQPixmap;
 
 #ifndef NO_KDE2
-class KToolBar;
+class TDEToolBar;
 class TDEConfig;
 #else
 class TQToolBar;
@@ -1264,7 +1264,7 @@ private:
 };
 
 /**
- * A special kind of KMainWindow that is able to have dockwidget child widgets (and member of the dockwidget class set).
+ * A special kind of TDEMainWindow that is able to have dockwidget child widgets (and member of the dockwidget class set).
  *
  * The main widget should be a KDockWidget where other KDockWidget can be docked to
  * the left, right, top, bottom or to the middle.
@@ -1306,7 +1306,7 @@ private:
  *
  * @author Max Judin (documentation: Falk Brettschneider).
  */
-class TDEUI_EXPORT KDockMainWindow : public KMainWindow
+class TDEUI_EXPORT KDockMainWindow : public TDEMainWindow
 {
   Q_OBJECT
   
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.h b/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.h
index 4678f0f8..abf853be 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.h
@@ -13,7 +13,7 @@
 #include <ktabwidget.h>
 #include <tdemdidefines.h>
 
-class KPopupMenu;
+class TDEPopupMenu;
 
 //KDE4: Add a d pointer
 /**
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp
index bef9fb12..4c9930be 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp
@@ -57,9 +57,9 @@ using namespace KMDIPrivate;
 
 
 
-ToggleToolViewAction::ToggleToolViewAction( const TQString& text, const KShortcut& cut, KDockWidget *dw, KMdiMainFrm *mdiMainFrm,
+ToggleToolViewAction::ToggleToolViewAction( const TQString& text, const TDEShortcut& cut, KDockWidget *dw, KMdiMainFrm *mdiMainFrm,
         TQObject* parent, const char* name )
-		: KToggleAction( text, cut, parent, name ), m_dw( dw ), m_mdiMainFrm( mdiMainFrm )
+		: TDEToggleAction( text, cut, parent, name ), m_dw( dw ), m_mdiMainFrm( mdiMainFrm )
 {
 	if ( m_dw )
 	{
@@ -136,10 +136,10 @@ KMDIGUIClient::KMDIGUIClient( KMdiMainFrm* mdiMainFrm, bool showMDIModeAction, c
 
 	if ( actionCollection() ->kaccel() == 0 )
 		actionCollection() ->setWidget( mdiMainFrm );
-	m_toolMenu = new KActionMenu( i18n( "Tool &Views" ), actionCollection(), "tdemdi_toolview_menu" );
+	m_toolMenu = new TDEActionMenu( i18n( "Tool &Views" ), actionCollection(), "tdemdi_toolview_menu" );
 	if ( showMDIModeAction )
 	{
-		m_mdiModeAction = new KSelectAction( i18n( "MDI Mode" ), 0, actionCollection() );
+		m_mdiModeAction = new TDESelectAction( i18n( "MDI Mode" ), 0, actionCollection() );
 		TQStringList modes;
 		modes << i18n( "&Toplevel Mode" ) << i18n( "C&hildframe Mode" ) << i18n( "Ta&b Page Mode" ) << i18n( "I&DEAl Mode" );
 		m_mdiModeAction->setItems( modes );
@@ -151,19 +151,19 @@ KMDIGUIClient::KMDIGUIClient( KMdiMainFrm* mdiMainFrm, bool showMDIModeAction, c
 	connect( m_mdiMainFrm, TQT_SIGNAL( mdiModeHasBeenChangedTo( KMdi::MdiMode ) ),
 	         this, TQT_SLOT( mdiModeHasBeenChangedTo( KMdi::MdiMode ) ) );
 
-	m_gotoToolDockMenu = new KActionMenu( i18n( "Tool &Docks" ), actionCollection(), "tdemdi_tooldock_menu" );
-	m_gotoToolDockMenu->insert( new KAction( i18n( "Switch Top Dock" ), ALT + CTRL + SHIFT + Key_T, TQT_TQOBJECT(this), TQT_SIGNAL( toggleTop() ),
+	m_gotoToolDockMenu = new TDEActionMenu( i18n( "Tool &Docks" ), actionCollection(), "tdemdi_tooldock_menu" );
+	m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Top Dock" ), ALT + CTRL + SHIFT + Key_T, TQT_TQOBJECT(this), TQT_SIGNAL( toggleTop() ),
 	                            actionCollection(), "tdemdi_activate_top" ) );
-	m_gotoToolDockMenu->insert( new KAction( i18n( "Switch Left Dock" ), ALT + CTRL + SHIFT + Key_L, TQT_TQOBJECT(this), TQT_SIGNAL( toggleLeft() ),
+	m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Left Dock" ), ALT + CTRL + SHIFT + Key_L, TQT_TQOBJECT(this), TQT_SIGNAL( toggleLeft() ),
 	                            actionCollection(), "tdemdi_activate_left" ) );
-	m_gotoToolDockMenu->insert( new KAction( i18n( "Switch Right Dock" ), ALT + CTRL + SHIFT + Key_R, TQT_TQOBJECT(this), TQT_SIGNAL( toggleRight() ),
+	m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Right Dock" ), ALT + CTRL + SHIFT + Key_R, TQT_TQOBJECT(this), TQT_SIGNAL( toggleRight() ),
 	                            actionCollection(), "tdemdi_activate_right" ) );
-	m_gotoToolDockMenu->insert( new KAction( i18n( "Switch Bottom Dock" ), ALT + CTRL + SHIFT + Key_B, TQT_TQOBJECT(this), TQT_SIGNAL( toggleBottom() ),
+	m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Bottom Dock" ), ALT + CTRL + SHIFT + Key_B, TQT_TQOBJECT(this), TQT_SIGNAL( toggleBottom() ),
 	                            actionCollection(), "tdemdi_activate_bottom" ) );
-	m_gotoToolDockMenu->insert( new KActionSeparator( actionCollection(), "tdemdi_goto_menu_separator" ) );
-	m_gotoToolDockMenu->insert( new KAction( i18n( "Previous Tool View" ), ALT + CTRL + Key_Left, TQT_TQOBJECT(m_mdiMainFrm), TQT_SLOT( prevToolViewInDock() ),
+	m_gotoToolDockMenu->insert( new TDEActionSeparator( actionCollection(), "tdemdi_goto_menu_separator" ) );
+	m_gotoToolDockMenu->insert( new TDEAction( i18n( "Previous Tool View" ), ALT + CTRL + Key_Left, TQT_TQOBJECT(m_mdiMainFrm), TQT_SLOT( prevToolViewInDock() ),
 	                            actionCollection(), "tdemdi_prev_toolview" ) );
-	m_gotoToolDockMenu->insert( new KAction( i18n( "Next Tool View" ), ALT + CTRL + Key_Right, TQT_TQOBJECT(m_mdiMainFrm), TQT_SLOT( nextToolViewInDock() ),
+	m_gotoToolDockMenu->insert( new TDEAction( i18n( "Next Tool View" ), ALT + CTRL + Key_Right, TQT_TQOBJECT(m_mdiMainFrm), TQT_SLOT( nextToolViewInDock() ),
 	                            actionCollection(), "tdemdi_next_toolview" ) );
 
 	actionCollection() ->readShortcutSettings( "Shortcuts", kapp->config() );
@@ -224,10 +224,10 @@ void KMDIGUIClient::setupActions()
 
 	//    m_toolBars = builder.toolBars();
 
-	//    m_toolViewActions.append(new KAction( "TESTKMDIGUICLIENT", TQString(), 0,
+	//    m_toolViewActions.append(new TDEAction( "TESTKMDIGUICLIENT", TQString(), 0,
 	//             this, TQT_SLOT(blah()),actionCollection(),"nothing"));
 
-	TQPtrList<KAction> addList;
+	TQPtrList<TDEAction> addList;
 	if ( m_toolViewActions.count() < 3 )
 		for ( uint i = 0;i < m_toolViewActions.count();i++ )
 			addList.append( m_toolViewActions.at( i ) );
@@ -250,14 +250,14 @@ void KMDIGUIClient::addToolView( KMdiToolViewAccessor* mtva )
 	TQString aname = TQString( "tdemdi_toolview_" ) + mtva->wrappedWidget() ->name();
 
 	// try to read the action shortcut
-	KShortcut sc;
+	TDEShortcut sc;
 	TDEConfig *cfg = kapp->config();
 	TQString _grp = cfg->group();
 	cfg->setGroup( "Shortcuts" );
 	// 	if ( cfg->hasKey( aname ) )
-	sc = KShortcut( cfg->readEntry( aname, "" ) );
+	sc = TDEShortcut( cfg->readEntry( aname, "" ) );
 	cfg->setGroup( _grp );
-	KAction *a = new ToggleToolViewAction( i18n( "Show %1" ).arg( mtva->wrappedWidget() ->caption() ),
+	TDEAction *a = new ToggleToolViewAction( i18n( "Show %1" ).arg( mtva->wrappedWidget() ->caption() ),
 	                                       /*TQString()*/sc, dynamic_cast<KDockWidget*>( mtva->wrapperWidget() ),
 	                                       m_mdiMainFrm, actionCollection(), aname.latin1() );
 #if KDE_IS_VERSION(3,2,90)
@@ -275,8 +275,8 @@ void KMDIGUIClient::addToolView( KMdiToolViewAccessor* mtva )
 
 void KMDIGUIClient::actionDeleted( TQObject* a )
 {
-	m_toolViewActions.remove( static_cast<KAction*>( a ) );
-	/*	if (!m_toolMenu.isNull()) m_toolMenu->remove(static_cast<KAction*>(a));*/
+	m_toolViewActions.remove( static_cast<TDEAction*>( a ) );
+	/*	if (!m_toolMenu.isNull()) m_toolMenu->remove(static_cast<TDEAction*>(a));*/
 	setupActions();
 }
 
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.h b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.h
index 46cc8ad2..98c606ce 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.h
@@ -25,8 +25,8 @@
 #include <kaction.h>
 #include "tdemdidefines.h"
 
-class KMainWindow;
-class KToolBar;
+class TDEMainWindow;
+class TDEToolBar;
 class KMdiToolViewAccessor;
 class KMdiMainFrm;
 class KDockWidget;
@@ -105,27 +105,27 @@ private:
 	KMdi::MdiMode m_mdiMode;
 
 	TQGuardedPtr<KMdiMainFrm> m_mdiMainFrm;
-	TQPtrList<KAction> m_toolViewActions;
-	TQPtrList<KAction> m_documentViewActions;
+	TQPtrList<TDEAction> m_toolViewActions;
+	TQPtrList<TDEAction> m_documentViewActions;
 
-	KActionMenu *m_docMenu;
-	KActionMenu *m_toolMenu;
-	KSelectAction *m_mdiModeAction;
+	TDEActionMenu *m_docMenu;
+	TDEActionMenu *m_toolMenu;
+	TDESelectAction *m_mdiModeAction;
 
-	KActionMenu *m_gotoToolDockMenu;
+	TDEActionMenu *m_gotoToolDockMenu;
 };
 
 /**
- * A KToggleAction specifically for toggling the showing
+ * A TDEToggleAction specifically for toggling the showing
  * or the hiding of a KMDI tool view
  */
-class KMDI_EXPORT ToggleToolViewAction: public KToggleAction
+class KMDI_EXPORT ToggleToolViewAction: public TDEToggleAction
 {
 	Q_OBJECT
   
 public:
 
-	ToggleToolViewAction( const TQString& text, const KShortcut& cut = KShortcut(), KDockWidget *dw = 0, KMdiMainFrm *mdiMainFrm = 0,
+	ToggleToolViewAction( const TQString& text, const TDEShortcut& cut = TDEShortcut(), KDockWidget *dw = 0, KMdiMainFrm *mdiMainFrm = 0,
 	                      TQObject* parent = 0, const char* name = 0 );
 
 	virtual ~ToggleToolViewAction();
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp
index de17b7f1..1aa659a5 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp
@@ -131,7 +131,7 @@ public:
 	KMdiFocusList *focusList;
 	int m_styleIDEAlMode;
 	int m_toolviewStyle;
-	KAction *closeWindowAction;
+	TDEAction *closeWindowAction;
 };
 
 //============ constructor ============//
@@ -216,7 +216,7 @@ KMdiMainFrm::KMdiMainFrm( TQWidget* parentWidget, const char* name, KMdi::MdiMod
 
 	m_pPlacingMenu = new TQPopupMenu( this, "placing_menu" );
 
-	d->closeWindowAction = new KAction(i18n("&Close"),
+	d->closeWindowAction = new TDEAction(i18n("&Close"),
 #ifdef TQ_WS_WIN
 		CTRL|Key_F4,
 #else
@@ -1200,10 +1200,10 @@ bool KMdiMainFrm::eventFilter( TQObject * /*obj*/, TQEvent *e )
 	{
 		if ( switching() )
 		{
-			KAction * a = actionCollection() ->action( "view_last_window" ) ;
+			TDEAction * a = actionCollection() ->action( "view_last_window" ) ;
 			if ( a )
 			{
-				const KShortcut cut( a->shortcut() );
+				const TDEShortcut cut( a->shortcut() );
 				const KKeySequence& seq = cut.seq( 0 );
 				const KKey& key = seq.key( 0 );
 				int modFlags = key.modFlags();
@@ -1226,7 +1226,7 @@ bool KMdiMainFrm::eventFilter( TQObject * /*obj*/, TQEvent *e )
 			}
 			else
 			{
-				kdDebug(760) << "KAction( \"view_last_window\") not found." << endl;
+				kdDebug(760) << "TDEAction( \"view_last_window\") not found." << endl;
 			}
 		}
 	}
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.cpp b/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.cpp
index 3c61dab2..6de04e4c 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.cpp
@@ -141,7 +141,7 @@ TQString KMdiTaskBarButton::actualText() const
 //####################################################################
 
 KMdiTaskBar::KMdiTaskBar( KMdiMainFrm *parent, TQMainWindow::ToolBarDock dock )
-		: KToolBar( parent, "KMdiTaskBar",  /*honor_style*/ false,  /*readConfig*/ true )
+		: TDEToolBar( parent, "KMdiTaskBar",  /*honor_style*/ false,  /*readConfig*/ true )
 		, m_pCurrentFocusedWindow( 0 )
 		, m_pStretchSpace( 0 )
 		, m_layoutIsPending( false )
@@ -384,7 +384,7 @@ void KMdiTaskBar::resizeEvent( TQResizeEvent* rse )
 			layoutTaskBar( rse->size().width() );
 		}
 	}
-	KToolBar::resizeEvent( rse );
+	TDEToolBar::resizeEvent( rse );
 }
 
 // kate: space-indent off; tab-width 4; replace-tabs off; indent-mode csands;
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.h b/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.h
index 50b77d9b..9d0267bb 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.h
@@ -127,7 +127,7 @@ class KMdiTaskBarPrivate;
  * KMdiTaskBarButtons can be added or removed dynamically.<br>
  * The button sizes are adjusted dynamically, as well.
  */
-class KMDI_EXPORT KMdiTaskBar : public KToolBar
+class KMDI_EXPORT KMdiTaskBar : public TDEToolBar
 {
 	Q_OBJECT
   
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor_p.h b/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor_p.h
index 81e770e8..c3812792 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor_p.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor_p.h
@@ -42,7 +42,7 @@ public:
 	}
 	TQGuardedPtr<KDockWidget> widgetContainer;
 	TQWidget* widget;
-	TQGuardedPtr<KAction> action;
+	TQGuardedPtr<TDEAction> action;
 };
 
 
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemultitabbar.cpp b/lib/compatibility/tdemdi/qextmdi/tdemultitabbar.cpp
index 511e50a0..131a252e 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemultitabbar.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemultitabbar.cpp
@@ -871,7 +871,7 @@ KMultiTabBar::~KMultiTabBar() {
 
 /*int KMultiTabBar::insertButton(TQPixmap pic,int id ,const TQString&)
 {
-  (new KToolbarButton(pic,id,m_internal))->show();
+  (new TDEToolbarButton(pic,id,m_internal))->show();
   return 0;
 }*/
 
diff --git a/lib/ksavealldialog.cpp b/lib/ksavealldialog.cpp
index 3cb238a4..53b9d344 100644
--- a/lib/ksavealldialog.cpp
+++ b/lib/ksavealldialog.cpp
@@ -57,7 +57,7 @@ KSaveSelectDialog::KSaveSelectDialog( KURL::List const & filelist, KURL::List co
 
   (void)new TQLabel( i18n("The following files have been modified. Save them?"), top );
 
-	_listview = new KListView( top );
+	_listview = new TDEListView( top );
 	_listview->addColumn( "" );
 	_listview->header()->hide();
 	_listview->setResizeMode( TQListView::LastColumn );
@@ -149,7 +149,7 @@ KSaveAllDialog::KSaveAllDialog( const TQStringList& filenames, TQWidget* parent
   TQVBox *top = makeVBoxMainWidget();
 
   (void)new TQLabel( i18n("The following files have been modified. Save them?"), top );
-  KListBox* lb = new KListBox( top );
+  TDEListBox* lb = new TDEListBox( top );
   lb->setMinimumHeight( lb->fontMetrics().height() * 5 );
   lb->insertStringList( filenames );
 
diff --git a/lib/ksavealldialog.h b/lib/ksavealldialog.h
index a122b11a..d7b989c5 100644
--- a/lib/ksavealldialog.h
+++ b/lib/ksavealldialog.h
@@ -24,7 +24,7 @@
 #include <kdialogbase.h>
 #include <kurl.h>
 
-class KListView;
+class TDEListView;
 /**
 @file ksavealldialog.h
 Dialogs to save multiple files.
@@ -51,7 +51,7 @@ private slots:
 	void cancel();
 	
 private:
-	KListView * _listview;
+	TDEListView * _listview;
 
 };
 
diff --git a/quanta/DESIGN b/quanta/DESIGN
index 892c2c8b..6d367c18 100644
--- a/quanta/DESIGN
+++ b/quanta/DESIGN
@@ -150,11 +150,11 @@ QConfig: holds the Quanta configuration settings.
 QuantaToolBar/ToolbarTabWidget/ToolbarXMLGUI: classes needed to make the

               user toolbars work.

 

-TagAction: an extended KAction, which can be modified in Quanta. May be of three

+TagAction: an extended TDEAction, which can be modified in Quanta. May be of three

                 types: Tag, Script, Text. Script actions can be executed in synchronous

                 (execute) or async. mode (insertTag). TagActions are usually put on the

                 user toolbars and under Tags menu, but they can be plugged anywhere

-                just like the normal KActions.

+                just like the normal TDEActions.

 

 

 4. treeviews directory

diff --git a/quanta/components/csseditor/colorrequester.cpp b/quanta/components/csseditor/colorrequester.cpp
index be7aba50..004f4c74 100644
--- a/quanta/components/csseditor/colorrequester.cpp
+++ b/quanta/components/csseditor/colorrequester.cpp
@@ -71,8 +71,8 @@ void colorRequester::init()
      connect( myButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( openColorDialog() ));
      connect( d->edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( setInitialValue(/*const TQString&*/ ) ));
 
-     KAccel *accel = new KAccel( this );
-     accel->insert( KStdAccel::Open, TQT_TQOBJECT(this), TQT_SLOT( openColorDialog() ));
+     TDEAccel *accel = new TDEAccel( this );
+     accel->insert( TDEStdAccel::Open, TQT_TQOBJECT(this), TQT_SLOT( openColorDialog() ));
      accel->readSettings();
  }
 
diff --git a/quanta/components/cvsservice/cvscommitdlgs.ui b/quanta/components/cvsservice/cvscommitdlgs.ui
index ad33e4f4..6f79a85e 100644
--- a/quanta/components/cvsservice/cvscommitdlgs.ui
+++ b/quanta/components/cvsservice/cvscommitdlgs.ui
@@ -28,7 +28,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="KListBox" row="1" column="0" rowspan="1" colspan="4">
+        <widget class="TDEListBox" row="1" column="0" rowspan="1" colspan="4">
             <property name="name">
                 <cstring>fileList</cstring>
             </property>
diff --git a/quanta/components/cvsservice/cvsservice.cpp b/quanta/components/cvsservice/cvsservice.cpp
index 58f7d667..e423a221 100644
--- a/quanta/components/cvsservice/cvsservice.cpp
+++ b/quanta/components/cvsservice/cvsservice.cpp
@@ -44,33 +44,33 @@
 
 #define CVSSERVICE_TIMEOUT 1000*60
 
-CVSService::CVSService(KActionCollection *ac)
+CVSService::CVSService(TDEActionCollection *ac)
 {
-  m_menu = new KPopupMenu();
-  KAction *action = new KAction(i18n("&Commit..."), "vcs_commit", 0, this, TQT_SLOT(slotCommit()), ac, "vcs_commit");
+  m_menu = new TDEPopupMenu();
+  TDEAction *action = new TDEAction(i18n("&Commit..."), "vcs_commit", 0, this, TQT_SLOT(slotCommit()), ac, "vcs_commit");
   action->plug(m_menu);
-  action = new KAction(i18n("&Update"), "vcs_update", 0, this, TQT_SLOT(slotUpdate()), ac, "vcs_update");
+  action = new TDEAction(i18n("&Update"), "vcs_update", 0, this, TQT_SLOT(slotUpdate()), ac, "vcs_update");
   action->plug(m_menu);
-  KPopupMenu *updateToMenu = new KPopupMenu(m_menu);
+  TDEPopupMenu *updateToMenu = new TDEPopupMenu(m_menu);
   m_menu->insertItem(SmallIconSet("vcs_update"), i18n("Update &To"), updateToMenu);
-  action = new KAction(i18n("&Tag/Date..."), "vcs_update", 0, this, TQT_SLOT(slotUpdateToTag()), ac, "vcs_update_tag_date");
+  action = new TDEAction(i18n("&Tag/Date..."), "vcs_update", 0, this, TQT_SLOT(slotUpdateToTag()), ac, "vcs_update_tag_date");
   action->plug(updateToMenu);
-  action = new KAction(i18n("&HEAD"), "vcs_update", 0, this, TQT_SLOT(slotUpdateToHead()), ac, "vcs_update_head");
+  action = new TDEAction(i18n("&HEAD"), "vcs_update", 0, this, TQT_SLOT(slotUpdateToHead()), ac, "vcs_update_head");
   action->plug(updateToMenu);
-  action = new KAction(i18n("Re&vert"), "reload", 0, this, TQT_SLOT(slotRevert()), ac, "vcs_revert");
+  action = new TDEAction(i18n("Re&vert"), "reload", 0, this, TQT_SLOT(slotRevert()), ac, "vcs_revert");
   action->plug(m_menu);
   m_menu->insertSeparator();
-  action = new KAction(i18n("&Add to Repository..."), "vcs_add", 0, this, TQT_SLOT(slotAdd()), ac, "vcs_add");
+  action = new TDEAction(i18n("&Add to Repository..."), "vcs_add", 0, this, TQT_SLOT(slotAdd()), ac, "vcs_add");
   action->plug(m_menu);
-  action = new KAction(i18n("&Remove From Repository..."), "vcs_remove", 0, this, TQT_SLOT(slotRemove()), ac, "vcs_remove");
+  action = new TDEAction(i18n("&Remove From Repository..."), "vcs_remove", 0, this, TQT_SLOT(slotRemove()), ac, "vcs_remove");
   action->plug(m_menu);
-  action = new KAction(i18n("&Ignore in CVS Operations"), 0, this, TQT_SLOT(slotAddToCVSIgnore()), ac);
+  action = new TDEAction(i18n("&Ignore in CVS Operations"), 0, this, TQT_SLOT(slotAddToCVSIgnore()), ac);
   action->plug(m_menu);
-  action = new KAction(i18n("Do &Not Ignore in CVS Operations"), 0, this, TQT_SLOT(slotRemoveFromCVSIgnore()), ac);
+  action = new TDEAction(i18n("Do &Not Ignore in CVS Operations"), 0, this, TQT_SLOT(slotRemoveFromCVSIgnore()), ac);
   action->plug(m_menu);
   
   m_menu->insertSeparator();
-  action = new KAction(i18n("Show &Log Messages"), 0, this, TQT_SLOT(slotBrowseLog()), ac);
+  action = new TDEAction(i18n("Show &Log Messages"), 0, this, TQT_SLOT(slotBrowseLog()), ac);
   action->plug(m_menu);
     
   m_cvsJob = 0L;
diff --git a/quanta/components/cvsservice/cvsservice.h b/quanta/components/cvsservice/cvsservice.h
index 4ff92cbe..5c12d91a 100644
--- a/quanta/components/cvsservice/cvsservice.h
+++ b/quanta/components/cvsservice/cvsservice.h
@@ -26,8 +26,8 @@
 #include "cvsservicedcopif.h"
 
 class TQTimer;
-class KPopupMenu;
-class KActionCollection;
+class TDEPopupMenu;
+class TDEActionCollection;
 class CvsJob_stub;
 class CvsService_stub;
 class Repository_stub;
@@ -49,7 +49,7 @@ public:
    *  since this class is a singleton you must use this function to access it
    *  @return the class pointer
    */
-  static CVSService* ref(KActionCollection *ac = 0L)
+  static CVSService* ref(TDEActionCollection *ac = 0L)
   {
     static CVSService *m_ref;
     if (!m_ref) m_ref = new CVSService(ac);
@@ -63,7 +63,7 @@ public:
   bool exists() {return !m_appId.isEmpty();}
   void setRepository(const TQString &repository);
   void setCurrentFile(const TQString &file) {m_defaultFile = file;}
-  KPopupMenu *menu() {return m_menu;}
+  TDEPopupMenu *menu() {return m_menu;}
 
 public slots:
   void slotUpdate();
@@ -97,12 +97,12 @@ private slots:
   void slotTimeout();
   
 private:
-  CVSService(KActionCollection *ac);
+  CVSService(TDEActionCollection *ac);
   void notInRepository();
   void startService();
 
   TQCString m_appId;
-  KPopupMenu *m_menu;
+  TDEPopupMenu *m_menu;
   Repository_stub *m_repository;
   CvsJob_stub *m_cvsJob;
   CvsService_stub *m_cvsService;
diff --git a/quanta/components/debugger/backtracelistview.cpp b/quanta/components/debugger/backtracelistview.cpp
index cd3b3e35..a5925c26 100644
--- a/quanta/components/debugger/backtracelistview.cpp
+++ b/quanta/components/debugger/backtracelistview.cpp
@@ -44,13 +44,13 @@ namespace BacktraceListviewColumns
 }
 
 BacktraceListviewItem::BacktraceListviewItem(BacktraceListview* view)
-  : KListViewItem(view)
+  : TDEListViewItem(view)
 {
 }
 
 
 BacktraceListview::BacktraceListview(TQWidget *parent, const char *name)
-  : KListView(parent, name)
+  : TDEListView(parent, name)
 {
   int charwidth = this->fontMetrics().width("0");
   // If you change the order here, change the BacktraceListviewColumns enums above
@@ -103,7 +103,7 @@ void BacktraceListview::keyPressEvent(TQKeyEvent *e)
 
 void BacktraceListview::clear()
 {
-  KListView::clear();
+  TDEListView::clear();
 }
 
 void BacktraceListview::slotBacktraceDoubleClick(TQListViewItem *item, const TQPoint &, int )
diff --git a/quanta/components/debugger/backtracelistview.h b/quanta/components/debugger/backtracelistview.h
index 0661af1a..4203cf70 100644
--- a/quanta/components/debugger/backtracelistview.h
+++ b/quanta/components/debugger/backtracelistview.h
@@ -33,7 +33,7 @@ enum BacktraceType
 };
 
 
-class BacktraceListviewItem : public KListViewItem
+class BacktraceListviewItem : public TDEListViewItem
 {
   private:
     BacktraceType m_type;
@@ -68,7 +68,7 @@ class BacktraceListviewItem : public KListViewItem
 
 };
 
-class BacktraceListview : public KListView
+class BacktraceListview : public TDEListView
 {
   Q_OBJECT
   
diff --git a/quanta/components/debugger/debuggerbreakpointview.cpp b/quanta/components/debugger/debuggerbreakpointview.cpp
index d490478d..c1074e9d 100644
--- a/quanta/components/debugger/debuggerbreakpointview.cpp
+++ b/quanta/components/debugger/debuggerbreakpointview.cpp
@@ -47,13 +47,13 @@ namespace DebuggerBreakpointViewColumns
 }
 
 DebuggerBreakpointViewItem::DebuggerBreakpointViewItem(DebuggerBreakpointView* view)
-   : KListViewItem(view)
+   : TDEListViewItem(view)
 {
 }
 
 
 DebuggerBreakpointView::DebuggerBreakpointView(TQWidget *parent, const char *name)
-    : KListView(parent, name)
+    : TDEListView(parent, name)
 {
   // If you change here, change the DebuggerBreakpointViewColumns enums above
   addColumn(i18n("Expression"));
@@ -66,10 +66,10 @@ DebuggerBreakpointView::DebuggerBreakpointView(TQWidget *parent, const char *nam
   setResizeMode(TQListView::AllColumns);
   setAllColumnsShowFocus(true);
 
-  m_breakpointPopup = new KPopupMenu(this);
+  m_breakpointPopup = new TDEPopupMenu(this);
   m_breakpointPopup->insertItem(SmallIcon("editdelete"), i18n("&Remove"), this, TQT_SLOT(slotRemoveSelected()));
 
-  connect(this, TQT_SIGNAL( contextMenu( KListView *, TQListViewItem *, const TQPoint & ) ), this, TQT_SLOT(slotBreakpointContextMenu(KListView *, TQListViewItem *, const TQPoint &)));
+  connect(this, TQT_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), this, TQT_SLOT(slotBreakpointContextMenu(TDEListView *, TQListViewItem *, const TQPoint &)));
 
   // Jump to bp
   connect(this, TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int) ), this, TQT_SLOT(slotBreakpointDoubleClick( TQListViewItem *, const TQPoint &, int)));
@@ -165,7 +165,7 @@ void DebuggerBreakpointView::keyPressEvent(TQKeyEvent *e)
 
 void DebuggerBreakpointView::clear()
 {
-  KListView::clear();
+  TDEListView::clear();
 }
 
 void DebuggerBreakpointView::slotBreakpointDoubleClick(TQListViewItem *item, const TQPoint &, int )
@@ -182,7 +182,7 @@ void DebuggerBreakpointView::slotBreakpointDoubleClick(TQListViewItem *item, con
 
 }
 
-void DebuggerBreakpointView::slotBreakpointContextMenu(KListView *, TQListViewItem *, const TQPoint& point)
+void DebuggerBreakpointView::slotBreakpointContextMenu(TDEListView *, TQListViewItem *, const TQPoint& point)
 {
   if(!selectedItem())
     return;
diff --git a/quanta/components/debugger/debuggerbreakpointview.h b/quanta/components/debugger/debuggerbreakpointview.h
index 9724cec5..e6abcfcd 100644
--- a/quanta/components/debugger/debuggerbreakpointview.h
+++ b/quanta/components/debugger/debuggerbreakpointview.h
@@ -27,7 +27,7 @@
 // class DebuggerBreakpoint;
 class DebuggerBreakpointView;
 
-class DebuggerBreakpointViewItem : public KListViewItem
+class DebuggerBreakpointViewItem : public TDEListViewItem
 {
   private:
     DebuggerBreakpoint m_breakpoint;
@@ -41,7 +41,7 @@ class DebuggerBreakpointViewItem : public KListViewItem
 
 };
 
-class DebuggerBreakpointView : public KListView
+class DebuggerBreakpointView : public TDEListView
 {
   Q_OBJECT
   
@@ -59,7 +59,7 @@ class DebuggerBreakpointView : public KListView
 
   public slots:
     void slotRemoveSelected();
-    void slotBreakpointContextMenu(KListView *list, TQListViewItem * item, const TQPoint& point);
+    void slotBreakpointContextMenu(TDEListView *list, TQListViewItem * item, const TQPoint& point);
     void slotBreakpointDoubleClick(TQListViewItem *item, const TQPoint &point, int column);
 
   signals:
@@ -69,7 +69,7 @@ class DebuggerBreakpointView : public KListView
     void keyPressEvent(TQKeyEvent *e);
     TQListViewItem* findBreakpoint(const DebuggerBreakpoint& bp, bool addIfNotExist = true);
 
-    KPopupMenu *m_breakpointPopup;
+    TDEPopupMenu *m_breakpointPopup;
 };
 
 #endif
diff --git a/quanta/components/debugger/debuggermanager.cpp b/quanta/components/debugger/debuggermanager.cpp
index e9b9573a..bdab1245 100644
--- a/quanta/components/debugger/debuggermanager.cpp
+++ b/quanta/components/debugger/debuggermanager.cpp
@@ -206,71 +206,71 @@ void DebuggerManager::slotNewProjectLoaded(const TQString &projectname, const KU
 
 void DebuggerManager::initActions()
 {
-  KAction * newaction;
-  KActionCollection *ac = quantaApp->actionCollection();
+  TDEAction * newaction;
+  TDEActionCollection *ac = quantaApp->actionCollection();
   if(!ac)
     return;
 
   //Debugger, breakpoint
-  newaction = new KAction(i18n("Toggle &Breakpoint"), SmallIcon("debug_breakpoint"), TQt::CTRL+TQt::SHIFT+TQt::Key_B, this, TQT_SLOT(toggleBreakpoint()), ac, "debug_breakpoints_toggle");
+  newaction = new TDEAction(i18n("Toggle &Breakpoint"), SmallIcon("debug_breakpoint"), TQt::CTRL+TQt::SHIFT+TQt::Key_B, this, TQT_SLOT(toggleBreakpoint()), ac, "debug_breakpoints_toggle");
   newaction->setToolTip(i18n("Toggles a breakpoint at the current cursor location"));
   
-  newaction = new KAction(i18n("&Clear Breakpoints"), 0, this, TQT_SLOT(clearBreakpoints()), ac, "debug_breakpoints_clear");
+  newaction = new TDEAction(i18n("&Clear Breakpoints"), 0, this, TQT_SLOT(clearBreakpoints()), ac, "debug_breakpoints_clear");
   newaction->setToolTip(i18n("Clears all breakpoints"));
   
-  newaction = new KAction(i18n("Break When..."), SmallIcon("math_int"), 0, this, TQT_SLOT(slotConditionalBreakpoint()), ac, "debug_conditional_break");
+  newaction = new TDEAction(i18n("Break When..."), SmallIcon("math_int"), 0, this, TQT_SLOT(slotConditionalBreakpoint()), ac, "debug_conditional_break");
   newaction->setToolTip(i18n("Adds a new conditional breakpoint"));
   
-  newaction = new KAction(i18n("Break When..."), SmallIcon("math_int"), 0, this, TQT_SLOT(slotConditionalBreakpoint()), ac, "debug_conditional_breakdialog");
+  newaction = new TDEAction(i18n("Break When..."), SmallIcon("math_int"), 0, this, TQT_SLOT(slotConditionalBreakpoint()), ac, "debug_conditional_breakdialog");
   newaction->setToolTip(i18n("Adds a new conditional breakpoint"));
 
   // Execution
-  newaction = new KAction(i18n("Send HTTP R&equest"), SmallIcon("debug_currentline"), 0, this, TQT_SLOT(slotDebugRequest()), ac, "debug_request");
+  newaction = new TDEAction(i18n("Send HTTP R&equest"), SmallIcon("debug_currentline"), 0, this, TQT_SLOT(slotDebugRequest()), ac, "debug_request");
   newaction->setToolTip(i18n("Initiate HTTP Request to the server with debugging activated"));
   
-  newaction = new KAction(i18n("&Trace"), SmallIcon("debug_run"), 0, this, TQT_SLOT(slotDebugTrace()), ac, "debug_trace");
+  newaction = new TDEAction(i18n("&Trace"), SmallIcon("debug_run"), 0, this, TQT_SLOT(slotDebugTrace()), ac, "debug_trace");
   newaction->setToolTip(i18n("Traces through the script. If a script is currently not being debugged, it will start in trace mode when started"));
   
-  newaction = new KAction(i18n("&Run"), SmallIcon("debug_leap"), 0, this, TQT_SLOT(slotDebugRun()), ac, "debug_run");
+  newaction = new TDEAction(i18n("&Run"), SmallIcon("debug_leap"), 0, this, TQT_SLOT(slotDebugRun()), ac, "debug_run");
   newaction->setToolTip(i18n("Runs the script. If a script is currently not being debugged, it will start in run mode when started"));
   
-  newaction = new KAction(i18n("&Step"), SmallIcon("debug_stepover"), 0, this, TQT_SLOT(slotDebugStepOver()), ac, "debug_stepover");
+  newaction = new TDEAction(i18n("&Step"), SmallIcon("debug_stepover"), 0, this, TQT_SLOT(slotDebugStepOver()), ac, "debug_stepover");
   newaction->setToolTip(i18n("Executes the next line of execution, but does not step into functions or includes"));
   
-  newaction = new KAction(i18n("Step &Into"), SmallIcon("debug_stepinto"), 0, this, TQT_SLOT(slotDebugStepInto()), ac, "debug_stepinto");
+  newaction = new TDEAction(i18n("Step &Into"), SmallIcon("debug_stepinto"), 0, this, TQT_SLOT(slotDebugStepInto()), ac, "debug_stepinto");
   newaction->setToolTip(i18n("Executes the next line of execution and steps into it if it is a function call or inclusion of a file"));
   
-  newaction = new KAction(i18n("S&kip"), SmallIcon("debug_skip"), 0, this, TQT_SLOT(slotDebugSkip()), ac, "debug_skip");
+  newaction = new TDEAction(i18n("S&kip"), SmallIcon("debug_skip"), 0, this, TQT_SLOT(slotDebugSkip()), ac, "debug_skip");
   newaction->setToolTip(i18n("Skips the next command of execution and makes the next command the current one"));
   
-  newaction = new KAction(i18n("Step &Out"), SmallIcon("debug_stepout"), 0, this, TQT_SLOT(slotDebugStepOut()), ac, "debug_stepout");
+  newaction = new TDEAction(i18n("Step &Out"), SmallIcon("debug_stepout"), 0, this, TQT_SLOT(slotDebugStepOut()), ac, "debug_stepout");
   newaction->setToolTip(i18n("Executes the rest of the commands in the current function/file and pauses when it is done (when it reaches a higher level in the backtrace)"));
   
-  newaction = new KAction(i18n("&Pause"), SmallIcon("debug_pause"), 0, this, TQT_SLOT(slotDebugPause()), ac, "debug_pause");
+  newaction = new TDEAction(i18n("&Pause"), SmallIcon("debug_pause"), 0, this, TQT_SLOT(slotDebugPause()), ac, "debug_pause");
   newaction->setToolTip(i18n("Pauses the scripts if it is running or tracing. If a script is currently not being debugged, it will start in paused mode when started"));
-  newaction = new KAction(i18n("Kill"), SmallIcon("debug_kill"), 0, this, TQT_SLOT(slotDebugKill()), ac, "debug_kill");
+  newaction = new TDEAction(i18n("Kill"), SmallIcon("debug_kill"), 0, this, TQT_SLOT(slotDebugKill()), ac, "debug_kill");
   newaction->setToolTip(i18n("Kills the currently running script"));
   
-  newaction = new KAction(i18n("Start Session"), SmallIcon("debug_connect"), 0, this, TQT_SLOT(slotDebugStartSession()), ac, "debug_connect");
+  newaction = new TDEAction(i18n("Start Session"), SmallIcon("debug_connect"), 0, this, TQT_SLOT(slotDebugStartSession()), ac, "debug_connect");
   newaction->setToolTip(i18n("Starts the debugger internally (Makes debugging possible)"));
   
-  newaction = new KAction(i18n("End Session"), SmallIcon("debug_disconnect"), 0, this, TQT_SLOT(slotDebugEndSession()), ac, "debug_disconnect");
+  newaction = new TDEAction(i18n("End Session"), SmallIcon("debug_disconnect"), 0, this, TQT_SLOT(slotDebugEndSession()), ac, "debug_disconnect");
   newaction->setToolTip(i18n("Stops the debugger internally (debugging not longer possible)"));
 
   // Variables
-  newaction = new KAction(i18n("Watch Variable"), SmallIcon("math_brace"), 0, this, TQT_SLOT(slotAddWatch()), ac, "debug_addwatch");
+  newaction = new TDEAction(i18n("Watch Variable"), SmallIcon("math_brace"), 0, this, TQT_SLOT(slotAddWatch()), ac, "debug_addwatch");
   newaction->setToolTip(i18n("Adds a variable to the watch list"));
   
-  newaction = new KAction(i18n("Watch Variable"), SmallIcon("math_brace"), 0, this, TQT_SLOT(slotAddWatch()), ac, "debug_addwatchdialog");
+  newaction = new TDEAction(i18n("Watch Variable"), SmallIcon("math_brace"), 0, this, TQT_SLOT(slotAddWatch()), ac, "debug_addwatchdialog");
   newaction->setToolTip(i18n("Adds a variable to the watch list"));
   
-  newaction = new KAction(i18n("Set Value of Variable"), SmallIcon("edit"), 0, this, TQT_SLOT(slotVariableSet()), ac, "debug_variable_set");
+  newaction = new TDEAction(i18n("Set Value of Variable"), SmallIcon("edit"), 0, this, TQT_SLOT(slotVariableSet()), ac, "debug_variable_set");
   newaction->setToolTip(i18n("Changes the value of a variable"));
   
-  newaction = new KAction(i18n("Set Value of Variable"), SmallIcon("edit"), 0, this, TQT_SLOT(slotVariableSet()), ac, "debug_variable_setdialog");
+  newaction = new TDEAction(i18n("Set Value of Variable"), SmallIcon("edit"), 0, this, TQT_SLOT(slotVariableSet()), ac, "debug_variable_setdialog");
   newaction->setToolTip(i18n("Changes the value of a variable"));
 
-  newaction = new KAction(i18n("Open Profiler Output"), SmallIcon("launch"), 0, this, TQT_SLOT(slotProfilerOpen()), ac, "debug_profiler_open");
+  newaction = new TDEAction(i18n("Open Profiler Output"), SmallIcon("launch"), 0, this, TQT_SLOT(slotProfilerOpen()), ac, "debug_profiler_open");
   newaction->setToolTip(i18n("Opens the profiler output file"));
 
   enableAction("*", false);
@@ -340,7 +340,7 @@ void DebuggerManager::enableAction(const TQString& action, bool enable)
   else
   {
     // The action may or may not exist, depending on capabilities of the debugger plugin
-    KActionCollection *ac = quantaApp->actionCollection();
+    TDEActionCollection *ac = quantaApp->actionCollection();
     if(ac && ac->action(action.ascii()))
       ac->action(action.ascii())->setEnabled(enable);
   }
diff --git a/quanta/components/debugger/debuggervariable.h b/quanta/components/debugger/debuggervariable.h
index 50d28136..af78fde6 100644
--- a/quanta/components/debugger/debuggervariable.h
+++ b/quanta/components/debugger/debuggervariable.h
@@ -80,8 +80,8 @@ class DebuggerVariable
     virtual void touch() { m_touched = true;};
     virtual bool touched()  const { return m_touched;};
 
-    virtual void setItem(KListViewItem* item) { m_item = item;};
-    virtual KListViewItem*  item() const{  return m_item;};
+    virtual void setItem(TDEListViewItem* item) { m_item = item;};
+    virtual TDEListViewItem*  item() const{  return m_item;};
 
     virtual void copy(DebuggerVariable* v, bool copychldren = true);
     virtual void append(DebuggerVariable* v);
@@ -98,6 +98,6 @@ class DebuggerVariable
     int     m_type;
     long    m_touched;
 
-    KListViewItem* m_item;
+    TDEListViewItem* m_item;
 };
 #endif
diff --git a/quanta/components/debugger/variableslistview.cpp b/quanta/components/debugger/variableslistview.cpp
index 40df91c0..04eb90a1 100644
--- a/quanta/components/debugger/variableslistview.cpp
+++ b/quanta/components/debugger/variableslistview.cpp
@@ -48,7 +48,7 @@ namespace VariablesListViewColumns
 }
 
 VariablesListView::VariablesListView(TQWidget *parent, const char *name)
-    : KListView(parent, name)
+    : TDEListView(parent, name)
 {
   // If you change here, change the VariablesListViewColumns enums above
   addColumn(i18n("Name"));
@@ -59,7 +59,7 @@ VariablesListView::VariablesListView(TQWidget *parent, const char *name)
   setRootIsDecorated(true);
   setSorting(-1); // No sorting
   
-  m_variablePopup = new KPopupMenu(this);
+  m_variablePopup = new TDEPopupMenu(this);
   m_variablePopup->insertItem(SmallIcon("editdelete"), i18n("&Remove"), this, TQT_SLOT(slotRemoveSelected()), 0, removeWatch);
 
   if(quantaApp->debugger()->client()->supports(DebuggerClientCapabilities::VariableSetValue))
@@ -69,7 +69,7 @@ VariablesListView::VariablesListView(TQWidget *parent, const char *name)
   
   m_variablePopup->insertItem(SmallIcon("editcopy"), i18n("&Copy to Clipboard"), this, TQT_SLOT(slotVariableCopyToClipboard()), 0, copyValue);
 
-  connect(this, TQT_SIGNAL( contextMenu( KListView *, TQListViewItem *, const TQPoint & ) ), this, TQT_SLOT(slotVariableContextMenu(KListView *, TQListViewItem *, const TQPoint &)));
+  connect(this, TQT_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), this, TQT_SLOT(slotVariableContextMenu(TDEListView *, TQListViewItem *, const TQPoint &)));
 }
 
 
@@ -144,7 +144,7 @@ void VariablesListView::addVariable(DebuggerVariable* variable)
   DebuggerVariable *newvar = new DebuggerVariable(variable);
   m_variablesList.append(newvar);
 
-  KListViewItem * item = new KListViewItem(this);
+  TDEListViewItem * item = new TDEListViewItem(this);
   insertItem(item);
   newvar->setItem(item);
   replaceVariable(newvar, variable);
@@ -152,13 +152,13 @@ void VariablesListView::addVariable(DebuggerVariable* variable)
 
 void VariablesListView::clear()
 {
-  KListView::clear();
+  TDEListView::clear();
   m_variablesList.clear();
 }
 
 void VariablesListView::replaceVariable(DebuggerVariable* oldvar, DebuggerVariable* newvar)
 { 
-  KListViewItem * item;
+  TDEListViewItem * item;
   
   // Remove children that doesen't exist anymore
   TQPtrList<DebuggerVariable> oldlist = oldvar->values();
@@ -196,7 +196,7 @@ void VariablesListView::replaceVariable(DebuggerVariable* oldvar, DebuggerVariab
     if(!found)
     {
       DebuggerVariable* child = new DebuggerVariable();
-      item = new KListViewItem(oldvar->item());
+      item = new TDEListViewItem(oldvar->item());
       child->setItem(item);
       replaceVariable( child, newchild);
       oldvar->append(child);
@@ -219,7 +219,7 @@ void VariablesListView::replaceVariable(DebuggerVariable* oldvar, DebuggerVariab
   
 }
 
-void VariablesListView::slotVariableContextMenu(KListView *, TQListViewItem *, const TQPoint& point)
+void VariablesListView::slotVariableContextMenu(TDEListView *, TQListViewItem *, const TQPoint& point)
 {
   if(!selectedItem())
     return;
diff --git a/quanta/components/debugger/variableslistview.h b/quanta/components/debugger/variableslistview.h
index af3db373..de837241 100644
--- a/quanta/components/debugger/variableslistview.h
+++ b/quanta/components/debugger/variableslistview.h
@@ -25,7 +25,7 @@
 
 class DebuggerVariable;
 
-class VariablesListView : public KListView
+class VariablesListView : public TDEListView
 {
   Q_OBJECT
   
@@ -55,7 +55,7 @@ class VariablesListView : public KListView
     void slotVariableSetValue();
     void slotVariableDump();
     void slotVariableCopyToClipboard();
-    void slotVariableContextMenu(KListView *list, TQListViewItem * item, const TQPoint& point);
+    void slotVariableContextMenu(TDEListView *list, TQListViewItem * item, const TQPoint& point);
 
   signals:
     void valueChanged(DebuggerVariable*);
@@ -66,7 +66,7 @@ class VariablesListView : public KListView
     void replaceVariable(DebuggerVariable* oldvar, DebuggerVariable* newvar);
 
     TQPtrList<DebuggerVariable> m_variablesList;
-    KPopupMenu *m_variablePopup;
+    TDEPopupMenu *m_variablePopup;
 };
 
 #endif
diff --git a/quanta/components/tableeditor/tableeditor.cpp b/quanta/components/tableeditor/tableeditor.cpp
index 60eb455e..c53d87b1 100644
--- a/quanta/components/tableeditor/tableeditor.cpp
+++ b/quanta/components/tableeditor/tableeditor.cpp
@@ -51,7 +51,7 @@ int newNum;
 TableEditor::TableEditor(TQWidget* parent, const char* name)
   : TableEditorS(parent, name)
 {
-  m_popup = new KPopupMenu();
+  m_popup = new TDEPopupMenu();
   m_cellEditId = m_popup->insertItem(i18n("&Edit Cell Properties"), this ,TQT_SLOT(slotEditCell()));
   m_rowEditId = m_popup->insertItem(i18n("Edit &Row Properties"), this ,TQT_SLOT(slotEditRow()));
   //  m_colEditId = m_popup->insertItem(i18n("Edit &Column Properties"), this ,TQT_SLOT(slotEditCol()));
diff --git a/quanta/components/tableeditor/tableeditor.h b/quanta/components/tableeditor/tableeditor.h
index c97f9ca0..171cb9c1 100644
--- a/quanta/components/tableeditor/tableeditor.h
+++ b/quanta/components/tableeditor/tableeditor.h
@@ -23,7 +23,7 @@
 
 class TQSpinBox;
 class TQTable;
-class KPopupMenu;
+class TDEPopupMenu;
 class Tag;
 struct DTDStruct;
 class Node;
@@ -109,7 +109,7 @@ protected:
   int m_cellEditId;
   int m_col;
   int m_row;
-  KPopupMenu *m_popup;
+  TDEPopupMenu *m_popup;
   KURL m_baseURL;
   const DTDStruct *m_dtd;
   TQValueList<TQValueList<TableNode> > *m_tableDataTags;
diff --git a/quanta/dialogs/actionconfigdialog.cpp b/quanta/dialogs/actionconfigdialog.cpp
index 9654c046..4346be52 100644
--- a/quanta/dialogs/actionconfigdialog.cpp
+++ b/quanta/dialogs/actionconfigdialog.cpp
@@ -50,7 +50,7 @@
 #include "tagaction.h"
 #include "toolbartabwidget.h"
 
-ActionConfigDialog::ActionConfigDialog(const TQDict<ToolbarEntry> &toolbarList, KMainWindow* parent, const char* name, bool modal, WFlags fl, const TQString& defaultAction )
+ActionConfigDialog::ActionConfigDialog(const TQDict<ToolbarEntry> &toolbarList, TDEMainWindow* parent, const char* name, bool modal, WFlags fl, const TQString& defaultAction )
     :ActionConfigDialogS( parent, name, modal, fl )
 {
   m_mainWindow = parent;
@@ -63,34 +63,34 @@ ActionConfigDialog::ActionConfigDialog(const TQDict<ToolbarEntry> &toolbarList,
   currentAction = 0L;
   m_toolbarItem = 0L;
 
-  connect(actionTreeView, TQT_SIGNAL(contextMenu(KListView *,TQListViewItem *,const TQPoint &)),
-                          TQT_SLOT(slotContextMenu(KListView *,TQListViewItem *,const TQPoint &)));
+  connect(actionTreeView, TQT_SIGNAL(contextMenu(TDEListView *,TQListViewItem *,const TQPoint &)),
+                          TQT_SLOT(slotContextMenu(TDEListView *,TQListViewItem *,const TQPoint &)));
   connect(actionTreeView, TQT_SIGNAL(selectionChanged(TQListViewItem *)),
                           TQT_SLOT(slotSelectionChanged(TQListViewItem *)));
-  connect(shortcutKeyButton, TQT_SIGNAL(capturedShortcut(const KShortcut &)),
-                             TQT_SLOT(slotShortcutCaptured(const KShortcut &)));
+  connect(shortcutKeyButton, TQT_SIGNAL(capturedShortcut(const TDEShortcut &)),
+                             TQT_SLOT(slotShortcutCaptured(const TDEShortcut &)));
   connect(scriptPath, TQT_SIGNAL(activated(const TQString&)),
                       TQT_SLOT(slotTextChanged(const TQString&)));
   connect(this, TQT_SIGNAL(addToolbar()), m_mainWindow, TQT_SLOT(slotAddToolbar()));
   connect(this, TQT_SIGNAL(removeToolbar(const TQString&)), m_mainWindow, TQT_SLOT(slotRemoveToolbar(const TQString&)));
-  connect(this, TQT_SIGNAL(deleteUserAction(KAction*)), m_mainWindow, TQT_SLOT(slotDeleteAction(KAction*)));
+  connect(this, TQT_SIGNAL(deleteUserAction(TDEAction*)), m_mainWindow, TQT_SLOT(slotDeleteAction(TDEAction*)));
   connect(this, TQT_SIGNAL(configureToolbars(const TQString&)), m_mainWindow, TQT_SLOT(slotConfigureToolbars(const TQString&)));
 //fill up the tree view with the toolbars and actions
   actionTreeView->setSorting(-1);
-  allActionsItem = new KListViewItem(actionTreeView, i18n("All"));
+  allActionsItem = new TDEListViewItem(actionTreeView, i18n("All"));
   actionTreeView->insertItem(allActionsItem);
   TQListViewItem *item, *oldItem = allActionsItem;
-  KAction *action;
+  TDEAction *action;
   TQString toolbarName;
   TQString toolbarId;
   ToolbarTabWidget *tb = ToolbarTabWidget::ref();
   TQRegExp r("\\&(?!\\&)");
-  KActionCollection *ac = m_mainWindow->actionCollection();
+  TDEActionCollection *ac = m_mainWindow->actionCollection();
   for (int i = 0; i < tb->count(); i++)
   {
     toolbarName = tb->label(i);
     toolbarName.replace(r, "");
-    item = new KListViewItem(actionTreeView, oldItem, i18n(toolbarName.utf8()));
+    item = new TDEListViewItem(actionTreeView, oldItem, i18n(toolbarName.utf8()));
     actionTreeView->insertItem(item);
 
     toolbarId = tb->id(i);
@@ -106,7 +106,7 @@ ActionConfigDialog::ActionConfigDialog(const TQDict<ToolbarEntry> &toolbarList,
           action = ac->action(node.toElement().attribute("name").ascii());
           if (action)
           {
-            oldActionItem = new KListViewItem(item, oldActionItem, action->text().replace(r,""), action->shortcut().toString(), action->name());
+            oldActionItem = new TDEListViewItem(item, oldActionItem, action->text().replace(r,""), action->shortcut().toString(), action->name());
             oldActionItem->setPixmap(0, SmallIcon(action->icon()) );
           }
         }
@@ -142,12 +142,12 @@ ActionConfigDialog::ActionConfigDialog(const TQDict<ToolbarEntry> &toolbarList,
   for (uint i = 0; i < acCount; i++)
   {
     action = ac->action(i);
-    item = new KListViewItem(allActionsItem, action->text().replace(r, ""),  action->shortcut().toString(), action->name());
+    item = new TDEListViewItem(allActionsItem, action->text().replace(r, ""),  action->shortcut().toString(), action->name());
     item->setPixmap(0, SmallIcon(action->icon()) );
   }
   allActionsItem->sortChildItems(0, true);
 
-  treeMenu = new KPopupMenu(actionTreeView);
+  treeMenu = new TDEPopupMenu(actionTreeView);
   treeMenu->insertItem(i18n("&Add New Toolbar"), this, TQT_SLOT(slotAddToolbar()));
   treeMenu->insertItem(i18n("&Remove Toolbar"), this, TQT_SLOT(slotRemoveToolbar()));
   treeMenu->insertItem(i18n("&Edit Toolbar"), this, TQT_SLOT(slotEditToolbar()));
@@ -173,7 +173,7 @@ void ActionConfigDialog::slotAddToolbar()
       item = actionTreeView->lastItem();
       if (item->parent())
         item = item->parent();
-      new KListViewItem(actionTreeView, item, i18n(toolbarName.utf8()));
+      new TDEListViewItem(actionTreeView, item, i18n(toolbarName.utf8()));
       break;
     }
   }
@@ -221,8 +221,8 @@ void ActionConfigDialog::slotEditToolbar()
     emit configureToolbars(toolbarName +" <quanta>");
 
     //update the tree view
-    KAction *action;
-    KActionCollection *ac = m_mainWindow->actionCollection();
+    TDEAction *action;
+    TDEActionCollection *ac = m_mainWindow->actionCollection();
     ToolbarTabWidget *tb = ToolbarTabWidget::ref();
     for (int i = 0; i < tb->count(); i++)
     {
@@ -232,7 +232,7 @@ void ActionConfigDialog::slotEditToolbar()
       if (p_toolbar)
       {
         oldItem = actionTreeView->findItem(toolbarName, 0);
-        item = new KListViewItem(actionTreeView, oldItem, toolbarName);
+        item = new TDEListViewItem(actionTreeView, oldItem, toolbarName);
         item->setOpen(oldItem->isOpen());
         delete oldItem;
         TQDomNode node = p_toolbar->guiClient->domDocument().firstChild().firstChild().firstChild();
@@ -243,7 +243,7 @@ void ActionConfigDialog::slotEditToolbar()
             action = ac->action(node.toElement().attribute("name").ascii());
             if (action)
             {
-              oldItem = new KListViewItem(item, oldItem, action->text().replace(TQRegExp("\\&(?!\\&)"),""), action->shortcut().toString(), action->name());
+              oldItem = new TDEListViewItem(item, oldItem, action->text().replace(TQRegExp("\\&(?!\\&)"),""), action->shortcut().toString(), action->name());
               oldItem->setPixmap(0, SmallIcon(action->icon()));
             }
           }
@@ -256,7 +256,7 @@ void ActionConfigDialog::slotEditToolbar()
   }
 }
 
-void ActionConfigDialog::slotContextMenu(KListView *,TQListViewItem *,const TQPoint &point)
+void ActionConfigDialog::slotContextMenu(TDEListView *,TQListViewItem *,const TQPoint &point)
 {
   treeMenu->popup(point);
 }
@@ -276,12 +276,12 @@ void ActionConfigDialog::slotSelectionChanged(TQListViewItem *item)
   if (item && item->depth() > 0)
   {
     TagAction *action = 0L;
-    KActionCollection *ac = m_mainWindow->actionCollection();
+    TDEActionCollection *ac = m_mainWindow->actionCollection();
     uint acCount = ac->count();
 //find the corresponding action
     for (uint i = 0; i < acCount; i++)
     {
-      KAction *a = ac->action(i);
+      TDEAction *a = ac->action(i);
       TQString actionName = a->name();
       if (a && actionName == item->text(2) && a->inherits("TagAction"))
       {
@@ -485,7 +485,7 @@ void ActionConfigDialog::saveCurrentAction()
     currentAction->setShortcut(selectedShortcut);
   } else
   {
-    currentAction->setShortcut(KShortcut());
+    currentAction->setShortcut(TDEShortcut());
   }
   el.setAttribute("shortcut", s);
 
@@ -673,7 +673,7 @@ void ActionConfigDialog::saveCurrentAction()
           }
           if (placeOnToolbar)
           {
-              listItem = new KListViewItem(listItem, after, lineText->text(), currentAction->shortcut().toString(), currentAction->name());
+              listItem = new TDEListViewItem(listItem, after, lineText->text(), currentAction->shortcut().toString(), currentAction->name());
               listItem->setPixmap(0, SmallIcon(actionIcon->icon()));
           }
         }
@@ -694,7 +694,7 @@ void ActionConfigDialog::saveCurrentAction()
   }
 }
 
-void ActionConfigDialog::slotShortcutCaptured(const KShortcut &shortcut)
+void ActionConfigDialog::slotShortcutCaptured(const TDEShortcut &shortcut)
 {
   TQString shortcutText = shortcut.toString();
   TQString shortcutText2;
@@ -733,10 +733,10 @@ void ActionConfigDialog::slotShortcutCaptured(const KShortcut &shortcut)
     TQPtrList<KXMLGUIClient> clients = m_mainWindow->guiFactory()->clients();
     for( TQPtrListIterator<KXMLGUIClient> it( clients ); it.current(); ++it )
     {
-        KActionCollection *ac = (*it)->actionCollection();
+        TDEActionCollection *ac = (*it)->actionCollection();
         for (uint i = 0; i < ac->count(); i++)
         {
-          KAction *action = ac->action(i);
+          TDEAction *action = ac->action(i);
           if (action != currentAction && action->shortcut().toString().contains(shortcutRx))
           {
             global = action->text();
@@ -801,10 +801,10 @@ void ActionConfigDialog::slotNewAction()
     ++it;
   }
 
-  selectedShortcut = KShortcut();
+  selectedShortcut = TDEShortcut();
   static_cast<TagAction*>(currentAction)->setModified(true);
   TQListViewItem *currentItem = actionTreeView->currentItem();
-  TQListViewItem *item = new KListViewItem(allActionsItem);
+  TQListViewItem *item = new TDEListViewItem(allActionsItem);
   TQString actionText = TQString("Action_%1").arg(m_mainWindow->actionCollection()->count());
   currentAction->setText(actionText);
   item->setText(2, currentAction->name());
@@ -820,7 +820,7 @@ void ActionConfigDialog::slotNewAction()
     if (!parentItem)
       parentItem = currentItem;
 
-    item = new KListViewItem(parentItem, currentItem);
+    item = new TDEListViewItem(parentItem, currentItem);
     item->setText(0, actionText);
     item->setText(2, currentAction->name());
     item->setPixmap(0, SmallIcon("ball"));
diff --git a/quanta/dialogs/actionconfigdialog.h b/quanta/dialogs/actionconfigdialog.h
index 97125f3d..853d839a 100644
--- a/quanta/dialogs/actionconfigdialog.h
+++ b/quanta/dialogs/actionconfigdialog.h
@@ -21,10 +21,10 @@
 class TQDomDocument;
 class TQPopupMenu;
 
-class KAction;
-class KMainWindow;
-class KPopupMenu;
-class KShortcut;
+class TDEAction;
+class TDEMainWindow;
+class TDEPopupMenu;
+class TDEShortcut;
 class KXMLGUIClient;
 
 struct ToolbarEntry {
@@ -46,7 +46,7 @@ class ActionConfigDialog: public ActionConfigDialogS
 
 public:
 
-  ActionConfigDialog(const TQDict<ToolbarEntry> &toolbarList, KMainWindow* parent = 0, const char* name = 0, bool modal = true, WFlags fl = 0 , const TQString& defaultAction = TQString());
+  ActionConfigDialog(const TQDict<ToolbarEntry> &toolbarList, TDEMainWindow* parent = 0, const char* name = 0, bool modal = true, WFlags fl = 0 , const TQString& defaultAction = TQString());
   ~ActionConfigDialog();
   void createScriptAction(const TQString& a_name, const TQString& a_script);
 
@@ -62,9 +62,9 @@ private slots:
   void slotAddToolbar();
   void slotRemoveToolbar();
   void slotEditToolbar();
-  void slotContextMenu(KListView *,TQListViewItem *,const TQPoint &);
+  void slotContextMenu(TDEListView *,TQListViewItem *,const TQPoint &);
   void slotSelectionChanged(TQListViewItem *);
-  void slotShortcutCaptured(const KShortcut&);
+  void slotShortcutCaptured(const TDEShortcut&);
   void slotDeleteAction();
   void slotApply();
   void slotAddContainerToolbar();
@@ -74,18 +74,18 @@ private slots:
 signals:
   void addToolbar();
   void removeToolbar(const TQString&);      
-  void deleteUserAction(KAction *);
+  void deleteUserAction(TDEAction *);
   void configureToolbars(const TQString&);
 
 private:
   void saveCurrentAction();
 
-  KPopupMenu *treeMenu;
-  KAction *currentAction;
+  TDEPopupMenu *treeMenu;
+  TDEAction *currentAction;
   TQListViewItem *allActionsItem;
   TQMap<TQString, TQString> globalShortcuts;
-  KShortcut selectedShortcut;
-  KMainWindow *m_mainWindow;
+  TDEShortcut selectedShortcut;
+  TDEMainWindow *m_mainWindow;
   TQDict<ToolbarEntry> m_toolbarList;
   TQListViewItem *m_toolbarItem;
 };
diff --git a/quanta/dialogs/actionconfigdialogs.ui b/quanta/dialogs/actionconfigdialogs.ui
index f642719c..9ed82302 100644
--- a/quanta/dialogs/actionconfigdialogs.ui
+++ b/quanta/dialogs/actionconfigdialogs.ui
@@ -117,7 +117,7 @@
                             <string>Toolbar &amp; Action Tree</string>
                         </property>
                     </widget>
-                    <widget class="KListView" row="1" column="1" rowspan="1" colspan="3">
+                    <widget class="TDEListView" row="1" column="1" rowspan="1" colspan="3">
                         <column>
                             <property name="text">
                                 <string>Name</string>
@@ -378,7 +378,7 @@
                                     </widget>
                                 </grid>
                             </widget>
-                            <widget class="KListBox" row="6" column="1" rowspan="2" colspan="2">
+                            <widget class="TDEListBox" row="6" column="1" rowspan="2" colspan="2">
                                 <property name="name">
                                     <cstring>toolbarListBox</cstring>
                                 </property>
diff --git a/quanta/dialogs/settings/abbreviation.cpp b/quanta/dialogs/settings/abbreviation.cpp
index eb143120..90e098b8 100644
--- a/quanta/dialogs/settings/abbreviation.cpp
+++ b/quanta/dialogs/settings/abbreviation.cpp
@@ -78,7 +78,7 @@ void AbbreviationDlg::slotGroupChanged(const TQString& newGroupName)
     templateStr = it.key();
     templateName = templateStr.mid(templateStr.find(' ') + 1);
     templateStr = templateStr.left(templateStr.find(' '));
-    new KListViewItem(templatesList, templateStr, templateName);
+    new TDEListViewItem(templatesList, templateStr, templateName);
   }
   for ( TQStringList::ConstIterator dtepit = m_currentAbbrev->dteps.constBegin(); dtepit != m_currentAbbrev->dteps.constEnd(); ++dtepit )
   {
@@ -174,7 +174,7 @@ void AbbreviationDlg::slotAddTemplate()
     TQString description = w.descriptionEdit->text();
     if (!templateName.isEmpty())
     {
-      TQListViewItem *item = new KListViewItem(templatesList, templateName, description);
+      TQListViewItem *item = new TDEListViewItem(templatesList, templateName, description);
       templatesList->setCurrentItem(item);
       templatesList->setSelected(item, true);
       templatesList->ensureItemVisible(item);
diff --git a/quanta/dialogs/settings/abbreviations.ui b/quanta/dialogs/settings/abbreviations.ui
index 24edbaa8..f283a092 100644
--- a/quanta/dialogs/settings/abbreviations.ui
+++ b/quanta/dialogs/settings/abbreviations.ui
@@ -111,7 +111,7 @@
                 <enum>PlainText</enum>
             </property>
         </widget>
-        <widget class="KListView" row="5" column="0" rowspan="4" colspan="2">
+        <widget class="TDEListView" row="5" column="0" rowspan="4" colspan="2">
             <column>
                 <property name="text">
                     <string>Template</string>
@@ -229,7 +229,7 @@
                 <cstring>templatesList</cstring>
             </property>
         </widget>
-        <widget class="KListBox" row="1" column="1" rowspan="3" colspan="1">
+        <widget class="TDEListBox" row="1" column="1" rowspan="3" colspan="1">
             <property name="name">
                 <cstring>dtepList</cstring>
             </property>
diff --git a/quanta/dialogs/specialchardialogs.ui b/quanta/dialogs/specialchardialogs.ui
index d29bd1ba..caaf3848 100644
--- a/quanta/dialogs/specialchardialogs.ui
+++ b/quanta/dialogs/specialchardialogs.ui
@@ -129,7 +129,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="KListBox" row="1" column="0">
+        <widget class="TDEListBox" row="1" column="0">
             <property name="name">
                 <cstring>CharsListBox</cstring>
             </property>
diff --git a/quanta/dialogs/tagdialogs/listdlg.cpp b/quanta/dialogs/tagdialogs/listdlg.cpp
index 1544b6d8..ba583b99 100644
--- a/quanta/dialogs/tagdialogs/listdlg.cpp
+++ b/quanta/dialogs/tagdialogs/listdlg.cpp
@@ -25,7 +25,7 @@
 #include <tqstringlist.h>
 
 ListDlg::ListDlg(TQStringList &entryList,TQWidget* parent, const char *name )
-  :KDialogBase(parent,name),    listbox(new KListBox(this))
+  :KDialogBase(parent,name),    listbox(new TDEListBox(this))
 {
    TQ_CHECK_PTR(listbox);
    setMainWidget(listbox);
diff --git a/quanta/dialogs/tagdialogs/listdlg.h b/quanta/dialogs/tagdialogs/listdlg.h
index eaf46a79..3d190ae7 100644
--- a/quanta/dialogs/tagdialogs/listdlg.h
+++ b/quanta/dialogs/tagdialogs/listdlg.h
@@ -21,7 +21,7 @@
 class TQPushButton;
 class TQString;
 class TQStringList;
-class KListBox;
+class TDEListBox;
 
 /**Select an item from a list. The list is given in
 the constructor as a parameter. After calling
@@ -40,7 +40,7 @@ public:
   int getEntryNum();
 private: // Private attributes
   /**  */
-  KListBox * listbox;
+  TDEListBox * listbox;
 };
 
 #endif
diff --git a/quanta/messages/annotationoutput.cpp b/quanta/messages/annotationoutput.cpp
index e42eef5d..7ded7062 100644
--- a/quanta/messages/annotationoutput.cpp
+++ b/quanta/messages/annotationoutput.cpp
@@ -41,7 +41,7 @@ AnnotationOutput::AnnotationOutput(TQWidget *parent, const char *name)
   m_currentFileAnnotations = new MessageOutput(this);
   addTab(m_currentFileAnnotations, i18n("Current File"));
 
-  m_yourAnnotations = new KListView(this);
+  m_yourAnnotations = new TDEListView(this);
   m_yourAnnotations->addColumn("1", -1);
   m_yourAnnotations->addColumn("2", 0);
   m_yourAnnotations->setRootIsDecorated(true);
@@ -52,7 +52,7 @@ AnnotationOutput::AnnotationOutput(TQWidget *parent, const char *name)
   
   connect(m_yourAnnotations, TQT_SIGNAL(executed(TQListViewItem*)), TQT_SLOT(yourAnnotationsItemExecuted(TQListViewItem *)));
 
-  m_allAnnotations = new KListView(this);
+  m_allAnnotations = new TDEListView(this);
   m_allAnnotations->addColumn("1", -1);
   m_allAnnotations->addColumn("2", 0);
   m_allAnnotations->setRootIsDecorated(true);
@@ -162,14 +162,14 @@ void AnnotationOutput::readAnnotations()
         s.fill('0', 20 - lineText.length());
         lineText.prepend(s);
       }
-      KListViewItem *fileIt = m_annotatedFileItems[fileName];
+      TDEListViewItem *fileIt = m_annotatedFileItems[fileName];
       if (!fileIt)
       {
-        fileIt = new KListViewItem(m_allAnnotations, fileName);
+        fileIt = new TDEListViewItem(m_allAnnotations, fileName);
         m_annotatedFileItems.insert(fileName, fileIt);
         m_fileNames[fileIt] = u.url();
       }
-      KListViewItem *it = new KListViewItem(fileIt, fileIt, text, lineText);
+      TDEListViewItem *it = new TDEListViewItem(fileIt, fileIt, text, lineText);
       if (openedItems.contains(fileName))
         fileIt->setOpen(true);
       m_fileNames[it] = u.url();
@@ -178,14 +178,14 @@ void AnnotationOutput::readAnnotations()
       if (!yourself.isEmpty() && (receiver == yourself || roles.contains(receiver)))
       {
         m_yourAnnotationsNum++;
-        KListViewItem *fileIt = m_yourFileItems[fileName];
+        TDEListViewItem *fileIt = m_yourFileItems[fileName];
         if (!fileIt)
         {
-          fileIt = new KListViewItem(m_yourAnnotations, fileName);
+          fileIt = new TDEListViewItem(m_yourAnnotations, fileName);
           m_yourFileItems.insert(fileName, fileIt);
           m_yourFileNames[fileIt] = u.url();
         }
-        KListViewItem *it = new KListViewItem(fileIt, fileIt, text, lineText);
+        TDEListViewItem *it = new TDEListViewItem(fileIt, fileIt, text, lineText);
         if (yourOpenedItems.contains(fileName))
           fileIt->setOpen(true);
         m_yourFileNames[it] = u.url();
@@ -261,7 +261,7 @@ void AnnotationOutput::writeAnnotations(const TQString &fileName, const TQMap<ui
 
 void AnnotationOutput::allAnnotationsItemExecuted(TQListViewItem *item)
 {
-  if (dynamic_cast<KListView*> (item->parent()) != m_allAnnotations)
+  if (dynamic_cast<TDEListView*> (item->parent()) != m_allAnnotations)
   {
     emit clicked(m_fileNames[item], m_lines[item], 0);
   } else
@@ -270,7 +270,7 @@ void AnnotationOutput::allAnnotationsItemExecuted(TQListViewItem *item)
 
 void AnnotationOutput::yourAnnotationsItemExecuted(TQListViewItem *item)
 {
-  if (dynamic_cast<KListView*> (item->parent()) != m_yourAnnotations)
+  if (dynamic_cast<TDEListView*> (item->parent()) != m_yourAnnotations)
   {
     emit clicked(m_yourFileNames[item], m_yourLines[item], 0);
   } else
diff --git a/quanta/messages/annotationoutput.h b/quanta/messages/annotationoutput.h
index 352f046d..850b3e7c 100644
--- a/quanta/messages/annotationoutput.h
+++ b/quanta/messages/annotationoutput.h
@@ -23,8 +23,8 @@ class TQDomDocument;
 class TQListViewItem;
 class TQTimer;
 
-class KListView;
-class KListViewItem;
+class TDEListView;
+class TDEListViewItem;
 
 class MessageOutput;
 
@@ -43,7 +43,7 @@ public:
 
     ~AnnotationOutput();
     MessageOutput *currentFileAnnotations() const {return m_currentFileAnnotations;}
-    KListView *allAnnotations() const {return m_allAnnotations;}
+    TDEListView *allAnnotations() const {return m_allAnnotations;}
     void writeAnnotations(const TQString &fileName, const TQMap<uint, TQPair<TQString, TQString> > &annotations);
 
 public slots:
@@ -72,14 +72,14 @@ private:
     void updateAnnotationForFile(const KURL& url);
 
     MessageOutput *m_currentFileAnnotations;
-    KListView *m_allAnnotations;
-    TQDict<KListViewItem> m_annotatedFileItems;
+    TDEListView *m_allAnnotations;
+    TQDict<TDEListViewItem> m_annotatedFileItems;
     TQMap<TQListViewItem*, TQString> m_fileNames;
     TQMap<TQListViewItem*, uint> m_lines;
     uint m_yourAnnotationsNum;
 
-    KListView *m_yourAnnotations;
-    TQDict<KListViewItem> m_yourFileItems;
+    TDEListView *m_yourAnnotations;
+    TQDict<TDEListViewItem> m_yourFileItems;
     TQMap<TQListViewItem*, TQString> m_yourFileNames;
     TQMap<TQListViewItem*, uint> m_yourLines;
 
diff --git a/quanta/messages/messageoutput.cpp b/quanta/messages/messageoutput.cpp
index 210ee532..fe1a5230 100644
--- a/quanta/messages/messageoutput.cpp
+++ b/quanta/messages/messageoutput.cpp
@@ -43,7 +43,7 @@ MessageOutput::MessageOutput(TQWidget *parent, const char *name )
   setPalette(pal);
   setFocusPolicy( TQ_NoFocus );
 
-  m_popupMenu = new KPopupMenu(this);
+  m_popupMenu = new TDEPopupMenu(this);
   connect(this, TQT_SIGNAL(contextMenuRequested(TQListBoxItem*, const TQPoint&)),
      this, TQT_SLOT(showMenu(TQListBoxItem*, const TQPoint&)));
   m_popupMenu->insertItem( SmallIconSet("editcopy"), i18n("&Copy"), this, TQT_SLOT(copyContent()) ) ;
diff --git a/quanta/messages/messageoutput.h b/quanta/messages/messageoutput.h
index f2a8d894..f958ac00 100644
--- a/quanta/messages/messageoutput.h
+++ b/quanta/messages/messageoutput.h
@@ -21,7 +21,7 @@
 #include <tqlistbox.h>
 
 class TDEProcess;
-class KPopupMenu;
+class TDEPopupMenu;
 
 class MessageItem;
 
@@ -85,7 +85,7 @@ protected slots:
 
 private:
   uint m_maxItems;
-  KPopupMenu* m_popupMenu;
+  TDEPopupMenu* m_popupMenu;
 };
 
 #endif
diff --git a/quanta/parts/kafka/domtreeview.cpp b/quanta/parts/kafka/domtreeview.cpp
index 1ba6e467..5e1757e3 100644
--- a/quanta/parts/kafka/domtreeview.cpp
+++ b/quanta/parts/kafka/domtreeview.cpp
@@ -27,7 +27,7 @@
 
 #include "domtreeview.moc"
 
-DOMTreeView::DOMTreeView(TQWidget *parent, TDEHTMLPart *currentpart, const char * name) : KListView(parent, name)
+DOMTreeView::DOMTreeView(TQWidget *parent, TDEHTMLPart *currentpart, const char * name) : TDEListView(parent, name)
 {
     setCaption(name);
     setRootIsDecorated(true);
diff --git a/quanta/parts/kafka/domtreeview.h b/quanta/parts/kafka/domtreeview.h
index ba282d3b..1621fd61 100644
--- a/quanta/parts/kafka/domtreeview.h
+++ b/quanta/parts/kafka/domtreeview.h
@@ -32,10 +32,10 @@ class TQString;
 class TQGridLayout;
 
 /**
- * This class is very useful to see the DOM tree in a KListView
+ * This class is very useful to see the DOM tree in a TDEListView
  */
 
-class DOMTreeView : public KListView
+class DOMTreeView : public TDEListView
 {
     Q_OBJECT
   
diff --git a/quanta/parts/kafka/htmldocumentproperties.cpp b/quanta/parts/kafka/htmldocumentproperties.cpp
index dbe6ae53..21d614dc 100644
--- a/quanta/parts/kafka/htmldocumentproperties.cpp
+++ b/quanta/parts/kafka/htmldocumentproperties.cpp
@@ -92,7 +92,7 @@ htmlDocumentProperties::htmlDocumentProperties( TQWidget* parent, bool forceInse
 	metaItems->setSorting(0, true);
 
 
-	//set the cssRules KListView
+	//set the cssRules TDEListView
 	//cssRules->setEditable(false);
 	cssRules->addColumn(i18n("Selector"));
 	cssRules->addColumn(i18n("Rule"));
diff --git a/quanta/parts/kafka/kafkahtmlpart.cpp b/quanta/parts/kafka/kafkahtmlpart.cpp
index 1b2ca3d2..9d35c33b 100644
--- a/quanta/parts/kafka/kafkahtmlpart.cpp
+++ b/quanta/parts/kafka/kafkahtmlpart.cpp
@@ -2261,7 +2261,7 @@ void KafkaWidget::applyQueuedToggableTagActions()
         {
             if(tag_action->name() == *it)
             {
-                tag_action->slotActionActivated(KAction::EmulatedActivation, Qt::NoButton);
+                tag_action->slotActionActivated(TDEAction::EmulatedActivation, Qt::NoButton);
                 break;
             }
         }
diff --git a/quanta/parts/preview/whtmlpart.cpp b/quanta/parts/preview/whtmlpart.cpp
index 51b41628..6560191b 100644
--- a/quanta/parts/preview/whtmlpart.cpp
+++ b/quanta/parts/preview/whtmlpart.cpp
@@ -52,7 +52,7 @@ WHTMLPart::WHTMLPart(TQWidget *parentWidget, const char *widgetName, bool enable
    m_enableViewSource = enableViewSource;
    if (m_enableViewSource)
    {
-    m_contextMenu = new KPopupMenu(parentWidget);
+    m_contextMenu = new TDEPopupMenu(parentWidget);
     m_contextMenu->insertItem(i18n("View &Document Source"), this, TQT_SLOT(slotViewSource()));
     
     connect(this, TQT_SIGNAL(popupMenu(const TQString&, const TQPoint&)), TQT_SLOT(popupMenu(const TQString&, const TQPoint&)));
diff --git a/quanta/parts/preview/whtmlpart.h b/quanta/parts/preview/whtmlpart.h
index 41212459..73bd23e5 100644
--- a/quanta/parts/preview/whtmlpart.h
+++ b/quanta/parts/preview/whtmlpart.h
@@ -22,7 +22,7 @@
 
 #include <tdehtml_part.h>
 
-class KPopupMenu;
+class TDEPopupMenu;
 /**
   *@author Dmitry Poplavsky & Alexander Yakovlev & Eric Laffoon
   */
@@ -68,7 +68,7 @@ protected:
 
 private:
   KURL m_previewedURL;
-  KPopupMenu *m_contextMenu;
+  TDEPopupMenu *m_contextMenu;
   TQStrList history;
   unsigned int hpos;
   bool m_enableViewSource;
diff --git a/quanta/plugins/quantaplugin.cpp b/quanta/plugins/quantaplugin.cpp
index b52f02f6..252ac07c 100644
--- a/quanta/plugins/quantaplugin.cpp
+++ b/quanta/plugins/quantaplugin.cpp
@@ -73,7 +73,7 @@ void QuantaPlugin::setPluginName(const TQString &a_name)
   m_name = a_name;
   if (!m_action)
   {
-    m_action = new KToggleAction(i18n(a_name.utf8()), 0, this, TQT_SLOT(toggle()), quantaApp->actionCollection(), a_name.ascii());
+    m_action = new TDEToggleAction(i18n(a_name.utf8()), 0, this, TQT_SLOT(toggle()), quantaApp->actionCollection(), a_name.ascii());
   }
   m_action->setText(a_name);
 }
diff --git a/quanta/plugins/quantaplugin.h b/quanta/plugins/quantaplugin.h
index c7a4c705..5f022797 100644
--- a/quanta/plugins/quantaplugin.h
+++ b/quanta/plugins/quantaplugin.h
@@ -31,7 +31,7 @@ class TQString;
   *@author Marc Britton
   */
 
-class KToggleAction;
+class TDEToggleAction;
 class KMdiToolViewAccessor;
 
 class QuantaView;
@@ -119,7 +119,7 @@ protected:
   TQGuardedPtr<KParts::ReadOnlyPart> m_part;
   bool m_readOnlyPart;
   QuantaView *m_view;
-  KToggleAction *m_action;
+  TDEToggleAction *m_action;
 private: // Private attributes
   TQString m_standardName;
   KMdiToolViewAccessor* m_pluginToolView;
diff --git a/quanta/plugins/quantaplugininterface.cpp b/quanta/plugins/quantaplugininterface.cpp
index 51a2cf25..b2ce2713 100644
--- a/quanta/plugins/quantaplugininterface.cpp
+++ b/quanta/plugins/quantaplugininterface.cpp
@@ -41,9 +41,9 @@
 QuantaPluginInterface::QuantaPluginInterface(TQWidget *parent)
 {
   m_parent = parent;
-   (void) new KAction( i18n( "Configure &Plugins..." ), 0, 0,
+   (void) new TDEAction( i18n( "Configure &Plugins..." ), 0, 0,
                         this, TQT_SLOT( slotPluginsEdit() ),
-                        ((KMainWindow*)parent)->actionCollection(), "configure_plugins" );
+                        ((TDEMainWindow*)parent)->actionCollection(), "configure_plugins" );
   m_pluginMenu = 0L;
   // m_plugins.setAutoDelete(true);
 }
diff --git a/quanta/project/eventconfigurationdlg.cpp b/quanta/project/eventconfigurationdlg.cpp
index 29d23964..d3c84d26 100644
--- a/quanta/project/eventconfigurationdlg.cpp
+++ b/quanta/project/eventconfigurationdlg.cpp
@@ -29,7 +29,7 @@
 #include "eventeditordlg.h"
 #include "qpevents.h"
 
-EventConfigurationDlg::EventConfigurationDlg(KActionCollection *actionCollection, TQWidget* parent, const char* name, WFlags fl)
+EventConfigurationDlg::EventConfigurationDlg(TDEActionCollection *actionCollection, TQWidget* parent, const char* name, WFlags fl)
 : EventConfigurationDlgS(parent,name,fl)
 {
   m_actionCollection = actionCollection;
diff --git a/quanta/project/eventconfigurationdlg.h b/quanta/project/eventconfigurationdlg.h
index 9841d009..b7c64779 100644
--- a/quanta/project/eventconfigurationdlg.h
+++ b/quanta/project/eventconfigurationdlg.h
@@ -20,7 +20,7 @@
 #include "eventconfigurationdlgs.h"
 
 class TQDomDocument;
-class KActionCollection;
+class TDEActionCollection;
 struct EventAction;
 typedef  TQMap<TQString, TQValueList<EventAction> > EventActions;
 
@@ -30,7 +30,7 @@ class EventConfigurationDlg : public EventConfigurationDlgS
   
 
 public:
-  EventConfigurationDlg(KActionCollection *actionCollection, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+  EventConfigurationDlg(TDEActionCollection *actionCollection, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
   ~EventConfigurationDlg();
   void initEvents(EventActions *events);
   void saveEvents(TQDomDocument dom);
@@ -41,7 +41,7 @@ public slots:
    void slotDeleteEvent();
 
 protected:
-  KActionCollection *m_actionCollection;
+  TDEActionCollection *m_actionCollection;
 
 protected slots:
 
diff --git a/quanta/project/eventconfigurationdlgs.ui b/quanta/project/eventconfigurationdlgs.ui
index 2c9b133f..f60d8f6d 100644
--- a/quanta/project/eventconfigurationdlgs.ui
+++ b/quanta/project/eventconfigurationdlgs.ui
@@ -71,7 +71,7 @@
                         </size>
                     </property>
                 </spacer>
-                <widget class="KListView" row="0" column="0" rowspan="1" colspan="5">
+                <widget class="TDEListView" row="0" column="0" rowspan="1" colspan="5">
                     <column>
                         <property name="text">
                             <string>Event</string>
diff --git a/quanta/project/eventeditordlg.cpp b/quanta/project/eventeditordlg.cpp
index ddd22837..d98c5ce3 100644
--- a/quanta/project/eventeditordlg.cpp
+++ b/quanta/project/eventeditordlg.cpp
@@ -35,7 +35,7 @@ extern TQString taskLeaderStr;
 extern TQString teamLeaderStr;
 extern TQString subprojectLeaderStr;
 
-EventEditorDlg::EventEditorDlg(KActionCollection *actionCollection, TQWidget* parent, const char* name, WFlags fl)
+EventEditorDlg::EventEditorDlg(TDEActionCollection *actionCollection, TQWidget* parent, const char* name, WFlags fl)
 : EventEditorDlgS(parent,name,fl)
 {
   m_actionCollection = actionCollection;
@@ -388,7 +388,7 @@ void EventEditorDlg::slotActionChanged(const TQString &name)
        TQStringList items;
        for (uint i = 0; i < m_actionCollection->count(); i++)
        {
-          KAction *a = m_actionCollection->action(i);
+          TDEAction *a = m_actionCollection->action(i);
           action = dynamic_cast<TagAction*>(a);
           if (!action || action->type() != "script")
           {
diff --git a/quanta/project/eventeditordlg.h b/quanta/project/eventeditordlg.h
index 697821c6..45b94a95 100644
--- a/quanta/project/eventeditordlg.h
+++ b/quanta/project/eventeditordlg.h
@@ -21,7 +21,7 @@
 #include "eventeditordlgs.h"
 
 class TQLabel;
-class KActionCollection;
+class TDEActionCollection;
 class KComboBox;
 
 class EventEditorDlg : public EventEditorDlgS
@@ -30,7 +30,7 @@ class EventEditorDlg : public EventEditorDlgS
   
 
 public:
-  EventEditorDlg(KActionCollection *actionCollection, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+  EventEditorDlg(TDEActionCollection *actionCollection, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
   ~EventEditorDlg();
   void setEvent(const TQString &name);
   void setAction(const TQString &name);
@@ -48,7 +48,7 @@ protected:
 
    TQMap<TQString, TQString> m_scriptActions;
    TQMap<TQString, TQString> m_otherActions;
-   KActionCollection *m_actionCollection;
+   TDEActionCollection *m_actionCollection;
 
 protected slots:
 
diff --git a/quanta/project/project.cpp b/quanta/project/project.cpp
index d3786e3b..c4da3a3c 100644
--- a/quanta/project/project.cpp
+++ b/quanta/project/project.cpp
@@ -68,7 +68,7 @@ extern TQString taskLeaderStr;
 extern TQString teamLeaderStr;
 extern TQString subprojectLeaderStr;
 
-Project::Project(KMainWindow *parent)
+Project::Project(TDEMainWindow *parent)
         : TQObject()
 {
   d = new ProjectPrivate(this);
diff --git a/quanta/project/project.h b/quanta/project/project.h
index 42d18fef..e1487ad7 100644
--- a/quanta/project/project.h
+++ b/quanta/project/project.h
@@ -37,7 +37,7 @@ typedef  TQMap<TQString, TQValueList<EventAction> > EventActions;
   */
 
 class TDEConfig;
-class KMainWindow;
+class TDEMainWindow;
 
 struct TeamMember {
   TQString name;
@@ -64,7 +64,7 @@ public:
    *  the parameter is only used at the first call to create the class
    *
    */
-  static Project* const ref(KMainWindow *parent = 0L)
+  static Project* const ref(TDEMainWindow *parent = 0L)
   {
     static Project *m_ref;
     if (!m_ref) m_ref = new Project(parent);
@@ -212,7 +212,7 @@ private:
    *  If you need the class use Project::ref() for
    *  construction and reference
    */
-  Project(KMainWindow *parent);
+  Project(TDEMainWindow *parent);
 
   ProjectPrivate *d;
   bool m_projectToolbarVisible;
diff --git a/quanta/project/projectprivate.cpp b/quanta/project/projectprivate.cpp
index 7e676e2b..1df99466 100644
--- a/quanta/project/projectprivate.cpp
+++ b/quanta/project/projectprivate.cpp
@@ -80,13 +80,13 @@ ProjectPrivate::~ProjectPrivate()
 }
 
 /** setup of the actions */
-void ProjectPrivate::initActions(KActionCollection *ac)
+void ProjectPrivate::initActions(TDEActionCollection *ac)
 {
-  (void) new KAction( i18n( "&New Project..." ), "window_new", 0,
+  (void) new TDEAction( i18n( "&New Project..." ), "window_new", 0,
                         this, TQT_SLOT( slotNewProject() ),
                         ac, "project_new" );
 
-  (void) new KAction( i18n( "&Open Project..." ), "project_open", 0,
+  (void) new TDEAction( i18n( "&Open Project..." ), "project_open", 0,
                         this, TQT_SLOT( slotOpenProject() ),
                         ac, "project_open" );
   m_projectRecent =
@@ -97,24 +97,24 @@ void ProjectPrivate::initActions(KActionCollection *ac)
   m_projectRecent->setToolTip(i18n("Open/Open recent project"));
   connect(m_projectRecent, TQT_SIGNAL(activated()), this, TQT_SLOT(slotOpenProject()));
 
-  closeprjAction =  new KAction( i18n( "&Close Project" ), "fileclose", 0,
+  closeprjAction =  new TDEAction( i18n( "&Close Project" ), "fileclose", 0,
                         this, TQT_SLOT( slotCloseProject() ),
                         ac, "project_close" );
 
 
-  openPrjViewAction = new KSelectAction( i18n( "Open Project &View..." ), 0,
+  openPrjViewAction = new TDESelectAction( i18n( "Open Project &View..." ), 0,
                         ac, "project_view_open" );
   connect(openPrjViewAction, TQT_SIGNAL(activated(const TQString &)),
           this, TQT_SLOT(slotOpenProjectView(const TQString &)));
   openPrjViewAction->setToolTip(i18n("Open project view"));
 
-  savePrjViewAction = new KAction( i18n( "&Save Project View" ), "filesave", 0,
+  savePrjViewAction = new TDEAction( i18n( "&Save Project View" ), "filesave", 0,
                         this, TQT_SLOT( slotSaveProjectView() ),
                         ac, "project_view_save" );
-  saveAsPrjViewAction = new KAction( i18n( "Save Project View &As..." ), "filesaveas", 0,
+  saveAsPrjViewAction = new TDEAction( i18n( "Save Project View &As..." ), "filesaveas", 0,
                         this, TQT_SLOT( slotSaveAsProjectView() ),
                         ac, "project_view_save_as" );
-  deletePrjViewAction = new KSelectAction( i18n( "&Delete Project View" ), "editdelete", 0,
+  deletePrjViewAction = new TDESelectAction( i18n( "&Delete Project View" ), "editdelete", 0,
                         ac, "project_view_delete" );
   connect(deletePrjViewAction, TQT_SIGNAL(activated(const TQString &)),
           this, TQT_SLOT(slotDeleteProjectView(const TQString &)));
@@ -122,33 +122,33 @@ void ProjectPrivate::initActions(KActionCollection *ac)
 
 
 
-  insertFileAction = new KAction( i18n( "&Insert Files..." ), 0,
+  insertFileAction = new TDEAction( i18n( "&Insert Files..." ), 0,
                         this, TQT_SLOT( slotAddFiles() ),
                         ac, "project_insert_file" );
 
-  insertDirAction = new KAction( i18n( "Inser&t Folder..." ), 0,
+  insertDirAction = new TDEAction( i18n( "Inser&t Folder..." ), 0,
                         this, TQT_SLOT( slotAddDirectory() ),
                         ac, "project_insert_directory" );
 
-  rescanPrjDirAction = new KAction( i18n( "&Rescan Project Folder..." ), "reload", 0,
+  rescanPrjDirAction = new TDEAction( i18n( "&Rescan Project Folder..." ), "reload", 0,
                         parent, TQT_SLOT( slotRescanPrjDir() ),
                         ac, "project_rescan" );
 
-  uploadProjectAction = new KAction( i18n( "&Upload Project..." ), "up", Key_F8,
+  uploadProjectAction = new TDEAction( i18n( "&Upload Project..." ), "up", Key_F8,
                         parent, TQT_SLOT( slotUpload() ),
                         ac, "project_upload" );
 
-  projectOptionAction = new KAction( i18n( "&Project Properties" ), "configure", SHIFT + Key_F7,
+  projectOptionAction = new TDEAction( i18n( "&Project Properties" ), "configure", SHIFT + Key_F7,
                         parent, TQT_SLOT( slotOptions() ),
                         ac, "project_options" );
 
   saveAsProjectTemplateAction =
-            new KAction( i18n( "Save as Project Template..." ), 0,
+            new TDEAction( i18n( "Save as Project Template..." ), 0,
                         TQT_TQOBJECT(m_mainWindow), TQT_SLOT( slotFileSaveAsProjectTemplate() ),
                         ac, "save_project_template" );
 
   saveSelectionAsProjectTemplateAction =
-                        new KAction( i18n( "Save Selection to Project Template File..." ), 0,
+                        new TDEAction( i18n( "Save Selection to Project Template File..." ), 0,
                                     TQT_TQOBJECT(m_mainWindow), TQT_SLOT( slotFileSaveSelectionAsProjectTemplate() ),
                                     ac, "save_selection_project_template" );
   adjustActions();
diff --git a/quanta/project/projectprivate.h b/quanta/project/projectprivate.h
index 0b0a14df..d67d27d3 100644
--- a/quanta/project/projectprivate.h
+++ b/quanta/project/projectprivate.h
@@ -30,12 +30,12 @@
 
 class TQWidgetStack;
 
-class KAction;
-class KActionCollection;
+class TDEAction;
+class TDEActionCollection;
 class TDEConfig;
 class KDirWatch;
-class KRecentFilesAction;
-class KSelectAction;
+class TDERecentFilesAction;
+class TDESelectAction;
 class KTempFile;
 
 class CopyTo;
@@ -73,7 +73,7 @@ upload.*/
   bool usePreviewPrefix;
   bool m_persistentBookmarks;
   TQString author;
-  KRecentFilesAction *m_projectRecent;
+  TDERecentFilesAction *m_projectRecent;
 
   ProjectNewGeneral    *png;
   ProjectNewLocal      *pnl;
@@ -91,7 +91,7 @@ upload.*/
   TQString m_defaultEncoding;
   TQRegExp excludeRx;
   TQStringList excludeList;
-  KMainWindow *m_mainWindow;
+  TDEMainWindow *m_mainWindow;
   TQString m_debuggerClientEdit;
   TQMap<TQString, TQString> m_passwdList;
   ProjectList m_projectFiles; ///< the list with the _absolute_ URL's of the project
@@ -116,14 +116,14 @@ upload.*/
   bool m_showUploadTreeviews;
   bool m_eventsEnabled;
 
-  KAction
+  TDEAction
     *closeprjAction, *insertFileAction, *insertDirAction,
     *uploadProjectAction,  *rescanPrjDirAction,
     *projectOptionAction, *saveAsProjectTemplateAction,
     *saveSelectionAsProjectTemplateAction,
     *savePrjViewAction, *saveAsPrjViewAction;
 
-   KSelectAction *openPrjViewAction, *deletePrjViewAction;
+   TDESelectAction *openPrjViewAction, *deletePrjViewAction;
   /** the filename of the local webprj file after download */
   TQString m_tmpProjectFile;
   TQString m_tmpSessionFile;
@@ -133,7 +133,7 @@ upload.*/
   EventActions *m_events;
 
   /** setup of the actions */
-  void initActions(KActionCollection *ac);
+  void initActions(TDEActionCollection *ac);
 
   void adjustActions();
 
diff --git a/quanta/project/teammembersdlgs.ui b/quanta/project/teammembersdlgs.ui
index aa1c42f6..dc8f0328 100644
--- a/quanta/project/teammembersdlgs.ui
+++ b/quanta/project/teammembersdlgs.ui
@@ -83,7 +83,7 @@
                         <string>&amp;Edit...</string>
                     </property>
                 </widget>
-                <widget class="KListView" row="0" column="0" rowspan="1" colspan="5">
+                <widget class="TDEListView" row="0" column="0" rowspan="1" colspan="5">
                     <column>
                         <property name="text">
                             <string>Name</string>
diff --git a/quanta/quanta_uml.xmi b/quanta/quanta_uml.xmi
index 365a7cae..ac5b3ffa 100644
--- a/quanta/quanta_uml.xmi
+++ b/quanta/quanta_uml.xmi
@@ -142,11 +142,11 @@
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="272" type="QWidgetStack *" abstract="0" documentation="" name="widgetStackOfHtmlPart" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="273" type="" abstract="0" documentation="" name="~QuantaApp" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="113" value="" type="KAction *" abstract="0" documentation="" name="bookmarkClear" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="114" value="" type="KAction *" abstract="0" documentation="" name="bookmarkToggle" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="113" value="" type="TDEAction *" abstract="0" documentation="" name="bookmarkClear" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="114" value="" type="TDEAction *" abstract="0" documentation="" name="bookmarkToggle" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="115" value="" type="KDockWidget *" abstract="0" documentation="" name="bottdock" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="116" value="" type="QWidgetStack *" abstract="0" documentation="" name="bottomWidgetStack" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="117" value="" type="KAction *" abstract="0" documentation="" name="closeprjAction" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="117" value="" type="TDEAction *" abstract="0" documentation="" name="closeprjAction" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="118" value="" type="TDEConfig *" abstract="0" documentation="" name="config" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="119" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="currentToolbarDTD" static="0" scope="202" />
     <UML:Attribute stereotype="" package="" xmi.id="120" value="" type="DocTreeView *" abstract="0" documentation="" name="dTab" static="0" scope="201" />
@@ -155,20 +155,20 @@
     <UML:Attribute stereotype="" package="" xmi.id="123" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="debuggerStyle" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="124" value="" type="QuantaDoc *" abstract="0" documentation="" name="doc" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="125" value="" type="KDockWidget *" abstract="0" documentation="" name="dtabdock" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="126" value="" type="KAction *" abstract="0" documentation="" name="editRedo" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="127" value="" type="KAction *" abstract="0" documentation="" name="editTagAction" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="128" value="" type="KAction *" abstract="0" documentation="" name="editUndo" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="126" value="" type="TDEAction *" abstract="0" documentation="" name="editRedo" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="127" value="" type="TDEAction *" abstract="0" documentation="" name="editTagAction" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="128" value="" type="TDEAction *" abstract="0" documentation="" name="editUndo" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="129" value="" type="bool" abstract="0" documentation="" name="exitingFlag" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="130" value="" type="FilesListView *" abstract="0" documentation="" name="fLTab" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="131" value="" type="FilesTreeView *" abstract="0" documentation="" name="fTTab" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="132" value="" type="QWidgetStack *" abstract="0" documentation="" name="fTab" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="133" value="" type="KRecentFilesAction *" abstract="0" documentation="" name="fileRecent" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="133" value="" type="TDERecentFilesAction *" abstract="0" documentation="" name="fileRecent" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="134" value="" type="KDockWidget *" abstract="0" documentation="" name="ftabdock" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="135" value="" type="GrepDialog *" abstract="0" documentation="" name="grepDialog" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="136" value="" type="WHTMLPart *" abstract="0" documentation="" name="htmlPartDoc" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="137" value="" type="WHTMLPart *" abstract="0" documentation="" name="htmlpart" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="138" value="" type="KAction *" abstract="0" documentation="" name="insertDirAction" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="139" value="" type="KAction *" abstract="0" documentation="" name="insertFileAction" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="138" value="" type="TDEAction *" abstract="0" documentation="" name="insertDirAction" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="139" value="" type="TDEAction *" abstract="0" documentation="" name="insertFileAction" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="140" value="" type="KDockWidget *" abstract="0" documentation="" name="leftdock" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="141" value="" type="QDomDocument *" abstract="0" documentation="" name="m_actions" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="142" value="" type="KDockWidget *" abstract="0" documentation="" name="m_oldTreeViewWidget" static="0" scope="202" />
@@ -178,9 +178,9 @@
     <UML:Attribute stereotype="" package="" xmi.id="146" value="" type="KDockWidget *" abstract="0" documentation="" name="maindock" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="147" value="" type="QPtrList" abstract="0" documentation="" name="markList" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="148" value="" type="MessageOutput *" abstract="0" documentation="" name="messageOutput" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="149" value="" type="KAction *" abstract="0" documentation="" name="newPrjAction" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="150" value="" type="KAction *" abstract="0" documentation="" name="openPrjAction" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="151" value="" type="KAction *" abstract="0" documentation="" name="openPrjViewAction" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="149" value="" type="TDEAction *" abstract="0" documentation="" name="newPrjAction" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="150" value="" type="TDEAction *" abstract="0" documentation="" name="openPrjAction" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="151" value="" type="TDEAction *" abstract="0" documentation="" name="openPrjViewAction" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="152" value="" type="ProjectTreeView *" abstract="0" documentation="" name="pTab" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="153" value="" type="int" abstract="0" documentation="" name="phpDebugPort" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="154" value="" type="QPopupMenu *" abstract="0" documentation="" name="pm_bookmark" static="0" scope="201" />
@@ -188,38 +188,38 @@
     <UML:Attribute stereotype="" package="" xmi.id="156" value="" type="bool" abstract="0" documentation="" name="previewCopyMade" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="157" value="" type="KTempFile *" abstract="0" documentation="" name="previewTmpFile" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="158" value="" type="Project *" abstract="0" documentation="" name="project" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="159" value="" type="KAction *" abstract="0" documentation="" name="projectOptionAction" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="160" value="" type="KRecentFilesAction *" abstract="0" documentation="" name="projectToolbarFiles" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="159" value="" type="TDEAction *" abstract="0" documentation="" name="projectOptionAction" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="160" value="" type="TDERecentFilesAction *" abstract="0" documentation="" name="projectToolbarFiles" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="161" value="" type="KDockWidget *" abstract="0" documentation="" name="ptabdock" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="162" value="" type="bool" abstract="0" documentation="" name="quantaStarted" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="163" value="" type="KAction *" abstract="0" documentation="" name="redoAction" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="163" value="" type="TDEAction *" abstract="0" documentation="" name="redoAction" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="164" value="" type="QTimer *" abstract="0" documentation="" name="refreshTimer" static="0" scope="202" />
-    <UML:Attribute stereotype="" package="" xmi.id="165" value="" type="KAction *" abstract="0" documentation="" name="rescanPrjDirAction" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="165" value="" type="TDEAction *" abstract="0" documentation="" name="rescanPrjDirAction" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="166" value="" type="QWidgetStack *" abstract="0" documentation="" name="rightWidgetStack" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="167" value="" type="StructTreeView *" abstract="0" documentation="" name="sTab" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="168" value="" type="KAction *" abstract="0" documentation="" name="saveAction" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="169" value="" type="KAction *" abstract="0" documentation="" name="saveAllAction" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="170" value="" type="KAction *" abstract="0" documentation="" name="saveAsLocalTemplateAction" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="171" value="" type="KAction *" abstract="0" documentation="" name="saveAsPrjViewAction" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="172" value="" type="KAction *" abstract="0" documentation="" name="saveAsProjectTemplateAction" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="173" value="" type="KAction *" abstract="0" documentation="" name="savePrjViewAction" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="174" value="" type="KAction *" abstract="0" documentation="" name="saveSelectionAsLocalTemplateAction" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="175" value="" type="KAction *" abstract="0" documentation="" name="saveSelectionAsProjectTemplateAction" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="176" value="" type="KAction *" abstract="0" documentation="" name="saveprjAction" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="168" value="" type="TDEAction *" abstract="0" documentation="" name="saveAction" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="169" value="" type="TDEAction *" abstract="0" documentation="" name="saveAllAction" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="170" value="" type="TDEAction *" abstract="0" documentation="" name="saveAsLocalTemplateAction" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="171" value="" type="TDEAction *" abstract="0" documentation="" name="saveAsPrjViewAction" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="172" value="" type="TDEAction *" abstract="0" documentation="" name="saveAsProjectTemplateAction" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="173" value="" type="TDEAction *" abstract="0" documentation="" name="savePrjViewAction" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="174" value="" type="TDEAction *" abstract="0" documentation="" name="saveSelectionAsLocalTemplateAction" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="175" value="" type="TDEAction *" abstract="0" documentation="" name="saveSelectionAsProjectTemplateAction" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="176" value="" type="TDEAction *" abstract="0" documentation="" name="saveprjAction" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="177" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="scriptBeginRxStr" static="0" scope="202" />
     <UML:Attribute stereotype="" package="" xmi.id="178" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="scriptEndRxStr" static="0" scope="202" />
-    <UML:Attribute stereotype="" package="" xmi.id="179" value="" type="KSelectAction *" abstract="0" documentation="" name="setEndOfLine" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="180" value="" type="KToggleAction *" abstract="0" documentation="" name="showDTDToolbar" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="181" value="" type="KToggleAction *" abstract="0" documentation="" name="showDTabAction" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="182" value="" type="KToggleAction *" abstract="0" documentation="" name="showFTabAction" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="183" value="" type="KToggleAction *" abstract="0" documentation="" name="showMessagesAction" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="184" value="" type="KToggleAction *" abstract="0" documentation="" name="showPTabAction" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="185" value="" type="KToggleAction *" abstract="0" documentation="" name="showPreviewAction" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="186" value="" type="KToggleAction *" abstract="0" documentation="" name="showSTabAction" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="187" value="" type="KToggleAction *" abstract="0" documentation="" name="showStatusbarAction" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="188" value="" type="KToggleAction *" abstract="0" documentation="" name="showTTabAction" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="189" value="" type="KToggleAction *" abstract="0" documentation="" name="showToolbarAction" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="190" value="" type="KToggleAction *" abstract="0" documentation="" name="showTreeAction" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="179" value="" type="TDESelectAction *" abstract="0" documentation="" name="setEndOfLine" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="180" value="" type="TDEToggleAction *" abstract="0" documentation="" name="showDTDToolbar" static="0" scope="200" />
+    <UML:Attribute stereotype="" package="" xmi.id="181" value="" type="TDEToggleAction *" abstract="0" documentation="" name="showDTabAction" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="182" value="" type="TDEToggleAction *" abstract="0" documentation="" name="showFTabAction" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="183" value="" type="TDEToggleAction *" abstract="0" documentation="" name="showMessagesAction" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="184" value="" type="TDEToggleAction *" abstract="0" documentation="" name="showPTabAction" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="185" value="" type="TDEToggleAction *" abstract="0" documentation="" name="showPreviewAction" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="186" value="" type="TDEToggleAction *" abstract="0" documentation="" name="showSTabAction" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="187" value="" type="TDEToggleAction *" abstract="0" documentation="" name="showStatusbarAction" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="188" value="" type="TDEToggleAction *" abstract="0" documentation="" name="showTTabAction" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="189" value="" type="TDEToggleAction *" abstract="0" documentation="" name="showToolbarAction" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="190" value="" type="TDEToggleAction *" abstract="0" documentation="" name="showTreeAction" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="191" value="" type="SpellChecker *" abstract="0" documentation="" name="spellChecker" static="0" scope="202" />
     <UML:Attribute stereotype="" package="" xmi.id="192" value="" type="KDockWidget *" abstract="0" documentation="" name="stabdock" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="193" value="" type="QTimer *" abstract="0" documentation="" name="statusbarTimer" static="0" scope="201" />
@@ -227,13 +227,13 @@
     <UML:Attribute stereotype="" package="" xmi.id="195" value="" type="QPtrList" abstract="0" documentation="" name="tempFileList" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="196" value="" type="QDict" abstract="0" documentation="" name="toolbarList" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="197" value="" type="KDockWidget *" abstract="0" documentation="" name="ttabdock" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="198" value="" type="KAction *" abstract="0" documentation="" name="undoAction" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="199" value="" type="KAction *" abstract="0" documentation="" name="uploadProjectAction" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="198" value="" type="TDEAction *" abstract="0" documentation="" name="undoAction" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="199" value="" type="TDEAction *" abstract="0" documentation="" name="uploadProjectAction" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="200" value="" type="uint" abstract="0" documentation="" name="userToolbarsCount" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="201" value="" type="QuantaView *" abstract="0" documentation="" name="view" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="202" value="" type="KToggleAction *" abstract="0" documentation="" name="viewBorder" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="203" value="" type="KToggleAction *" abstract="0" documentation="" name="viewDynamicWordWrap" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="204" value="" type="KToggleAction *" abstract="0" documentation="" name="viewLineNumbers" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="202" value="" type="TDEToggleAction *" abstract="0" documentation="" name="viewBorder" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="203" value="" type="TDEToggleAction *" abstract="0" documentation="" name="viewDynamicWordWrap" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="204" value="" type="TDEToggleAction *" abstract="0" documentation="" name="viewLineNumbers" static="0" scope="201" />
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="274" abstract="0" documentation="The document handling class. This is somewhat weird, as the Document class should handle all the document related things. The job is distrivute now between this the QuantaView and the QuantaApp class. This must be clearly seperated...
 See the operations in order to get a picture what's here." name="QuantaDoc" static="0" scope="200" >
@@ -278,7 +278,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
      <UML:Parameter stereotype="" package="" xmi.id="305" value="" type="TDEConfig *" abstract="0" documentation="" name="" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="306" type="" abstract="0" documentation="" name="~QuantaDoc" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="275" value="" type="KPopupMenu *" abstract="0" documentation="" name="attribMenu" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="275" value="" type="TDEPopupMenu *" abstract="0" documentation="" name="attribMenu" static="0" scope="201" />
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="307" abstract="0" documentation="Common static functions used everywhere in the code. " name="QuantaCommon" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="308" type="" abstract="0" documentation="" name="QuantaCommon" static="0" scope="200" />
@@ -957,7 +957,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
      <UML:Parameter stereotype="" package="" xmi.id="851" value="" type="const QString &amp;" abstract="0" documentation="" name="" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="852" type="" abstract="0" documentation="" name="~QuantaPlugin" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="794" value="" type="KToggleAction *" abstract="0" documentation="" name="m_action" static="0" scope="200" />
+    <UML:Attribute stereotype="" package="" xmi.id="794" value="" type="TDEToggleAction *" abstract="0" documentation="" name="m_action" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="795" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_arguments" static="0" scope="202" />
     <UML:Attribute stereotype="" package="" xmi.id="796" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_fileName" static="0" scope="202" />
     <UML:Attribute stereotype="" package="" xmi.id="797" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_icon" static="0" scope="202" />
@@ -1061,7 +1061,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
     <UML:Attribute stereotype="" package="" xmi.id="896" value="" type="ProjectNewWeb *" abstract="0" documentation="" name="pnw" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="897" value="" type="KURL" abstract="0" documentation="" name="previewPrefix" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="898" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="projectName" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="899" value="" type="KRecentFilesAction *" abstract="0" documentation="" name="projectRecent" static="0" scope="200" />
+    <UML:Attribute stereotype="" package="" xmi.id="899" value="" type="TDERecentFilesAction *" abstract="0" documentation="" name="projectRecent" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="900" value="" type="KURL" abstract="0" documentation="" name="projectURL" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="901" value="" type="KURL" abstract="0" documentation="" name="remoteDir" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="902" value="" type="QWidgetStack *" abstract="0" documentation="" name="stack" static="0" scope="201" />
@@ -1086,7 +1086,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
     <UML:Attribute stereotype="" package="" xmi.id="938" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="dir" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="939" value="" type=TQSTRINGLIST_OBJECT_NAME_STRING abstract="0" documentation="" name="dirList" static="0" scope="200" />
    </UML:Class>
-   <UML:Class stereotype="" package="" xmi.id="950" abstract="0" documentation="An extended KListViewItem for folders." name="FilesTreeFolder" static="0" scope="200" >
+   <UML:Class stereotype="" package="" xmi.id="950" abstract="0" documentation="An extended TDEListViewItem for folders." name="FilesTreeFolder" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="955" type="" abstract="0" documentation="" name="FilesTreeFolder" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="956" value="" type="QListView *" abstract="0" documentation="" name="parentListView" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="957" value="" type="FilesTreeFolder *" abstract="0" documentation="" name="parent" static="0" scope="200" />
@@ -1315,7 +1315,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="1125" type="" abstract="0" documentation="" name="~UploadTreeView" static="0" scope="200" />
    </UML:Class>
-   <UML:Class stereotype="" package="" xmi.id="1126" abstract="0" documentation="Treeview to display the document structure. Inherits from KListView." name="StructTreeView" static="0" scope="200" >
+   <UML:Class stereotype="" package="" xmi.id="1126" abstract="0" documentation="Treeview to display the document structure. Inherits from TDEListView." name="StructTreeView" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="1144" type="" abstract="0" documentation="" name="StructTreeView" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1145" value="" type="Parser *" abstract="0" documentation="" name="parser" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1146" value="" type="TDEConfig *" abstract="0" documentation="" name="config" static="0" scope="200" />
@@ -1418,7 +1418,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
     <UML:Attribute stereotype="" package="" xmi.id="1193" value="" type="FilesTreeFolder *" abstract="0" documentation="" name="projectDir" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="1194" value="" type="QuantaPropertiesPageDlg *" abstract="0" documentation="" name="quantaProperties" static="0" scope="201" />
    </UML:Class>
-   <UML:Class stereotype="" package="" xmi.id="1211" abstract="0" documentation="KListViewItem specific for the structure tree." name="StructTreeTag" static="0" scope="200" >
+   <UML:Class stereotype="" package="" xmi.id="1211" abstract="0" documentation="TDEListViewItem specific for the structure tree." name="StructTreeTag" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="1213" type="" abstract="0" documentation="" name="StructTreeTag" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1214" value="" type="QListView *" abstract="0" documentation="" name="parent" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1215" value="" type="const QString" abstract="0" documentation="" name="a_title" static="0" scope="200" />
@@ -1436,7 +1436,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
     <UML:Operation stereotype="" package="" xmi.id="1224" type="" abstract="0" documentation="" name="~StructTreeTag" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="1212" value="" type="Node *" abstract="0" documentation="" name="node" static="0" scope="200" />
    </UML:Class>
-   <UML:Class stereotype="" package="" xmi.id="1225" abstract="0" documentation="A project specific KListView." name="ProjectTreeView" static="0" scope="200" >
+   <UML:Class stereotype="" package="" xmi.id="1225" abstract="0" documentation="A project specific TDEListView." name="ProjectTreeView" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="1231" type="" abstract="0" documentation="" name="ProjectTreeView" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1232" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="1233" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" />
@@ -1491,7 +1491,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
     <UML:Operation stereotype="" package="" xmi.id="1265" type="virtual void" abstract="0" documentation="" name="slotReload" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="1266" type="" abstract="0" documentation="" name="~FilesTreeView" static="0" scope="200" />
    </UML:Class>
-   <UML:Class stereotype="" package="" xmi.id="1267" abstract="0" documentation="A treeview which has some common file managing methods. It inherits from KListView." name="FileManage" static="0" scope="200" >
+   <UML:Class stereotype="" package="" xmi.id="1267" abstract="0" documentation="A treeview which has some common file managing methods. It inherits from TDEListView." name="FileManage" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="1272" type="" abstract="0" documentation="" name="FileManage" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="1273" type="" abstract="0" documentation="" name="FileManage" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1274" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" />
@@ -1830,7 +1830,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
    <UML:Association nameb="" stereotype="" assoctype="association" rolea="74" roleb="112" multia="" multib="" package="" xmi.id="1563" abstract="0" documentation="" name="" static="0" scope="200" namea="" />
    <UML:Association nameb="" stereotype="" assoctype="association" rolea="112" roleb="274" multia="" multib="" package="" xmi.id="1564" abstract="0" documentation="" name="" static="0" scope="200" namea="" />
    <UML:Association nameb="" stereotype="" assoctype="association" rolea="74" roleb="407" multia="" multib="" package="" xmi.id="1568" abstract="0" documentation="" name="" static="0" scope="200" namea="" />
-   <UML:Class stereotype="" package="" xmi.id="1570" abstract="0" documentation="" name="KListView" static="0" scope="200" />
+   <UML:Class stereotype="" package="" xmi.id="1570" abstract="0" documentation="" name="TDEListView" static="0" scope="200" />
    <UML:Association nameb="" stereotype="" assoctype="generalization" rolea="1241" roleb="1267" multia="" multib="" package="" xmi.id="1572" abstract="0" documentation="" name="" static="0" scope="200" namea="" />
    <UML:Association nameb="" stereotype="" assoctype="aggregation" rolea="981" roleb="1241" multia="" multib="" package="" xmi.id="1573" abstract="0" documentation="" name="" static="0" scope="200" namea="" />
    <UML:Association nameb="" stereotype="" assoctype="aggregation" rolea="950" roleb="1241" multia="" multib="" package="" xmi.id="1574" abstract="0" documentation="" name="" static="0" scope="200" namea="" />
@@ -2662,7 +2662,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat
       <listitem open="0" type="815" id="1266" label="~FilesTreeView" />
      </listitem>
      <listitem open="1" type="813" id="1298" label="TDEApplication" />
-     <listitem open="1" type="813" id="1570" label="KListView" />
+     <listitem open="1" type="813" id="1570" label="TDEListView" />
      <listitem open="0" type="813" id="564" label="KQApplication" >
       <listitem open="0" type="815" id="565" label="KQApplication" />
       <listitem open="0" type="815" id="566" label="~KQApplication" />
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
diff --git a/quanta/treeviews/basetreeview.cpp b/quanta/treeviews/basetreeview.cpp
index 1b1b3e7a..603249c0 100644
--- a/quanta/treeviews/basetreeview.cpp
+++ b/quanta/treeviews/basetreeview.cpp
@@ -581,13 +581,13 @@ void BaseTreeView::slotOpenWithActivated(int id)
   }
 }
 
-void BaseTreeView::insertOpenWithMenu(KPopupMenu *menu, int position)
+void BaseTreeView::insertOpenWithMenu(TDEPopupMenu *menu, int position)
 {
   if (m_openWithMenuId != -1)
     menu->removeItem(m_openWithMenuId);
   for (uint i = 0; i < m_openWithActions.count(); i++)
   {
-    KAction *action = m_openWithActions[i];
+    TDEAction *action = m_openWithActions[i];
     delete action;
   }
   m_openWithActions.clear();
@@ -599,13 +599,13 @@ void BaseTreeView::insertOpenWithMenu(KPopupMenu *menu, int position)
 
   if (offers.count() > 0 || plugins.count() > 0)
   {
-    m_openWithMenu = new KPopupMenu(this);
+    m_openWithMenu = new TDEPopupMenu(this);
     if (offers.count() > 0) 
     {
       TDETrader::OfferList::Iterator it;
       for (it = offers.begin(); it != offers.end(); ++it)
       {
-        KAction *action = new KAction((*it)->name(), (*it)->icon(), 0, 0, TQFile::encodeName((*it)->desktopEntryPath()).data());
+        TDEAction *action = new TDEAction((*it)->name(), (*it)->icon(), 0, 0, TQFile::encodeName((*it)->desktopEntryPath()).data());
         connect(action, TQT_SIGNAL(activated()), this, TQT_SLOT(slotOpenWithApplication()));
         action->plug(m_openWithMenu);
         m_openWithActions.append(action);
@@ -1059,7 +1059,7 @@ void BaseTreeView::doRename(KFileTreeViewItem* kftvi, const TQString & newName)
 
 void BaseTreeView::saveLayout(TDEConfig *config, const TQString &group)
 {
-  KListView::saveLayout(config, group);
+  TDEListView::saveLayout(config, group);
   if (! m_saveOpenFolder || ! qConfig.saveTrees)
     return;
 
@@ -1085,7 +1085,7 @@ void BaseTreeView::saveLayout(TDEConfig *config, const TQString &group)
 
 void BaseTreeView::restoreLayout(TDEConfig *config, const TQString &group)
 {
-  KListView::restoreLayout(config, group);
+  TDEListView::restoreLayout(config, group);
   TDEConfigGroupSaver saver(config, group);
   setShowToolTips( config->readBoolEntry("ShowToolTips", true) );
 
diff --git a/quanta/treeviews/basetreeview.h b/quanta/treeviews/basetreeview.h
index bef646ae..f189c4d7 100644
--- a/quanta/treeviews/basetreeview.h
+++ b/quanta/treeviews/basetreeview.h
@@ -37,9 +37,9 @@ class TQPoint;
 class TQRegExp;
 class TQCloseEvent;
 
-class KAction;
+class TDEAction;
 class KFileItem;
-class KPopupMenu;
+class TDEPopupMenu;
 class KPropertiesDialog;
 class KURL;
 class FileInfoDlg;
@@ -321,7 +321,7 @@ protected:
   @param menu the menu where the Open With submenu should be inserted
   @param position the position in this menu
   */
-  void insertOpenWithMenu(KPopupMenu *menu, int position);
+  void insertOpenWithMenu(TDEPopupMenu *menu, int position);
   KPropertiesDialog *propDlg;
   TQString m_projectName;
   KURL m_projectBaseURL;
@@ -355,9 +355,9 @@ signals:
 
 private:
   bool m_saveOpenFolder;
-  KPopupMenu *m_openWithMenu;
+  TDEPopupMenu *m_openWithMenu;
   int m_openWithMenuId;
-  TQValueList<KAction *> m_openWithActions;
+  TQValueList<TDEAction *> m_openWithActions;
   TQMap<int, QuantaPlugin*> m_pluginIds;
 };
 
diff --git a/quanta/treeviews/docfolder.cpp b/quanta/treeviews/docfolder.cpp
index 3d028451..358fec8a 100644
--- a/quanta/treeviews/docfolder.cpp
+++ b/quanta/treeviews/docfolder.cpp
@@ -29,7 +29,7 @@
 #include "docitem.h"
 
 DocFolder::DocFolder(TQListViewItem *parent, const TQString &_name, TDEConfig *config, const TQString &basePath)
-  : KListViewItem(parent)
+  : TDEListViewItem(parent)
 {
   name = _name;
   topLevel = false;
@@ -60,7 +60,7 @@ DocFolder::DocFolder(TQListViewItem *parent, const TQString &_name, TDEConfig *c
 }
 
 DocFolder::DocFolder(TQListView *parent, const TQString &_name, TDEConfig *config, const TQString &basePath)
-  : KListViewItem(parent)
+  : TDEListViewItem(parent)
 {
   name = _name;
   topLevel = false;
diff --git a/quanta/treeviews/docfolder.h b/quanta/treeviews/docfolder.h
index 5f36a825..c6d02fe0 100644
--- a/quanta/treeviews/docfolder.h
+++ b/quanta/treeviews/docfolder.h
@@ -31,7 +31,7 @@ Doc tree
 
 class TDEConfig;
 
-class DocFolder : public KListViewItem  {
+class DocFolder : public TDEListViewItem  {
 public:
   DocFolder(TQListViewItem *parent, const TQString &_name, TDEConfig *config, const TQString &basePath);
   DocFolder(TQListView *parent, const TQString &_name, TDEConfig *config, const TQString &basePath);
diff --git a/quanta/treeviews/docitem.cpp b/quanta/treeviews/docitem.cpp
index 3fb4ac2f..0e31c2ed 100644
--- a/quanta/treeviews/docitem.cpp
+++ b/quanta/treeviews/docitem.cpp
@@ -22,14 +22,14 @@
 #include "docitem.h"
 
 DocItem::DocItem(TQListViewItem *parent, const TQString &_name, const TQString &_url)
-  : KListViewItem(parent)
+  : TDEListViewItem(parent)
 {
   url = _url;
   name = _name;
 }
 
 DocItem::DocItem(TQListView *parent, const TQString &_name, const TQString &_url)
-  : KListViewItem(parent)
+  : TDEListViewItem(parent)
 {
   url = _url;
   name = _name;
diff --git a/quanta/treeviews/docitem.h b/quanta/treeviews/docitem.h
index 6022650b..5a245828 100644
--- a/quanta/treeviews/docitem.h
+++ b/quanta/treeviews/docitem.h
@@ -28,7 +28,7 @@ class TDEConfig;
   *@author Yacovlev Alexander & Dmitry Poplavsky
   */
 
-class DocItem : public KListViewItem  {
+class DocItem : public TDEListViewItem  {
 
 public:
   DocItem(TQListViewItem *parent, const TQString &_name, const TQString &_url);
diff --git a/quanta/treeviews/doctreeview.cpp b/quanta/treeviews/doctreeview.cpp
index 684072a5..a9859858 100644
--- a/quanta/treeviews/doctreeview.cpp
+++ b/quanta/treeviews/doctreeview.cpp
@@ -36,7 +36,7 @@
 #include "docitem.h"
 
 DocTreeView::DocTreeView(TQWidget *parent, const char *name )
-  : KListView(parent,name)
+  : TDEListView(parent,name)
 {
 
   contextHelpDict = new TQDict<TQString>( 101, false );
@@ -51,7 +51,7 @@ DocTreeView::DocTreeView(TQWidget *parent, const char *name )
   addColumn("");
   setFullWidth(true);
 
-  projectDocFolder = new KListViewItem(this, i18n("Project Documentation"));
+  projectDocFolder = new TDEListViewItem(this, i18n("Project Documentation"));
   projectDocFolder->setOpen(true);
   slotRefreshTree();
   setFocusPolicy(TQ_ClickFocus);
@@ -60,11 +60,11 @@ DocTreeView::DocTreeView(TQWidget *parent, const char *name )
   connect(this, TQT_SIGNAL(returnPressed(TQListViewItem *)), TQT_SLOT(clickItem(TQListViewItem *)));
   connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem *)), TQT_SLOT(slotDoubleClicked(TQListViewItem *)));
 
-  m_contextMenu  = new KPopupMenu(this);
+  m_contextMenu  = new TDEPopupMenu(this);
   m_menuReload = m_contextMenu->insertItem(i18n("&Reload"), this, TQT_SLOT(slotReloadProjectDocs()));
   m_contextMenu->insertItem(SmallIcon("network"), i18n("&Download Documentation..."), this, TQT_SIGNAL(downloadDoc()));
-  connect(this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)),
-          this, TQT_SLOT(slotMenu(KListView*, TQListViewItem*, const TQPoint&)));
+  connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
+          this, TQT_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
 }
 
 
@@ -161,7 +161,7 @@ void DocTreeView::slotAddProjectDoc(const KURL& url)
   new DocItem(projectDocFolder, path, url.url());
 }
 
-void DocTreeView::slotMenu(KListView *, TQListViewItem *item, const TQPoint &point)
+void DocTreeView::slotMenu(TDEListView *, TQListViewItem *item, const TQPoint &point)
 {
   m_contextMenu->setItemVisible(m_menuReload, false);
   if (item)
diff --git a/quanta/treeviews/doctreeview.h b/quanta/treeviews/doctreeview.h
index 7ce1b656..3168899c 100644
--- a/quanta/treeviews/doctreeview.h
+++ b/quanta/treeviews/doctreeview.h
@@ -26,14 +26,14 @@
 #include <klistview.h>
 
 class DocFolder;
-class KPopupMenu;
+class TDEPopupMenu;
 
 
 /**
   *@author Yacovlev Alexander & Dmitry Poplavsky
   */
 
-class DocTreeView : public KListView  {
+class DocTreeView : public TDEListView  {
    Q_OBJECT
   
 public:
@@ -57,15 +57,15 @@ signals:
 private slots:
   void clickItem( TQListViewItem *);
   void slotDoubleClicked(TQListViewItem *);
-  void slotMenu(KListView *, TQListViewItem *item, const TQPoint &point);
+  void slotMenu(TDEListView *, TQListViewItem *item, const TQPoint &point);
 
 
 private:
 
   TQDict<TQString> *contextHelpDict;
   TQValueList<DocFolder *> m_folderList;
-  KListViewItem *projectDocFolder;
-  KPopupMenu *m_contextMenu;
+  TDEListViewItem *projectDocFolder;
+  TDEPopupMenu *m_contextMenu;
   int m_menuReload;
 };
 
diff --git a/quanta/treeviews/filestreeview.cpp b/quanta/treeviews/filestreeview.cpp
index eee9e6fb..7d82961f 100644
--- a/quanta/treeviews/filestreeview.cpp
+++ b/quanta/treeviews/filestreeview.cpp
@@ -82,7 +82,7 @@ FilesTreeView::FilesTreeView(TDEConfig *config, TQWidget *parent, const char *na
         topURLList.append(url);
   }
 
-  m_fileMenu = new KPopupMenu(this);
+  m_fileMenu = new TDEPopupMenu(this);
 
   m_fileMenu->insertItem(SmallIcon("fileopen"), i18n("&Open"), this ,TQT_SLOT(slotOpen()));
   m_fileMenu->insertItem(i18n("Insert &Tag"), this, TQT_SLOT(slotInsertTag()));
@@ -95,11 +95,11 @@ FilesTreeView::FilesTreeView(TDEConfig *config, TQWidget *parent, const char *na
   m_fileMenu->insertSeparator();
   m_fileMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
 
-  KPopupMenu *createNewMenu = new KPopupMenu(this);
+  TDEPopupMenu *createNewMenu = new TDEPopupMenu(this);
   createNewMenu->insertItem(SmallIcon("folder_new"), i18n("F&older..."), this, TQT_SLOT(slotCreateFolder()));
   createNewMenu->insertItem(SmallIcon("document"), i18n("&File..."), this, TQT_SLOT(slotCreateFile()));
 
-  m_folderMenu = new KPopupMenu();
+  m_folderMenu = new TDEPopupMenu();
 
   m_folderMenu->insertItem(SmallIcon("folder_new"), i18n("New Top &Folder..."), this, TQT_SLOT(slotNewTopFolder()));
   m_menuTop = m_folderMenu->insertItem(i18n("&Add Folder to Top"), this, TQT_SLOT(slotAddToTop()));
@@ -116,7 +116,7 @@ FilesTreeView::FilesTreeView(TDEConfig *config, TQWidget *parent, const char *na
   m_folderMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
   m_reloadMenuId = m_folderMenu->insertItem(SmallIcon("revert"), i18n("&Reload"), this, TQT_SLOT(slotReload()));
 
-  m_emptyMenu = new KPopupMenu();
+  m_emptyMenu = new TDEPopupMenu();
 
   m_emptyMenu->insertItem(i18n("New Top &Folder..."), this, TQT_SLOT(slotNewTopFolder()), 0, -1 , 0);
 
@@ -125,8 +125,8 @@ FilesTreeView::FilesTreeView(TDEConfig *config, TQWidget *parent, const char *na
 
   connect(this, TQT_SIGNAL(open(TQListViewItem *)),
           this, TQT_SLOT(slotSelectFile(TQListViewItem *)));
-  connect(this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)),
-          this, TQT_SLOT(slotMenu(KListView*, TQListViewItem*, const TQPoint&)));
+  connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
+          this, TQT_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
 
   // generate top list of directories
   for (uint i = 0; i <  topURLList.count(); i++)
@@ -175,7 +175,7 @@ KFileTreeBranch* FilesTreeView::newBranch(const KURL& url)
 
 
 /** RMB pressed, bring up the menu */
-void FilesTreeView::slotMenu(KListView* listView, TQListViewItem *item, const TQPoint &point)
+void FilesTreeView::slotMenu(TDEListView* listView, TQListViewItem *item, const TQPoint &point)
 {
   Q_UNUSED(listView);
 #ifdef ENABLE_CVSSERVICE
diff --git a/quanta/treeviews/filestreeview.h b/quanta/treeviews/filestreeview.h
index 4cf89304..1cee782b 100644
--- a/quanta/treeviews/filestreeview.h
+++ b/quanta/treeviews/filestreeview.h
@@ -27,7 +27,7 @@
 //foward declarations
 class TQListViewItem;
 class TQPoint;
-class KPopupMenu;
+class TDEPopupMenu;
 class KURL;
 
 
@@ -48,7 +48,7 @@ protected slots:
   */
   void slotNewTopFolder();
 
-  virtual void slotMenu(KListView *listView, TQListViewItem *item, const TQPoint &point);
+  virtual void slotMenu(TDEListView *listView, TQListViewItem *item, const TQPoint &point);
   /**
   creates a new branch from the current url
   */
@@ -61,9 +61,9 @@ protected slots:
 protected:
   virtual KFileTreeBranch* newBranch(const KURL& url);
 
-  KPopupMenu *m_fileMenu;
-  KPopupMenu *m_folderMenu;
-  KPopupMenu *m_emptyMenu;
+  TDEPopupMenu *m_fileMenu;
+  TDEPopupMenu *m_folderMenu;
+  TDEPopupMenu *m_emptyMenu;
   int m_menuClose;                ///< remembers the menu entry
   int m_menuPasteFolder;          ///< remembers the menu entry
   int m_insertFileInProject;
diff --git a/quanta/treeviews/projecttreeview.cpp b/quanta/treeviews/projecttreeview.cpp
index 205e5bf0..fa3a0ed8 100644
--- a/quanta/treeviews/projecttreeview.cpp
+++ b/quanta/treeviews/projecttreeview.cpp
@@ -103,7 +103,7 @@ KFileTreeViewItem* ProjectTreeBranch::createTreeViewItem(KFileTreeViewItem *pare
 ProjectTreeView::ProjectTreeView(TQWidget *parent, const char *name )
   : BaseTreeView(parent,name), m_projectFiles(0)
 {
-  //setSelectionModeExt(KListView::Extended);
+  //setSelectionModeExt(TDEListView::Extended);
   setRootIsDecorated(false);
   addColumn(i18n("Project Files"), -1);
   addColumn(i18n("Description"), -1);
@@ -117,13 +117,13 @@ ProjectTreeView::ProjectTreeView(TQWidget *parent, const char *name )
   newBranch(m_projectBaseURL);  // create an empty project branch
   m_projectDir->root()->setEnabled(false);
 
-  m_uploadStatusMenu = new KPopupMenu(this);
+  m_uploadStatusMenu = new TDEPopupMenu(this);
   m_alwaysUploadId = m_uploadStatusMenu->insertItem(i18n("&When Modified"), this, TQT_SLOT(slotAlwaysUpload()));
   m_neverUploadId = m_uploadStatusMenu->insertItem(i18n("&Never"), this, TQT_SLOT(slotNeverUpload()));
   m_confirmUploadId = m_uploadStatusMenu->insertItem(i18n("&Confirm"), this, TQT_SLOT(slotConfirmUpload()));
   connect(m_uploadStatusMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotUploadMenuAboutToShow()));
 
-  m_fileMenu = new KPopupMenu(this);
+  m_fileMenu = new TDEPopupMenu(this);
 
   m_fileMenu->insertItem(SmallIcon("fileopen"), i18n("&Open"), this, TQT_SLOT(slotOpen()));
   m_openInQuantaId = m_fileMenu->insertItem(i18n("Load Toolbar"), this, TQT_SLOT(slotLoadToolbar()));
@@ -139,11 +139,11 @@ ProjectTreeView::ProjectTreeView(TQWidget *parent, const char *name )
   m_fileMenu->insertItem(i18n("Upload &Status"), m_uploadStatusMenu);
   m_fileMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
 
-  KPopupMenu *createNewMenu = new KPopupMenu(this);
+  TDEPopupMenu *createNewMenu = new TDEPopupMenu(this);
   createNewMenu->insertItem(SmallIcon("folder_new"), i18n("F&older..."), this, TQT_SLOT(slotCreateFolder()));
   createNewMenu->insertItem(SmallIcon("document"), i18n("&File..."), this, TQT_SLOT(slotCreateFile()));
 
-  m_folderMenu = new KPopupMenu(this);
+  m_folderMenu = new TDEPopupMenu(this);
 
   m_folderMenu->insertItem(SmallIconSet("filenew"), i18n("&Create New"), createNewMenu);
   m_folderMenu->insertSeparator();
@@ -158,7 +158,7 @@ ProjectTreeView::ProjectTreeView(TQWidget *parent, const char *name )
   m_folderMenu->insertItem(i18n("Upload &Status"), m_uploadStatusMenu);
   m_folderMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
 
-  m_projectMenu = new KPopupMenu(this);
+  m_projectMenu = new TDEPopupMenu(this);
   m_projectMenu->insertItem(SmallIconSet("filenew"), i18n("&Create New"), createNewMenu);
   m_projectMenu->insertSeparator();
   m_projectMenu->insertItem(SmallIcon("up"), i18n("&Upload Project..."), this, TQT_SLOT(slotUploadProject()));
@@ -169,8 +169,8 @@ ProjectTreeView::ProjectTreeView(TQWidget *parent, const char *name )
   m_projectMenu->insertItem(i18n("Upload &Status"), m_uploadStatusMenu);
 
 
-  connect(this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)),
-          this, TQT_SLOT(slotMenu(KListView*, TQListViewItem*, const TQPoint&)));
+  connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
+          this, TQT_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
 
   connect(this, TQT_SIGNAL(open(TQListViewItem *)),
           this, TQT_SLOT(slotSelectFile(TQListViewItem *)));
@@ -222,7 +222,7 @@ KFileTreeBranch* ProjectTreeView::newBranch(const KURL& url)
 
 
 /** slot for context menu */
-void ProjectTreeView::slotMenu(KListView *listView, TQListViewItem *item, const TQPoint& point)
+void ProjectTreeView::slotMenu(TDEListView *listView, TQListViewItem *item, const TQPoint& point)
 {
   Q_UNUSED(listView);
   KURL url = currentURL();
diff --git a/quanta/treeviews/projecttreeview.h b/quanta/treeviews/projecttreeview.h
index ea67610a..d8c65cbd 100644
--- a/quanta/treeviews/projecttreeview.h
+++ b/quanta/treeviews/projecttreeview.h
@@ -91,7 +91,7 @@ public slots: // Public slots
 
 
 protected slots:
-  void slotMenu(KListView *listView, TQListViewItem *item, const TQPoint &point);
+  void slotMenu(TDEListView *listView, TQListViewItem *item, const TQPoint &point);
   void slotRenameItem(TQListViewItem* kvtvi, const TQString & newText, int col);
   virtual void slotCreateFolder();
   virtual void slotCreateFile();
@@ -119,13 +119,13 @@ private:
   ProjectTreeView(TQWidget *parent, const char *name);
 
   ProjectTreeBranch *m_projectDir;
-  KPopupMenu *m_fileMenu;
-  KPopupMenu *m_folderMenu;
-  KPopupMenu *m_projectMenu;
+  TDEPopupMenu *m_fileMenu;
+  TDEPopupMenu *m_folderMenu;
+  TDEPopupMenu *m_projectMenu;
   KURL m_documentRootURL;
   ProjectTreeViewItem *m_documentRootItem;
   KURL::List m_documentFolderList;
-  KPopupMenu *m_uploadStatusMenu;
+  TDEPopupMenu *m_uploadStatusMenu;
   ProjectList *m_projectFiles;
   int m_menuClose;                ///< remembers the menu entry
 
diff --git a/quanta/treeviews/scripttreeview.cpp b/quanta/treeviews/scripttreeview.cpp
index 6819e1ca..768b7416 100644
--- a/quanta/treeviews/scripttreeview.cpp
+++ b/quanta/treeviews/scripttreeview.cpp
@@ -83,7 +83,7 @@ ScriptTreeView::ScriptTreeView(TQWidget *parent, const char *name )
   m_globalDir->excludeFilterRx.setPattern(excludeString);
   m_localDir->excludeFilterRx.setPattern(excludeString);
 
-  m_fileMenu = new KPopupMenu(this);
+  m_fileMenu = new TDEPopupMenu(this);
   m_fileMenu->insertItem(SmallIcon("info"), i18n("&Description"), this, TQT_SLOT(slotProperties()));
   m_fileMenu->insertItem(SmallIcon("run"), i18n("&Run Script"), this, TQT_SLOT(slotRun()));
   m_fileMenu->insertSeparator();
@@ -95,12 +95,12 @@ ScriptTreeView::ScriptTreeView(TQWidget *parent, const char *name )
   m_fileMenu->insertItem(SmallIcon("mail_send"), i18n("&Send in Email..."), this, TQT_SLOT(slotSendScriptInMail()));
   m_fileMenu->insertItem(SmallIcon("network"), i18n("&Upload Script..."), this, TQT_SLOT(slotUploadScript()));
 
-  m_folderMenu = new KPopupMenu(this);
+  m_folderMenu = new TDEPopupMenu(this);
   m_downloadMenuId = m_folderMenu->insertItem(SmallIcon("network"), i18n("&Download Script..."), this, TQT_SIGNAL(downloadScript()));
 
 
-  connect(this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)),
-          this, TQT_SLOT(slotMenu(KListView*, TQListViewItem*, const TQPoint&)));
+  connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
+          this, TQT_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
 
   restoreLayout( kapp->config(), className() );
   // the restored size of the first column might be too large for the current content
@@ -112,7 +112,7 @@ ScriptTreeView::~ScriptTreeView()
 {
 }
 
-void ScriptTreeView::slotMenu(KListView *, TQListViewItem *item, const TQPoint &point)
+void ScriptTreeView::slotMenu(TDEListView *, TQListViewItem *item, const TQPoint &point)
 {
   if (!item)
   {
diff --git a/quanta/treeviews/scripttreeview.h b/quanta/treeviews/scripttreeview.h
index 9914c622..88f0e4cb 100644
--- a/quanta/treeviews/scripttreeview.h
+++ b/quanta/treeviews/scripttreeview.h
@@ -54,14 +54,14 @@ protected slots:
    *  displays the RBM
    *
    *
-   *  @param listView KListView where the event comes from
+   *  @param listView TDEListView where the event comes from
    *
    *  @param item TQListViewItem where the mousepointer is hovering
    *
    *  @param point TQPoint coordinates of the event
    *
    */
-  virtual void slotMenu(KListView *listView, TQListViewItem *item, const TQPoint &point);
+  virtual void slotMenu(TDEListView *listView, TQListViewItem *item, const TQPoint &point);
 
   /**
    *  slot of TQListView
@@ -212,8 +212,8 @@ private:
   /**
    *  remember the menu for manipulation
    */
-  KPopupMenu *m_fileMenu;
-  KPopupMenu *m_folderMenu;
+  TDEPopupMenu *m_fileMenu;
+  TDEPopupMenu *m_folderMenu;
 
   int m_downloadMenuId;
 };
diff --git a/quanta/treeviews/servertreeview.cpp b/quanta/treeviews/servertreeview.cpp
index fa34f582..bfb6ad23 100644
--- a/quanta/treeviews/servertreeview.cpp
+++ b/quanta/treeviews/servertreeview.cpp
@@ -98,7 +98,7 @@ ServerTreeView::ServerTreeView(TDEConfig *config, TQWidget *parent, const KURL &
   // I must read this here because quanta_init has not done it yet
   qConfig.showHiddenFiles = m_config->readBoolEntry("Show Hidden Files", true);
 
-  m_fileMenu = new KPopupMenu();
+  m_fileMenu = new TDEPopupMenu();
 
   m_fileMenu->insertItem(SmallIcon("fileopen"), i18n("&Open"), this ,TQT_SLOT(slotOpen()));
   m_fileMenu->insertItem(i18n("Open &With..."), this, TQT_SLOT(slotOpenWith()));
@@ -111,7 +111,7 @@ ServerTreeView::ServerTreeView(TDEConfig *config, TQWidget *parent, const KURL &
   m_fileMenu->insertSeparator();
   m_fileMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
 
-  m_folderMenu = new KPopupMenu();
+  m_folderMenu = new TDEPopupMenu();
 
 //  m_insertFolderInProject = m_folderMenu->insertItem(i18n("&Insert in Project..."), this, TQT_SLOT(slotInsertDirInProject()));
   m_folderMenu->insertItem(SmallIcon("editcopy"), i18n("&Copy"), this, TQT_SLOT(slotCopy()));
@@ -127,8 +127,8 @@ ServerTreeView::ServerTreeView(TDEConfig *config, TQWidget *parent, const KURL &
 
   connect(this, TQT_SIGNAL(open(TQListViewItem *)),
           this, TQT_SLOT(slotSelectFile(TQListViewItem *)));
-  connect(this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)),
-          this, TQT_SLOT(slotMenu(KListView*, TQListViewItem*, const TQPoint&)));
+  connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
+          this, TQT_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
   connect(Project::ref(), TQT_SIGNAL(reloadTree(ProjectList *, bool, const TQStringList &)),
           this, TQT_SLOT(slotReloadTree(ProjectList *, bool, const TQStringList &)));
 
@@ -156,7 +156,7 @@ KFileTreeBranch* ServerTreeView::newBranch(const KURL& url)
 
 
 /** RMB pressed, bring up the menu */
-void ServerTreeView::slotMenu(KListView* listView, TQListViewItem *item, const TQPoint &point)
+void ServerTreeView::slotMenu(TDEListView* listView, TQListViewItem *item, const TQPoint &point)
 {
   Q_UNUSED(listView);
   if (item)
diff --git a/quanta/treeviews/servertreeview.h b/quanta/treeviews/servertreeview.h
index fc3b8c96..94ab33fe 100644
--- a/quanta/treeviews/servertreeview.h
+++ b/quanta/treeviews/servertreeview.h
@@ -24,7 +24,7 @@
 //foward declarations
 class TQListViewItem;
 class TQPoint;
-class KPopupMenu;
+class TDEPopupMenu;
 class KURL;
 class ProjectList;
 
@@ -67,7 +67,7 @@ public:
 
 protected slots:
 
-  void slotMenu(KListView *listView, TQListViewItem *item, const TQPoint &point);
+  void slotMenu(TDEListView *listView, TQListViewItem *item, const TQPoint &point);
   
   /** repaints the treeview items, because they might be added to or removed from the project*/
   void slotReloadTree( ProjectList *fileList, bool buildNewTree, const TQStringList &folderToOpen);
@@ -75,8 +75,8 @@ protected slots:
 protected:
   KFileTreeBranch* newBranch(const KURL& url);
 
-  KPopupMenu *m_fileMenu;
-  KPopupMenu *m_folderMenu;
+  TDEPopupMenu *m_fileMenu;
+  TDEPopupMenu *m_folderMenu;
   int m_menuClose;                ///< remembers the menu entry
   int m_menuPasteFolder;          ///< remembers the menu entry
   int m_insertFileInProject;
diff --git a/quanta/treeviews/structtreetag.cpp b/quanta/treeviews/structtreetag.cpp
index 0325645e..f54cb23c 100644
--- a/quanta/treeviews/structtreetag.cpp
+++ b/quanta/treeviews/structtreetag.cpp
@@ -32,7 +32,7 @@
 #include "resource.h"
 
 StructTreeTag::StructTreeTag(TQListView *parent, TQString a_title)
-  : KListViewItem(parent, a_title)
+  : TDEListViewItem(parent, a_title)
 {
   node = 0L;
   hasOpenFileMenu = false;
@@ -42,7 +42,7 @@ StructTreeTag::StructTreeTag(TQListView *parent, TQString a_title)
 
 StructTreeTag::StructTreeTag(StructTreeTag *parent, Node *a_node, const TQString a_title,
                              TQListViewItem *after )
-: KListViewItem(parent, after, a_title)
+: TDEListViewItem(parent, after, a_title)
 {
   parentTree = parent->parentTree;
   hasOpenFileMenu = false;
@@ -202,7 +202,7 @@ StructTreeTag::StructTreeTag(StructTreeTag *parent, Node *a_node, const TQString
 }
 
 StructTreeTag::StructTreeTag(StructTreeTag *parent, TQString a_title )
-: KListViewItem(parent, a_title)
+: TDEListViewItem(parent, a_title)
 {
   node = 0L;
   hasOpenFileMenu = false;
diff --git a/quanta/treeviews/structtreetag.h b/quanta/treeviews/structtreetag.h
index 2f408707..b7ba1585 100644
--- a/quanta/treeviews/structtreetag.h
+++ b/quanta/treeviews/structtreetag.h
@@ -27,7 +27,7 @@ class StructTreeView;
   *@author Yacovlev Alexander & Dmitry Poplavsky & Andras Mantia
   */
 
-class StructTreeTag : public KListViewItem  {
+class StructTreeTag : public TDEListViewItem  {
 
 public:
   StructTreeTag(TQListView *parent, const TQString a_title = TQString() );
diff --git a/quanta/treeviews/structtreeview.cpp b/quanta/treeviews/structtreeview.cpp
index 4fa7afa9..ccf3caef 100644
--- a/quanta/treeviews/structtreeview.cpp
+++ b/quanta/treeviews/structtreeview.cpp
@@ -58,7 +58,7 @@
 extern GroupElementMapList globalGroupMap;
 
 StructTreeView::StructTreeView(TQWidget *parent, const char *name )
-    : KListView(parent,name), m_marker(0), m_draggedItem(0)/*, m_thisWidget(0)*/
+    : TDEListView(parent,name), m_marker(0), m_draggedItem(0)/*, m_thisWidget(0)*/
 {
   for (int i = 0; i < 15; i++)
     groupOpened.append(false);
@@ -85,7 +85,7 @@ StructTreeView::StructTreeView(TQWidget *parent, const char *name )
 
   setFocusPolicy(TQ_ClickFocus);
 
-  dtdMenu = new KPopupMenu(this);
+  dtdMenu = new TDEPopupMenu(this);
 
   dtdMenu->insertItem(i18n("All Present DTEP"));
   dtdMenu->insertSeparator();
@@ -100,11 +100,11 @@ StructTreeView::StructTreeView(TQWidget *parent, const char *name )
   connect(this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)),
           TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)));
   
-  emptyAreaMenu = new KPopupMenu(this);
+  emptyAreaMenu = new TDEPopupMenu(this);
   emptyAreaMenu->insertItem(i18n("Show Groups For"), dtdMenu);
   emptyAreaMenu->insertItem(SmallIcon("reload"), i18n("&Reparse"),     this, TQT_SLOT(slotReparseMenuItem()));
 
-  popupMenu = new KPopupMenu(this);
+  popupMenu = new TDEPopupMenu(this);
 
   popupMenu -> insertItem( i18n("Show Groups For"), dtdMenu);
   popupMenu -> insertSeparator();
@@ -828,7 +828,7 @@ void StructTreeView::slotDropped(TQDropEvent* e, TQListViewItem* parent, TQListV
     if(!TQTextDrag::canDecode(e))
         return;
     
-    KPopupMenu *menu = new KPopupMenu( this );
+    TDEPopupMenu *menu = new TDEPopupMenu( this );
     menu->insertItem( i18n("&Move Here"), DRAG_MOVE, 0 );
     menu->insertItem( SmallIcon("editcopy"), i18n("&Copy Here"), DRAG_COPY, 1 );
     menu->insertSeparator();
@@ -872,7 +872,7 @@ void StructTreeView::contentsMousePressEvent(TQMouseEvent* e)
         m_draggedItem = itemAt(p);
         m_marker = m_draggedItem;
     }
-    KListView::contentsMousePressEvent(e);
+    TDEListView::contentsMousePressEvent(e);
 }
 
 void StructTreeView::copySelectedItems(TQListViewItem* parent, TQListViewItem* after)
diff --git a/quanta/treeviews/structtreeview.h b/quanta/treeviews/structtreeview.h
index d0e32dfc..d6158431 100644
--- a/quanta/treeviews/structtreeview.h
+++ b/quanta/treeviews/structtreeview.h
@@ -27,7 +27,7 @@
  *@author Andras Mantia & Paulo Moura Guedes & Yacovlev Alexander & Dmitry Poplavsky
  */
 
-class KPopupMenu;
+class TDEPopupMenu;
 class TDEConfig;
 class KURL;
 class TQTime;
@@ -38,7 +38,7 @@ class Parser;
 class Document;
 struct DTDStruct;
 
-class StructTreeView : public KListView  {
+class StructTreeView : public TDEListView  {
    Q_OBJECT
   
 public:
@@ -130,9 +130,9 @@ private:
   int followCursorId;
   bool followCursorFlag;
 
-  KPopupMenu *popupMenu;
-  KPopupMenu *emptyAreaMenu;
-  KPopupMenu *dtdMenu;
+  TDEPopupMenu *popupMenu;
+  TDEPopupMenu *emptyAreaMenu;
+  TDEPopupMenu *dtdMenu;
   StructTreeTag *lastTag;
   TDEConfig *config;
   TQStringList dtdList;
diff --git a/quanta/treeviews/tagattributeitems.cpp b/quanta/treeviews/tagattributeitems.cpp
index 776ac366..4a21ec27 100644
--- a/quanta/treeviews/tagattributeitems.cpp
+++ b/quanta/treeviews/tagattributeitems.cpp
@@ -40,13 +40,13 @@
 #include "qextfileinfo.h"
 #include "styleeditor.h"
 
-TopLevelItem::TopLevelItem(KListView* parent, const TQString &title)
-: KListViewItem(parent, title)
+TopLevelItem::TopLevelItem(TDEListView* parent, const TQString &title)
+: TDEListViewItem(parent, title)
 {
 }
 
-TopLevelItem::TopLevelItem(KListView* parent, TQListViewItem* after, const TQString &title)
-: KListViewItem(parent, after, title)
+TopLevelItem::TopLevelItem(TDEListView* parent, TQListViewItem* after, const TQString &title)
+: TDEListViewItem(parent, after, title)
 {
 }
 
@@ -68,7 +68,7 @@ void TopLevelItem::paintCell(TQPainter *p, const TQColorGroup &cg,
         f.setBold(true);
         p->setFont(f);
     }
-    KListViewItem::paintCell( p, cg, column, width, align );
+    TDEListViewItem::paintCell( p, cg, column, width, align );
     if (column == 0)
     {
       p->setPen(TQPen(TQColor(0,0,0)));
@@ -77,7 +77,7 @@ void TopLevelItem::paintCell(TQPainter *p, const TQColorGroup &cg,
 }
 
 ParentItem::ParentItem(TagAttributeTree *listView, TQListViewItem* parent)
-: KListViewItem(parent)
+: TDEListViewItem(parent)
 {
   m_listView = listView;
   comboBox = new TQComboBox(false, m_listView->viewport() );
@@ -106,7 +106,7 @@ void ParentItem::paintCell(TQPainter *p, const TQColorGroup &cg,
     if ( !p )
         return;
 
-    KListViewItem::paintCell( p, cg, column, width, align );
+    TDEListViewItem::paintCell( p, cg, column, width, align );
     if (column == 0)
     {
       p->setPen(TQPen(TQColor(0,0,0)));
@@ -144,14 +144,14 @@ void ParentItem::showList(bool show)
 
 //Generic attribute item
 AttributeItem::AttributeItem(TQListViewItem* parent, const TQString &title, const TQString& title2)
-: KListViewItem(parent, title, title2)
+: TDEListViewItem(parent, title, title2)
 {
   lin = 0L;
   lin2 = 0L;
 }
 
 AttributeItem::AttributeItem(EditableTree* listView, TQListViewItem* parent, const TQString &title, const TQString& title2)
-: KListViewItem(parent, title, title2)
+: TDEListViewItem(parent, title, title2)
 {
   m_listView = listView;
   lin = new TQLineEdit( m_listView->viewport() );
@@ -162,7 +162,7 @@ AttributeItem::AttributeItem(EditableTree* listView, TQListViewItem* parent, con
 }
 
 AttributeItem::AttributeItem(EditableTree *listView, const TQString& title, const TQString& title2)
-: KListViewItem(listView, title, title2)
+: TDEListViewItem(listView, title, title2)
 {
   m_listView = listView;
   lin = new TQLineEdit( m_listView->viewport() );
@@ -176,7 +176,7 @@ AttributeItem::AttributeItem(EditableTree *listView, const TQString& title, cons
 
 AttributeItem::AttributeItem(EditableTree *listView, const TQString& title, const TQString& title2,
   TQListViewItem* after)
-: KListViewItem(listView, after, title, title2)
+: TDEListViewItem(listView, after, title, title2)
 {
   m_listView = listView;
   lin = new TQLineEdit( m_listView->viewport() );
@@ -199,7 +199,7 @@ void AttributeItem::paintCell(TQPainter *p, const TQColorGroup &cg,
 {
     if ( !p )
         return;
-    KListViewItem::paintCell( p, cg, column, width, align );
+    TDEListViewItem::paintCell( p, cg, column, width, align );
     if (column == 0)
     {
       p->setPen(TQPen(TQColor(0,0,0)));
diff --git a/quanta/treeviews/tagattributeitems.h b/quanta/treeviews/tagattributeitems.h
index 81f5cb43..9b06f7dd 100644
--- a/quanta/treeviews/tagattributeitems.h
+++ b/quanta/treeviews/tagattributeitems.h
@@ -19,8 +19,8 @@
 
 class KColorCombo;
 class KURLRequester;
-class KListView;
-class KListViewItem;
+class TDEListView;
+class TDEListViewItem;
 class TQListViewItem;
 class TQLineEdit;
 class TQComboBox;
@@ -31,12 +31,12 @@ class TagAttributeTree;
 class Node;
 class StyleEditor;
 
-class TopLevelItem : public KListViewItem
+class TopLevelItem : public TDEListViewItem
 {
 
 public:
-    TopLevelItem(KListView *parent, const TQString& title);
-    TopLevelItem(KListView *parent, TQListViewItem* after, const TQString& title);
+    TopLevelItem(TDEListView *parent, const TQString& title);
+    TopLevelItem(TDEListView *parent, TQListViewItem* after, const TQString& title);
 
     virtual ~TopLevelItem();
 
@@ -46,7 +46,7 @@ protected:
                     int column, int width, int align );
 };
 
-class ParentItem : public KListViewItem
+class ParentItem : public TDEListViewItem
 {
 
 public:
@@ -68,7 +68,7 @@ private:
     TagAttributeTree *m_listView;
 };
 
-class AttributeItem : public KListViewItem
+class AttributeItem : public TDEListViewItem
 {
 public:
     AttributeItem(TQListViewItem* parent, const TQString& title, const TQString& title2);
diff --git a/quanta/treeviews/tagattributetree.cpp b/quanta/treeviews/tagattributetree.cpp
index abf4fb37..a125405e 100644
--- a/quanta/treeviews/tagattributetree.cpp
+++ b/quanta/treeviews/tagattributetree.cpp
@@ -51,7 +51,7 @@
 #include "viewmanager.h"
 
 EditableTree::EditableTree(TQWidget *parent, const char *name)
-: KListView(parent, name)
+: TDEListView(parent, name)
 {
   m_editable = true;
 }
@@ -69,7 +69,7 @@ void EditableTree::setCurrentItem( TQListViewItem *item)
     if ( dynamic_cast<AttributeItem*>(it) )
          static_cast<AttributeItem*>(it)->hideEditor();
 
-    KListView::setCurrentItem(item);
+    TDEListView::setCurrentItem(item);
     it = currentItem();
     if ( dynamic_cast<AttributeItem*>(it) )
          static_cast<AttributeItem*>(it)->showEditor();
@@ -120,7 +120,7 @@ bool DualEditableTree::eventFilter(TQObject *object, TQEvent *event)
   AttributeItem *it = dynamic_cast<AttributeItem*>(currentItem());
   AttributeItem *up = 0L, *down = 0L;
   if(!it)
-    return KListView::eventFilter(object, event);
+    return TDEListView::eventFilter(object, event);
   if(currentItem()->itemAbove())
     up = dynamic_cast<AttributeItem*>(currentItem()->itemAbove());
   if(currentItem()->itemBelow())
@@ -168,12 +168,12 @@ bool DualEditableTree::eventFilter(TQObject *object, TQEvent *event)
       break;
     }
   }
-  return KListView::eventFilter(object, event);;
+  return TDEListView::eventFilter(object, event);;
 }
 
 void DualEditableTree::resizeEvent(TQResizeEvent *ev)
 {
-  KListView::resizeEvent(ev);
+  TDEListView::resizeEvent(ev);
   if(!currentItem()) return;
   AttributeItem *item = dynamic_cast<AttributeItem*>(currentItem());
   if(item)
@@ -194,7 +194,7 @@ void DualEditableTree::setCurrentItem(TQListViewItem *item)
          static_cast<AttributeItem*>(it)->hideEditor(1);
     }
 
-    KListView::setCurrentItem(item);
+    TDEListView::setCurrentItem(item);
     it = currentItem();
     if ( dynamic_cast<AttributeItem*>(it) )
          static_cast<AttributeItem*>(it)->showEditor(curCol);
@@ -411,7 +411,7 @@ void TagAttributeTree::editorContentChanged()
     if ( dynamic_cast<AttributeItem*>(it) )
          static_cast<AttributeItem*>(it)->hideEditor();
 
-    KListView::setCurrentItem(item);
+    TDEListView::setCurrentItem(item);
     it = currentItem();
     if ( dynamic_cast<AttributeItem*>(it) )
          static_cast<AttributeItem*>(it)->showEditor();
diff --git a/quanta/treeviews/tagattributetree.h b/quanta/treeviews/tagattributetree.h
index d91135da..c3e7decf 100644
--- a/quanta/treeviews/tagattributetree.h
+++ b/quanta/treeviews/tagattributetree.h
@@ -23,7 +23,7 @@
 
 //app includes
 
-class KListView;
+class TDEListView;
 class TQListViewItem;
 class ParentItem;
 class Node;
@@ -31,7 +31,7 @@ class TQLabel;
 class KPushButton;
 class TQGridLayout;
 
-class EditableTree : public KListView {
+class EditableTree : public TDEListView {
 Q_OBJECT
   
 
diff --git a/quanta/treeviews/templatestreeview.cpp b/quanta/treeviews/templatestreeview.cpp
index a9aa75d0..f6bbce38 100644
--- a/quanta/treeviews/templatestreeview.cpp
+++ b/quanta/treeviews/templatestreeview.cpp
@@ -129,7 +129,7 @@ KFileTreeViewItem* TemplatesTreeBranch::createTreeViewItem(KFileTreeViewItem *pa
 
 
 
-TemplatesTreeView::TemplatesTreeView(KMainWindow *parent, const char *name )
+TemplatesTreeView::TemplatesTreeView(TDEMainWindow *parent, const char *name )
   : BaseTreeView(parent,name), m_projectDir(0), m_mainWindow(parent)
 {
   typeToi18n["text/all"] = i18n("Text Snippet");
@@ -141,7 +141,7 @@ TemplatesTreeView::TemplatesTreeView(KMainWindow *parent, const char *name )
   i18nToType[i18n("Document Template")] = "template/all";
   i18nToType[i18n("Site Template")] = "site/all";
 
-  m_fileMenu = new KPopupMenu(this);
+  m_fileMenu = new TDEPopupMenu(this);
 
   m_openId = m_fileMenu->insertItem(i18n("Open"), this ,TQT_SLOT(slotInsert()));
   m_fileMenu->insertItem(SmallIcon("fileopen"), i18n("&Open"), this ,TQT_SLOT(slotOpen()));
@@ -155,7 +155,7 @@ TemplatesTreeView::TemplatesTreeView(KMainWindow *parent, const char *name )
   m_fileMenu->insertSeparator();
   m_fileMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
 
-  m_folderMenu = new KPopupMenu(this);
+  m_folderMenu = new TDEPopupMenu(this);
 
   m_folderMenu->insertItem(SmallIcon("folder_new"), i18n("&New Folder..."), this, TQT_SLOT(slotNewDir()));
   m_folderMenu->insertItem(SmallIcon("mail_send"), i18n("Send in E&mail..."), this, TQT_SLOT(slotSendInMail()));
@@ -170,7 +170,7 @@ TemplatesTreeView::TemplatesTreeView(KMainWindow *parent, const char *name )
   m_folderMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
   m_reloadMenuId = m_folderMenu->insertItem(SmallIcon("revert"), i18n("&Reload"), this, TQT_SLOT(slotReload()));
 
-  m_emptyAreaMenu = new KPopupMenu(this);
+  m_emptyAreaMenu = new TDEPopupMenu(this);
   m_emptyAreaMenu->insertItem(SmallIcon("network"), i18n("&Download Template..."), this, TQT_SIGNAL(downloadTemplate()));
 
   addColumn(i18n("Templates"), -1);
@@ -182,8 +182,8 @@ TemplatesTreeView::TemplatesTreeView(KMainWindow *parent, const char *name )
   localURL.setPath(locateLocal("data", resourceDir + "templates/"));
   newBranch(localURL);
 
-  connect(this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)),
-          this, TQT_SLOT(slotMenu(KListView*, TQListViewItem*, const TQPoint&)));
+  connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
+          this, TQT_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
 
   connect(this, TQT_SIGNAL(open(TQListViewItem *)),
           this,  TQT_SLOT(slotSelectFile(TQListViewItem *)));
@@ -251,7 +251,7 @@ void TemplatesTreeView::slotInsertInDocument()
 
 }
 
-void TemplatesTreeView::slotMenu(KListView*, TQListViewItem *item, const TQPoint &point)
+void TemplatesTreeView::slotMenu(TDEListView*, TQListViewItem *item, const TQPoint &point)
 {
   if (!item)
   {
@@ -641,7 +641,7 @@ void TemplatesTreeView::slotProperties()
   uint j = 1;
   m_quantaProperties->actionCombo->insertItem(i18n(NONE));
   TQString tmpStr;
-  KActionCollection *ac = m_mainWindow->actionCollection();
+  TDEActionCollection *ac = m_mainWindow->actionCollection();
   uint acCount = ac->count();
   for (uint i = 0; i < acCount; i++)
   {
@@ -900,7 +900,7 @@ KURL TemplatesTreeView::filterTemplate()
  config.setGroup("Filtering");
  name = config.readEntry("Action", NONE);
  TagAction *filterAction = 0L;
- KActionCollection *ac = m_mainWindow->actionCollection();
+ TDEActionCollection *ac = m_mainWindow->actionCollection();
  uint acCount = ac->count();
  TQString tmpStr;
  for (uint i = 0; i < acCount; i++)
diff --git a/quanta/treeviews/templatestreeview.h b/quanta/treeviews/templatestreeview.h
index 075c9ba7..22fd3535 100644
--- a/quanta/treeviews/templatestreeview.h
+++ b/quanta/treeviews/templatestreeview.h
@@ -22,7 +22,7 @@
 
 //forward declarations
 class QuantaPropertiesPage;
-class KMainWindow;
+class TDEMainWindow;
 
 class TemplatesTreeBranch : public BaseTreeBranch {
 
@@ -49,7 +49,7 @@ public:
    *  the parameter are only used at the first call to create the class
    *
    */
-  static TemplatesTreeView* const ref(KMainWindow *parent = 0L, const char *name = 0L)
+  static TemplatesTreeView* const ref(TDEMainWindow *parent = 0L, const char *name = 0L)
   {
     static TemplatesTreeView *m_ref;
     if (!m_ref) m_ref = new TemplatesTreeView (parent, name);
@@ -74,14 +74,14 @@ public slots:
    *  displays the RBM
    *
    *
-   *  @param listView KListView where the event comes from
+   *  @param listView TDEListView where the event comes from
    *
    *  @param item TQListViewItem where the mousepointer is hovering
    *
    *  @param point TQPoint coordinates of the event
    *
    */
-  void slotMenu(KListView *listView, TQListViewItem *item, const TQPoint &point);
+  void slotMenu(TDEListView *listView, TQListViewItem *item, const TQPoint &point);
   /** Creates a new document based in the selected template. */
   void slotNewDocument();
   /** Insert the template as text, image, new document. */
@@ -119,7 +119,7 @@ private:
    *  If you need the class use TemplatesTreeView::ref() for
    *  construction and reference
    */
-  TemplatesTreeView(KMainWindow *parent, const char *name = 0L);
+  TemplatesTreeView(TDEMainWindow *parent, const char *name = 0L);
   /** Filters the template through and action, and returns the modified/filtered
   template file */
   KURL filterTemplate();
@@ -135,10 +135,10 @@ private:
   TQString m_projectName;
   KURL localURL;
   KURL globalURL;
-  KPopupMenu *m_fileMenu;
-  KPopupMenu *m_folderMenu;
-  KPopupMenu *m_emptyAreaMenu;
-  KMainWindow *m_mainWindow;
+  TDEPopupMenu *m_fileMenu;
+  TDEPopupMenu *m_folderMenu;
+  TDEPopupMenu *m_emptyAreaMenu;
+  TDEMainWindow *m_mainWindow;
   DirInfo m_dirInfo;
   DirInfo m_parentDirInfo;
   int m_insertFileInProject;
diff --git a/quanta/treeviews/uploadtreefile.cpp b/quanta/treeviews/uploadtreefile.cpp
index 5257117e..25ae4e98 100644
--- a/quanta/treeviews/uploadtreefile.cpp
+++ b/quanta/treeviews/uploadtreefile.cpp
@@ -28,7 +28,7 @@
 #include "resource.h"
 
 UploadTreeFile::UploadTreeFile( UploadTreeFolder *parent, const KURL &a_url, const KFileItem &a_fileItem)
-    : KListViewItem( parent, a_url.fileName(), "", TQString("%1").arg( (long int)a_fileItem.size() ), a_fileItem.timeString())
+    : TDEListViewItem( parent, a_url.fileName(), "", TQString("%1").arg( (long int)a_fileItem.size() ), a_fileItem.timeString())
 {
   m_url = a_url;
   isDir = false;
@@ -41,7 +41,7 @@ UploadTreeFile::UploadTreeFile( UploadTreeFolder *parent, const KURL &a_url, con
 }
 
 UploadTreeFile::UploadTreeFile( TQListView *parent, const KURL &a_url, const KFileItem &a_fileItem)
-    : KListViewItem( parent, a_url.fileName(), "", TQString("%1").arg( (long int)a_fileItem.size() ), a_fileItem.timeString())
+    : TDEListViewItem( parent, a_url.fileName(), "", TQString("%1").arg( (long int)a_fileItem.size() ), a_fileItem.timeString())
 {
   m_url = a_url;
   isDir = false;
diff --git a/quanta/treeviews/uploadtreefile.h b/quanta/treeviews/uploadtreefile.h
index 736a3a88..aaa31b21 100644
--- a/quanta/treeviews/uploadtreefile.h
+++ b/quanta/treeviews/uploadtreefile.h
@@ -26,7 +26,7 @@
 
 class KFileItem;
 
-class UploadTreeFile : public KListViewItem  {
+class UploadTreeFile : public TDEListViewItem  {
 public:
   UploadTreeFile( UploadTreeFolder *parent, const KURL &a_url, const KFileItem &a_fileItem);
   UploadTreeFile( TQListView *parent, const KURL &a_url, const KFileItem &a_fileItem);
diff --git a/quanta/treeviews/uploadtreefolder.cpp b/quanta/treeviews/uploadtreefolder.cpp
index 123eaf35..ea933592 100644
--- a/quanta/treeviews/uploadtreefolder.cpp
+++ b/quanta/treeviews/uploadtreefolder.cpp
@@ -28,7 +28,7 @@
 #include "resource.h"
 
 UploadTreeFolder::UploadTreeFolder(const KURL &a_url, UploadTreeFolder * parent, const char * name )
-    : KListViewItem( parent, name, "", "", "" )
+    : TDEListViewItem( parent, name, "", "", "" )
 {
   parentFolder = parent;
   m_url = a_url;
@@ -41,7 +41,7 @@ UploadTreeFolder::UploadTreeFolder(const KURL &a_url, UploadTreeFolder * parent,
 }
 
 UploadTreeFolder::UploadTreeFolder(const KURL &a_url, TQListView * parent, const char * name )
-    : KListViewItem( parent, name, "", "", "" )
+    : TDEListViewItem( parent, name, "", "", "" )
 {
   parentFolder = 0L;
   m_url = a_url;
diff --git a/quanta/treeviews/uploadtreefolder.h b/quanta/treeviews/uploadtreefolder.h
index d6959ab3..96b45771 100644
--- a/quanta/treeviews/uploadtreefolder.h
+++ b/quanta/treeviews/uploadtreefolder.h
@@ -30,7 +30,7 @@
 
 class KURL;
 
-class UploadTreeFolder : public KListViewItem  {
+class UploadTreeFolder : public TDEListViewItem  {
 public:
   UploadTreeFolder( const KURL &a_url, TQListView * parent, const char * name);
   UploadTreeFolder( const KURL &a_url, UploadTreeFolder * parent, const char * name );
diff --git a/quanta/treeviews/uploadtreeview.cpp b/quanta/treeviews/uploadtreeview.cpp
index 4c5af524..f45681ad 100644
--- a/quanta/treeviews/uploadtreeview.cpp
+++ b/quanta/treeviews/uploadtreeview.cpp
@@ -24,7 +24,7 @@
 #include "quantacommon.h"
 
 UploadTreeView::UploadTreeView( TQWidget *parent, const char *name ) :
-  KListView(parent, name)
+  TDEListView(parent, name)
 {
   setRootIsDecorated( true );
   setSorting( 0 );
diff --git a/quanta/treeviews/uploadtreeview.h b/quanta/treeviews/uploadtreeview.h
index 8d9edfbb..f8a58e80 100644
--- a/quanta/treeviews/uploadtreeview.h
+++ b/quanta/treeviews/uploadtreeview.h
@@ -29,7 +29,7 @@ class KFileItem;
   *@author George Vilches & Andras Mantia
   */
 
-class UploadTreeView : public KListView {
+class UploadTreeView : public TDEListView {
   Q_OBJECT
   
 public:
diff --git a/quanta/utility/qpevents.cpp b/quanta/utility/qpevents.cpp
index 3426b83f..beb21170 100644
--- a/quanta/utility/qpevents.cpp
+++ b/quanta/utility/qpevents.cpp
@@ -321,7 +321,7 @@ bool QPEvents::handleEvent(const EventAction& ev)
       if (ev.action == "script" || ev.action =="action")
       {
           TQString name = ev.arguments[0];
-          KAction *action = quantaApp->actionCollection()->action(name.ascii());
+          TDEAction *action = quantaApp->actionCollection()->action(name.ascii());
           TagAction *tagAction = dynamic_cast<TagAction*>(action);
           if (tagAction)
           {
diff --git a/quanta/utility/quantabookmarks.cpp b/quanta/utility/quantabookmarks.cpp
index 0678a972..09529616 100644
--- a/quanta/utility/quantabookmarks.cpp
+++ b/quanta/utility/quantabookmarks.cpp
@@ -76,34 +76,34 @@ QuantaBookmarks::~QuantaBookmarks()
 {
 }
 
-void QuantaBookmarks::createActions( KActionCollection* ac )
+void QuantaBookmarks::createActions( TDEActionCollection* ac )
 {
-  m_bookmarksMenu = (new KActionMenu(i18n("&Bookmarks"), ac, "bookmarks"))->popupMenu();
+  m_bookmarksMenu = (new TDEActionMenu(i18n("&Bookmarks"), ac, "bookmarks"))->popupMenu();
   init(ac);
 }
 
-void QuantaBookmarks::init(KActionCollection* ac)
+void QuantaBookmarks::init(TDEActionCollection* ac)
 {
-  m_bookmarkToggle = new KToggleAction(
+  m_bookmarkToggle = new TDEToggleAction(
       i18n("Set &Bookmark"), "bookmark", CTRL+Key_B,
   this, TQT_SLOT(toggleBookmark()),
   ac, "bookmarks_toggle" );
   m_bookmarkToggle->setWhatsThis(i18n("If a line has no bookmark then add one, otherwise remove it."));
   m_bookmarkToggle->setCheckedState( i18n("Clear &Bookmark") );
 
-  m_bookmarkClear = new KAction(
+  m_bookmarkClear = new TDEAction(
       i18n("Clear &All Bookmarks"), 0,
   this, TQT_SLOT(clearBookmarks()),
   ac, "bookmarks_clear");
   m_bookmarkClear->setWhatsThis(i18n("Remove all bookmarks of the current document."));
 
-  m_goNext = new KAction(
+  m_goNext = new TDEAction(
       i18n("Next Bookmark"), "next", ALT + Key_PageDown,
   this, TQT_SLOT(goNext()),
   ac, "bookmarks_next");
   m_goNext->setWhatsThis(i18n("Go to the next bookmark."));
 
-  m_goPrevious = new KAction(
+  m_goPrevious = new TDEAction(
       i18n("Previous Bookmark"), "previous", ALT + Key_PageUp,
   this, TQT_SLOT(goPrevious()),
   ac, "bookmarks_previous");
diff --git a/quanta/utility/quantabookmarks.h b/quanta/utility/quantabookmarks.h
index 83f30aa6..71353c17 100644
--- a/quanta/utility/quantabookmarks.h
+++ b/quanta/utility/quantabookmarks.h
@@ -32,9 +32,9 @@ namespace KTextEditor { class Mark; }
 class ViewManager;
 class Document;
 
-class KAction;
-class KToggleAction;
-class KActionCollection;
+class TDEAction;
+class TDEToggleAction;
+class TDEActionCollection;
 class TQPopupMenu;
 class TQMenuData;
 
@@ -50,7 +50,7 @@ class QuantaBookmarks : public TQObject
     QuantaBookmarks(ViewManager *parent, Sorting sort=Position, bool onlyFromActualDocument = false );
     virtual ~QuantaBookmarks();
 
-    void createActions( KActionCollection* );
+    void createActions( TDEActionCollection* );
     void setBookmarksMenu(TQPopupMenu* bookmarksMenu);
 
     QuantaBookmarks::Sorting sorting() { return m_sorting; };
@@ -59,7 +59,7 @@ class QuantaBookmarks : public TQObject
 
   protected:
     int insertBookmarks(TQPopupMenu& menu, Document *doc, bool insertNavigationItems = true);
-    void init(KActionCollection* ac = 0L);
+    void init(TDEActionCollection* ac = 0L);
 
   private slots:
     void toggleBookmark();
@@ -78,10 +78,10 @@ class QuantaBookmarks : public TQObject
     void gotoFileAndLine(const TQString&, int, int);
 
   private:
-    KToggleAction*               m_bookmarkToggle;
-    KAction*                     m_bookmarkClear;
-    KAction*                     m_goNext;
-    KAction*                     m_goPrevious;
+    TDEToggleAction*               m_bookmarkToggle;
+    TDEAction*                     m_bookmarkClear;
+    TDEAction*                     m_goNext;
+    TDEAction*                     m_goPrevious;
 
     Sorting                      m_sorting;
     TQPopupMenu*          m_bookmarksMenu;
diff --git a/quanta/utility/quantacommon.h b/quanta/utility/quantacommon.h
index 4553da9c..b341d6ac 100644
--- a/quanta/utility/quantacommon.h
+++ b/quanta/utility/quantacommon.h
@@ -36,7 +36,7 @@ class TQWidget;
 class Tag;
 
 class TDEConfig;
-class KPopupMenu;
+class TDEPopupMenu;
 
 /** Describes one abbreviation group */
 class Abbreviation{
diff --git a/quanta/utility/tagaction.cpp b/quanta/utility/tagaction.cpp
index d532a8b8..c4c3b870 100644
--- a/quanta/utility/tagaction.cpp
+++ b/quanta/utility/tagaction.cpp
@@ -72,9 +72,9 @@ int MyProcess::commSetupDoneC()
   return TDEProcess::commSetupDoneC();
 }
 
-TagAction::TagAction( TQDomElement *element, KMainWindow *parentMainWindow, bool toggle)
-    : KToggleAction(element->attribute("text").isEmpty() ? TQString("") : i18n(element->attribute("text").utf8()), 
-                    KShortcut(element->attribute("shortcut")), 0, 0, parentMainWindow->actionCollection(), element->attribute("name").ascii()),
+TagAction::TagAction( TQDomElement *element, TDEMainWindow *parentMainWindow, bool toggle)
+    : TDEToggleAction(element->attribute("text").isEmpty() ? TQString("") : i18n(element->attribute("text").utf8()), 
+                    TDEShortcut(element->attribute("shortcut")), 0, 0, parentMainWindow->actionCollection(), element->attribute("name").ascii()),
  //disable toggle now m_toggle(toggle)
   m_toggle(false)
 {
@@ -93,8 +93,8 @@ TagAction::TagAction( TQDomElement *element, KMainWindow *parentMainWindow, bool
   m_file = 0L;
   loopStarted = false;
 #if TDE_VERSION >= TDE_MAKE_VERSION(3,4,0)
-  connect(this, TQT_SIGNAL(activated(KAction::ActivationReason, TQt::ButtonState)), 
-          TQT_SLOT(slotActionActivated(KAction::ActivationReason, TQt::ButtonState)));
+  connect(this, TQT_SIGNAL(activated(TDEAction::ActivationReason, TQt::ButtonState)), 
+          TQT_SLOT(slotActionActivated(TDEAction::ActivationReason, TQt::ButtonState)));
 #else
   connect(this, TQT_SIGNAL(activated()), TQT_SLOT(slotActionActivated()));
 #endif
@@ -114,7 +114,7 @@ TQString TagAction::type()
 }
 
 #if TDE_VERSION >= TDE_MAKE_VERSION(3,4,0)
-bool TagAction::slotActionActivated(KAction::ActivationReason reason, TQt::ButtonState /*state*/)
+bool TagAction::slotActionActivated(TDEAction::ActivationReason reason, TQt::ButtonState /*state*/)
 {
     QuantaView *view = ViewManager::ref()->activeView();
     if ( !view || !view->document())
@@ -182,7 +182,7 @@ bool TagAction::slotActionActivated(KAction::ActivationReason reason, TQt::Butto
                   kafkaCommon::getStartOfParagraph(start_node, start_offset);
                   kafkaCommon::getEndOfParagraph(end_node, end_offset);
               }
-              else if(reason != KAction::EmulatedActivation) // is between words: save the state and return
+              else if(reason != TDEAction::EmulatedActivation) // is between words: save the state and return
               {
                   if(!toggled())
                       quantaApp->insertTagActionPoolItem(name());
@@ -488,7 +488,7 @@ bool TagAction::slotActionActivated(KAction::ActivationReason reason, TQt::Butto
 #else
  // hack to compile. moc doesn't check the "#ifdef" at the declaration and the compiler complains 
  // of no matching function.
-bool TagAction::slotActionActivated(KAction::ActivationReason /*reason*/, TQt::ButtonState /*state*/)
+bool TagAction::slotActionActivated(TDEAction::ActivationReason /*reason*/, TQt::ButtonState /*state*/)
 {return true;}
 #endif
 
@@ -954,7 +954,7 @@ TQString TagAction::closeXMLTagString() const
 void TagAction::slotActivated()
 {
 //     if(m_toggle)
-    KToggleAction::slotActivated();
+    TDEToggleAction::slotActivated();
 //Andras: Disable toggle behavior. It is just too broken.
     setChecked(false);
 /*
diff --git a/quanta/utility/tagaction.h b/quanta/utility/tagaction.h
index 3a58f603..84e01465 100644
--- a/quanta/utility/tagaction.h
+++ b/quanta/utility/tagaction.h
@@ -25,7 +25,7 @@
 #include <tqstring.h>
 #include <tqdom.h>
 
-class KMainWindow;
+class TDEMainWindow;
 class QuantaView;
 class TDEProcess;
 class TQDomElement;
@@ -44,7 +44,7 @@ class NodeSelection;
  *         Paulo Moura Guedes, moura@tdewebdev.org
  */
 
-class TagAction : public KToggleAction
+class TagAction : public TDEToggleAction
 {
     Q_OBJECT
   
@@ -52,10 +52,10 @@ class TagAction : public KToggleAction
 public:
     /**
      * Create an insert from dom element.
-     * @param toggle If set to true, the class behaves like a KToggleAction;
-     *               Else it behaves like a KAction. This avoids the multi-inheritance problem.
+     * @param toggle If set to true, the class behaves like a TDEToggleAction;
+     *               Else it behaves like a TDEAction. This avoids the multi-inheritance problem.
      */
-    TagAction(TQDomElement *element, KMainWindow *parentMainWindow, bool toggle = false);
+    TagAction(TQDomElement *element, TDEMainWindow *parentMainWindow, bool toggle = false);
     virtual ~TagAction();
 
     TQDomElement data() const { return tag; }
@@ -94,7 +94,7 @@ public slots:
      * We need this information in order to know if queued actions should be applied.
      * It's public because it can be activated by other classes if there are any queued actions.
      */
-    virtual bool slotActionActivated(KAction::ActivationReason reason, TQt::ButtonState state);
+    virtual bool slotActionActivated(TDEAction::ActivationReason reason, TQt::ButtonState state);
 
 protected slots:
     virtual void slotGetScriptOutput( TDEProcess *, char *buffer, int buflen );
@@ -127,7 +127,7 @@ private:
     TQTimer* timer;
     TQDomElement tag;
     TQFile* m_file;
-    KMainWindow *m_parentMainWindow;
+    TDEMainWindow *m_parentMainWindow;
     TQString m_inputFileName;
     TQStringList m_argsList;
     uint m_killCount;
diff --git a/quanta/utility/tagactionmanager.cpp b/quanta/utility/tagactionmanager.cpp
index eaad16ec..63df0010 100644
--- a/quanta/utility/tagactionmanager.cpp
+++ b/quanta/utility/tagactionmanager.cpp
@@ -58,7 +58,7 @@ void TagActionManager::initActions(TQWidget* parent)
 {
     Q_ASSERT(parent);
     
-    m_actionCollection = new KActionCollection(parent);
+    m_actionCollection = new TDEActionCollection(parent);
     
     TagActionSet* general(new TagActionSet());
     general->initActions(parent);
diff --git a/quanta/utility/tagactionmanager.h b/quanta/utility/tagactionmanager.h
index 6a6a45a9..de36356a 100644
--- a/quanta/utility/tagactionmanager.h
+++ b/quanta/utility/tagactionmanager.h
@@ -18,7 +18,7 @@
 #ifndef TAGACTIONMANAGER_H
 #define TAGACTIONMANAGER_H
 
-class KActionCollection;
+class TDEActionCollection;
 namespace DOM
 {
 class Node;
@@ -52,7 +52,7 @@ public:
     
     static bool canIndentDTD(TQString const& dtd);
 
-    KActionCollection* actionCollection() const
+    TDEActionCollection* actionCollection() const
     {
         return m_actionCollection;
     }
@@ -67,7 +67,7 @@ private:
 private:
     static TagActionManager* s_mSelf;
 
-    KActionCollection* m_actionCollection;
+    TDEActionCollection* m_actionCollection;
     TQPtrList<TagActionSetAbstract> m_tagActionSets;
 };
 
diff --git a/quanta/utility/tagactionset.cpp b/quanta/utility/tagactionset.cpp
index a5397df8..31f246ec 100644
--- a/quanta/utility/tagactionset.cpp
+++ b/quanta/utility/tagactionset.cpp
@@ -84,7 +84,7 @@ bool TagActionSetAbstract::fillWithTagActions(TQWidget* /*widget*/, DOM::Node co
 TagActionSet::TagActionSet(TQObject *parent, const char *name)
     : TagActionSetAbstract(parent, name), m_separator(0)
 {
-    m_separator = new KActionSeparator();
+    m_separator = new TDEActionSeparator();
 }
 
 bool TagActionSet::isInTagContext() const
@@ -98,20 +98,20 @@ void TagActionSet::initActionMenus(TQWidget* /*widget*/)
 
 void TagActionSet::initActions(TQWidget* /*parent*/)
 {
-    KActionCollection* ac(TagActionManager::self()->actionCollection());
+    TDEActionCollection* ac(TagActionManager::self()->actionCollection());
 
     const char *actionName = "apply_source_indentation";
-    new KAction(i18n("Apply Source Indentation"), 0, this,
+    new TDEAction(i18n("Apply Source Indentation"), 0, this,
                 TQT_SLOT(slotApplySourceIndentation()),
                 ac, actionName);
 
     actionName = "copy_div_element";
-    new KAction(i18n("Copy DIV Area"), 0, this,
+    new TDEAction(i18n("Copy DIV Area"), 0, this,
                 TQT_SLOT(slotCopyDivElement()),
                 ac, actionName);
 
     actionName = "cut_div_element";
-    new KAction(i18n("Cut DIV Area"), 0, this,
+    new TDEAction(i18n("Cut DIV Area"), 0, this,
                 TQT_SLOT(slotCutDivElement()),
                 ac, actionName);
 }
@@ -128,11 +128,11 @@ bool TagActionSet::fillWithTagActions(TQWidget* widget, DOM::Node const& node)
 
     m_separator->unplugAll();
     
-    KActionCollection* ac(TagActionManager::self()->actionCollection());
+    TDEActionCollection* ac(TagActionManager::self()->actionCollection());
 
-    KAction* copyDivAction = ac->action("copy_div_element");
+    TDEAction* copyDivAction = ac->action("copy_div_element");
     Q_ASSERT(copyDivAction);
-    KAction* cutDivAction = ac->action("cut_div_element");
+    TDEAction* cutDivAction = ac->action("cut_div_element");
     Q_ASSERT(cutDivAction);
     
     if(/*!KafkaDocument::ref()->getKafkaWidget()->hasSelection() && */isInDivArea())
@@ -151,7 +151,7 @@ bool TagActionSet::fillWithTagActions(TQWidget* widget, DOM::Node const& node)
         cutDivAction->unplug(widget);
     }
         
-//     KAction* applySourceIndentationAction = ac->action("apply_source_indentation");
+//     TDEAction* applySourceIndentationAction = ac->action("apply_source_indentation");
 //     Q_ASSERT(applySourceIndentationAction);
 // 
 //     applySourceIndentationAction->unplug(widget); // to keep things in order
@@ -164,19 +164,19 @@ bool TagActionSet::fillWithTagActions(TQWidget* widget, DOM::Node const& node)
 
 void TagActionSet::unplugAllActions(TQWidget* widget) const
 {
-    KActionCollection* ac(TagActionManager::self()->actionCollection());
+    TDEActionCollection* ac(TagActionManager::self()->actionCollection());
 
     m_separator->unplugAll();
     
-    KAction* applySourceIndentationAction = ac->action("apply_source_indentation");
+    TDEAction* applySourceIndentationAction = ac->action("apply_source_indentation");
     Q_ASSERT(applySourceIndentationAction);
     applySourceIndentationAction->unplug(widget);
 
-    KAction* copyDivAction = ac->action("copy_div_element");
+    TDEAction* copyDivAction = ac->action("copy_div_element");
     Q_ASSERT(copyDivAction);
     copyDivAction->unplug(widget);
 
-    KAction* cutDivAction = ac->action("cut_div_element");
+    TDEAction* cutDivAction = ac->action("cut_div_element");
     Q_ASSERT(cutDivAction);
     cutDivAction->unplug(widget);
 }
@@ -269,7 +269,7 @@ void TagActionSet::slotCutDivElement()
 TableTagActionSet::TableTagActionSet(TQObject *parent, const char *name)
     : TagActionSetAbstract(parent, name), m_separator(0), m_tableActionMenu_0(0), m_insertActionMenu_1(0)
 {
-    m_separator = new KActionSeparator();
+    m_separator = new TDEActionSeparator();
 }
 
 bool TableTagActionSet::isInTagContext() const
@@ -281,9 +281,9 @@ void TableTagActionSet::initActionMenus(TQWidget* widget)
 {
     Q_ASSERT(!m_tableActionMenu_0);
 
-    m_tableActionMenu_0 = new KActionMenu(i18n("Table..."), TQT_TQOBJECT(widget));
-    m_insertActionMenu_1 = new KActionMenu(i18n("Insert..."), m_tableActionMenu_0);
-    m_removeActionMenu_1 = new KActionMenu(i18n("Remove..."), m_tableActionMenu_0);
+    m_tableActionMenu_0 = new TDEActionMenu(i18n("Table..."), TQT_TQOBJECT(widget));
+    m_insertActionMenu_1 = new TDEActionMenu(i18n("Insert..."), m_tableActionMenu_0);
+    m_removeActionMenu_1 = new TDEActionMenu(i18n("Remove..."), m_tableActionMenu_0);
 }
 
 
@@ -292,37 +292,37 @@ void TableTagActionSet::initActions(TQWidget* parent)
     if(!m_tableActionMenu_0)
         initActionMenus(parent);
 
-    KActionCollection* ac(TagActionManager::self()->actionCollection());
+    TDEActionCollection* ac(TagActionManager::self()->actionCollection());
 
     // Insert___________________________________________________________________________
 
     const char *actionName = "insert_table";
     //m_actionNames += actionName;
-    new KAction(i18n("Table..."), 0, this,
+    new TDEAction(i18n("Table..."), 0, this,
                 TQT_SLOT(slotInsertTable()),
                 ac, actionName);
 
     actionName = "insert_row_above";
     //m_actionNames += actionName;
-    new KAction(i18n("Row Above"), 0, this,
+    new TDEAction(i18n("Row Above"), 0, this,
                 TQT_SLOT(slotInsertRowAbove()),
                 ac, actionName);
 
     actionName = "insert_row_below";
     //m_actionNames += actionName;
-    new KAction(i18n("Row Below"), 0, this,
+    new TDEAction(i18n("Row Below"), 0, this,
                 TQT_SLOT(slotInsertRowBelow()),
                 ac, actionName);
 
     actionName = "insert_column_left";
     //m_actionNames += actionName;
-    new KAction(i18n("Column Left"), 0, this,
+    new TDEAction(i18n("Column Left"), 0, this,
                 TQT_SLOT(slotInsertColumnLeft()),
                 ac, actionName);
 
     actionName = "insert_column_right";
     //m_actionNames += actionName;
-    new KAction(i18n("Column Right"), 0, this,
+    new TDEAction(i18n("Column Right"), 0, this,
                 TQT_SLOT(slotInsertColumnRight()),
                 ac, actionName);
 
@@ -330,31 +330,31 @@ void TableTagActionSet::initActions(TQWidget* parent)
 
     actionName = "remove_table";
     //m_actionNames += actionName;
-    new KAction(i18n("Table"), 0, this,
+    new TDEAction(i18n("Table"), 0, this,
                 TQT_SLOT(slotRemoveTable()),
                 ac, actionName);
 
     actionName = "remove_rows";
     //m_actionNames += actionName;
-    new KAction(i18n("Row(s)"), 0, this,
+    new TDEAction(i18n("Row(s)"), 0, this,
                 TQT_SLOT(slotRemoveRows()),
                 ac, actionName);
 
     actionName = "remove_columns";
     //m_actionNames += actionName;
-    new KAction(i18n("Column(s)"), 0, this,
+    new TDEAction(i18n("Column(s)"), 0, this,
                 TQT_SLOT(slotRemoveColumns()),
                 ac, actionName);
 
     actionName = "remove_cells";
     //m_actionNames += actionName;
-    new KAction(i18n("Cell(s)"), 0, this,
+    new TDEAction(i18n("Cell(s)"), 0, this,
                 TQT_SLOT(slotRemoveCells()),
                 ac, actionName);
 
     actionName = "remove_cells_content";
     //m_actionNames += actionName;
-    new KAction(i18n("Cell(s) Content"), 0, this,
+    new TDEAction(i18n("Cell(s) Content"), 0, this,
                 TQT_SLOT(slotRemoveCellsContent()),
                 ac, actionName);
 
@@ -362,7 +362,7 @@ void TableTagActionSet::initActions(TQWidget* parent)
 
     actionName = "merge_selected_cells";
     //m_actionNames += actionName;
-    new KAction(i18n("Merge Selected Cells"), 0, this,
+    new TDEAction(i18n("Merge Selected Cells"), 0, this,
                 TQT_SLOT(slotMergeSelectedCells()),
                 ac, actionName);
 }
@@ -379,7 +379,7 @@ bool TableTagActionSet::fillWithTagActions(TQWidget* widget, DOM::Node const& no
 
     m_separator->unplugAll();
     
-    KActionCollection* ac(TagActionManager::self()->actionCollection());
+    TDEActionCollection* ac(TagActionManager::self()->actionCollection());
 
     // Table
     bool emptyTableActionMenu_0 = true;
@@ -390,7 +390,7 @@ bool TableTagActionSet::fillWithTagActions(TQWidget* widget, DOM::Node const& no
     bool emptyInsertActionMenu_1 = true;
 
     // Insert Table
-    KAction* insertTableAction = ac->action("insert_table");
+    TDEAction* insertTableAction = ac->action("insert_table");
     Q_ASSERT(insertTableAction);
 
     m_insertActionMenu_1->remove(insertTableAction);
@@ -402,7 +402,7 @@ bool TableTagActionSet::fillWithTagActions(TQWidget* widget, DOM::Node const& no
         m_insertActionMenu_1->insert(m_separator);
     }
     // Insert Row Above
-    KAction* insertRowAboveAction = ac->action("insert_row_above");
+    TDEAction* insertRowAboveAction = ac->action("insert_row_above");
     Q_ASSERT(insertRowAboveAction);
 
     m_insertActionMenu_1->remove(insertRowAboveAction);
@@ -414,7 +414,7 @@ bool TableTagActionSet::fillWithTagActions(TQWidget* widget, DOM::Node const& no
         //m_insertActionMenu_1->insert(m_separator);
     }
     // Insert Row Below
-    KAction* insertRowBelowAction = ac->action("insert_row_below");
+    TDEAction* insertRowBelowAction = ac->action("insert_row_below");
     Q_ASSERT(insertRowBelowAction);
 
     m_insertActionMenu_1->remove(insertRowBelowAction);
@@ -426,7 +426,7 @@ bool TableTagActionSet::fillWithTagActions(TQWidget* widget, DOM::Node const& no
         m_insertActionMenu_1->insert(m_separator);
     }
     // Insert Column Left
-    KAction* insertColumnLeftAction = ac->action("insert_column_left");
+    TDEAction* insertColumnLeftAction = ac->action("insert_column_left");
     Q_ASSERT(insertColumnLeftAction);
 
     m_insertActionMenu_1->remove(insertColumnLeftAction);
@@ -438,7 +438,7 @@ bool TableTagActionSet::fillWithTagActions(TQWidget* widget, DOM::Node const& no
         //m_insertActionMenu_1->insert(m_separator);
     }
     // Insert Column Right
-    KAction* insertColumnRightAction = ac->action("insert_column_right");
+    TDEAction* insertColumnRightAction = ac->action("insert_column_right");
     Q_ASSERT(insertColumnRightAction);
 
     m_insertActionMenu_1->remove(insertColumnRightAction);
@@ -455,7 +455,7 @@ bool TableTagActionSet::fillWithTagActions(TQWidget* widget, DOM::Node const& no
     bool emptyRemoveActionMenu_1 = true;
 
     // Remove Table
-    KAction* removeTableAction = ac->action("remove_table");
+    TDEAction* removeTableAction = ac->action("remove_table");
     Q_ASSERT(removeTableAction);
 
     m_removeActionMenu_1->remove(removeTableAction);
@@ -467,7 +467,7 @@ bool TableTagActionSet::fillWithTagActions(TQWidget* widget, DOM::Node const& no
         m_removeActionMenu_1->insert(m_separator);
     }
     // Remove Row(s)
-    KAction* removeRowsAction = ac->action("remove_rows");
+    TDEAction* removeRowsAction = ac->action("remove_rows");
     Q_ASSERT(removeRowsAction);
 
     m_removeActionMenu_1->remove(removeRowsAction);
@@ -479,7 +479,7 @@ bool TableTagActionSet::fillWithTagActions(TQWidget* widget, DOM::Node const& no
         //m_removeActionMenu_1->insert(m_separator);
     }
     // Remove Column(s)
-    KAction* removeColumnsAction = ac->action("remove_columns");
+    TDEAction* removeColumnsAction = ac->action("remove_columns");
     Q_ASSERT(removeColumnsAction);
 
     m_removeActionMenu_1->remove(removeColumnsAction);
@@ -491,7 +491,7 @@ bool TableTagActionSet::fillWithTagActions(TQWidget* widget, DOM::Node const& no
         //m_removeActionMenu_1->insert(m_separator);
     }
 /*    // Remove Cell(s)
-    KAction* removeCellsAction = ac->action("remove_cells");
+    TDEAction* removeCellsAction = ac->action("remove_cells");
     Q_ASSERT(removeCellsAction);
 
     m_removeActionMenu_1->remove(removeCellsAction);
@@ -503,7 +503,7 @@ bool TableTagActionSet::fillWithTagActions(TQWidget* widget, DOM::Node const& no
         //m_removeActionMenu_1->insert(m_separator);
     }*/
     // Remove Cell(s) Content
-    KAction* removeCellsContentAction = ac->action("remove_cells_content");
+    TDEAction* removeCellsContentAction = ac->action("remove_cells_content");
     Q_ASSERT(removeCellsContentAction);
 
     m_removeActionMenu_1->remove(removeCellsContentAction);
@@ -538,7 +538,7 @@ bool TableTagActionSet::fillWithTagActions(TQWidget* widget, DOM::Node const& no
         m_tableActionMenu_0->insert(m_separator);
     }
     // Merge selected cells
-    KAction* mergeSelectedCellsAction = ac->action("merge_selected_cells");
+    TDEAction* mergeSelectedCellsAction = ac->action("merge_selected_cells");
     Q_ASSERT(mergeSelectedCellsAction);
 
     m_tableActionMenu_0->remove(mergeSelectedCellsAction);
diff --git a/quanta/utility/tagactionset.h b/quanta/utility/tagactionset.h
index 19b06fb7..f94506a5 100644
--- a/quanta/utility/tagactionset.h
+++ b/quanta/utility/tagactionset.h
@@ -22,12 +22,12 @@ namespace DOM
 {
 class Node;
 }
-class KActionSeparator;
+class TDEActionSeparator;
 
 #include <tqobject.h>
 class TQWidget;
-class KActionSet;
-class KActionMenu;
+class TDEActionSet;
+class TDEActionMenu;
 
 class Node;
 class NodeModifsSet;
@@ -89,7 +89,7 @@ private:
     bool isInDivArea() const;
    
 private:
-    KActionSeparator* m_separator;
+    TDEActionSeparator* m_separator;
 };
 
 
@@ -154,11 +154,11 @@ private:
     void clearCellContents(Node* tdNode, NodeModifsSet* modifs);
     
 private:
-    KActionSeparator* m_separator;
+    TDEActionSeparator* m_separator;
         
-    KActionMenu* m_tableActionMenu_0;
-    KActionMenu* m_insertActionMenu_1;
-    KActionMenu* m_removeActionMenu_1;
+    TDEActionMenu* m_tableActionMenu_0;
+    TDEActionMenu* m_insertActionMenu_1;
+    TDEActionMenu* m_removeActionMenu_1;
 };
 
 #endif
diff --git a/quanta/utility/toolbartabwidget.cpp b/quanta/utility/toolbartabwidget.cpp
index c594c46b..6d715d64 100644
--- a/quanta/utility/toolbartabwidget.cpp
+++ b/quanta/utility/toolbartabwidget.cpp
@@ -41,7 +41,7 @@
 ToolbarTabWidget::ToolbarTabWidget(TQWidget * parent, const char * name, WFlags f)
 :TQTabWidget(parent, name, f)
 {
-  m_popupMenu = new KPopupMenu(this);
+  m_popupMenu = new TDEPopupMenu(this);
   m_popupMenu->insertTitle(i18n("Toolbar Menu"), 1);
   m_popupMenu->insertItem(i18n("New Action..."), parent, TQT_SLOT(slotNewAction()));
   m_popupMenu->insertSeparator();
@@ -60,12 +60,12 @@ ToolbarTabWidget::ToolbarTabWidget(TQWidget * parent, const char * name, WFlags
           parent, TQT_SLOT(slotNewAction()));
   connect(this, TQT_SIGNAL(addToolbar()),
           parent, TQT_SLOT(slotAddToolbar()));
-  KAcceleratorManager::setNoAccel(this);
+  TDEAcceleratorManager::setNoAccel(this);
 }
 
 void ToolbarTabWidget::insertTab(TQWidget *child, const TQString &label, const TQString &id)
 {
-  if (child->inherits("KToolBar") && child->parentWidget())
+  if (child->inherits("TDEToolBar") && child->parentWidget())
   {
     TQTabWidget::insertTab(child->parentWidget(), label);
     toolbarList.insert(id, child);
@@ -125,7 +125,7 @@ TQWidget* ToolbarTabWidget::page(const TQString& id)
 void ToolbarTabWidget::removePage(TQWidget * w)
 {
   TQWidget *parent = w->parentWidget();
-  if (w->inherits("KToolBar") && parent)
+  if (w->inherits("TDEToolBar") && parent)
   {
     TQTabWidget::removePage(parent);
     for (TQMap<TQString, TQWidget*>::ConstIterator it = toolbarList.constBegin(); it != toolbarList.constEnd(); ++it)
@@ -224,12 +224,12 @@ int ToolbarTabWidget::tabHeight() const
 
 
 QuantaToolBar::QuantaToolBar(TQWidget *parent, const char *name, bool honor_style, bool readConfig)
-:KToolBar (parent, name=0, honor_style, readConfig)
+:TDEToolBar (parent, name=0, honor_style, readConfig)
 {
-  m_popupMenu = new KPopupMenu(this);
+  m_popupMenu = new TDEPopupMenu(this);
   m_toolbarTab = dynamic_cast<ToolbarTabWidget*>(parent->parentWidget());
   currentActionName = "";
-  m_iconTextMenu = new KPopupMenu(this);
+  m_iconTextMenu = new TDEPopupMenu(this);
   m_iconTextMenu->setCheckable(true);
   m_iconTextMenu->insertItem(i18n("Icons Only"), 0);
   m_iconTextMenu->insertItem(i18n("Text Only"), 1);
@@ -307,10 +307,10 @@ void QuantaToolBar::mousePressEvent(TQMouseEvent *e)
       m_popupMenu->insertTitle(i18n("Toolbar Menu") + " - "
                                + i18n(m_toolbarTab->tabUnderMouseLabel.utf8()));
       m_popupMenu->insertItem(i18n("New Action..."), m_toolbarTab, TQT_SIGNAL(newAction()));
-      TQObjectList* childrenList = queryList("KToolBarButton");
+      TQObjectList* childrenList = queryList("TDEToolBarButton");
       for (uint i = 0; i < childrenList->count(); i++)
       {
-        KToolBarButton *w = static_cast<KToolBarButton*>(TQT_TQWIDGET(childrenList->at(i)));
+        TDEToolBarButton *w = static_cast<TDEToolBarButton*>(TQT_TQWIDGET(childrenList->at(i)));
         TQPoint p1 = w->parentWidget()->mapToGlobal(w->pos());
         TQPoint p2 = TQPoint(p1.x() + w->width(), p1.y()+w->height());
         if (TQRect(p1, p2).contains(p))
diff --git a/quanta/utility/toolbartabwidget.h b/quanta/utility/toolbartabwidget.h
index 24d09e36..a8ce9ecc 100644
--- a/quanta/utility/toolbartabwidget.h
+++ b/quanta/utility/toolbartabwidget.h
@@ -19,10 +19,10 @@
 #include <tqmap.h>
 
 class TQTabWidget;
-class KPopupMenu;
+class TDEPopupMenu;
 class TQWidgetStack;
 class TQTabBar;
-class KToolBar;
+class TDEToolBar;
 
 class ToolbarTabWidget: public TQTabWidget
 {
@@ -45,8 +45,8 @@ public:
   int tabHeight() const;
   TQString id(TQWidget *w) const;
   TQString id(int index) const;
-  KToolBar::IconText iconText() const {return m_iconText;}
-  void setIconText(KToolBar::IconText mode) {m_iconText = mode; emit iconTextModeChanged();}
+  TDEToolBar::IconText iconText() const {return m_iconText;}
+  void setIconText(TDEToolBar::IconText mode) {m_iconText = mode; emit iconTextModeChanged();}
 
 public slots:
   virtual void removePage(TQWidget * w );
@@ -72,17 +72,17 @@ public:
 protected:
   virtual void mousePressEvent ( TQMouseEvent * e );
 
-  KPopupMenu *m_popupMenu;
+  TDEPopupMenu *m_popupMenu;
   TQTabBar *m_tabBar;
   TQMap<TQString, TQWidget*> toolbarList;
 
 private:
   ToolbarTabWidget(TQWidget * parent = 0, const char * name = 0, WFlags f = 0);
-  KToolBar::IconText m_iconText;
+  TDEToolBar::IconText m_iconText;
 
 };
 
-class QuantaToolBar: public KToolBar
+class QuantaToolBar: public TDEToolBar
 {
   Q_OBJECT
   
@@ -104,8 +104,8 @@ signals:
 protected:
   virtual void mousePressEvent ( TQMouseEvent * e );
 
-  KPopupMenu *m_popupMenu;
-  KPopupMenu *m_iconTextMenu;
+  TDEPopupMenu *m_popupMenu;
+  TDEPopupMenu *m_iconTextMenu;
   ToolbarTabWidget *m_toolbarTab;
   TQString currentActionName;
 };
diff --git a/tdefilereplace/report.h b/tdefilereplace/report.h
index 13856334..2255f240 100644
--- a/tdefilereplace/report.h
+++ b/tdefilereplace/report.h
@@ -25,7 +25,7 @@ class TQString;
 // KDE
 #include <klocale.h>
 #include "configurationclasses.h"
-class KListView;
+class TDEListView;
 
 /** Report class is used to create a pair of files (a xml and a css file) which are
   * a short statistical report of the operations.
@@ -34,14 +34,14 @@ class KListView;
 class Report
 {
   private:
-    KListView* m_stringsView,
+    TDEListView* m_stringsView,
              * m_resultsView;
     TQString m_docPath;
     bool m_isSearchFlag;
     RCOptions* m_option;
 
   public:
-    Report(RCOptions* info, KListView* rv, KListView* sv) { m_option = info;
+    Report(RCOptions* info, TDEListView* rv, TDEListView* sv) { m_option = info;
                                                             m_resultsView = rv;
                                                             m_stringsView = sv;
                                                             m_isSearchFlag = m_option->m_searchingOnlyMode;
diff --git a/tdefilereplace/tdefilereplace.cpp b/tdefilereplace/tdefilereplace.cpp
index bd5725e4..b96883d9 100644
--- a/tdefilereplace/tdefilereplace.cpp
+++ b/tdefilereplace/tdefilereplace.cpp
@@ -91,10 +91,10 @@ void KFileReplace::applyNewToolbarConfig()
 
 void KFileReplace::removeDuplicatedActions()
 {
-    KActionCollection* part_action_collection = m_part->actionCollection();
-    KAction* part_about_action = part_action_collection->action("help_about_tdefilereplace");
-    KAction* part_report_action = part_action_collection->action("report_bug");
-    KAction* part_help_action= part_action_collection->action("help_tdefilereplace");
+    TDEActionCollection* part_action_collection = m_part->actionCollection();
+    TDEAction* part_about_action = part_action_collection->action("help_about_tdefilereplace");
+    TDEAction* part_report_action = part_action_collection->action("report_bug");
+    TDEAction* part_help_action= part_action_collection->action("help_tdefilereplace");
 
     if (!part_about_action || !part_report_action || !part_help_action || !part_action_collection) 
       return;
diff --git a/tdefilereplace/tdefilereplacelib.cpp b/tdefilereplace/tdefilereplacelib.cpp
index 0f396f85..0d2246a1 100644
--- a/tdefilereplace/tdefilereplacelib.cpp
+++ b/tdefilereplace/tdefilereplacelib.cpp
@@ -119,7 +119,7 @@ TQString KFileReplaceLib::formatFileSize(double size)
   return stringSize;
 }
 
-void KFileReplaceLib::convertOldToNewKFRFormat(const TQString& fileName, KListView* stringView)
+void KFileReplaceLib::convertOldToNewKFRFormat(const TQString& fileName, TDEListView* stringView)
 {
  //this method convert old format in new XML-based format
  typedef struct
diff --git a/tdefilereplace/tdefilereplacelib.h b/tdefilereplace/tdefilereplacelib.h
index 9669b31c..eb83f9a2 100644
--- a/tdefilereplace/tdefilereplacelib.h
+++ b/tdefilereplace/tdefilereplacelib.h
@@ -53,7 +53,7 @@ class KFileReplaceLib
     /**
     converts the old kfr format file in the new xml-based format.
     */
-    static void convertOldToNewKFRFormat(const TQString& fileName, KListView* stringView);
+    static void convertOldToNewKFRFormat(const TQString& fileName, TDEListView* stringView);
     /**
     Verifies that files, which we are scanning, respect some
     conditions
diff --git a/tdefilereplace/tdefilereplacepart.cpp b/tdefilereplace/tdefilereplacepart.cpp
index ab91ae47..39126044 100644
--- a/tdefilereplace/tdefilereplacepart.cpp
+++ b/tdefilereplace/tdefilereplacepart.cpp
@@ -107,7 +107,7 @@ void KFileReplacePart::slotSearchingOperation()
   if(!checkBeforeOperation())
     return;
 
-  KListView* rv = m_view->getResultsView();
+  TDEListView* rv = m_view->getResultsView();
 
   rv->clear();
 
@@ -166,7 +166,7 @@ void KFileReplacePart::slotReplacingOperation()
   if(!checkBeforeOperation())
     return;
 
-  KListView* rv = m_view->getResultsView();
+  TDEListView* rv = m_view->getResultsView();
 
   if(m_option->m_simulation)
     {
@@ -239,7 +239,7 @@ void KFileReplacePart::slotStop()
 void KFileReplacePart::slotCreateReport()
 {
   // Check there are results
-  KListView* rv = m_view->getResultsView(),
+  TDEListView* rv = m_view->getResultsView(),
            * sv = m_view->getStringsView();
 
   if(rv->firstChild() == 0)
@@ -454,7 +454,7 @@ void KFileReplacePart::reportBug()
 
 void KFileReplacePart::resetActions()
 {
-  KListView* rv = m_view->getResultsView(),
+  TDEListView* rv = m_view->getResultsView(),
            * sv = m_view->getStringsView();
 
   bool hasItems = (sv->firstChild() != 0),
@@ -499,11 +499,11 @@ void KFileReplacePart::resetActions()
   actionCollection()->action("results_treereduce")->setEnabled(hasItems);
 
   // Updates menus and toolbar
-  ((KToggleAction* ) actionCollection()->action("options_recursive"))->setChecked(m_option->m_recursive);
-  ((KToggleAction* ) actionCollection()->action("options_backup"))->setChecked(m_option->m_backup && !searchOnlyMode);
-  ((KToggleAction* ) actionCollection()->action("options_case"))->setChecked(m_option->m_caseSensitive);
-  ((KToggleAction* ) actionCollection()->action("options_var"))->setChecked(m_option->m_variables && !searchOnlyMode);
-  ((KToggleAction* ) actionCollection()->action("options_regularexpressions"))->setChecked(m_option->m_regularExpressions);
+  ((TDEToggleAction* ) actionCollection()->action("options_recursive"))->setChecked(m_option->m_recursive);
+  ((TDEToggleAction* ) actionCollection()->action("options_backup"))->setChecked(m_option->m_backup && !searchOnlyMode);
+  ((TDEToggleAction* ) actionCollection()->action("options_case"))->setChecked(m_option->m_caseSensitive);
+  ((TDEToggleAction* ) actionCollection()->action("options_var"))->setChecked(m_option->m_variables && !searchOnlyMode);
+  ((TDEToggleAction* ) actionCollection()->action("options_regularexpressions"))->setChecked(m_option->m_regularExpressions);
 }
 
 //PUBLIC METHODS
@@ -567,48 +567,48 @@ void KFileReplacePart::initGUI()
         }
     }
   // File
-  (void)new KAction(i18n("Customize Search/Replace Session..."), "projectopen", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetNewParameters()), actionCollection(), "new_project");
-  (void)new KAction(i18n("&Search"), "filesearch", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSearchingOperation()), actionCollection(), "search");
-  (void)new KAction(i18n("S&imulate"), "filesimulate", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSimulatingOperation()), actionCollection(), "file_simulate");
-  (void)new KAction(i18n("&Replace"),  "filereplace", 0, TQT_TQOBJECT(this), TQT_SLOT(slotReplacingOperation()), actionCollection(), "replace");
-  (void)new KAction(i18n("Sto&p"), "stop", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStop()), actionCollection(), "stop");
-  (void)new KAction(i18n("Cre&ate Report File..."), "filesaveas", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCreateReport()), actionCollection(), "save_results");
+  (void)new TDEAction(i18n("Customize Search/Replace Session..."), "projectopen", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetNewParameters()), actionCollection(), "new_project");
+  (void)new TDEAction(i18n("&Search"), "filesearch", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSearchingOperation()), actionCollection(), "search");
+  (void)new TDEAction(i18n("S&imulate"), "filesimulate", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSimulatingOperation()), actionCollection(), "file_simulate");
+  (void)new TDEAction(i18n("&Replace"),  "filereplace", 0, TQT_TQOBJECT(this), TQT_SLOT(slotReplacingOperation()), actionCollection(), "replace");
+  (void)new TDEAction(i18n("Sto&p"), "stop", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStop()), actionCollection(), "stop");
+  (void)new TDEAction(i18n("Cre&ate Report File..."), "filesaveas", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCreateReport()), actionCollection(), "save_results");
 
   // Strings
-  (void)new KAction(i18n("&Add String..."), "editadd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsAdd()), actionCollection(), "strings_add");
+  (void)new TDEAction(i18n("&Add String..."), "editadd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsAdd()), actionCollection(), "strings_add");
 
-  (void)new KAction(i18n("&Delete String"), "editremove", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsDeleteItem()), actionCollection(), "strings_del");
-  (void)new KAction(i18n("&Empty Strings List"), "editdelete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsEmpty()), actionCollection(), "strings_empty");
-  (void)new KAction(i18n("Edit Selected String..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsEdit()), actionCollection(), "strings_edit");
-  (void)new KAction(i18n("&Save Strings List to File..."), "filesaveas", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsSave()), actionCollection(), "strings_save");
-  (void)new KAction(i18n("&Load Strings List From File..."), "unsortedList", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsLoad()), actionCollection(), "strings_load");
-  (void)new KRecentFilesAction(i18n("&Load Recent Strings Files"), "fileopen", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenRecentStringFile(const KURL&)), actionCollection(),"strings_load_recent");
-  (void)new KAction(i18n("&Invert Current String (search <--> replace)"), "invert", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsInvertCur()), actionCollection(), "strings_invert");
-  (void)new KAction(i18n("&Invert All Strings (search <--> replace)"), "invert", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsInvertAll()), actionCollection(), "strings_invert_all");
+  (void)new TDEAction(i18n("&Delete String"), "editremove", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsDeleteItem()), actionCollection(), "strings_del");
+  (void)new TDEAction(i18n("&Empty Strings List"), "editdelete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsEmpty()), actionCollection(), "strings_empty");
+  (void)new TDEAction(i18n("Edit Selected String..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsEdit()), actionCollection(), "strings_edit");
+  (void)new TDEAction(i18n("&Save Strings List to File..."), "filesaveas", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsSave()), actionCollection(), "strings_save");
+  (void)new TDEAction(i18n("&Load Strings List From File..."), "unsortedList", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsLoad()), actionCollection(), "strings_load");
+  (void)new TDERecentFilesAction(i18n("&Load Recent Strings Files"), "fileopen", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenRecentStringFile(const KURL&)), actionCollection(),"strings_load_recent");
+  (void)new TDEAction(i18n("&Invert Current String (search <--> replace)"), "invert", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsInvertCur()), actionCollection(), "strings_invert");
+  (void)new TDEAction(i18n("&Invert All Strings (search <--> replace)"), "invert", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStringsInvertAll()), actionCollection(), "strings_invert_all");
 
   // Options
-  (void)new KToggleAction(i18n("&Include Sub-Folders"), "recursive_option", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionRecursive()), actionCollection(), "options_recursive");
-  (void)new KToggleAction(i18n("Create &Backup Files"), "backup_option", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionBackup()), actionCollection(), "options_backup");
-  (void)new KToggleAction(i18n("Case &Sensitive"), "casesensitive_option", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionCaseSensitive()), actionCollection(), "options_case");
-  (void)new KToggleAction(i18n("Enable Commands &in Replace String: [$command:option$]"), "command_option", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionVariables()), actionCollection(), "options_var");
-  (void)new KToggleAction(i18n("Enable &Regular Expressions"), "regularexpression_option", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionRegularExpressions()), actionCollection(), "options_regularexpressions");
-  (void)new KAction(i18n("Configure &KFileReplace..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionPreferences()), actionCollection(), "configure_tdefilereplace");
+  (void)new TDEToggleAction(i18n("&Include Sub-Folders"), "recursive_option", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionRecursive()), actionCollection(), "options_recursive");
+  (void)new TDEToggleAction(i18n("Create &Backup Files"), "backup_option", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionBackup()), actionCollection(), "options_backup");
+  (void)new TDEToggleAction(i18n("Case &Sensitive"), "casesensitive_option", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionCaseSensitive()), actionCollection(), "options_case");
+  (void)new TDEToggleAction(i18n("Enable Commands &in Replace String: [$command:option$]"), "command_option", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionVariables()), actionCollection(), "options_var");
+  (void)new TDEToggleAction(i18n("Enable &Regular Expressions"), "regularexpression_option", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionRegularExpressions()), actionCollection(), "options_regularexpressions");
+  (void)new TDEAction(i18n("Configure &KFileReplace..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionPreferences()), actionCollection(), "configure_tdefilereplace");
 
   // Results
-  (void)new KAction(i18n("&Properties"), "informations", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultProperties()), actionCollection(), "results_infos");
-  (void)new KAction(i18n("&Open"), "filenew", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultOpen()), actionCollection(), "results_openfile");
+  (void)new TDEAction(i18n("&Properties"), "informations", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultProperties()), actionCollection(), "results_infos");
+  (void)new TDEAction(i18n("&Open"), "filenew", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultOpen()), actionCollection(), "results_openfile");
 
   if(quantaFound)
     {
-      (void)new KAction(i18n("&Edit in Quanta"), "quanta", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultEdit()), actionCollection(), "results_editfile");
+      (void)new TDEAction(i18n("&Edit in Quanta"), "quanta", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultEdit()), actionCollection(), "results_editfile");
     }
-  (void)new KAction(i18n("Open Parent &Folder"), "fileopen", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultDirOpen()), actionCollection(), "results_opendir");
-  (void)new KAction(i18n("&Delete"), "editdelete", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultDelete()), actionCollection(), "results_delete");
-  (void)new KAction(i18n("E&xpand Tree"), 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultTreeExpand()), actionCollection(), "results_treeexpand");
-  (void)new KAction(i18n("&Reduce Tree"), 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultTreeReduce()), actionCollection(), "results_treereduce");
-  (void)new KAction(i18n("&About KFileReplace"), "tdefilereplace", 0, TQT_TQOBJECT(this), TQT_SLOT(showAboutApplication()), actionCollection(), "help_about_tdefilereplace");
-  (void)new KAction(i18n("KFileReplace &Handbook"), "help", 0, TQT_TQOBJECT(this), TQT_SLOT(appHelpActivated()), actionCollection(), "help_tdefilereplace");
-  (void)new KAction(i18n("&Report Bug"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(reportBug()), actionCollection(), "report_bug");
+  (void)new TDEAction(i18n("Open Parent &Folder"), "fileopen", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultDirOpen()), actionCollection(), "results_opendir");
+  (void)new TDEAction(i18n("&Delete"), "editdelete", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultDelete()), actionCollection(), "results_delete");
+  (void)new TDEAction(i18n("E&xpand Tree"), 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultTreeExpand()), actionCollection(), "results_treeexpand");
+  (void)new TDEAction(i18n("&Reduce Tree"), 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultTreeReduce()), actionCollection(), "results_treereduce");
+  (void)new TDEAction(i18n("&About KFileReplace"), "tdefilereplace", 0, TQT_TQOBJECT(this), TQT_SLOT(showAboutApplication()), actionCollection(), "help_about_tdefilereplace");
+  (void)new TDEAction(i18n("KFileReplace &Handbook"), "help", 0, TQT_TQOBJECT(this), TQT_SLOT(appHelpActivated()), actionCollection(), "help_tdefilereplace");
+  (void)new TDEAction(i18n("&Report Bug"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(reportBug()), actionCollection(), "report_bug");
 
 }
 
@@ -654,11 +654,11 @@ void KFileReplacePart::freezeActions()
   actionCollection()->action("results_delete")->setEnabled(false);
   actionCollection()->action("results_treeexpand")->setEnabled(false);
   actionCollection()->action("results_treereduce")->setEnabled(false);
-  ((KToggleAction* ) actionCollection()->action("options_recursive"))->setChecked(false);
-  ((KToggleAction* ) actionCollection()->action("options_backup"))->setChecked(false);
-  ((KToggleAction* ) actionCollection()->action("options_case"))->setChecked(false);
-  ((KToggleAction* ) actionCollection()->action("options_var"))->setChecked(false);
-  ((KToggleAction* ) actionCollection()->action("options_regularexpressions"))->setChecked(false);
+  ((TDEToggleAction* ) actionCollection()->action("options_recursive"))->setChecked(false);
+  ((TDEToggleAction* ) actionCollection()->action("options_backup"))->setChecked(false);
+  ((TDEToggleAction* ) actionCollection()->action("options_case"))->setChecked(false);
+  ((TDEToggleAction* ) actionCollection()->action("options_var"))->setChecked(false);
+  ((TDEToggleAction* ) actionCollection()->action("options_regularexpressions"))->setChecked(false);
 }
 
 void KFileReplacePart::loadOptionsFromRC()
@@ -1040,7 +1040,7 @@ void KFileReplacePart::replaceAndBackup(const TQString& currentDir, const TQStri
   TQString backupExtension = m_option->m_backupExtension;
 
   bool atLeastOneStringFound = false;
-  KListViewItem *item = 0;
+  TDEListViewItem *item = 0;
   int occurrence = 0;
 
   replacingLoop(line, &item, atLeastOneStringFound, occurrence, m_option->m_regularExpressions, m_option->m_askConfirmReplace);
@@ -1115,7 +1115,7 @@ void KFileReplacePart::replaceAndOverwrite(const TQString& currentDir, const TQS
     }
 
   TQString fileSizeBeforeReplacing =  KFileReplaceLib::formatFileSize(oldFileInfo.size());
-  KListViewItem *item = 0;
+  TDEListViewItem *item = 0;
 
   TQTextStream oldStream( &oldFile );
   if (m_option->m_encoding == "utf8")
@@ -1176,11 +1176,11 @@ void KFileReplacePart::replaceAndOverwrite(const TQString& currentDir, const TQS
     }
 }
 
-void KFileReplacePart::replacingLoop(TQString& line, KListViewItem** item, bool& atLeastOneStringFound, int& occur, bool regularExpression, bool& askConfirmReplace)
+void KFileReplacePart::replacingLoop(TQString& line, TDEListViewItem** item, bool& atLeastOneStringFound, int& occur, bool regularExpression, bool& askConfirmReplace)
 {
   KeyValueMap tempMap = m_replacementMap;
   KeyValueMap::Iterator it;
-  KListView* rv = m_view->getResultsView();
+  TDEListView* rv = m_view->getResultsView();
 
   for(it = tempMap.begin(); it != tempMap.end(); ++it)
     {
@@ -1209,8 +1209,8 @@ void KFileReplacePart::replacingLoop(TQString& line, KListViewItem** item, bool&
 					      entry.columnNumber(line));
 
 		  if(!*item)
-		    *item =  new KListViewItem(rv);
-		  KListViewItem* tempItem = new KListViewItem(*item);
+		    *item =  new TDEListViewItem(rv);
+		  TDEListViewItem* tempItem = new TDEListViewItem(*item);
 		  tempItem->setMultiLinesEnabled(true);
 		  tempItem->setText(0,msg);
 		  occur ++;
@@ -1231,8 +1231,8 @@ void KFileReplacePart::replacingLoop(TQString& line, KListViewItem** item, bool&
 					   entry.columnNumber(line));
 
 	       if(!*item)
-		 *item =  new KListViewItem(rv);
-	       KListViewItem* tempItem = new KListViewItem(*item);
+		 *item =  new TDEListViewItem(rv);
+	       TDEListViewItem* tempItem = new TDEListViewItem(*item);
 	       tempItem->setMultiLinesEnabled(true);
 	       tempItem->setText(0,msg);
 	       occur ++;
@@ -1346,7 +1346,7 @@ void KFileReplacePart::search(const TQString& currentDir, const TQString& fileNa
 
   TQFileInfo fileInfo(currentDir+"/"+fileName);
 
-  KListViewItem *item = 0;
+  TDEListViewItem *item = 0;
  
   //Counts occurrences
   int occurrence = 0;
@@ -1358,7 +1358,7 @@ void KFileReplacePart::search(const TQString& currentDir, const TQString& fileNa
 
   KeyValueMap::Iterator it = tempMap.begin();
 
-  KListView* rv = m_view->getResultsView();
+  TDEListView* rv = m_view->getResultsView();
 
   while(it != tempMap.end())
     {
@@ -1392,9 +1392,9 @@ void KFileReplacePart::search(const TQString& currentDir, const TQString& fileNa
               int columnNumber = pos - line.findRev('\n',pos);
 
               if (!item)
-                item = new KListViewItem(rv);
+                item = new TDEListViewItem(rv);
 
-              KListViewItem* tempItem= new KListViewItem(item);
+              TDEListViewItem* tempItem= new TDEListViewItem(item);
               TQString msg,
                       capturedText;
 
@@ -1446,8 +1446,8 @@ void KFileReplacePart::search(const TQString& currentDir, const TQString& fileNa
               msg = i18n(" Line:%2, Col:%3 - \"%1\"").arg(capturedText).arg(TQString::number(lineNumber,10)).arg(TQString::number(columnNumber,10));
 
               if(!item)
-                 item = new KListViewItem(rv);
-              KListViewItem* tempItem = new KListViewItem(item);
+                 item = new TDEListViewItem(rv);
+              TDEListViewItem* tempItem = new TDEListViewItem(item);
               tempItem->setMultiLinesEnabled(true);
               tempItem->setText(0,msg);
               occurrence++;
@@ -1505,7 +1505,7 @@ void KFileReplacePart::loadRulesFile(const TQString& fileName)
   *  creates a xml document and browses it*/
   TQDomDocument doc("mydocument");
   TQFile file(fileName);
-  KListView* sv = m_view->getStringsView();
+  TDEListView* sv = m_view->getStringsView();
 
   if(!file.open(IO_ReadOnly))
     {
@@ -1572,7 +1572,7 @@ void KFileReplacePart::loadRulesFile(const TQString& fileName)
   if(!fileList.contains(fileName))
     {
       fileList.append(fileName);
-      ((KRecentFilesAction* ) actionCollection()->action("strings_load_recent"))->setItems(fileList);
+      ((TDERecentFilesAction* ) actionCollection()->action("strings_load_recent"))->setItems(fileList);
       m_option->m_recentStringFileList = fileList;
     }
 
@@ -1621,7 +1621,7 @@ void KFileReplacePart::setOptionMask()
 bool KFileReplacePart::checkBeforeOperation()
 {
   loadViewContent();
-  KListView* sv = m_view->getStringsView();
+  TDEListView* sv = m_view->getStringsView();
 
   // Checks if there are strings to replace (not need in search operation)
   if (sv->childCount() == 0)
diff --git a/tdefilereplace/tdefilereplacepart.h b/tdefilereplace/tdefilereplacepart.h
index d625d7bb..bc507088 100644
--- a/tdefilereplace/tdefilereplacepart.h
+++ b/tdefilereplace/tdefilereplacepart.h
@@ -136,7 +136,7 @@ class KFileReplacePart: public KParts::ReadOnlyPart
     void recursiveFileReplace(const TQString& dirName, int& filesNumber);
     void replaceAndBackup(const TQString& currentDir, const TQString& oldFileName);
     void replaceAndOverwrite(const TQString& currentDir, const TQString& oldFileName);
-    void replacingLoop(TQString& line, KListViewItem** item, bool& atLeastOneStringFound, int& occur, bool regularExpression, bool& askConfirmReplace);
+    void replacingLoop(TQString& line, TDEListViewItem** item, bool& atLeastOneStringFound, int& occur, bool regularExpression, bool& askConfirmReplace);
 
     /**
      * Searching methods
diff --git a/tdefilereplace/tdefilereplaceview.cpp b/tdefilereplace/tdefilereplaceview.cpp
index b7a8c6be..ffefd154 100644
--- a/tdefilereplace/tdefilereplaceview.cpp
+++ b/tdefilereplace/tdefilereplaceview.cpp
@@ -99,7 +99,7 @@ void KFileReplaceView::stringsInvert(bool invertAll)
 {
   TQListViewItem* lviCurItem,
   * lviFirst;
-  KListView* sv = getStringsView();
+  TDEListView* sv = getStringsView();
 
   if(invertAll)
     lviCurItem = lviFirst = sv->firstChild();
@@ -149,7 +149,7 @@ void KFileReplaceView::changeView(bool searchingOnlyMode)
     }
 }
 
-KListView* KFileReplaceView::getResultsView()
+TDEListView* KFileReplaceView::getResultsView()
 {
   if(m_option->m_searchingOnlyMode)
     m_rv = m_lvResults_2;
@@ -159,7 +159,7 @@ KListView* KFileReplaceView::getResultsView()
   return m_rv;
 }
 
-KListView* KFileReplaceView::getStringsView()
+TDEListView* KFileReplaceView::getStringsView()
 {
   if(m_option->m_searchingOnlyMode)
     m_sv = m_lvStrings_2;
@@ -177,7 +177,7 @@ void KFileReplaceView::slotMouseButtonClicked (int button, TQListViewItem *lvi,
   // RIGHT BUTTON
   if (button == Qt::RightButton)
     {
-      m_lviCurrent = static_cast<KListViewItem*>(lvi);
+      m_lviCurrent = static_cast<TDEListViewItem*>(lvi);
       m_menuResult->popup(pos);
     }
 }
@@ -394,7 +394,7 @@ void KFileReplaceView::slotStringsEdit()
 void KFileReplaceView::slotStringsSave()
 {
   // Check there are strings in the list
-  KListView* sv = getStringsView();
+  TDEListView* sv = getStringsView();
 
   if (sv->firstChild() == 0)
   {
@@ -494,7 +494,7 @@ void KFileReplaceView::initGUI()
         }
     }
 
-  m_menuResult = new KPopupMenu(this, "ResultPopup");
+  m_menuResult = new TDEPopupMenu(this, "ResultPopup");
 
 
 
diff --git a/tdefilereplace/tdefilereplaceview.h b/tdefilereplace/tdefilereplaceview.h
index 5ef3cfe4..bac91dcb 100644
--- a/tdefilereplace/tdefilereplaceview.h
+++ b/tdefilereplace/tdefilereplaceview.h
@@ -28,8 +28,8 @@
 class TQPixMap;
 
 //KDE
-class KPopupMenu;
-class KListView;
+class TDEPopupMenu;
+class TDEListView;
 
 //local
 #include "tdefilereplaceviewwdg.h"
@@ -59,10 +59,10 @@ class KFileReplaceView : public KFileReplaceViewWdg
   Q_OBJECT
   
   private:
-    KPopupMenu* m_menuResult;
+    TDEPopupMenu* m_menuResult;
     RCOptions* m_option;
-    KListViewItem* m_lviCurrent;
-    KListView* m_rv,
+    TDEListViewItem* m_lviCurrent;
+    TDEListView* m_rv,
              * m_sv;
 
   public://Constructors
@@ -74,8 +74,8 @@ class KFileReplaceView : public KFileReplaceViewWdg
     void displayScannedFiles(int filesNumber) { m_lcdFilesNumber->display(TQString::number(filesNumber,10)); }
     void stringsInvert(bool invertAll);
     void changeView(bool searchingOnlyMode);
-    KListView* getResultsView();
-    KListView* getStringsView();
+    TDEListView* getResultsView();
+    TDEListView* getStringsView();
     void updateOptions(RCOptions* info) { m_option = info; }
     void loadMap(KeyValueMap extMap){ loadMapIntoView(extMap); }
     KeyValueMap getStringsViewMap()const { return m_option->m_mapStringsView;}
diff --git a/tdefilereplace/tdefilereplaceviewwdg.ui b/tdefilereplace/tdefilereplaceviewwdg.ui
index c8fca48d..4bd2ee37 100644
--- a/tdefilereplace/tdefilereplaceviewwdg.ui
+++ b/tdefilereplace/tdefilereplaceviewwdg.ui
@@ -52,7 +52,7 @@
                         <property name="margin">
                             <number>0</number>
                         </property>
-                        <widget class="KListView" row="0" column="0">
+                        <widget class="TDEListView" row="0" column="0">
                             <column>
                                 <property name="text">
                                     <string>Name</string>
@@ -175,7 +175,7 @@
                         <property name="margin">
                             <number>0</number>
                         </property>
-                        <widget class="KListView" row="0" column="0">
+                        <widget class="TDEListView" row="0" column="0">
                             <column>
                                 <property name="text">
                                     <string>Name</string>
@@ -300,7 +300,7 @@
                         <property name="margin">
                             <number>0</number>
                         </property>
-                        <widget class="KListView" row="0" column="0">
+                        <widget class="TDEListView" row="0" column="0">
                             <column>
                                 <property name="text">
                                     <string>Search For</string>
@@ -355,7 +355,7 @@
                         <property name="margin">
                             <number>0</number>
                         </property>
-                        <widget class="KListView" row="0" column="0">
+                        <widget class="TDEListView" row="0" column="0">
                             <column>
                                 <property name="text">
                                     <string>Search For</string>