diff --git a/src/circuitdocument.cpp b/src/circuitdocument.cpp
index bd9ea39..01f4178 100644
--- a/src/circuitdocument.cpp
+++ b/src/circuitdocument.cpp
@@ -36,7 +36,7 @@
 CircuitDocument::CircuitDocument( const TQString & caption, KTechlab *ktechlab, const char *name )
 	: ICNDocument( caption, ktechlab, name )
 {
-	m_pOrientationAction = new KActionMenu( i18n("Orientation"), "rotate", this );
+	m_pOrientationAction = new TDEActionMenu( i18n("Orientation"), "rotate", this );
 	
 	m_type = Document::dt_circuit;
 	m_pDocumentIface = new CircuitDocumentIface(this);
@@ -84,7 +84,7 @@ void CircuitDocument::slotInitItemActions( Item *itemBase )
 	if ( !item && m_selectList->count() > 0 || !m_selectList->itemsAreSameType() )
 		return;
 	
-	KAction * orientation_actions[] = {
+	TDEAction * orientation_actions[] = {
 		activeCircuitView->action("edit_orientation_0"),
 		activeCircuitView->action("edit_orientation_90"),
 		activeCircuitView->action("edit_orientation_180"),
@@ -105,16 +105,16 @@ void CircuitDocument::slotInitItemActions( Item *itemBase )
 	}
 	
 	if ( item->angleDegrees() == 0 )
-		(static_cast<KToggleAction*>( orientation_actions[0] ))->setChecked(true);
+		(static_cast<TDEToggleAction*>( orientation_actions[0] ))->setChecked(true);
 	
 	else if ( item->angleDegrees() == 90 )
-		(static_cast<KToggleAction*>( orientation_actions[1] ))->setChecked(true);
+		(static_cast<TDEToggleAction*>( orientation_actions[1] ))->setChecked(true);
 	
 	else if ( item->angleDegrees() == 180 )
-		(static_cast<KToggleAction*>( orientation_actions[2] ))->setChecked(true);
+		(static_cast<TDEToggleAction*>( orientation_actions[2] ))->setChecked(true);
 	
 	else if ( item->angleDegrees() == 270 )
-		(static_cast<KToggleAction*>( orientation_actions[3] ))->setChecked(true);
+		(static_cast<TDEToggleAction*>( orientation_actions[3] ))->setChecked(true);
 }
 
 
@@ -209,7 +209,7 @@ void CircuitDocument::fillContextMenu( const TQPoint &pos )
 	//logic was --electronerd
 	if (!( !item && m_selectList->count() > 0 || !m_selectList->itemsAreSameType() ))
 	{	
-		KAction * orientation_actions[] = {
+		TDEAction * orientation_actions[] = {
 			activeCircuitView->action("edit_orientation_0"),
 			activeCircuitView->action("edit_orientation_90"),
 			activeCircuitView->action("edit_orientation_180"),
@@ -224,16 +224,16 @@ void CircuitDocument::fillContextMenu( const TQPoint &pos )
 			m_pOrientationAction->insert( orientation_actions[i] );
 		}
 		
-		TQPtrList<KAction> orientation_actionlist;
-	// 	orientation_actionlist.prepend( new KActionSeparator() );
+		TQPtrList<TDEAction> orientation_actionlist;
+	// 	orientation_actionlist.prepend( new TDEActionSeparator() );
 		orientation_actionlist.append( m_pOrientationAction );
 		p_ktechlab->plugActionList( "orientation_actionlist", orientation_actionlist );
 	}
 	
 	if(m_selectList->count() > 1 && countExtCon(m_selectList->items()) > 0)
 	{
-		TQPtrList<KAction> component_actionlist;
-	// 	component_actionlist.append( new KActionSeparator() );
+		TQPtrList<TDEAction> component_actionlist;
+	// 	component_actionlist.append( new TDEActionSeparator() );
 		component_actionlist.append( activeCircuitView->action("circuit_create_subcircuit") );
 		p_ktechlab->plugActionList( "component_actionlist", component_actionlist );
 	}
diff --git a/src/circuitdocument.h b/src/circuitdocument.h
index 846c650..f9942c2 100644
--- a/src/circuitdocument.h
+++ b/src/circuitdocument.h
@@ -25,7 +25,7 @@ class TQTimer;
 class Switch;
 class Wire;
 
-class KActionMenu;
+class TDEActionMenu;
 
 typedef TQValueList<Circuit*> CircuitList;
 typedef TQValueList<Component*> ComponentList;
@@ -108,7 +108,7 @@ class CircuitDocument : public ICNDocument
 		virtual bool isValidItem( Item *item );
 		virtual bool isValidItem( const TQString &itemId );
 		
-		KActionMenu * m_pOrientationAction;
+		TDEActionMenu * m_pOrientationAction;
 	
 	private slots:
 		void assignCircuits();
diff --git a/src/circuitview.cpp b/src/circuitview.cpp
index 409296a..90cb376 100644
--- a/src/circuitview.cpp
+++ b/src/circuitview.cpp
@@ -22,26 +22,26 @@ CircuitView::CircuitView( CircuitDocument * circuitDocument, ViewContainer *view
 	: ICNView( circuitDocument, viewContainer, viewAreaId, name ),
 	p_circuitDocument(circuitDocument)
 {
-	KActionCollection * ac = actionCollection();
+	TDEActionCollection * ac = actionCollection();
 	
-	new KAction( "Dump linear equations", TQt::CTRL|TQt::Key_D, circuitDocument, TQT_SLOT(displayEquations()), ac, "dump_les" );
+	new TDEAction( "Dump linear equations", TQt::CTRL|TQt::Key_D, circuitDocument, TQT_SLOT(displayEquations()), ac, "dump_les" );
 	
 	//BEGIN Item Control Actions
-	KRadioAction * ra;
-	ra = new KRadioAction( i18n("0 Degrees"), "", 0, circuitDocument, TQT_SLOT(setOrientation0()), ac, "edit_orientation_0" );
+	TDERadioAction * ra;
+	ra = new TDERadioAction( i18n("0 Degrees"), "", 0, circuitDocument, TQT_SLOT(setOrientation0()), ac, "edit_orientation_0" );
 	ra->setExclusiveGroup("orientation");
 	ra->setChecked(true);
-	ra = new KRadioAction( i18n("90 Degrees"), "", 0, circuitDocument, TQT_SLOT(setOrientation90()), ac, "edit_orientation_90" );
+	ra = new TDERadioAction( i18n("90 Degrees"), "", 0, circuitDocument, TQT_SLOT(setOrientation90()), ac, "edit_orientation_90" );
 	ra->setExclusiveGroup("orientation");
-	ra = new KRadioAction( i18n("180 Degrees"), "", 0, circuitDocument, TQT_SLOT(setOrientation180()), ac, "edit_orientation_180" );
+	ra = new TDERadioAction( i18n("180 Degrees"), "", 0, circuitDocument, TQT_SLOT(setOrientation180()), ac, "edit_orientation_180" );
 	ra->setExclusiveGroup("orientation");
-	ra =new KRadioAction( i18n("270 Degrees"), "", 0, circuitDocument, TQT_SLOT(setOrientation270()), ac, "edit_orientation_270" );
+	ra =new TDERadioAction( i18n("270 Degrees"), "", 0, circuitDocument, TQT_SLOT(setOrientation270()), ac, "edit_orientation_270" );
 	ra->setExclusiveGroup("orientation");
 	
-	new KAction( i18n("Create Subcircuit"), "", 0, circuitDocument, TQT_SLOT(createSubcircuit()), ac, "circuit_create_subcircuit" );
-	new KAction( i18n("Rotate Clockwise"), "rotate_cw", "]", circuitDocument, TQT_SLOT(rotateClockwise()), ac, "edit_rotate_cw" );
-	new KAction( i18n("Rotate Counter-Clockwise"), "rotate_ccw", "[", circuitDocument, TQT_SLOT(rotateCounterClockwise()), ac, "edit_rotate_ccw" );
-	new KAction( i18n("Flip"), "", 0, circuitDocument, TQT_SLOT(itemFlip()), ac, "edit_flip" );
+	new TDEAction( i18n("Create Subcircuit"), "", 0, circuitDocument, TQT_SLOT(createSubcircuit()), ac, "circuit_create_subcircuit" );
+	new TDEAction( i18n("Rotate Clockwise"), "rotate_cw", "]", circuitDocument, TQT_SLOT(rotateClockwise()), ac, "edit_rotate_cw" );
+	new TDEAction( i18n("Rotate Counter-Clockwise"), "rotate_ccw", "[", circuitDocument, TQT_SLOT(rotateCounterClockwise()), ac, "edit_rotate_ccw" );
+	new TDEAction( i18n("Flip"), "", 0, circuitDocument, TQT_SLOT(itemFlip()), ac, "edit_flip" );
 	//END Item Control Actions
 	
 	setXMLFile( "ktechlabcircuitui.rc", true );
diff --git a/src/docmanager.h b/src/docmanager.h
index 0daa669..c6b28ec 100644
--- a/src/docmanager.h
+++ b/src/docmanager.h
@@ -25,11 +25,11 @@ class TextDocument;
 class View;
 class ViewArea;
 
-class KAction;
+class TDEAction;
 
 typedef TQValueList<Document*> DocumentList;
 typedef TQMap< KURL, Document* > URLDocumentMap;
-typedef TQValueList<KAction*> KActionList;
+typedef TQValueList<TDEAction*> TDEActionList;
 
 /**
 @author David Saxton
diff --git a/src/flowcodeview.cpp b/src/flowcodeview.cpp
index 38af6ef..dc58a38 100644
--- a/src/flowcodeview.cpp
+++ b/src/flowcodeview.cpp
@@ -21,13 +21,13 @@
 FlowCodeView::FlowCodeView( FlowCodeDocument * flowCodeDocument, ViewContainer *viewContainer, uint viewAreaId, const char *name )
 	: ICNView( flowCodeDocument, viewContainer, viewAreaId, name )
 {
-	KActionCollection * ac = actionCollection();
+	TDEActionCollection * ac = actionCollection();
 	
 	//BEGIN Convert To * Actions
-	KToolBarPopupAction * pa = new KToolBarPopupAction( i18n("Convert to ..."), "fork", 0, 0, 0, ac, "program_convert" );
+	TDEToolBarPopupAction * pa = new TDEToolBarPopupAction( i18n("Convert to ..."), "fork", 0, 0, 0, ac, "program_convert" );
 	pa->setDelayed(false);
 	
-	KPopupMenu * m = pa->popupMenu();
+	TDEPopupMenu * m = pa->popupMenu();
 	
 	m->insertTitle( i18n("Convert to") );
 	m->insertItem( TDEGlobal::iconLoader()->loadIcon( "convert_to_microbe", KIcon::Small ), i18n("Microbe"), FlowCodeDocument::MicrobeOutput );
@@ -40,10 +40,10 @@ FlowCodeView::FlowCodeView( FlowCodeDocument * flowCodeDocument, ViewContainer *
 	
 	
 	
-// 	new KAction( i18n("Convert to Microbe"), "convert_to_microbe", TQt::Key_F7, flowCodeDocument, TQT_SLOT(convertToMicrobe()), ac, "tools_to_microbe" );
-// 	new KAction( i18n("Convert to Assembly"), "convert_to_assembly", TQt::Key_F8, flowCodeDocument, TQT_SLOT(convertToAssembly()), ac, "tools_to_assembly" );
-// 	new KAction( i18n("Convert to Hex"), "convert_to_hex", TQt::Key_F9, flowCodeDocument, TQT_SLOT(convertToHex()), ac, "tools_to_hex" );
-// 	new KAction( i18n("Upload PIC Program"), "convert_to_pic", 0, flowCodeDocument, TQT_SLOT(convertToPIC()), ac, "tools_to_pic" );
+// 	new TDEAction( i18n("Convert to Microbe"), "convert_to_microbe", TQt::Key_F7, flowCodeDocument, TQT_SLOT(convertToMicrobe()), ac, "tools_to_microbe" );
+// 	new TDEAction( i18n("Convert to Assembly"), "convert_to_assembly", TQt::Key_F8, flowCodeDocument, TQT_SLOT(convertToAssembly()), ac, "tools_to_assembly" );
+// 	new TDEAction( i18n("Convert to Hex"), "convert_to_hex", TQt::Key_F9, flowCodeDocument, TQT_SLOT(convertToHex()), ac, "tools_to_hex" );
+// 	new TDEAction( i18n("Upload PIC Program"), "convert_to_pic", 0, flowCodeDocument, TQT_SLOT(convertToPIC()), ac, "tools_to_pic" );
 	
 	
 	
diff --git a/src/flowparts/pinmapping.cpp b/src/flowparts/pinmapping.cpp
index 5b9675d..9159b09 100644
--- a/src/flowparts/pinmapping.cpp
+++ b/src/flowparts/pinmapping.cpp
@@ -62,15 +62,15 @@ PinMapEditor::PinMapEditor( PinMapping * pinMapping, MicroInfo * picInfo, TQWidg
 						m_pPinMapDocument,
 						TQT_SLOT(deleteSelection()) );
 	
-	accel->connectItem( accel->insertItem( KStdAccel::selectAll().keyCodeQt() ),
+	accel->connectItem( accel->insertItem( TDEStdAccel::selectAll().keyCodeQt() ),
 						m_pPinMapDocument,
 						TQT_SLOT(selectAll()) );
 	
-	accel->connectItem( accel->insertItem( KStdAccel::undo().keyCodeQt() ),
+	accel->connectItem( accel->insertItem( TDEStdAccel::undo().keyCodeQt() ),
 						m_pPinMapDocument,
 						TQT_SLOT(undo()) );
 	
-	accel->connectItem( accel->insertItem( KStdAccel::redo().keyCodeQt() ),
+	accel->connectItem( accel->insertItem( TDEStdAccel::redo().keyCodeQt() ),
 						m_pPinMapDocument,
 						TQT_SLOT(redo()) );
 	
diff --git a/src/gui/itemselector.cpp b/src/gui/itemselector.cpp
index 32e0cf6..8ddcc2a 100644
--- a/src/gui/itemselector.cpp
+++ b/src/gui/itemselector.cpp
@@ -31,7 +31,7 @@
 #include <assert.h>
 
 ILVItem::ILVItem( TQListView* parent, const TQString &id )
-	: KListViewItem( parent, 0 )
+	: TDEListViewItem( parent, 0 )
 {
 	m_id = id;
 	b_isRemovable = false;
@@ -39,7 +39,7 @@ ILVItem::ILVItem( TQListView* parent, const TQString &id )
 }
 
 ILVItem::ILVItem( TQListViewItem* parent, const TQString &id )
-	: KListViewItem( parent, 0 )
+	: TDEListViewItem( parent, 0 )
 {
 	m_id = id;
 	b_isRemovable = false;
@@ -48,7 +48,7 @@ ILVItem::ILVItem( TQListViewItem* parent, const TQString &id )
 
 
 ItemSelector::ItemSelector( TQWidget *parent, const char *name )
-	: KListView( parent, name )
+	: TDEListView( parent, name )
 {
     addColumn( i18n( "Component" ) );
 	setFullWidth(true);
@@ -71,7 +71,7 @@ ItemSelector::~ItemSelector()
 void ItemSelector::clear()
 {
 	m_categories.clear();
-	KListView::clear();
+	TDEListView::clear();
 }
 
 
diff --git a/src/gui/itemselector.h b/src/gui/itemselector.h
index 2b327bf..72df34f 100644
--- a/src/gui/itemselector.h
+++ b/src/gui/itemselector.h
@@ -24,7 +24,7 @@ namespace KateMDI { class ToolView; }
 @short Contains info about item for ItemSelector
 @author David Saxton
 */
-class ILVItem : public TQObject, public KListViewItem
+class ILVItem : public TQObject, public TDEListViewItem
 {
 	public:
 		ILVItem( TQListView *parent, const TQString &id );
@@ -55,7 +55,7 @@ class ILVItem : public TQObject, public KListViewItem
 @short Allows selection of generic items for dragging / clicking
 @author David Saxton
 */
-class ItemSelector : public KListView
+class ItemSelector : public TDEListView
 {
 	Q_OBJECT
   
diff --git a/src/gui/linkeroptionswidget.ui b/src/gui/linkeroptionswidget.ui
index ef4dcb8..e353f5e 100644
--- a/src/gui/linkeroptionswidget.ui
+++ b/src/gui/linkeroptionswidget.ui
@@ -122,7 +122,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="KListView">
+                <widget class="TDEListView">
                     <column>
                         <property name="text">
                             <string>Library</string>
diff --git a/src/gui/oscilloscopeview.cpp b/src/gui/oscilloscopeview.cpp
index 81471b2..b7673a7 100644
--- a/src/gui/oscilloscopeview.cpp
+++ b/src/gui/oscilloscopeview.cpp
@@ -122,7 +122,7 @@ void OscilloscopeView::mousePressEvent( TQMouseEvent *event )
 		{
 			event->accept();
 	
-			KPopupMenu fpsMenu;
+			TDEPopupMenu fpsMenu;
 			fpsMenu.insertTitle( i18n("Framerate") );
 	
 			const int fps[] = { 10, 25, 50, 75, 100 };
diff --git a/src/gui/plvitem.cpp b/src/gui/plvitem.cpp
index 55f6f6a..24b12ac 100644
--- a/src/gui/plvitem.cpp
+++ b/src/gui/plvitem.cpp
@@ -16,8 +16,8 @@
 #include <tqvariant.h>
 
 //BEGIN class PLVItem
-PLVItem::PLVItem(KListView *listview, const TQString &id, Variant *data)
-	: KListViewItem(listview, data->editorCaption())
+PLVItem::PLVItem(TDEListView *listview, const TQString &id, Variant *data)
+	: TDEListViewItem(listview, data->editorCaption())
 {
 	p_data = data;
 	m_id = id;
@@ -45,7 +45,7 @@ int PLVItem::width ( const TQFontMetrics & fm, const TQListView * lv, int c ) co
 {
 	if ( c == 0 )
 		return 100;
-// 		return KListViewItem::width( fm, lv, c );
+// 		return TDEListViewItem::width( fm, lv, c );
 	else
 		return 200;
 }
@@ -54,7 +54,7 @@ int PLVItem::width ( const TQFontMetrics & fm, const TQListView * lv, int c ) co
 
 
 //BEGIN class PLVColorItem
-PLVColorItem::PLVColorItem(KListView *listview, const TQString &id, Variant *data)
+PLVColorItem::PLVColorItem(TDEListView *listview, const TQString &id, Variant *data)
 	: PLVItem(listview,id,data)
 {
 }
@@ -74,10 +74,10 @@ void PLVColorItem::paintCell ( TQPainter * p, const TQColorGroup & cg, int colum
 	{
 		p->setBackgroundColor( p_data->value().toColor() );
 		TQBrush brush( p_data->value().toColor() );
-		p->fillRect(TQRect(0,0,listView()->columnWidth(1),KListViewItem::height()),brush);
+		p->fillRect(TQRect(0,0,listView()->columnWidth(1),TDEListViewItem::height()),brush);
 	}
 	else
-		KListViewItem::paintCell(p,cg,column,width,align);
+		TDEListViewItem::paintCell(p,cg,column,width,align);
 }
 
 void PLVColorItem::updateData(TQVariant value)
diff --git a/src/gui/plvitem.h b/src/gui/plvitem.h
index 3e7ea12..5dd653c 100644
--- a/src/gui/plvitem.h
+++ b/src/gui/plvitem.h
@@ -24,12 +24,12 @@ class Variant;
 PropertiesListView Item
 Basic item, which holds the Variant data and Id for an item
 */
-class PLVItem : public TQObject, public KListViewItem
+class PLVItem : public TQObject, public TDEListViewItem
 {
 	Q_OBJECT
   
 	public:
-		PLVItem( KListView *listview, const TQString &id, Variant * data );
+		PLVItem( TDEListView *listview, const TQString &id, Variant * data );
 		~PLVItem();
 		
 		TQString id() const { return m_id; }
@@ -55,7 +55,7 @@ class PLVItem : public TQObject, public KListViewItem
 class PLVColorItem : public PLVItem
 {
 	public:
-		PLVColorItem( KListView *listview, const TQString &id, Variant *data );
+		PLVColorItem( TDEListView *listview, const TQString &id, Variant *data );
 		~PLVColorItem();
 		
 		void updateData(TQVariant value);
diff --git a/src/gui/propertieslistview.cpp b/src/gui/propertieslistview.cpp
index e647997..cf30212 100644
--- a/src/gui/propertieslistview.cpp
+++ b/src/gui/propertieslistview.cpp
@@ -26,7 +26,7 @@
 #include <tqvariant.h>
 
 PropertiesListView::PropertiesListView(TQWidget *parent, const char *name)
- : KListView(parent, name)
+ : TDEListView(parent, name)
 {
 	addColumn(i18n("Property"));
 	addColumn(i18n("Data"));
@@ -321,7 +321,7 @@ void PropertiesListView::wheelEvent( TQWheelEvent *e )
 		e->accept();
 		if(!item->isSelected()) slotSelectionChanged(item);
 	}
-	else KListView::wheelEvent(e);
+	else TDEListView::wheelEvent(e);
 }
 
 #include "propertieslistview.moc"
diff --git a/src/gui/propertieslistview.h b/src/gui/propertieslistview.h
index 5073455..dd75276 100644
--- a/src/gui/propertieslistview.h
+++ b/src/gui/propertieslistview.h
@@ -26,7 +26,7 @@ typedef TQMap< TQString, PLVItem * > PLVItemMap;
 @author Daniel Clarke
 @author David Saxton
 */
-class PropertiesListView : public KListView
+class PropertiesListView : public TDEListView
 {
 Q_OBJECT
   
diff --git a/src/gui/symbolviewer.cpp b/src/gui/symbolviewer.cpp
index 71265b6..e887c8b 100644
--- a/src/gui/symbolviewer.cpp
+++ b/src/gui/symbolviewer.cpp
@@ -29,7 +29,7 @@ static const int VALUE_COLUMN = 1;
 
 //BEGIN class SymbolViewerItem
 SymbolViewerItem::SymbolViewerItem( SymbolViewer * symbolViewer, RegisterInfo * registerInfo )
-	: KListViewItem( symbolViewer->symbolList() )
+	: TDEListViewItem( symbolViewer->symbolList() )
 {
 	assert(registerInfo);
 	m_pRegisterInfo = registerInfo;
@@ -76,7 +76,7 @@ SymbolViewer::SymbolViewer( KateMDI::ToolView * parent )
 {
 	TQGridLayout  * grid = new TQGridLayout( this, 1, 1, 0, 6 );
 	
-	m_pSymbolList = new KListView(this);
+	m_pSymbolList = new TDEListView(this);
 	grid->addMultiCellWidget( m_pSymbolList, 0, 0, 0, 1 );
 	
 	grid->addWidget( new TQLabel( i18n("Value radix:"), this ), 1, 0 );
diff --git a/src/gui/symbolviewer.h b/src/gui/symbolviewer.h
index 78c0140..68826a4 100644
--- a/src/gui/symbolviewer.h
+++ b/src/gui/symbolviewer.h
@@ -46,7 +46,7 @@ class SymbolViewer : public TQWidget
 		
 		Radix valueRadix() const { return m_valueRadix; }
 		
-		KListView * symbolList() const { return m_pSymbolList; }
+		TDEListView * symbolList() const { return m_pSymbolList; }
 		/**
 		 * Write the current properties (such as currently selected radix) to
 		 * the config.
@@ -74,7 +74,7 @@ class SymbolViewer : public TQWidget
 	protected:
 		TQGuardedPtr<GpsimProcessor> m_pGpsim;
 		RegisterSet * m_pCurrentContext;
-		KListView * m_pSymbolList;
+		TDEListView * m_pSymbolList;
 		Radix m_valueRadix;
 
 	private:
@@ -84,7 +84,7 @@ class SymbolViewer : public TQWidget
 };
 
 
-class SymbolViewerItem : public TQObject, public KListViewItem
+class SymbolViewerItem : public TQObject, public TDEListViewItem
 {
 	Q_OBJECT
   
diff --git a/src/icnview.cpp b/src/icnview.cpp
index bd99dd6..6954cb6 100644
--- a/src/icnview.cpp
+++ b/src/icnview.cpp
@@ -24,26 +24,26 @@ ICNView::ICNView( ICNDocument *icnDocument, ViewContainer *viewContainer, uint v
 {
 	bool manualRouting = (icnDocument->m_cmManager->cmState() & CMManager::cms_manual_route);
 	
-	KActionCollection * ac = actionCollection();
+	TDEActionCollection * ac = actionCollection();
 	
 	//BEGIN Routing Actions
 	// These actions get inserted into the main menu
-	m_pAutoRoutingAction = new KRadioAction( i18n("Automatic"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetRoutingAuto()), ac, "routing_mode_auto" );
+	m_pAutoRoutingAction = new TDERadioAction( i18n("Automatic"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetRoutingAuto()), ac, "routing_mode_auto" );
 	m_pAutoRoutingAction->setExclusiveGroup("routing_mode");
 	if ( !manualRouting )
 		m_pAutoRoutingAction->setChecked( true );
 	
-	m_pManualRoutingAction = new KRadioAction( i18n("Manual"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetRoutingManual()), ac, "routing_mode_manual" );
+	m_pManualRoutingAction = new TDERadioAction( i18n("Manual"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetRoutingManual()), ac, "routing_mode_manual" );
 	m_pManualRoutingAction->setExclusiveGroup("routing_mode");
 	if ( manualRouting )
 		m_pManualRoutingAction->setChecked( true );
 	
 	
 	// This popup gets inserted into the toolbar
-	m_pRoutingModeToolbarPopup = new KToolBarPopupAction( i18n("Connection Routing Mode"), "pencil", 0, 0, 0, ac, "routing_mode" );
+	m_pRoutingModeToolbarPopup = new TDEToolBarPopupAction( i18n("Connection Routing Mode"), "pencil", 0, 0, 0, ac, "routing_mode" );
 	m_pRoutingModeToolbarPopup->setDelayed(false);
 	
-	KPopupMenu * m = m_pRoutingModeToolbarPopup->popupMenu();
+	TDEPopupMenu * m = m_pRoutingModeToolbarPopup->popupMenu();
 	m->insertTitle( i18n("Connection Routing Mode") );
 	
 	m->insertItem( /*TDEGlobal::iconLoader()->loadIcon( "routing_mode_auto",	KIcon::Small ), */i18n("Automatic"), 0 );
diff --git a/src/icnview.h b/src/icnview.h
index 3584510..206d10b 100644
--- a/src/icnview.h
+++ b/src/icnview.h
@@ -14,8 +14,8 @@
 #include <itemview.h>
 
 class ICNDocument;
-class KRadioAction;
-class KToolBarPopupAction;
+class TDERadioAction;
+class TDEToolBarPopupAction;
 
 /**
 @author David Saxton
@@ -36,9 +36,9 @@ class ICNView : public ItemView
 		void slotUpdateRoutingToggles( bool manualRouting );
 		
 	protected:
-		KToolBarPopupAction * m_pRoutingModeToolbarPopup;
-		KRadioAction * m_pManualRoutingAction;
-		KRadioAction * m_pAutoRoutingAction;
+		TDEToolBarPopupAction * m_pRoutingModeToolbarPopup;
+		TDERadioAction * m_pManualRoutingAction;
+		TDERadioAction * m_pAutoRoutingAction;
 };
 
 #endif
diff --git a/src/itemdocument.cpp b/src/itemdocument.cpp
index 55696b2..935d101 100644
--- a/src/itemdocument.cpp
+++ b/src/itemdocument.cpp
@@ -81,7 +81,7 @@ ItemDocument::ItemDocument( const TQString &caption, KTechlab *ktechlab, const c
 	connect( MechanicsSelector::self(),	TQT_SIGNAL(itemClicked(const TQString& )),		this, TQT_SLOT(slotUnsetRepeatedItemId()) );
 #endif
 
-	m_pAlignmentAction = new KActionMenu( i18n("Alignment"), "rightjust", this );
+	m_pAlignmentAction = new TDEActionMenu( i18n("Alignment"), "rightjust", this );
 	
 	slotUpdateConfiguration();
 }
@@ -594,7 +594,7 @@ void ItemDocument::fillContextMenu( const TQPoint & pos )
 	if ( !p_ktechlab || !activeItemView )
 		return;
 	
-	KAction * align_actions[] = { 
+	TDEAction * align_actions[] = { 
 		activeItemView->action("align_horizontally"),
 		activeItemView->action("align_vertically"),
 		activeItemView->action("distribute_horizontally"),
@@ -611,7 +611,7 @@ void ItemDocument::fillContextMenu( const TQPoint & pos )
 		m_pAlignmentAction->remove( align_actions[i] );
 		m_pAlignmentAction->insert( align_actions[i] );
 	}
-	TQPtrList<KAction> alignment_actions;
+	TQPtrList<TDEAction> alignment_actions;
 	alignment_actions.append( m_pAlignmentAction );
 	p_ktechlab->plugActionList( "alignment_actionlist", alignment_actions );
 }
@@ -625,7 +625,7 @@ void ItemDocument::slotInitItemActions( Item *item )
 	if ( !p_ktechlab || !activeItemView )
 		return;
 	
-	KAction * align_actions[] = { 
+	TDEAction * align_actions[] = { 
 		activeItemView->action("align_horizontally"),
 		activeItemView->action("align_vertically"),
 		activeItemView->action("distribute_horizontally"),
diff --git a/src/itemdocument.h b/src/itemdocument.h
index 6c5b33b..1194ee3 100644
--- a/src/itemdocument.h
+++ b/src/itemdocument.h
@@ -27,7 +27,7 @@ class ItemGroup;
 class KTechlab;
 class Operation;
 
-class KActionMenu;
+class TDEActionMenu;
 class TQCanvasItem;
 
 typedef TQPtrStack<ItemDocumentData> IDDStack;
@@ -382,7 +382,7 @@ class ItemDocument : public Document
 		TQString m_fileExtensionInfo; // For displaying in the save file dialog
 		CanvasTip * m_canvasTip;
 		IntItemMap m_zOrder;
-		KActionMenu * m_pAlignmentAction;
+		TDEActionMenu * m_pAlignmentAction;
 		TQTimer * m_pEventTimer;
 		unsigned m_queuedEvents; // OR'ed together list of ItemDocumentEvent::type
 		
diff --git a/src/iteminterface.cpp b/src/iteminterface.cpp
index 9fe0527..08f6529 100644
--- a/src/iteminterface.cpp
+++ b/src/iteminterface.cpp
@@ -156,7 +156,7 @@ void ItemInterface::slotUpdateItemInterface()
 	// Update item editor toolbar
 	if ( ItemView * itemView = dynamic_cast<ItemView*>(p_cvb->activeView()) )
 	{
-		if ( m_pActiveItemEditorToolBar = dynamic_cast<KToolBar*>(p_ktechlab->factory()->container("itemEditorTB",itemView)) )
+		if ( m_pActiveItemEditorToolBar = dynamic_cast<TDEToolBar*>(p_ktechlab->factory()->container("itemEditorTB",itemView)) )
 		{
 			m_pActiveItemEditorToolBar->setFullSize( true );
 			TQWidget * widget = configWidget();
diff --git a/src/iteminterface.h b/src/iteminterface.h
index 4447219..6592597 100644
--- a/src/iteminterface.h
+++ b/src/iteminterface.h
@@ -25,7 +25,7 @@ class Variant;
 
 class ColorCombo;
 class KComboBox;
-class KToolBar;
+class TDEToolBar;
 class KURLRequester;
 class TQCheckBox;
 class KLineEdit;
@@ -112,7 +112,7 @@ class ItemInterface : public TQObject
 		TQCheckBoxMap m_boolCheckMap;
 		
 		// Use by item editor toolbar
-		TQGuardedPtr<KToolBar> m_pActiveItemEditorToolBar;
+		TQGuardedPtr<TDEToolBar> m_pActiveItemEditorToolBar;
 		int m_toolBarWidgetID;
 		
 		
diff --git a/src/itemview.cpp b/src/itemview.cpp
index c21cd25..0e3eebf 100644
--- a/src/itemview.cpp
+++ b/src/itemview.cpp
@@ -35,7 +35,7 @@
 ItemView::ItemView( ItemDocument * itemDocument, ViewContainer *viewContainer, uint viewAreaId, const char *name )
 	: View( itemDocument, viewContainer, viewAreaId, name )
 {
-	KActionCollection * ac = actionCollection();
+	TDEActionCollection * ac = actionCollection();
 	
 	KStdAction::selectAll(	itemDocument,		TQT_SLOT(selectAll()),		ac );
 	KStdAction::zoomIn(	TQT_TQOBJECT(this),	TQT_SLOT(zoomIn()),		ac );
@@ -43,26 +43,26 @@ ItemView::ItemView( ItemDocument * itemDocument, ViewContainer *viewContainer, u
 	KStdAction::actualSize(	TQT_TQOBJECT(this),	TQT_SLOT(actualSize()),		ac )->setEnabled(false);
 	
 	
-	KAccel *pAccel = new KAccel(this);
+	TDEAccel *pAccel = new TDEAccel(this);
 	pAccel->insert( "Cancel", i18n("Cancel"), i18n("Cancel the current operation"), TQt::Key_Escape, itemDocument, TQT_SLOT(cancelCurrentOperation()) );
 	pAccel->readSettings();
 	
-	new KAction( i18n("Delete"), "editdelete", TQt::Key_Delete, itemDocument, TQT_SLOT(deleteSelection()), ac, "edit_delete" );
-	new KAction( i18n("Export as Image..."), 0, 0, itemDocument, TQT_SLOT(exportToImage()), ac, "file_export_image");
+	new TDEAction( i18n("Delete"), "editdelete", TQt::Key_Delete, itemDocument, TQT_SLOT(deleteSelection()), ac, "edit_delete" );
+	new TDEAction( i18n("Export as Image..."), 0, 0, itemDocument, TQT_SLOT(exportToImage()), ac, "file_export_image");
 	
 	//BEGIN Item Alignment actions
-	new KAction( i18n("AlignQt::Horizontally"), 0, 0, itemDocument, TQT_SLOT(alignHorizontally()), ac, "align_horizontally" );
-	new KAction( i18n("AlignQt::Vertically"), 0, 0, itemDocument, TQT_SLOT(alignVertically()), ac, "align_vertically" );
-	new KAction( i18n("DistributeQt::Horizontally"), 0, 0, itemDocument, TQT_SLOT(distributeHorizontally()), ac, "distribute_horizontally" );
-	new KAction( i18n("DistributeQt::Vertically"), 0, 0, itemDocument, TQT_SLOT(distributeVertically()), ac, "distribute_vertically" );
+	new TDEAction( i18n("AlignQt::Horizontally"), 0, 0, itemDocument, TQT_SLOT(alignHorizontally()), ac, "align_horizontally" );
+	new TDEAction( i18n("AlignQt::Vertically"), 0, 0, itemDocument, TQT_SLOT(alignVertically()), ac, "align_vertically" );
+	new TDEAction( i18n("DistributeQt::Horizontally"), 0, 0, itemDocument, TQT_SLOT(distributeHorizontally()), ac, "distribute_horizontally" );
+	new TDEAction( i18n("DistributeQt::Vertically"), 0, 0, itemDocument, TQT_SLOT(distributeVertically()), ac, "distribute_vertically" );
 	//END Item Alignment actions
 	
 	
 	//BEGIN Draw actions
-	KToolBarPopupAction * pa = new KToolBarPopupAction( i18n("Draw"), "paintbrush", 0, 0, 0, ac, "edit_draw" );
+	TDEToolBarPopupAction * pa = new TDEToolBarPopupAction( i18n("Draw"), "paintbrush", 0, 0, 0, ac, "edit_draw" );
 	pa->setDelayed(false);
 	
-	KPopupMenu * m = pa->popupMenu();
+	TDEPopupMenu * m = pa->popupMenu();
 	m->insertTitle( i18n("Draw") );
 	
 	m->insertItem( TDEGlobal::iconLoader()->loadIcon( "tool_text",		KIcon::Small ), i18n("Text"),		DrawPart::da_text );
@@ -75,12 +75,12 @@ ItemView::ItemView( ItemDocument * itemDocument, ViewContainer *viewContainer, u
 	
 	
 	//BEGIN Item Control actions
-	new KAction( i18n("Raise Selection"), "1uparrow", TQt::Key_PageUp, itemDocument, TQT_SLOT(raiseZ()), ac, "edit_raise" );
-	new KAction( i18n("Lower Selection"), "1downarrow", TQt::Key_PageDown, itemDocument, TQT_SLOT(lowerZ()), ac, "edit_lower" );
+	new TDEAction( i18n("Raise Selection"), "1uparrow", TQt::Key_PageUp, itemDocument, TQT_SLOT(raiseZ()), ac, "edit_raise" );
+	new TDEAction( i18n("Lower Selection"), "1downarrow", TQt::Key_PageDown, itemDocument, TQT_SLOT(lowerZ()), ac, "edit_lower" );
 	//END Item Control actions
 	
 	
-	KAction * na = new KAction( "", 0, 0, 0, 0, ac, "null_action" );
+	TDEAction * na = new TDEAction( "", 0, 0, 0, 0, ac, "null_action" );
 	na->setEnabled(false);
 	
 	setXMLFile( "ktechlabitemviewui.rc" );
diff --git a/src/katemdi.cpp b/src/katemdi.cpp
index f7071db..ea18af7 100644
--- a/src/katemdi.cpp
+++ b/src/katemdi.cpp
@@ -59,9 +59,9 @@ int Splitter::idAfter ( TQWidget * w ) const
 
 //BEGIN TOGGLETOOLVIEWACTION
 
-ToggleToolViewAction::ToggleToolViewAction ( const TQString& text, const KShortcut& cut, ToolView *tv,
+ToggleToolViewAction::ToggleToolViewAction ( const TQString& text, const TDEShortcut& cut, ToolView *tv,
                                              TQObject* parent, const char* name )
- : KToggleAction(text,cut,parent,name)
+ : TDEToggleAction(text,cut,parent,name)
  , m_tv(tv)
 {
   connect(this,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotToggled(bool)));
@@ -125,11 +125,11 @@ void GUIClient::registerToolView (ToolView *tv)
   TQString aname = TQString("kate_mdi_toolview_") + tv->id;
 
   // try to read the action shortcut
-  KShortcut sc;
+  TDEShortcut sc;
   TDEConfig *cfg = kapp->config();
   TQString _grp = cfg->group();
   cfg->setGroup("Shortcuts");
-  sc = KShortcut( cfg->readEntry( aname, "" ) );
+  sc = TDEShortcut( cfg->readEntry( aname, "" ) );
   cfg->setGroup( _grp );
 }
 
@@ -396,7 +396,7 @@ bool Sidebar::eventFilter(TQObject *obj, TQEvent *ev)
 
       if (w)
       {
-        KPopupMenu *p = new KPopupMenu (this);
+        TDEPopupMenu *p = new TDEPopupMenu (this);
 
         p->insertTitle(SmallIcon("view_remove"), i18n("Behavior"), 50);
 
diff --git a/src/katemdi.h b/src/katemdi.h
index 7a74e65..42df649 100644
--- a/src/katemdi.h
+++ b/src/katemdi.h
@@ -53,13 +53,13 @@ class Splitter : public TQSplitter
     int idAfter ( TQWidget * w ) const;
 };
 
-class ToggleToolViewAction : public KToggleAction
+class ToggleToolViewAction : public TDEToggleAction
 {
   Q_OBJECT
   
 
   public:
-    ToggleToolViewAction ( const TQString& text, const KShortcut& cut,
+    ToggleToolViewAction ( const TQString& text, const TDEShortcut& cut,
                            class ToolView *tv, TQObject* parent = 0, const char* name = 0 );
 
     virtual ~ToggleToolViewAction();
diff --git a/src/ktechlab.cpp b/src/ktechlab.cpp
index 00e6c6c..69041cb 100644
--- a/src/ktechlab.cpp
+++ b/src/ktechlab.cpp
@@ -275,13 +275,13 @@ void KTechlab::overlayToolBarScreenshot()
 		return;
 	}
 	
-	TQPtrListIterator<KToolBar> toolBarIterator();
+	TQPtrListIterator<TDEToolBar> toolBarIterator();
 	
 // 	TQWidget * toolsWidget = toolBar( "toolsToolBar" );
 // 	TQWidget * debugWidget = toolBar( "debugTB" );
 	
-	KToolBar * toolsWidget = static_cast<KToolBar*>(TQT_TQWIDGET(child( "toolsToolBar", "KToolBar" )));
-	KToolBar * debugWidget = static_cast<KToolBar*>(TQT_TQWIDGET(child( "debugTB", "KToolBar" )));
+	TDEToolBar * toolsWidget = static_cast<TDEToolBar*>(TQT_TQWIDGET(child( "toolsToolBar", "TDEToolBar" )));
+	TDEToolBar * debugWidget = static_cast<TDEToolBar*>(TQT_TQWIDGET(child( "debugTB", "TDEToolBar" )));
 	
 	if ( !toolsWidget && !debugWidget )
 		return;
@@ -410,7 +410,7 @@ void KTechlab::slotUpdateTabWidget()
 
 void KTechlab::setupActions()
 {
-	KActionCollection *ac = actionCollection();
+	TDEActionCollection *ac = actionCollection();
 	
     KStdAction::openNew(			TQT_TQOBJECT(this), TQT_SLOT(slotFileNew()),					ac );
     KStdAction::open(				TQT_TQOBJECT(this), TQT_SLOT(slotFileOpen()),					ac );
@@ -429,16 +429,16 @@ void KTechlab::setupActions()
 	KStdAction::preferences(		TQT_TQOBJECT(this), TQT_SLOT(slotOptionsPreferences()),		ac );
 	
 	//BEGIN New file popup
-	KToolBarPopupAction *p = new KToolBarPopupAction( i18n("&New"), "filenew", KStdAccel::shortcut(KStdAccel::New), TQT_TQOBJECT(this), TQT_SLOT(slotFileNew()), ac, "newfile_popup" );
+	TDEToolBarPopupAction *p = new TDEToolBarPopupAction( i18n("&New"), "filenew", TDEStdAccel::shortcut(TDEStdAccel::New), TQT_TQOBJECT(this), TQT_SLOT(slotFileNew()), ac, "newfile_popup" );
 	p->popupMenu()->insertTitle( i18n("New File") );
-	(new KAction( i18n("Assembly"), "source", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileNewAssembly()), ac, "newfile_asm" ))->plug( p->popupMenu() );
-	(new KAction( i18n("C source"), "source_c", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileNewC()), ac, "newfile_c" ))->plug( p->popupMenu() );
-	(new KAction( i18n("Circuit"), "ktechlab_circuit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileNewCircuit()), ac, "newfile_circuit" ))->plug( p->popupMenu() );
-	(new KAction( i18n("FlowCode"), "ktechlab_flowcode", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileNewFlowCode()), ac, "newfile_flowcode" ))->plug( p->popupMenu() );
+	(new TDEAction( i18n("Assembly"), "source", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileNewAssembly()), ac, "newfile_asm" ))->plug( p->popupMenu() );
+	(new TDEAction( i18n("C source"), "source_c", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileNewC()), ac, "newfile_c" ))->plug( p->popupMenu() );
+	(new TDEAction( i18n("Circuit"), "ktechlab_circuit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileNewCircuit()), ac, "newfile_circuit" ))->plug( p->popupMenu() );
+	(new TDEAction( i18n("FlowCode"), "ktechlab_flowcode", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileNewFlowCode()), ac, "newfile_flowcode" ))->plug( p->popupMenu() );
 #ifdef MECHANICS
-	(new KAction( i18n("Mechanics"), "ktechlab_mechanics", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileNewMechanics()), ac, "newfile_mechanics" ))->plug( p->popupMenu() );
+	(new TDEAction( i18n("Mechanics"), "ktechlab_mechanics", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileNewMechanics()), ac, "newfile_mechanics" ))->plug( p->popupMenu() );
 #endif
-	(new KAction( "Microbe", "ktechlab_microbe", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileNewMicrobe()), ac, "newfile_microbe" ))->plug( p->popupMenu() );
+	(new TDEAction( "Microbe", "ktechlab_microbe", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileNewMicrobe()), ac, "newfile_microbe" ))->plug( p->popupMenu() );
 	//END New File popup
 	
 
@@ -448,29 +448,29 @@ void KTechlab::setupActions()
 	
 	//BEGIN Project Actions
 	ProjectManager *pm = ProjectManager::self(this);
-	new KAction( i18n("New Project.."), "window_new",			0, TQT_TQOBJECT(pm), TQT_SLOT(slotNewProject()),			ac, 	"project_new" );
-	new KAction( i18n("Open Project..."), "project_open",		0, TQT_TQOBJECT(pm), TQT_SLOT(slotOpenProject()),			ac, 	"project_open" );
-// 	m_recentProjects = new KRecentFilesAction( i18n("Open &Recent Project..."), 0, ProjectManager::self(), TQT_SLOT(slotOpenProject(const KURL&)), ac, "project_open_recent" );
+	new TDEAction( i18n("New Project.."), "window_new",			0, TQT_TQOBJECT(pm), TQT_SLOT(slotNewProject()),			ac, 	"project_new" );
+	new TDEAction( i18n("Open Project..."), "project_open",		0, TQT_TQOBJECT(pm), TQT_SLOT(slotOpenProject()),			ac, 	"project_open" );
+// 	m_recentProjects = new TDERecentFilesAction( i18n("Open &Recent Project..."), 0, ProjectManager::self(), TQT_SLOT(slotOpenProject(const KURL&)), ac, "project_open_recent" );
 	m_recentProjects = new RecentFilesAction( "Recent Projects", i18n("Open &Recent Project..."), TQT_TQOBJECT(ProjectManager::self()), TQT_SLOT(slotOpenProject(const KURL&)), ac, "project_open_recent" );
-	new KAction( i18n("Export to Makefile..."), "fileexport",	0, TQT_TQOBJECT(pm), TQT_SLOT(slotExportToMakefile()),		ac, "project_export_makefile" );
-	new KAction( i18n("Create Subproject..."), 0,				0, TQT_TQOBJECT(pm), TQT_SLOT(slotCreateSubproject()),		ac, "project_create_subproject" );
-	new KAction( i18n("Add Existing File..."), "fileopen",		0, TQT_TQOBJECT(pm), TQT_SLOT(slotAddFile()),					ac, "project_add_existing_file" );
-	new KAction( i18n("Add Current File..."), "fileimport",		0, TQT_TQOBJECT(pm), TQT_SLOT(slotAddCurrentFile()),			ac, "project_add_current_file" );
-// 	new KAction( i18n("Project Options"), "configure",			0, TQT_TQOBJECT(pm), TQT_SLOT(slotProjectOptions()),			ac, "project_options" );
-	new KAction( i18n("Close Project"), "fileclose",			0, TQT_TQOBJECT(pm), TQT_SLOT(slotCloseProject()),			ac, "project_close" );
-	new KAction( i18n("Remove from Project"), "editdelete",		0, TQT_TQOBJECT(pm), TQT_SLOT(slotRemoveSelected()),			ac, "project_remove_selected" );
-	new KAction( i18n("Insert Existing File..."), "fileopen",	0, TQT_TQOBJECT(pm), TQT_SLOT(slotSubprojectAddExistingFile()),	ac, "subproject_add_existing_file" );
-	new KAction( i18n("Insert Current File..."), "fileimport",	0, TQT_TQOBJECT(pm), TQT_SLOT(slotSubprojectAddCurrentFile()),ac, "subproject_add_current_file" );
-	new KAction( i18n("Linker Options..."), "configure",		0, TQT_TQOBJECT(pm), TQT_SLOT(slotSubprojectLinkerOptions()),	ac, "project_item_linker_options" );
-	new KAction( i18n("Build..."), "launch",					0, TQT_TQOBJECT(pm), TQT_SLOT(slotItemBuild()),				ac, "project_item_build" );
-	new KAction( i18n("Upload..."), "convert_to_pic",			0, TQT_TQOBJECT(pm), TQT_SLOT(slotItemUpload()),				ac, "project_item_upload" );
-	new KAction( i18n("Processing Options..."), "configure",	0, TQT_TQOBJECT(pm), TQT_SLOT(slotItemProcessingOptions()),	ac, "project_item_processing_options" );
+	new TDEAction( i18n("Export to Makefile..."), "fileexport",	0, TQT_TQOBJECT(pm), TQT_SLOT(slotExportToMakefile()),		ac, "project_export_makefile" );
+	new TDEAction( i18n("Create Subproject..."), 0,				0, TQT_TQOBJECT(pm), TQT_SLOT(slotCreateSubproject()),		ac, "project_create_subproject" );
+	new TDEAction( i18n("Add Existing File..."), "fileopen",		0, TQT_TQOBJECT(pm), TQT_SLOT(slotAddFile()),					ac, "project_add_existing_file" );
+	new TDEAction( i18n("Add Current File..."), "fileimport",		0, TQT_TQOBJECT(pm), TQT_SLOT(slotAddCurrentFile()),			ac, "project_add_current_file" );
+// 	new TDEAction( i18n("Project Options"), "configure",			0, TQT_TQOBJECT(pm), TQT_SLOT(slotProjectOptions()),			ac, "project_options" );
+	new TDEAction( i18n("Close Project"), "fileclose",			0, TQT_TQOBJECT(pm), TQT_SLOT(slotCloseProject()),			ac, "project_close" );
+	new TDEAction( i18n("Remove from Project"), "editdelete",		0, TQT_TQOBJECT(pm), TQT_SLOT(slotRemoveSelected()),			ac, "project_remove_selected" );
+	new TDEAction( i18n("Insert Existing File..."), "fileopen",	0, TQT_TQOBJECT(pm), TQT_SLOT(slotSubprojectAddExistingFile()),	ac, "subproject_add_existing_file" );
+	new TDEAction( i18n("Insert Current File..."), "fileimport",	0, TQT_TQOBJECT(pm), TQT_SLOT(slotSubprojectAddCurrentFile()),ac, "subproject_add_current_file" );
+	new TDEAction( i18n("Linker Options..."), "configure",		0, TQT_TQOBJECT(pm), TQT_SLOT(slotSubprojectLinkerOptions()),	ac, "project_item_linker_options" );
+	new TDEAction( i18n("Build..."), "launch",					0, TQT_TQOBJECT(pm), TQT_SLOT(slotItemBuild()),				ac, "project_item_build" );
+	new TDEAction( i18n("Upload..."), "convert_to_pic",			0, TQT_TQOBJECT(pm), TQT_SLOT(slotItemUpload()),				ac, "project_item_upload" );
+	new TDEAction( i18n("Processing Options..."), "configure",	0, TQT_TQOBJECT(pm), TQT_SLOT(slotItemProcessingOptions()),	ac, "project_item_processing_options" );
 	//END Project Actions
 	
-	new KAction( i18n("Split View Left/Right"), "view_right", TQt::CTRL|TQt::SHIFT|TQt::Key_L, TQT_TQOBJECT(this), TQT_SLOT(slotViewSplitLeftRight()), ac, "view_split_leftright" );
-	new KAction( i18n("Split View Top/Bottom"), "view_bottom", TQt::CTRL|TQt::SHIFT|TQt::Key_T, TQT_TQOBJECT(this), TQT_SLOT(slotViewSplitTopBottom()), ac, "view_split_topbottom" );
+	new TDEAction( i18n("Split View Left/Right"), "view_right", TQt::CTRL|TQt::SHIFT|TQt::Key_L, TQT_TQOBJECT(this), TQT_SLOT(slotViewSplitLeftRight()), ac, "view_split_leftright" );
+	new TDEAction( i18n("Split View Top/Bottom"), "view_bottom", TQt::CTRL|TQt::SHIFT|TQt::Key_T, TQT_TQOBJECT(this), TQT_SLOT(slotViewSplitTopBottom()), ac, "view_split_topbottom" );
 	
-	KToggleAction * ta = new KToggleAction( i18n("Run Simulation"), "player_play", TQt::Key_F10, 0, 0, ac, "simulation_run" );
+	TDEToggleAction * ta = new TDEToggleAction( i18n("Run Simulation"), "player_play", TQt::Key_F10, 0, 0, ac, "simulation_run" );
 	ta->setChecked(true);
 	connect( ta, TQT_SIGNAL(toggled(bool )), Simulator::self(), TQT_SLOT(slotSetSimulating(bool )) );
 #if defined(TDE_MAKE_VERSION)
@@ -554,7 +554,7 @@ void KTechlab::slotTabReceivedDropEvent( TQWidget *widget, TQDropEvent *e )
 	}
 	e->accept(true);
 	
-	KPopupMenu dropMenu;
+	TDEPopupMenu dropMenu;
 	dropMenu.insertItem( TDEGlobal::iconLoader()->loadIcon( "goto", KIcon::Small ), i18n("&Insert Into"), 0 );
 	dropMenu.insertItem( TDEGlobal::iconLoader()->loadIcon( "editcopy", KIcon::Small ), i18n("&Copy Into"), 1 );
 	dropMenu.insertSeparator();
@@ -587,9 +587,9 @@ void KTechlab::slotDragContextActivated( int id )
 }
 
 
-KAction * KTechlab::action( const TQString & name ) const
+TDEAction * KTechlab::action( const TQString & name ) const
 {
-	KAction * action = actionCollection()->action(name);
+	TDEAction * action = actionCollection()->action(name);
 	if ( !action )
 		kdError() << k_funcinfo << "No such action: " << name << endl;
 	return action;
@@ -598,7 +598,7 @@ KAction * KTechlab::action( const TQString & name ) const
 
 void KTechlab::saveProperties( TDEConfig *conf )
 {
-	// Dumbass KMainWindow - can't handle my width/height correctly. Whoever thought of the "+1" hack anyway?!
+	// Dumbass TDEMainWindow - can't handle my width/height correctly. Whoever thought of the "+1" hack anyway?!
 	conf->setGroup("UI");
 	conf->writeEntry( "Width", width() );
 	conf->writeEntry( "Height", height() );
@@ -643,7 +643,7 @@ void KTechlab::saveProperties( TDEConfig *conf )
 	//END Open Views State
 	
 	saveSession( conf, "KateMDI" );
-	// Piss off KMainWindow
+	// Piss off TDEMainWindow
 	conf->setGroup("KateMDI");
 	int scnum = TQApplication::desktop()->screenNumber(parentWidget());
 	TQRect desk = TQApplication::desktop()->screenGeometry(scnum);
@@ -695,7 +695,7 @@ void KTechlab::readProperties( TDEConfig *conf )
 	
 	finishRestore();
 	
-	// Dumbass KMainWindow - can't handle my width/height correctly. Whoever thought of the "+1" hack anyway?!
+	// Dumbass TDEMainWindow - can't handle my width/height correctly. Whoever thought of the "+1" hack anyway?!
 	conf->setGroup("UI");
 	resize( conf->readNumEntry( "Width", 800 ), conf->readNumEntry( "Height", 500 ) );
 	KWin::setState( winId(), conf->readLongNumEntry( "WinState", NET::Max ) );
@@ -799,7 +799,7 @@ void KTechlab::slotTabContext( TQWidget* widget,const TQPoint & pos )
 {
 	// Shamelessly stolen from KDevelop...
 	
-	KPopupMenu * tabMenu = new KPopupMenu;
+	TDEPopupMenu * tabMenu = new TDEPopupMenu;
 	tabMenu->insertTitle( (dynamic_cast<ViewContainer*>(widget))->caption() );
 
 	//Find the document on whose tab the user clicked
@@ -1150,7 +1150,7 @@ void KTechlab::slotFileQuit()
 {
 	// close the first window, the list makes the next one the first again.
 	// This ensures that queryClose() is called on each window to ask for closing
-	KMainWindow* w;
+	TDEMainWindow* w;
 	if(memberList)
 	{
 		for( w=memberList->first(); w!=0; w=memberList->next() )
diff --git a/src/ktechlab.h b/src/ktechlab.h
index 16aeb44..41dbf1a 100644
--- a/src/ktechlab.h
+++ b/src/ktechlab.h
@@ -28,11 +28,11 @@ class ViewContainer;
 
 typedef TQValueList< TQGuardedPtr<ViewContainer> > ViewContainerList;
 
-class KAction;
+class TDEAction;
 class RecentFilesAction;
 class KTabWidget;
-class KToolBar;
-class KToggleAction;
+class TDEToolBar;
+class TDEToggleAction;
 class KURL;
 class TQLabel;
 
@@ -54,7 +54,7 @@ class KTechlab : public KateMDI::MainWindow
 		/**
 		 * Returns a pointer to an action with the given name.
 		 */
-		KAction * action( const TQString & name ) const;
+		TDEAction * action( const TQString & name ) const;
 		/**
 		 * Returns a URL from a Open File dialog (with all ktechlab related file
 		 * types allowed).
@@ -225,7 +225,7 @@ class KTechlab : public KateMDI::MainWindow
 	
 		RecentFilesAction * m_recentFiles;
 		RecentFilesAction * m_recentProjects;
-		KToggleAction * m_statusbarAction;
+		TDEToggleAction * m_statusbarAction;
 		KTabWidget * m_pViewContainerTabWidget;
 		TQString m_lastStatusBarMessage;
 		TQValueList<KXMLGUIClient*> m_noRemoveGUIClients;
diff --git a/src/projectmanager.cpp b/src/projectmanager.cpp
index f77cdd9..dbefa7d 100644
--- a/src/projectmanager.cpp
+++ b/src/projectmanager.cpp
@@ -1193,7 +1193,7 @@ void ProjectManager::slotContextMenuRequested( TQListViewItem * item, const TQPo
 {
 	TQString popupName;
 	ILVItem * ilvItem = dynamic_cast<ILVItem*>(item);
-	KAction * linkerOptionsAct = p_ktechlab->action("project_item_linker_options");
+	TDEAction * linkerOptionsAct = p_ktechlab->action("project_item_linker_options");
 	linkerOptionsAct->setEnabled(false);
 	
 	if ( !m_pCurrentProject )
diff --git a/src/recentfilesaction.cpp b/src/recentfilesaction.cpp
index 086e81d..7194038 100644
--- a/src/recentfilesaction.cpp
+++ b/src/recentfilesaction.cpp
@@ -16,12 +16,12 @@
 #include <kurl.h>
 
 RecentFilesAction::RecentFilesAction( const TQString & configGroupName, const TQString& text, const TQObject* receiver, const char* slot, TQObject* parent, const char* name )
-	: KSelectAction( text, 0/*pix*/, parent, name )
+	: TDESelectAction( text, 0/*pix*/, parent, name )
 {
 	m_configGroupName = configGroupName;
 	m_maxItems = 10;
 	
-	m_popup = new KPopupMenu;
+	m_popup = new TDEPopupMenu;
 	connect(m_popup, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(menuAboutToShow()));
 	connect(m_popup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(menuItemActivated(int)));
 	connect( this, TQT_SIGNAL( activated( const TQString& ) ),
@@ -138,7 +138,7 @@ void RecentFilesAction::menuItemActivated( int id )
 
 void RecentFilesAction::menuAboutToShow()
 {
-	KPopupMenu *menu = m_popup;
+	TDEPopupMenu *menu = m_popup;
 	menu->clear();
 	TQStringList list = items();
 	TQStringList::iterator end = list.end();
@@ -148,18 +148,18 @@ void RecentFilesAction::menuAboutToShow()
 
 void RecentFilesAction::slotClicked()
 {
-	KAction::slotActivated();
+	TDEAction::slotActivated();
 }
 
 void RecentFilesAction::slotActivated(const TQString& text)
 {
-	KSelectAction::slotActivated(text);
+	TDESelectAction::slotActivated(text);
 }
 
 
 void RecentFilesAction::slotActivated(int id)
 {
-	KSelectAction::slotActivated(id);
+	TDESelectAction::slotActivated(id);
 }
 
 
diff --git a/src/recentfilesaction.h b/src/recentfilesaction.h
index 843403e..d56baf8 100644
--- a/src/recentfilesaction.h
+++ b/src/recentfilesaction.h
@@ -17,7 +17,7 @@
 Taken mainly from tdelibs/tdeui/kactionclasses.[cpp/h], author Michael Koch.
 Adapted to work around strange bug occuring.
 */
-class RecentFilesAction : public KSelectAction
+class RecentFilesAction : public TDESelectAction
 {
 	Q_OBJECT
   
@@ -68,7 +68,7 @@ class RecentFilesAction : public KSelectAction
 
 	protected:
 		unsigned m_maxItems;
-		KPopupMenu * m_popup;
+		TDEPopupMenu * m_popup;
 		TQString m_configGroupName;
 };
 
diff --git a/src/textdocument.cpp b/src/textdocument.cpp
index d31dc6f..b967d84 100644
--- a/src/textdocument.cpp
+++ b/src/textdocument.cpp
@@ -603,7 +603,7 @@ void TextDocument::slotUpdateMarksInfo()
 	{
 		if ( mark->type & Bookmark )
 		{
-			KAction * a = new KAction( i18n("%1 - %2").arg( TQString::number( mark->line+1 ) ).arg( m_doc->textLine(mark->line) ),
+			TDEAction * a = new TDEAction( i18n("%1 - %2").arg( TQString::number( mark->line+1 ) ).arg( m_doc->textLine(mark->line) ),
 									   0, this, TQT_SLOT(slotBookmarkRequested()), this,
 									   TQString("bookmark_%1").arg(TQString::number(mark->line).ascii()) );
 			m_bookmarkActions.append(a);
diff --git a/src/textdocument.h b/src/textdocument.h
index e5dd9d3..2fe79b9 100644
--- a/src/textdocument.h
+++ b/src/textdocument.h
@@ -232,7 +232,7 @@ private:
 	TextDocument( const TQString& caption, KTechlab *parent, const char *name = 0L );
 	bool m_constructorSuccessful;
 	CodeType m_guessedCodeType;
-	TQPtrList<KAction> m_bookmarkActions;
+	TQPtrList<TDEAction> m_bookmarkActions;
 	
 #ifndef NO_GPSIM
 	bool b_lockSyncBreakpoints; // Used to avoid calling syncMarks() when we are currently doing so
diff --git a/src/textview.cpp b/src/textview.cpp
index d6692c5..13a5069 100644
--- a/src/textview.cpp
+++ b/src/textview.cpp
@@ -46,14 +46,14 @@ TextView::TextView( TextDocument * textDocument, ViewContainer *viewContainer, u
 	m_view = textDocument->createKateView(this);
 	m_view->insertChildClient(this);
 	
-	KActionCollection * ac = actionCollection();
+	TDEActionCollection * ac = actionCollection();
 	
 	
 	//BEGIN Convert To * Actions
-	KToolBarPopupAction * pa = new KToolBarPopupAction( i18n("Convert to"), "fork", 0, 0, 0, ac, "program_convert" );
+	TDEToolBarPopupAction * pa = new TDEToolBarPopupAction( i18n("Convert to"), "fork", 0, 0, 0, ac, "program_convert" );
 	pa->setDelayed(false);
 	
-	KPopupMenu * m = pa->popupMenu();
+	TDEPopupMenu * m = pa->popupMenu();
 	
 	m->insertTitle( i18n("Convert to ...") );
 	m->insertItem( TDEGlobal::iconLoader()->loadIcon( "convert_to_microbe", KIcon::Small ), i18n("Microbe"), TextDocument::MicrobeOutput );
@@ -66,18 +66,18 @@ TextView::TextView( TextDocument * textDocument, ViewContainer *viewContainer, u
 	//END Convert To * Actions
 	
 	
-	new KAction( i18n("Format Assembly Code"), "", TQt::Key_F12, textDocument, TQT_SLOT(formatAssembly()), ac, "format_asm" );
+	new TDEAction( i18n("Format Assembly Code"), "", TQt::Key_F12, textDocument, TQT_SLOT(formatAssembly()), ac, "format_asm" );
 	
 	
 #ifndef NO_GPSIM
 	//BEGIN Debug Actions
-	new KAction( i18n("Set &Breakpoint"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(toggleBreakpoint()), ac, "debug_toggle_breakpoint" );
-	new KAction( i18n("Run"), "dbgrun", 0, textDocument, TQT_SLOT(debugRun()), ac, "debug_run" );
-	new KAction( i18n("Interrupt"), "player_pause", 0, textDocument, TQT_SLOT(debugInterrupt()), ac, "debug_interrupt" );
-	new KAction( i18n("Stop"), "stop", 0, textDocument, TQT_SLOT(debugStop()), ac, "debug_stop" );
-	new KAction( i18n("Step"), "dbgstep", TQt::CTRL|TQt::ALT|TQt::Key_Right, textDocument, TQT_SLOT(debugStep()), ac, "debug_step" );
-	new KAction( i18n("Step Over"), "dbgnext", 0, textDocument, TQT_SLOT(debugStepOver()), ac, "debug_step_over" );
-	new KAction( i18n("Step Out"), "dbgstepout", 0, textDocument, TQT_SLOT(debugStepOut()), ac, "debug_step_out" );
+	new TDEAction( i18n("Set &Breakpoint"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(toggleBreakpoint()), ac, "debug_toggle_breakpoint" );
+	new TDEAction( i18n("Run"), "dbgrun", 0, textDocument, TQT_SLOT(debugRun()), ac, "debug_run" );
+	new TDEAction( i18n("Interrupt"), "player_pause", 0, textDocument, TQT_SLOT(debugInterrupt()), ac, "debug_interrupt" );
+	new TDEAction( i18n("Stop"), "stop", 0, textDocument, TQT_SLOT(debugStop()), ac, "debug_stop" );
+	new TDEAction( i18n("Step"), "dbgstep", TQt::CTRL|TQt::ALT|TQt::Key_Right, textDocument, TQT_SLOT(debugStep()), ac, "debug_step" );
+	new TDEAction( i18n("Step Over"), "dbgnext", 0, textDocument, TQT_SLOT(debugStepOver()), ac, "debug_step_over" );
+	new TDEAction( i18n("Step Out"), "dbgstepout", 0, textDocument, TQT_SLOT(debugStepOut()), ac, "debug_step_out" );
 	//END Debug Actions
 #endif
 
@@ -157,7 +157,7 @@ TextDocument *TextView::textDocument() const
 
 void TextView::disableActions()
 {
-	KPopupMenu * tb = (dynamic_cast<KToolBarPopupAction*>(action("program_convert")))->popupMenu();
+	TDEPopupMenu * tb = (dynamic_cast<TDEToolBarPopupAction*>(action("program_convert")))->popupMenu();
 	
 	tb->setItemEnabled( TextDocument::AssemblyOutput, false );
 	tb->setItemEnabled( TextDocument::HexOutput, false );
@@ -188,7 +188,7 @@ void TextView::initCodeActions()
 {
 	disableActions();
 	
-	KPopupMenu * tb = (dynamic_cast<KToolBarPopupAction*>(action("program_convert")))->popupMenu();
+	TDEPopupMenu * tb = (dynamic_cast<TDEToolBarPopupAction*>(action("program_convert")))->popupMenu();
 	
 	switch ( textDocument()->guessedCodeType() )
 	{
diff --git a/src/view.cpp b/src/view.cpp
index a2f30e9..453d2e1 100644
--- a/src/view.cpp
+++ b/src/view.cpp
@@ -101,9 +101,9 @@ View::~View()
 }
 
 
-KAction * View::action( const TQString & name ) const
+TDEAction * View::action( const TQString & name ) const
 {
-	KAction * action = actionCollection()->action(name);
+	TDEAction * action = actionCollection()->action(name);
 	if ( !action )
 		kdError() << k_funcinfo << "No such action: " << name << endl;
 	return action;
diff --git a/src/view.h b/src/view.h
index 0fff775..b59d736 100644
--- a/src/view.h
+++ b/src/view.h
@@ -66,7 +66,7 @@ public:
 	View( Document *document, ViewContainer *viewContainer, uint viewAreaId, const char *name = 0 );
 	virtual ~View();
 	
-	KAction * action( const TQString & name ) const;
+	TDEAction * action( const TQString & name ) const;
 	bool isFocused() const { return b_isFocused; }
 	/**
 	 * Pointer to the parent document