diff --git a/kontact_plugin/basket_plugin.cpp b/kontact_plugin/basket_plugin.cpp
index b53567a..e8cc8ad 100644
--- a/kontact_plugin/basket_plugin.cpp
+++ b/kontact_plugin/basket_plugin.cpp
@@ -37,7 +37,7 @@ BasketPlugin::BasketPlugin( Kontact::Core *core, const char *, const TQStringLis
   : Kontact::Plugin( core, TQT_TQOBJECT(core), "basket" )
 {
 	setInstance( BasketPluginFactory::instance() );
-	insertNewAction(new KAction( i18n("&New Basket..."), "basket", CTRL+SHIFT+Key_B,
+	insertNewAction(new TDEAction( i18n("&New Basket..."), "basket", CTRL+SHIFT+Key_B,
 					this, TQT_SLOT(newBasket()), actionCollection(), "basket_new" ));
 
 	m_uniqueAppWatcher = new Kontact::UniqueAppWatcher(
diff --git a/src/basket.cpp b/src/basket.cpp
index 0ec22ca..f18c8cc 100644
--- a/src/basket.cpp
+++ b/src/basket.cpp
@@ -827,7 +827,7 @@ void Basket::loadProperties(const TQDomElement &properties)
 
 	TQDomElement shortcut = XMLWork::getElement(properties, "shortcut");
 	TQString actionStrings[] = { "show", "globalShow", "globalSwitch" };
-	KShortcut combination  = KShortcut( shortcut.attribute( "combination", m_action->shortcut().toStringInternal() ) );
+	TDEShortcut combination  = TDEShortcut( shortcut.attribute( "combination", m_action->shortcut().toStringInternal() ) );
 	TQString   actionString =            shortcut.attribute( "action" );
 	int action = shortcutAction();
 	if (actionString == actionStrings[0]) action = 0;
@@ -1293,7 +1293,7 @@ TQString Basket::fullPathForFileName(const TQString &fileName)
 }
 
 
-void Basket::setShortcut(KShortcut shortcut, int action)
+void Basket::setShortcut(TDEShortcut shortcut, int action)
 {
 	if(!Global::globalAccel)
 		return;
@@ -1305,7 +1305,7 @@ void Basket::setShortcut(KShortcut shortcut, int action)
 	m_shortcutAction = action;
 
 	if (action > 0)
-		Global::globalAccel->insert(sAction, m_action->text(), /*whatsThis=*/"", m_action->shortcut(), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(activatedShortcut()), /*configurable=*/false);
+		Global::globalAccel->insert(sAction, m_action->text(), /*whatsThis=*/"", m_action->shortcut(), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(activatedShortcut()), /*configurable=*/false);
 	Global::globalAccel->updateConnections();
 }
 
@@ -1354,7 +1354,7 @@ Basket::Basket(TQWidget *parent, const TQString &folderName)
    m_finishLoadOnFirstShow(false), m_relayoutOnNextShow(false)
 {
 	TQString sAction = "local_basket_activate_" + folderName;
-	m_action = new KAction("FAKE TEXT", "FAKE ICON", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(activatedShortcut()), Global::bnpView->actionCollection(), sAction);
+	m_action = new TDEAction("FAKE TEXT", "FAKE ICON", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(activatedShortcut()), Global::bnpView->actionCollection(), sAction);
 	m_action->setShortcutConfigurable(false); // We do it in the basket properties dialog (and keep it in sync with the global one)
 
 	if (!m_folderName.endsWith("/"))
@@ -1579,7 +1579,7 @@ void Basket::contentsMousePressEvent(TQMouseEvent *event)
 		m_clickedToInsert = clicked;
 		m_zoneToInsert    = zone;
 		m_posToInsert     = event->pos();
-		KPopupMenu* menu = (KPopupMenu*)(Global::bnpView->popupMenu("insert_popup"));
+		TDEPopupMenu* menu = (TDEPopupMenu*)(Global::bnpView->popupMenu("insert_popup"));
 		if (!menu->title(/*id=*/120).isEmpty()) // If we already added a title, remove it because it would be kept and then added several times:
 			menu->removeItem(/*id=*/120);
 		menu->insertTitle((zone == Note::TopGroup || zone == Note::BottomGroup ? i18n("The verb (Group New Note)", "Group") : i18n("The verb (Insert New Note)", "Insert")), /*id=*/120, /*index=*/0);
@@ -3374,7 +3374,7 @@ void Basket::popupEmblemMenu(Note *note, int emblemNumber)
 	TQKeySequence sequence = tag->shortcut().operator TQKeySequence();
 	bool sequenceOnDelete = (nextState == 0 && !tag->shortcut().isNull());
 
-	KPopupMenu menu(this);
+	TDEPopupMenu menu(this);
 	if (tag->countStates() == 1) {
 		menu.insertTitle(/*SmallIcon(state->icon()), */tag->name());
 		menu.insertItem( SmallIconSet("editdelete"), i18n("&Remove"),             1 );
@@ -3481,7 +3481,7 @@ void Basket::popupTagsMenu(Note *note)
 {
 	m_tagPopupNote = note;
 
-	KPopupMenu menu(this);
+	TDEPopupMenu menu(this);
 	menu.insertTitle(i18n("Tags"));
 // 	TQValueList<Tag*>::iterator it;
 // 	Tag *currentTag;
@@ -4285,7 +4285,7 @@ void Basket::noteOpen(Note *note)
   */
 bool KRun__displayOpenWithDialog(const KURL::List& lst, bool tempFiles, const TQString &text)
 {
-	if (kapp && !kapp->authorizeKAction("openwith")) {
+	if (kapp && !kapp->authorizeTDEAction("openwith")) {
 		KMessageBox::sorry(0L, i18n("You are not authorized to open this file.")); // TODO: Better message, i18n freeze :-(
 		return false;
 	}
diff --git a/src/basket.h b/src/basket.h
index 30eac95..db516d0 100644
--- a/src/basket.h
+++ b/src/basket.h
@@ -365,15 +365,15 @@ public slots:
 
 /// KEYBOARD SHORTCUT:
   public: // Temporar: for deletion purpose
-	KAction *m_action;
+	TDEAction *m_action;
   private:
 	int      m_shortcutAction;
   private slots:
 	void activatedShortcut();
   public:
-	KShortcut shortcut() { return m_action->shortcut(); }
+	TDEShortcut shortcut() { return m_action->shortcut(); }
 	int shortcutAction() { return m_shortcutAction;     }
-	void setShortcut(KShortcut shortcut, int action);
+	void setShortcut(TDEShortcut shortcut, int action);
 
 /// USER INTERACTION:
   private:
diff --git a/src/basketlistview.cpp b/src/basketlistview.cpp
index a747a6d..0ad8871 100644
--- a/src/basketlistview.cpp
+++ b/src/basketlistview.cpp
@@ -633,7 +633,7 @@ private:
 /** class BasketTreeListView: */
 
 BasketTreeListView::BasketTreeListView(TQWidget *parent, const char *name)
-	: KListView(parent, name), m_autoOpenItem(0)
+	: TDEListView(parent, name), m_autoOpenItem(0)
 	, m_itemUnderDrag(0)
 {
 	setWFlags(TQt::WStaticContents | WNoAutoErase);
@@ -646,7 +646,7 @@ BasketTreeListView::BasketTreeListView(TQWidget *parent, const char *name)
 
 void BasketTreeListView::viewportResizeEvent(TQResizeEvent *event)
 {
-	KListView::viewportResizeEvent(event);
+	TDEListView::viewportResizeEvent(event);
 	triggerUpdate();
 }
 
@@ -665,7 +665,7 @@ void BasketTreeListView::contentsDragEnterEvent(TQDragEnterEvent *event)
 		update();
 	}
 
-	KListView::contentsDragEnterEvent(event);
+	TDEListView::contentsDragEnterEvent(event);
 }
 
 void BasketTreeListView::removeExpands()
@@ -687,7 +687,7 @@ void BasketTreeListView::contentsDragLeaveEvent(TQDragLeaveEvent *event)
 	m_autoOpenTimer.stop();
 	setItemUnderDrag(0);
 	removeExpands();
-	KListView::contentsDragLeaveEvent(event);
+	TDEListView::contentsDragLeaveEvent(event);
 }
 
 void BasketTreeListView::contentsDropEvent(TQDropEvent *event)
@@ -695,7 +695,7 @@ void BasketTreeListView::contentsDropEvent(TQDropEvent *event)
 	std::cout << "BasketTreeListView::contentsDropEvent()" << std::endl;
 	if (event->provides("application/x-qlistviewitem"))
 	{
-		KListView::contentsDropEvent(event);
+		TDEListView::contentsDropEvent(event);
 	}
 	else {
 		std::cout << "Forwarding dropped data to the basket" << std::endl;
@@ -721,7 +721,7 @@ void BasketTreeListView::contentsDragMoveEvent(TQDragMoveEvent *event)
 {
 	std::cout << "BasketTreeListView::contentsDragMoveEvent" << std::endl;
 	if (event->provides("application/x-qlistviewitem"))
-		KListView::contentsDragMoveEvent(event);
+		TDEListView::contentsDragMoveEvent(event);
 	else {
 		TQListViewItem *item = itemAt(contentsToViewport(event->pos()));
 		BasketListViewItem* bitem = dynamic_cast<BasketListViewItem*>(item);
@@ -735,7 +735,7 @@ void BasketTreeListView::contentsDragMoveEvent(TQDragMoveEvent *event)
 		}
 		setItemUnderDrag(bitem);
 
-		KListView::contentsDragMoveEvent(event); // FIXME: ADDED
+		TDEListView::contentsDragMoveEvent(event); // FIXME: ADDED
 	}
 }
 
@@ -767,7 +767,7 @@ void BasketTreeListView::autoOpen()
 
 void BasketTreeListView::resizeEvent(TQResizeEvent *event)
 {
-	KListView::resizeEvent(event);
+	TDEListView::resizeEvent(event);
 }
 
 void BasketTreeListView::paintEmptyArea(TQPainter *painter, const TQRect &rect)
@@ -793,12 +793,12 @@ void BasketTreeListView::paintEmptyArea(TQPainter *painter, const TQRect &rect)
 }
 
 /** We should NEVER get focus (because of TQ_NoFocus focusPolicy())
- * but KListView can programatically give us the focus.
+ * but TDEListView can programatically give us the focus.
  * So we give it to the basket.
  */
 void BasketTreeListView::focusInEvent(TQFocusEvent*)
 {
-	//KListView::focusInEvent(event);
+	//TDEListView::focusInEvent(event);
 	Basket *basket = Global::bnpView->currentBasket();
 	if (basket)
 		basket->setFocus();
diff --git a/src/basketlistview.h b/src/basketlistview.h
index 4952cae..35d7a5a 100644
--- a/src/basketlistview.h
+++ b/src/basketlistview.h
@@ -74,7 +74,7 @@ class BasketListViewItem : public TQListViewItem
 		bool m_isAbbreviated;
 };
 
-class BasketTreeListView : public KListView
+class BasketTreeListView : public TDEListView
 {
 	Q_OBJECT
   
diff --git a/src/basketproperties.cpp b/src/basketproperties.cpp
index 70d5d33..bdc395b 100644
--- a/src/basketproperties.cpp
+++ b/src/basketproperties.cpp
@@ -145,7 +145,7 @@ BasketPropertiesDialog::BasketPropertiesDialog(Basket *basket, TQWidget *parent)
 	shortcutLayout->addWidget(m_shortcut);
 	shortcutLayout->addStretch();
 	shortcutLayout->addWidget(helpLabel);
-	connect( m_shortcut, TQT_SIGNAL(capturedShortcut(const KShortcut&)), this, TQT_SLOT(capturedShortcut(const KShortcut&)) );
+	connect( m_shortcut, TQT_SIGNAL(capturedShortcut(const TDEShortcut&)), this, TQT_SLOT(capturedShortcut(const TDEShortcut&)) );
 	new TQRadioButton(i18n("S&how this basket"),                        m_shortcutRole);
 	new TQRadioButton(i18n("Show this basket (&global shortcut)"),      m_shortcutRole);
 	new TQRadioButton(i18n("S&witch to this basket (global shortcut)"), m_shortcutRole);
@@ -189,7 +189,7 @@ void BasketPropertiesDialog::slotOk()
 	KDialogBase::slotOk();
 }
 
-void BasketPropertiesDialog::capturedShortcut(const KShortcut &shortcut)
+void BasketPropertiesDialog::capturedShortcut(const TDEShortcut &shortcut)
 {
 	// TODO: Validate it!
 	m_shortcut->setShortcut(shortcut, /*bTQtShortcut=*/true);
diff --git a/src/basketproperties.h b/src/basketproperties.h
index 4c863d4..62e07b7 100644
--- a/src/basketproperties.h
+++ b/src/basketproperties.h
@@ -31,7 +31,7 @@ class TQComboBox;
 class TQVButtonGroup;
 class KIntNumInput;
 class KKeyButton;
-class KShortcut;
+class TDEShortcut;
 
 class Basket;
 class KColorCombo2;
@@ -51,7 +51,7 @@ class BasketPropertiesDialog : public KDialogBase
   protected slots:
 	void slotApply();
 	void slotOk();
-	void capturedShortcut(const KShortcut &shortcut);
+	void capturedShortcut(const TDEShortcut &shortcut);
 	void selectColumnsLayout();
   private:
 	Basket        *m_basket;
diff --git a/src/bnpview.cpp b/src/bnpview.cpp
index 1862bfa..8a4308b 100644
--- a/src/bnpview.cpp
+++ b/src/bnpview.cpp
@@ -81,7 +81,7 @@
 const int BNPView::c_delayTooltipTime = 275;
 
 BNPView::BNPView(TQWidget *parent, const char *name, KXMLGUIClient *aGUIClient,
-				 KActionCollection *actionCollection, BasketStatusBar *bar)
+				 TDEActionCollection *actionCollection, BasketStatusBar *bar)
 	: DCOPObject("BasketIface"), TQSplitter(Qt::Horizontal, parent, name), m_actLockBasket(0), m_actPassBasket(0),
 	m_loading(true), m_newBasketPopup(false), m_firstShow(true),
 	m_regionGrabber(0), m_passiveDroppedSelection(0), m_passivePopup(0), m_actionCollection(actionCollection),
@@ -129,7 +129,7 @@ void BNPView::lateInit()
 
 	if(instance)
 	{
-		KToolBar* toolbar = instance->richTextToolBar();
+		TDEToolBar* toolbar = instance->richTextToolBar();
 
 		if(toolbar)
 			toolbar->hide();
@@ -160,7 +160,7 @@ void BNPView::lateInit()
 	DEBUG_WIN << "Baskets are loaded from " + Global::basketsFolder();
 
 	NoteDrag::createAndEmptyCuttingTmpFolder(); // If last exec hasn't done it: clean the temporary folder we will use
-	Tag::loadTags(); // Tags should be ready before loading baskets, but tags need the mainContainer to be ready to create KActions!
+	Tag::loadTags(); // Tags should be ready before loading baskets, but tags need the mainContainer to be ready to create TDEActions!
 	load();
 
 	// If no basket has been found, try to import from an older version,
@@ -372,7 +372,7 @@ void BNPView::initialize()
 	connect( m_tree, TQT_SIGNAL(pressed(TQListViewItem*)),          TQT_TQOBJECT(this), TQT_SLOT(slotPressed(TQListViewItem*)) );
 	connect( m_tree, TQT_SIGNAL(expanded(TQListViewItem*)),         TQT_TQOBJECT(this), TQT_SLOT(needSave(TQListViewItem*))    );
 	connect( m_tree, TQT_SIGNAL(collapsed(TQListViewItem*)),        TQT_TQOBJECT(this), TQT_SLOT(needSave(TQListViewItem*))    );
-	connect( m_tree, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)),      TQT_TQOBJECT(this), TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*, const TQPoint&))      );
+	connect( m_tree, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),      TQT_TQOBJECT(this), TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&))      );
 	connect( m_tree, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), TQT_TQOBJECT(this), TQT_SLOT(slotMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)) );
 	connect( m_tree, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), TQT_TQOBJECT(this), TQT_SLOT(slotShowProperties(TQListViewItem*, const TQPoint&, int)) );
 
@@ -409,53 +409,53 @@ void BNPView::initialize()
 
 void BNPView::setupActions()
 {
-	m_actSaveAsArchive = new KAction( i18n("&Basket Archive..."),  "baskets", 0,
+	m_actSaveAsArchive = new TDEAction( i18n("&Basket Archive..."),  "baskets", 0,
 	                                  TQT_TQOBJECT(this), TQT_SLOT(saveAsArchive()), actionCollection(), "basket_export_basket_archive" );
-	m_actOpenArchive   = new KAction( i18n("&Basket Archive..."),  "baskets", 0,
+	m_actOpenArchive   = new TDEAction( i18n("&Basket Archive..."),  "baskets", 0,
 	                                  TQT_TQOBJECT(this), TQT_SLOT(openArchive()),   actionCollection(), "basket_import_basket_archive" );
 
-	m_actHideWindow = new KAction( i18n("&Hide Window"), "", KStdAccel::shortcut(KStdAccel::Close),
+	m_actHideWindow = new TDEAction( i18n("&Hide Window"), "", TDEStdAccel::shortcut(TDEStdAccel::Close),
 								   TQT_TQOBJECT(this), TQT_SLOT(hideOnEscape()), actionCollection(), "window_hide" );
 	m_actHideWindow->setEnabled(Settings::useSystray()); // Init here !
 
-	m_actExportToHtml = new KAction( i18n("&HTML Web Page..."), "html", 0,
+	m_actExportToHtml = new TDEAction( i18n("&HTML Web Page..."), "html", 0,
 	             TQT_TQOBJECT(this), TQT_SLOT(exportToHTML()),      actionCollection(), "basket_export_html" );
-	new KAction( i18n("K&Notes"), "knotes", 0,
+	new TDEAction( i18n("K&Notes"), "knotes", 0,
 	             TQT_TQOBJECT(this), TQT_SLOT(importKNotes()),      actionCollection(), "basket_import_knotes" );
-	new KAction( i18n("K&Jots"), "kjots", 0,
+	new TDEAction( i18n("K&Jots"), "kjots", 0,
 	             TQT_TQOBJECT(this), TQT_SLOT(importKJots()),       actionCollection(), "basket_import_kjots" );
-	new KAction( i18n("&KnowIt..."), "knowit", 0,
+	new TDEAction( i18n("&KnowIt..."), "knowit", 0,
 	             TQT_TQOBJECT(this), TQT_SLOT(importKnowIt()),      actionCollection(), "basket_import_knowit" );
-	new KAction( i18n("Tux&Cards..."), "tuxcards", 0,
+	new TDEAction( i18n("Tux&Cards..."), "tuxcards", 0,
 	             TQT_TQOBJECT(this), TQT_SLOT(importTuxCards()),    actionCollection(), "basket_import_tuxcards" );
-	new KAction( i18n("&Sticky Notes"), "gnome", 0,
+	new TDEAction( i18n("&Sticky Notes"), "gnome", 0,
 	             TQT_TQOBJECT(this), TQT_SLOT(importStickyNotes()), actionCollection(), "basket_import_sticky_notes" );
-	new KAction( i18n("&Tomboy"), "tintin", 0,
+	new TDEAction( i18n("&Tomboy"), "tintin", 0,
 	             TQT_TQOBJECT(this), TQT_SLOT(importTomboy()),      actionCollection(), "basket_import_tomboy" );
-	new KAction( i18n("Text &File..."), "txt", 0,
+	new TDEAction( i18n("Text &File..."), "txt", 0,
 	             TQT_TQOBJECT(this), TQT_SLOT(importTextFile()),    actionCollection(), "basket_import_text_file" );
 
-	new KAction( i18n("&Backup && Restore..."), "", 0,
+	new TDEAction( i18n("&Backup && Restore..."), "", 0,
 	             TQT_TQOBJECT(this), TQT_SLOT(backupRestore()), actionCollection(), "basket_backup_restore" );
 
 	/** Note : ****************************************************************/
 
-	m_actDelNote  = new KAction( i18n("D&elete"), "editdelete", "Delete",
+	m_actDelNote  = new TDEAction( i18n("D&elete"), "editdelete", "Delete",
 								 TQT_TQOBJECT(this), TQT_SLOT(delNote()), actionCollection(), "edit_delete" );
 	m_actCutNote  = KStdAction::cut(   TQT_TQOBJECT(this), TQT_SLOT(cutNote()),               actionCollection() );
 	m_actCopyNote = KStdAction::copy(  TQT_TQOBJECT(this), TQT_SLOT(copyNote()),              actionCollection() );
 
 	m_actSelectAll = KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( slotSelectAll() ), actionCollection() );
 	m_actSelectAll->setStatusText( i18n( "Selects all notes" ) );
-	m_actUnselectAll = new KAction( i18n( "U&nselect All" ), "", TQT_TQOBJECT(this), TQT_SLOT( slotUnselectAll() ),
+	m_actUnselectAll = new TDEAction( i18n( "U&nselect All" ), "", TQT_TQOBJECT(this), TQT_SLOT( slotUnselectAll() ),
 									actionCollection(), "edit_unselect_all" );
 	m_actUnselectAll->setStatusText( i18n( "Unselects all selected notes" ) );
-	m_actInvertSelection = new KAction( i18n( "&Invert Selection" ), CTRL+Key_Asterisk,
+	m_actInvertSelection = new TDEAction( i18n( "&Invert Selection" ), CTRL+Key_Asterisk,
 										TQT_TQOBJECT(this), TQT_SLOT( slotInvertSelection() ),
 										actionCollection(), "edit_invert_selection" );
 	m_actInvertSelection->setStatusText( i18n( "Inverts the current selection of notes" ) );
 
-	m_actEditNote         = new KAction( i18n("Verb; not Menu", "&Edit..."), "edit",   "Return",
+	m_actEditNote         = new TDEAction( i18n("Verb; not Menu", "&Edit..."), "edit",   "Return",
 										 TQT_TQOBJECT(this), TQT_SLOT(editNote()), actionCollection(), "note_edit" );
 
 	m_actOpenNote         = KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT(openNote()), actionCollection(), "note_open" );
@@ -463,25 +463,25 @@ void BNPView::setupActions()
 	m_actOpenNote->setText(i18n("&Open"));
 	m_actOpenNote->setShortcut("F9");
 
-	m_actOpenNoteWith     = new KAction( i18n("Open &With..."), "", "Shift+F9",
+	m_actOpenNoteWith     = new TDEAction( i18n("Open &With..."), "", "Shift+F9",
 										 TQT_TQOBJECT(this), TQT_SLOT(openNoteWith()), actionCollection(), "note_open_with" );
 	m_actSaveNoteAs       = KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT(saveNoteAs()), actionCollection(), "note_save_to_file" );
 	m_actSaveNoteAs->setIcon("");
 	m_actSaveNoteAs->setText(i18n("&Save to File..."));
 	m_actSaveNoteAs->setShortcut("F10");
 
-	m_actGroup        = new KAction( i18n("&Group"),          "attach",     "Ctrl+G",
+	m_actGroup        = new TDEAction( i18n("&Group"),          "attach",     "Ctrl+G",
 									 TQT_TQOBJECT(this), TQT_SLOT(noteGroup()),    actionCollection(), "note_group" );
-	m_actUngroup      = new KAction( i18n("U&ngroup"),        "",           "Ctrl+Shift+G",
+	m_actUngroup      = new TDEAction( i18n("U&ngroup"),        "",           "Ctrl+Shift+G",
 									 TQT_TQOBJECT(this), TQT_SLOT(noteUngroup()),  actionCollection(), "note_ungroup" );
 
-	m_actMoveOnTop    = new KAction( i18n("Move on &Top"),    "2uparrow",   "Ctrl+Shift+Home",
+	m_actMoveOnTop    = new TDEAction( i18n("Move on &Top"),    "2uparrow",   "Ctrl+Shift+Home",
 									 TQT_TQOBJECT(this), TQT_SLOT(moveOnTop()),    actionCollection(), "note_move_top" );
-	m_actMoveNoteUp   = new KAction( i18n("Move &Up"),        "1uparrow",   "Ctrl+Shift+Up",
+	m_actMoveNoteUp   = new TDEAction( i18n("Move &Up"),        "1uparrow",   "Ctrl+Shift+Up",
 									 TQT_TQOBJECT(this), TQT_SLOT(moveNoteUp()),   actionCollection(), "note_move_up" );
-	m_actMoveNoteDown = new KAction( i18n("Move &Down"),      "1downarrow", "Ctrl+Shift+Down",
+	m_actMoveNoteDown = new TDEAction( i18n("Move &Down"),      "1downarrow", "Ctrl+Shift+Down",
 									 TQT_TQOBJECT(this), TQT_SLOT(moveNoteDown()), actionCollection(), "note_move_down" );
-	m_actMoveOnBottom = new KAction( i18n("Move on &Bottom"), "2downarrow", "Ctrl+Shift+End",
+	m_actMoveOnBottom = new TDEAction( i18n("Move on &Bottom"), "2downarrow", "Ctrl+Shift+End",
 									 TQT_TQOBJECT(this), TQT_SLOT(moveOnBottom()), actionCollection(), "note_move_bottom" );
 #if KDE_IS_VERSION( 3, 1, 90 ) // KDE 3.2.x
 	m_actPaste = KStdAction::pasteText( TQT_TQOBJECT(this), TQT_SLOT(pasteInCurrentBasket()), actionCollection() );
@@ -496,16 +496,16 @@ void BNPView::setupActions()
 	connect( insertEmptyMapper,  TQT_SIGNAL(mapped(int)), TQT_TQOBJECT(this), TQT_SLOT(insertEmpty(int))  );
 	connect( insertWizardMapper, TQT_SIGNAL(mapped(int)), TQT_TQOBJECT(this), TQT_SLOT(insertWizard(int)) );
 
-//	m_actInsertText   = new KAction( i18n("Plai&n Text"), "text",     "Ctrl+T", actionCollection(), "insert_text"     );
-	m_actInsertHtml   = new KAction( i18n("&Text"),       "html",     "Insert", actionCollection(), "insert_html"     );
-	m_actInsertLink   = new KAction( i18n("&Link"),       "link",     "Ctrl+Y", actionCollection(), "insert_link"     );
-	m_actInsertImage  = new KAction( i18n("&Image"),      "image",    "",       actionCollection(), "insert_image"    );
-	m_actInsertColor  = new KAction( i18n("&Color"),      "colorset", "",       actionCollection(), "insert_color"    );
-	m_actInsertLauncher=new KAction( i18n("L&auncher"),   "launch",   "",       actionCollection(), "insert_launcher" );
+//	m_actInsertText   = new TDEAction( i18n("Plai&n Text"), "text",     "Ctrl+T", actionCollection(), "insert_text"     );
+	m_actInsertHtml   = new TDEAction( i18n("&Text"),       "html",     "Insert", actionCollection(), "insert_html"     );
+	m_actInsertLink   = new TDEAction( i18n("&Link"),       "link",     "Ctrl+Y", actionCollection(), "insert_link"     );
+	m_actInsertImage  = new TDEAction( i18n("&Image"),      "image",    "",       actionCollection(), "insert_image"    );
+	m_actInsertColor  = new TDEAction( i18n("&Color"),      "colorset", "",       actionCollection(), "insert_color"    );
+	m_actInsertLauncher=new TDEAction( i18n("L&auncher"),   "launch",   "",       actionCollection(), "insert_launcher" );
 
-	m_actImportKMenu  = new KAction( i18n("Import Launcher from &TDE Menu..."), "kmenu",      "", actionCollection(), "insert_kmenu"     );
-	m_actImportIcon   = new KAction( i18n("Im&port Icon..."),                   "icons",      "", actionCollection(), "insert_icon"      );
-	m_actLoadFile     = new KAction( i18n("Load From &File..."),                "fileimport", "", actionCollection(), "insert_from_file" );
+	m_actImportKMenu  = new TDEAction( i18n("Import Launcher from &TDE Menu..."), "kmenu",      "", actionCollection(), "insert_kmenu"     );
+	m_actImportIcon   = new TDEAction( i18n("Im&port Icon..."),                   "icons",      "", actionCollection(), "insert_icon"      );
+	m_actLoadFile     = new TDEAction( i18n("Load From &File..."),                "fileimport", "", actionCollection(), "insert_from_file" );
 
 //	connect( m_actInsertText,     TQT_SIGNAL(activated()), insertEmptyMapper, TQT_SLOT(map()) );
 	connect( m_actInsertHtml,     TQT_SIGNAL(activated()), insertEmptyMapper, TQT_SLOT(map()) );
@@ -528,12 +528,12 @@ void BNPView::setupActions()
 	insertWizardMapper->setMapping(m_actLoadFile,     3 );
 
 	m_colorPicker = new DesktopColorPicker();
-	m_actColorPicker = new KAction( i18n("C&olor from Screen"), "kcolorchooser", "",
+	m_actColorPicker = new TDEAction( i18n("C&olor from Screen"), "kcolorchooser", "",
 									TQT_TQOBJECT(this), TQT_SLOT(slotColorFromScreen()), actionCollection(), "insert_screen_color" );
 	connect( m_colorPicker, TQT_SIGNAL(pickedColor(const TQColor&)), TQT_TQOBJECT(this), TQT_SLOT(colorPicked(const TQColor&)) );
 	connect( m_colorPicker, TQT_SIGNAL(canceledPick()),             TQT_TQOBJECT(this), TQT_SLOT(colorPickingCanceled())     );
 
-	m_actGrabScreenshot = new KAction( i18n("Grab Screen &Zone"), "ksnapshot", "",
+	m_actGrabScreenshot = new TDEAction( i18n("Grab Screen &Zone"), "ksnapshot", "",
 									   TQT_TQOBJECT(this), TQT_SLOT(grabScreenshot()), actionCollection(), "insert_screen_capture" );
 	//connect( m_actGrabScreenshot, TQT_SIGNAL(regionGrabbed(const TQPixmap&)), TQT_TQOBJECT(this), TQT_SLOT(screenshotGrabbed(const TQPixmap&)) );
 	//connect( m_colorPicker, TQT_SIGNAL(canceledPick()),             TQT_TQOBJECT(this), TQT_SLOT(colorPickingCanceled())     );
@@ -563,27 +563,27 @@ void BNPView::setupActions()
 	}
 
 	// Use the "basket" incon in Kontact so it is consistent with the Kontact "New..." icon
-	actNewBasket        = new KAction( i18n("&New Basket..."), (runInsideKontact ? "basket" : "filenew"), KStdAccel::shortcut(KStdAccel::New),
+	actNewBasket        = new TDEAction( i18n("&New Basket..."), (runInsideKontact ? "basket" : "filenew"), TDEStdAccel::shortcut(TDEStdAccel::New),
 									   TQT_TQOBJECT(this), TQT_SLOT(askNewBasket()), actionCollection(), "basket_new" );
-	actNewSubBasket     = new KAction( i18n("New &Sub-Basket..."), "", "Ctrl+Shift+N",
+	actNewSubBasket     = new TDEAction( i18n("New &Sub-Basket..."), "", "Ctrl+Shift+N",
 									   TQT_TQOBJECT(this), TQT_SLOT(askNewSubBasket()), actionCollection(), "basket_new_sub" );
-	actNewSiblingBasket = new KAction( i18n("New Si&bling Basket..."), "", "",
+	actNewSiblingBasket = new TDEAction( i18n("New Si&bling Basket..."), "", "",
 									   TQT_TQOBJECT(this), TQT_SLOT(askNewSiblingBasket()), actionCollection(), "basket_new_sibling" );
 
-	KActionMenu *newBasketMenu = new KActionMenu(i18n("&New"), "filenew", actionCollection(), "basket_new_menu");
+	TDEActionMenu *newBasketMenu = new TDEActionMenu(i18n("&New"), "filenew", actionCollection(), "basket_new_menu");
 	newBasketMenu->insert(actNewBasket);
 	newBasketMenu->insert(actNewSubBasket);
 	newBasketMenu->insert(actNewSiblingBasket);
 	connect( newBasketMenu, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(askNewBasket()) );
 
-	m_actPropBasket = new KAction( i18n("&Properties..."), "misc", "F2",
+	m_actPropBasket = new TDEAction( i18n("&Properties..."), "misc", "F2",
 								   TQT_TQOBJECT(this), TQT_SLOT(propBasket()), actionCollection(), "basket_properties" );
-	m_actDelBasket  = new KAction( i18n("Remove Basket", "&Remove"), "", 0,
+	m_actDelBasket  = new TDEAction( i18n("Remove Basket", "&Remove"), "", 0,
 								   TQT_TQOBJECT(this), TQT_SLOT(delBasket()), actionCollection(), "basket_remove" );
 #ifdef HAVE_LIBGPGME
-	m_actPassBasket = new KAction( i18n("Password protection", "Pass&word..."), "", 0,
+	m_actPassBasket = new TDEAction( i18n("Password protection", "Pass&word..."), "", 0,
 								   TQT_TQOBJECT(this), TQT_SLOT(password()), actionCollection(), "basket_password" );
-	m_actLockBasket = new KAction( i18n("Lock Basket", "&Lock"), "", "Ctrl+L",
+	m_actLockBasket = new TDEAction( i18n("Lock Basket", "&Lock"), "", "Ctrl+L",
 								   TQT_TQOBJECT(this), TQT_SLOT(lockBasket()), actionCollection(), "basket_lock" );
 #endif
 	/** Edit : ****************************************************************/
@@ -593,29 +593,29 @@ void BNPView::setupActions()
 	//m_actRedo     = KStdAction::redo(  TQT_TQOBJECT(this), TQT_SLOT(redo()),                 actionCollection() );
 	//m_actRedo->setEnabled(false); // Not yet implemented !
 
-	m_actShowFilter  = new KToggleAction( i18n("&Filter"), "filter", KStdAccel::shortcut(KStdAccel::Find),
+	m_actShowFilter  = new TDEToggleAction( i18n("&Filter"), "filter", TDEStdAccel::shortcut(TDEStdAccel::Find),
 										  actionCollection(), "edit_filter" );
 	connect( m_actShowFilter, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this), TQT_SLOT(showHideFilterBar(bool)) );
 
-	m_actFilterAllBaskets = new KToggleAction( i18n("Filter all &Baskets"), "find", "Ctrl+Shift+F",
+	m_actFilterAllBaskets = new TDEToggleAction( i18n("Filter all &Baskets"), "find", "Ctrl+Shift+F",
 											   actionCollection(), "edit_filter_all_baskets" );
 	connect( m_actFilterAllBaskets, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this), TQT_SLOT(toggleFilterAllBaskets(bool)) );
 
-	m_actResetFilter = new KAction( i18n( "&Reset Filter" ), "locationbar_erase", "Ctrl+R",
+	m_actResetFilter = new TDEAction( i18n( "&Reset Filter" ), "locationbar_erase", "Ctrl+R",
 									TQT_TQOBJECT(this), TQT_SLOT( slotResetFilter() ), actionCollection(), "edit_filter_reset" );
 
 	/** Go : ******************************************************************/
 
-	m_actPreviousBasket = new KAction( i18n( "&Previous Basket" ), "up",      "Alt+Up",
+	m_actPreviousBasket = new TDEAction( i18n( "&Previous Basket" ), "up",      "Alt+Up",
 									   TQT_TQOBJECT(this), TQT_SLOT(goToPreviousBasket()), actionCollection(), "go_basket_previous" );
-	m_actNextBasket     = new KAction( i18n( "&Next Basket" ),     "down",    "Alt+Down",
+	m_actNextBasket     = new TDEAction( i18n( "&Next Basket" ),     "down",    "Alt+Down",
 									   TQT_TQOBJECT(this), TQT_SLOT(goToNextBasket()),     actionCollection(), "go_basket_next"     );
-	m_actFoldBasket     = new KAction( i18n( "&Fold Basket" ),     "back",    "Alt+Left",
+	m_actFoldBasket     = new TDEAction( i18n( "&Fold Basket" ),     "back",    "Alt+Left",
 									   TQT_TQOBJECT(this), TQT_SLOT(foldBasket()),         actionCollection(), "go_basket_fold"     );
-	m_actExpandBasket   = new KAction( i18n( "&Expand Basket" ),   "forward", "Alt+Right",
+	m_actExpandBasket   = new TDEAction( i18n( "&Expand Basket" ),   "forward", "Alt+Right",
 									   TQT_TQOBJECT(this), TQT_SLOT(expandBasket()),       actionCollection(), "go_basket_expand"   );
 	// FOR_BETA_PURPOSE:
-//	m_convertTexts = new KAction( i18n("Convert text notes to rich text notes"), "compfile", "",
+//	m_convertTexts = new TDEAction( i18n("Convert text notes to rich text notes"), "compfile", "",
 //								  TQT_TQOBJECT(this), TQT_SLOT(convertTexts()), actionCollection(), "beta_convert_texts" );
 
 	InlineEditors::instance()->initToolBars(actionCollection());
@@ -626,7 +626,7 @@ void BNPView::setupActions()
 
 	/** Help : ****************************************************************/
 
-	new KAction( i18n("&Welcome Baskets"), "", "", TQT_TQOBJECT(this), TQT_SLOT(addWelcomeBaskets()), actionCollection(), "help_welcome_baskets" );
+	new TDEAction( i18n("&Welcome Baskets"), "", "", TQT_TQOBJECT(this), TQT_SLOT(addWelcomeBaskets()), actionCollection(), "help_welcome_baskets" );
 }
 
 TQListViewItem* BNPView::firstListViewItem()
@@ -647,7 +647,7 @@ void BNPView::slotMouseButtonPressed(int button, TQListViewItem *item, const TQP
 	}
 }
 
-void BNPView::slotContextMenu(KListView */*listView*/, TQListViewItem *item, const TQPoint &pos)
+void BNPView::slotContextMenu(TDEListView */*listView*/, TQListViewItem *item, const TQPoint &pos)
 {
 	TQString menuName;
 	if (item) {
@@ -764,7 +764,7 @@ void BNPView::load()
 	m_loading = false;
 }
 
-void BNPView::load(KListView */*listView*/, TQListViewItem *item, const TQDomElement &baskets)
+void BNPView::load(TDEListView */*listView*/, TQListViewItem *item, const TQDomElement &baskets)
 {
 	TQDomNode n = baskets.firstChild();
 	while ( ! n.isNull() ) {
@@ -1410,7 +1410,7 @@ void BNPView::updateNotesActions()
 	m_actMoveNoteDown    ->setEnabled( !isLocked && oneOrSeveralSelected );
 	m_actMoveOnBottom    ->setEnabled( !isLocked && oneOrSeveralSelected && !currentBasket()->isFreeLayout() );
 
-	for (KAction *action = m_insertActions.first(); action; action = m_insertActions.next())
+	for (TDEAction *action = m_insertActions.first(); action; action = m_insertActions.next())
 		action->setEnabled( !isLocked );
 
 	// From the old Note::contextMenuEvent(...) :
@@ -1551,7 +1551,7 @@ TQPopupMenu* BNPView::popupMenu(const TQString &menuName)
 		if(!isPart())
 			exit(1); // We SHOULD exit right now and abord everything because the caller except menu != 0 to not crash.
 		else
-			menu = new KPopupMenu; // When running in kpart we cannot exit
+			menu = new TDEPopupMenu; // When running in kpart we cannot exit
 	}
 	return menu;
 }
@@ -1598,7 +1598,7 @@ void BNPView::grabScreenshot(bool global)
 	// A special case is where the action is triggered with the global keyboard shortcut.
 	// In this case, global is true, and we don't wait.
 	// In the future, if global is also defined for other cases, check for
-	// enum KAction::ActivationReason { UnknownActivation, EmulatedActivation, AccelActivation, PopupMenuActivation, ToolBarActivation };
+	// enum TDEAction::ActivationReason { UnknownActivation, EmulatedActivation, AccelActivation, PopupMenuActivation, ToolBarActivation };
 	int delay = (isMainWindowActive() ? 500 : (global/*kapp->activePopupWidget()*/ ? 0 : 200));
 
 	m_colorPickWasGlobal = global;
@@ -1757,7 +1757,7 @@ void BNPView::doBasketDeletion(Basket *basket)
 	basket->deleteFiles();
 	removeBasket(basket);
 	// Remove the action to avoir keyboard-shortcut clashes:
-	delete basket->m_action; // FIXME: It's quick&dirty. In the future, the Basket should be deleted, and then the KAction deleted in the Basket destructor.
+	delete basket->m_action; // FIXME: It's quick&dirty. In the future, the Basket should be deleted, and then the TDEAction deleted in the Basket destructor.
 	delete decoBasket;
 //	delete basket;
 }
@@ -1845,7 +1845,7 @@ void BNPView::openArchive()
 
 void BNPView::activatedTagShortcut()
 {
-	Tag *tag = Tag::tagForKAction((KAction*)sender());
+	Tag *tag = Tag::tagForTDEAction((TDEAction*)sender());
 	currentBasket()->activatedTagShortcut(tag);
 }
 
@@ -2072,7 +2072,7 @@ void BNPView::setUnsavedStatus(bool isUnsaved)
 void BNPView::setActive(bool active)
 {
 //	std::cout << "Main Window Position: setActive(" << (active ? "true" : "false") << ")" << std::endl;
-	KMainWindow* win = Global::mainWindow();
+	TDEMainWindow* win = Global::mainWindow();
 	if(!win)
 		return;
 
@@ -2125,7 +2125,7 @@ bool BNPView::isPart()
 
 bool BNPView::isMainWindowActive()
 {
-	KMainWindow* main = Global::mainWindow();
+	TDEMainWindow* main = Global::mainWindow();
 	if (main && main->isActiveWindow())
 		return true;
 	return false;
@@ -2249,7 +2249,7 @@ void BNPView::enableActions()
 
 void BNPView::showMainWindow()
 {
-	KMainWindow *win = Global::mainWindow();
+	TDEMainWindow *win = Global::mainWindow();
 
 	if (win)
 	{
@@ -2261,7 +2261,7 @@ void BNPView::showMainWindow()
 
 void BNPView::populateTagsMenu()
 {
-	KPopupMenu *menu = (KPopupMenu*)(popupMenu("tags"));
+	TDEPopupMenu *menu = (TDEPopupMenu*)(popupMenu("tags"));
 	if (menu == 0 || currentBasket() == 0) // TODO: Display a messagebox. [menu is 0, surely because on first launch, the XMLGUI does not work!]
 		return;
 	menu->clear();
@@ -2278,7 +2278,7 @@ void BNPView::populateTagsMenu()
 //	connect( menu, TQT_SIGNAL(aboutToHide()), TQT_TQOBJECT(this), TQT_SLOT(disconnectTagsMenu()) );
 }
 
-void BNPView::populateTagsMenu(KPopupMenu &menu, Note *referenceNote)
+void BNPView::populateTagsMenu(TDEPopupMenu &menu, Note *referenceNote)
 {
 	if (currentBasket() == 0)
 		return;
diff --git a/src/bnpview.h b/src/bnpview.h
index 34e3042..0fabb22 100644
--- a/src/bnpview.h
+++ b/src/bnpview.h
@@ -36,10 +36,10 @@
 class TQWidgetStack;
 class TQDomDocument;
 class TQDomElement;
-class KToggleAction;
+class TDEToggleAction;
 class KPassivePopup;
 class TQPopupMenu;
-class KPopupMenu;
+class TDEPopupMenu;
 class KTar;
 
 class DesktopColorPicker;
@@ -61,7 +61,7 @@ class BNPView : public TQSplitter, virtual public BasketDcopInterface
 	public:
 	/// CONSTRUCTOR AND DESTRUCTOR:
 		BNPView(TQWidget *parent, const char *name, KXMLGUIClient *aGUIClient,
-				KActionCollection *actionCollection, BasketStatusBar *bar);
+				TDEActionCollection *actionCollection, BasketStatusBar *bar);
 		~BNPView();
 	/// MANAGE CONFIGURATION EVENTS!:
 		void setTreePlacement(bool onLeft);
@@ -97,7 +97,7 @@ class BNPView : public TQSplitter, virtual public BasketDcopInterface
 		void save(TQListViewItem *firstItem, TQDomDocument &document, TQDomElement &parentElement);
 		void saveSubHierarchy(TQListViewItem *item, TQDomDocument &document, TQDomElement &parentElement, bool recursive);
 		void load();
-		void load(KListView *listView, TQListViewItem *item, const TQDomElement &baskets);
+		void load(TDEListView *listView, TQListViewItem *item, const TQDomElement &baskets);
 		void loadNewBasket(const TQString &folderName, const TQDomElement &properties, Basket *parent);
 		void goToPreviousBasket();
 		void goToNextBasket();
@@ -213,65 +213,65 @@ class BNPView : public TQSplitter, virtual public BasketDcopInterface
 		void showGlobalShortcutsSettingsDialog();
 
 	public:
-		KAction       *m_actEditNote;
-		KAction       *m_actOpenNote;
-		KAction       *m_actPaste;
-		KAction       *m_actGrabScreenshot;
-		KAction       *m_actColorPicker;
-		KAction       *m_actLockBasket;
-		KAction       *m_actPassBasket;
-		KAction       *actNewBasket;
-		KAction       *actNewSubBasket;
-		KAction       *actNewSiblingBasket;
-		KAction       *m_actHideWindow;
-		KAction       *m_actExportToHtml;
-		KAction       *m_actPropBasket;
-		KAction       *m_actDelBasket;
-		KToggleAction *m_actFilterAllBaskets;
+		TDEAction       *m_actEditNote;
+		TDEAction       *m_actOpenNote;
+		TDEAction       *m_actPaste;
+		TDEAction       *m_actGrabScreenshot;
+		TDEAction       *m_actColorPicker;
+		TDEAction       *m_actLockBasket;
+		TDEAction       *m_actPassBasket;
+		TDEAction       *actNewBasket;
+		TDEAction       *actNewSubBasket;
+		TDEAction       *actNewSiblingBasket;
+		TDEAction       *m_actHideWindow;
+		TDEAction       *m_actExportToHtml;
+		TDEAction       *m_actPropBasket;
+		TDEAction       *m_actDelBasket;
+		TDEToggleAction *m_actFilterAllBaskets;
 
 	private:
 		// Basket actions:
-		KAction       *m_actSaveAsArchive;
-		KAction       *m_actOpenArchive;
+		TDEAction       *m_actSaveAsArchive;
+		TDEAction       *m_actOpenArchive;
 		// Notes actions :
-		KAction       *m_actOpenNoteWith;
-		KAction       *m_actSaveNoteAs;
-		KAction       *m_actGroup;
-		KAction       *m_actUngroup;
-		KAction       *m_actMoveOnTop;
-		KAction       *m_actMoveNoteUp;
-		KAction       *m_actMoveNoteDown;
-		KAction       *m_actMoveOnBottom;
+		TDEAction       *m_actOpenNoteWith;
+		TDEAction       *m_actSaveNoteAs;
+		TDEAction       *m_actGroup;
+		TDEAction       *m_actUngroup;
+		TDEAction       *m_actMoveOnTop;
+		TDEAction       *m_actMoveNoteUp;
+		TDEAction       *m_actMoveNoteDown;
+		TDEAction       *m_actMoveOnBottom;
 		// Edit actions :
-		KAction       *m_actUndo;
-		KAction       *m_actRedo;
-		KAction       *m_actCutNote;
-		KAction       *m_actCopyNote;
-		KAction       *m_actDelNote;
-		KAction       *m_actSelectAll;
-		KAction       *m_actUnselectAll;
-		KAction       *m_actInvertSelection;
+		TDEAction       *m_actUndo;
+		TDEAction       *m_actRedo;
+		TDEAction       *m_actCutNote;
+		TDEAction       *m_actCopyNote;
+		TDEAction       *m_actDelNote;
+		TDEAction       *m_actSelectAll;
+		TDEAction       *m_actUnselectAll;
+		TDEAction       *m_actInvertSelection;
 		// Insert actions :
-//		KAction       *m_actInsertText;
-		KAction       *m_actInsertHtml;
-		KAction       *m_actInsertLink;
-		KAction       *m_actInsertImage;
-		KAction       *m_actInsertColor;
-		KAction       *m_actImportKMenu;
-		KAction       *m_actInsertLauncher;
-		KAction       *m_actImportIcon;
-		KAction       *m_actLoadFile;
-		TQPtrList<KAction> m_insertActions;
+//		TDEAction       *m_actInsertText;
+		TDEAction       *m_actInsertHtml;
+		TDEAction       *m_actInsertLink;
+		TDEAction       *m_actInsertImage;
+		TDEAction       *m_actInsertColor;
+		TDEAction       *m_actImportKMenu;
+		TDEAction       *m_actInsertLauncher;
+		TDEAction       *m_actImportIcon;
+		TDEAction       *m_actLoadFile;
+		TQPtrList<TDEAction> m_insertActions;
 		// Basket actions :
-		KToggleAction *m_actShowFilter;
-		KAction       *m_actResetFilter;
+		TDEToggleAction *m_actShowFilter;
+		TDEAction       *m_actResetFilter;
 		// Go actions :
-		KAction       *m_actPreviousBasket;
-		KAction       *m_actNextBasket;
-		KAction       *m_actFoldBasket;
-		KAction       *m_actExpandBasket;
-//		KAction       *m_convertTexts; // FOR_BETA_PURPOSE
-		KAction       *actConfigGlobalShortcuts;
+		TDEAction       *m_actPreviousBasket;
+		TDEAction       *m_actNextBasket;
+		TDEAction       *m_actFoldBasket;
+		TDEAction       *m_actExpandBasket;
+//		TDEAction       *m_convertTexts; // FOR_BETA_PURPOSE
+		TDEAction       *actConfigGlobalShortcuts;
 
 		void setupActions();
 		void setupGlobalShortcuts();
@@ -300,10 +300,10 @@ class BNPView : public TQSplitter, virtual public BasketDcopInterface
 		void setStatusBarHint(const TQString&);
 		void setUnsavedStatus(bool isUnsaved);
 		void setActive(bool active = true);
-		KActionCollection *actionCollection() { return m_actionCollection; };
+		TDEActionCollection *actionCollection() { return m_actionCollection; };
 
 		void populateTagsMenu();
-		void populateTagsMenu(KPopupMenu &menu, Note *referenceNote);
+		void populateTagsMenu(TDEPopupMenu &menu, Note *referenceNote);
 		void connectTagsMenu();
 		void disconnectTagsMenu();
 		void disconnectTagsMenuDelayed();
@@ -311,12 +311,12 @@ class BNPView : public TQSplitter, virtual public BasketDcopInterface
 		void showEvent(TQShowEvent*);
 		void hideEvent(TQHideEvent*);
 	private:
-		KPopupMenu *m_lastOpenedTagsMenu;
+		TDEPopupMenu *m_lastOpenedTagsMenu;
 
 	private slots:
 		void slotPressed(TQListViewItem *item, const TQPoint &/*pos*/ = TQPoint(), int /*column*/ = 0);
 		void needSave(TQListViewItem*);
-		void slotContextMenu(KListView *listView, TQListViewItem *item, const TQPoint &pos);
+		void slotContextMenu(TDEListView *listView, TQListViewItem *item, const TQPoint &pos);
 		void slotMouseButtonPressed(int button, TQListViewItem *item, const TQPoint &pos, int column);
 		void slotShowProperties(TQListViewItem *item, const TQPoint&, int);
 		void initialize();
@@ -332,7 +332,7 @@ class BNPView : public TQSplitter, virtual public BasketDcopInterface
 		void leaveEvent(TQEvent*);
 
 	private:
-		KListView    *m_tree;
+		TDEListView    *m_tree;
 		TQWidgetStack *m_stack;
 		bool          m_loading;
 		bool          m_newBasketPopup;
@@ -345,7 +345,7 @@ class BNPView : public TQSplitter, virtual public BasketDcopInterface
 		NoteSelection *m_passiveDroppedSelection;
 		KPassivePopup *m_passivePopup;
 		static const int c_delayTooltipTime;
-		KActionCollection *m_actionCollection;
+		TDEActionCollection *m_actionCollection;
 		KXMLGUIClient *m_guiClient;
 		BasketStatusBar *m_statusbar;
 		TQTimer             *m_tryHideTimer;
diff --git a/src/filter.cpp b/src/filter.cpp
index 78e2b80..f7dd503 100644
--- a/src/filter.cpp
+++ b/src/filter.cpp
@@ -59,7 +59,7 @@ FilterBar::FilterBar(TQWidget *parent, const char *name)
 	m_resetButton->setIconSet(resetIconSet);
 	m_resetButton->setTextLabel(i18n("Reset Filter"));//, /*groupText=*/"", this, TQT_SLOT(reset()), 0);
 	m_resetButton->setAutoRaise(true);
-			//new KToolBarButton("locationbar_erase", /*id=*/1230, this, /*name=*/0, i18n("Reset Filter"));
+			//new TDEToolBarButton("locationbar_erase", /*id=*/1230, this, /*name=*/0, i18n("Reset Filter"));
 	m_lineEdit           = new FocusedLineEdit(this);
 	TQLabel *label        = new TQLabel(m_lineEdit, i18n("&Filter: "), this);
 	m_tagsBox            = new FocusedComboBox(this);
diff --git a/src/focusedwidgets.cpp b/src/focusedwidgets.cpp
index d472555..f4e14d9 100644
--- a/src/focusedwidgets.cpp
+++ b/src/focusedwidgets.cpp
@@ -228,7 +228,7 @@ void FocusedColorCombo::keyPressEvent(TQKeyEvent *event)
 /** class FocusedFontCombo: */
 
 FocusedFontCombo::FocusedFontCombo(TQWidget *parent, const char *name)
- : KFontCombo(parent, name)
+ : TDEFontCombo(parent, name)
 {
 }
 
@@ -243,7 +243,7 @@ void FocusedFontCombo::keyPressEvent(TQKeyEvent *event)
 	else if (event->key() == TQt::Key_Return)
 		emit returnPressed2();
 	else
-		KFontCombo::keyPressEvent(event);
+		TDEFontCombo::keyPressEvent(event);
 }
 
 /** class FocusedComboBox: */
diff --git a/src/focusedwidgets.h b/src/focusedwidgets.h
index f757fce..b710e34 100644
--- a/src/focusedwidgets.h
+++ b/src/focusedwidgets.h
@@ -66,8 +66,8 @@ class FocusedColorCombo : public KColorCombo
 	void returnPressed2();
 };
 
-// TODO: Rename to EscapableKFontCombo
-class FocusedFontCombo : public KFontCombo
+// TODO: Rename to EscapableTDEFontCombo
+class FocusedFontCombo : public TDEFontCombo
 {
   Q_OBJECT
   
diff --git a/src/global.cpp b/src/global.cpp
index edc1787..4ebd8fb 100644
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -81,13 +81,13 @@ TQString Global::openNoteIcon() // FIXME: Now an edit icon
 	return Global::bnpView->m_actEditNote->icon();
 }
 
-KMainWindow* Global::mainWindow()
+TDEMainWindow* Global::mainWindow()
 {
 	TQWidget* res = kapp->mainWidget();
 
-	if(res && res->inherits("KMainWindow"))
+	if(res && res->inherits("TDEMainWindow"))
 	{
-		return static_cast<KMainWindow*>(res);
+		return static_cast<TDEMainWindow*>(res);
 	}
 	return 0;
 }
diff --git a/src/global.h b/src/global.h
index 49ac04a..e987e4a 100644
--- a/src/global.h
+++ b/src/global.h
@@ -30,7 +30,7 @@ class BackgroundManager;
 class SystemTray;
 class BNPView;
 class TDEGlobalAccel;
-class KMainWindow;
+class TDEMainWindow;
 class TDEAboutData;
 
 /** Handle all global variables of the application.
@@ -63,7 +63,7 @@ class Global
 
 	// Various Things:
 	static TQString openNoteIcon();      /// << @return the icon used for the "Open" action on notes.
-	static KMainWindow* mainWindow();
+	static TDEMainWindow* mainWindow();
 	static TDEConfig* config();
 	static TDEAboutData* about() { return &basketAbout; };
 };
diff --git a/src/kcolorcombo2.cpp b/src/kcolorcombo2.cpp
index 1671186..bd4828b 100644
--- a/src/kcolorcombo2.cpp
+++ b/src/kcolorcombo2.cpp
@@ -743,10 +743,10 @@ void KColorCombo2::keyPressEvent(TQKeyEvent *event)
 {
 	KKey key(event);
 
-	if (KStdAccel::copy().contains(key)) {
+	if (TDEStdAccel::copy().contains(key)) {
 		TQMimeSource *mime = new KColorDrag(effectiveColor());
 		TQApplication::clipboard()->setData(mime, TQClipboard::Clipboard);
-	} else if (KStdAccel::paste().contains(key)) {
+	} else if (TDEStdAccel::paste().contains(key)) {
 		TQColor color;
 		KColorDrag::decode(TQApplication::clipboard()->data(TQClipboard::Clipboard), color);
 		setColor(color);
diff --git a/src/kgpgme.cpp b/src/kgpgme.cpp
index e3f7dff..f5a39c6 100644
--- a/src/kgpgme.cpp
+++ b/src/kgpgme.cpp
@@ -42,7 +42,7 @@
 class KGpgSelKey : public KDialogBase
 {
 	private:
-		KListView* keysListpr;
+		TDEListView* keysListpr;
 
 	public:
 
@@ -57,7 +57,7 @@ class KGpgSelKey : public KDialogBase
 			TQPixmap keyPair = loader->loadIcon("kgpg_key2", KIcon::Small, 20);
 
 			setMinimumSize(350,100);
-			keysListpr = new KListView(page);
+			keysListpr = new TDEListView(page);
 			keysListpr->setRootIsDecorated(true);
 			keysListpr->addColumn(i18n("Name"));
 			keysListpr->addColumn(i18n("Email"));
@@ -73,8 +73,8 @@ class KGpgSelKey : public KDialogBase
 
 			for(KGpgKeyList::iterator it = list.begin(); it != list.end(); ++it) {
 				TQString name = gpg.checkForUtf8((*it).name);
-				KListViewItem *item = new
-					KListViewItem(keysListpr, name, (*it).email, (*it).id);
+				TDEListViewItem *item = new
+					TDEListViewItem(keysListpr, name, (*it).email, (*it).id);
 				item->setPixmap(0,keyPair);
 				if(preselected == (*it).id) {
 					keysListpr->setSelected(item, true);
diff --git a/src/kicondialogui.ui b/src/kicondialogui.ui
index 3a27886..9bfa162 100644
--- a/src/kicondialogui.ui
+++ b/src/kicondialogui.ui
@@ -37,7 +37,7 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="KListBox" row="0" column="0">
+        <widget class="TDEListBox" row="0" column="0">
             <property name="name">
                 <cstring>listBox</cstring>
             </property>
diff --git a/src/likeback.cpp b/src/likeback.cpp
index e388995..7ff3a8d 100644
--- a/src/likeback.cpp
+++ b/src/likeback.cpp
@@ -374,10 +374,10 @@ TDEConfig* LikeBack::config()
 	return d->config;
 }
 
-KAction* LikeBack::sendACommentAction(KActionCollection *parent)
+TDEAction* LikeBack::sendACommentAction(TDEActionCollection *parent)
 {
 	if (d->action == 0)
-		d->action = new KAction(
+		d->action = new TDEAction(
 			i18n("&Send a Comment to Developers"), /*icon=*/"mail_new", /*shortcut=*/"",
 			this, TQT_SLOT(execCommentDialog()),
 			parent, "likeback_send_a_comment"
diff --git a/src/likeback.h b/src/likeback.h
index c3d1f25..7a2c90f 100644
--- a/src/likeback.h
+++ b/src/likeback.h
@@ -25,8 +25,8 @@
 
 class TDEConfig;
 class TDEAboutData;
-class KAction;
-class KActionCollection;
+class TDEAction;
+class TDEActionCollection;
 
 class LikeBackPrivate;
 class LikeBackBar;
@@ -48,7 +48,7 @@ class LikeBackDialog;
  *
  * The LikeBack system has 5 components:
  * @li In the application: The comment dialog, where the user write a comment, select a type of comment, etc.
- * @li In the application: The KAction to plug in the Help menu. This action displays the comment dialog.
+ * @li In the application: The TDEAction to plug in the Help menu. This action displays the comment dialog.
  * @li In the application: The button-bar, that floats bellow titlebar of every windows of the application, and let the user to quickly show the comment dialog.
  *                         The button-bar can be hidden.
  * @li On the server: A PHP script that collects every comments that users send. The LikeBack object should be configured to contact that server.
@@ -64,7 +64,7 @@ class LikeBackDialog;
  *     // Comment the following line once you are sure all your windows have a name:
  *     likeBack->setWindowNamesListing(LikeBack::WarnUnnamedWindows);
  *
- *     // This line should be called early in your KMainWindow constructor because it references actionCollection().
+ *     // This line should be called early in your TDEMainWindow constructor because it references actionCollection().
  *     // It should be called before createGUI() for the action to be plugged in the Help menu:
  *     likeBack->sendACommentAction(actionCollection());
  * @endcode
@@ -129,7 +129,7 @@ class LikeBack : public TQObject
 	/**
 	 * Destructor.
 	 * Also hide the button-bar, if it was shown.
-	 * Be careful, the KAction is deleted. Do not use it afterward, and take care to unplug it before destroying this LikeBack instance.
+	 * Be careful, the TDEAction is deleted. Do not use it afterward, and take care to unplug it before destroying this LikeBack instance.
 	 */
 	~LikeBack();
 
@@ -210,7 +210,7 @@ class LikeBack : public TQObject
 	TQ_UINT16 hostPort();
 
 	/**
-	 * Get the KAction letting user to show the comment dialog.
+	 * Get the TDEAction letting user to show the comment dialog.
 	 * You should plug it in your Help menu, just bellow the "Report a Bug" action, or replace it.
 	 * Adding the action below "Report a Bug" or replacing "Report a Bug" depends on your application and if you have a Bugzilla account.
 	 * If you do not have a Bugzilla account, LikeBack is a good way for your small application to get bug reports: remove "Report a Bug".
@@ -220,7 +220,7 @@ class LikeBack : public TQObject
 	 *       <Action name="likeback_send_a_comment" />
 	 * @endcode
 	 */
-	KAction* sendACommentAction(KActionCollection *parent = 0);
+	TDEAction* sendACommentAction(TDEActionCollection *parent = 0);
 
 	/**
 	 * @Returns The path of the currently active window. Each windows are separated with "~~".
@@ -281,7 +281,7 @@ class LikeBack : public TQObject
 	 * @param windowPath     The window path to send with the comment. If empty (the default), the current window path is took.
 	 *                       Separate window names with "~~". For instance "MainWindow~~NewFile~~FileOpen".
 	 *                       If you popup the dialog after an error occurred, you can put the error name in that field (if the window path has no sense in that context).
-	 *                       When the dialog is popuped up from the sendACommentAction() KAction, this value is "HelpMenu", because there is no way to know if the user
+	 *                       When the dialog is popuped up from the sendACommentAction() TDEAction, this value is "HelpMenu", because there is no way to know if the user
 	 *                       is commenting a thing he found/thinked about in a sub-dialog.
 	 * @param context        Not used for the moment. Will allow more fine-grained application status report.
 	 */
@@ -303,7 +303,7 @@ class LikeBack : public TQObject
 
   private slots:
 	/**
-	 * Slot triggered by the "Help -> Send a Comment to Developers" KAction.
+	 * Slot triggered by the "Help -> Send a Comment to Developers" TDEAction.
 	 * It popups the comment dialog, and set the window path to "HelpMenuAction",
 	 * because current window path has no meaning in that case.
 	 */
diff --git a/src/likeback_private.h b/src/likeback_private.h
index 211855b..fa44244 100644
--- a/src/likeback_private.h
+++ b/src/likeback_private.h
@@ -51,7 +51,7 @@ class LikeBackPrivate
 	bool                     showBar;
 	int                      disabledCount;
 	TQString                  fetchedEmail;
-	KAction                 *action;
+	TDEAction                 *action;
 };
 
 class LikeBackBar : public TQWidget
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 2f6b9fb..df98554 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -101,7 +101,7 @@
 /** Container */
 
 MainWindow::MainWindow(TQWidget *parent, const char *name)
-	: KMainWindow(parent, name != 0 ? name : "MainWindow"), m_settings(0), m_quit(false)
+	: TDEMainWindow(parent, name != 0 ? name : "MainWindow"), m_settings(0), m_quit(false)
 {
 	BasketStatusBar* bar = new BasketStatusBar(statusBar());
 	m_baskets = new BNPView(this, "BNPViewApp", this, actionCollection(), bar);
@@ -133,7 +133,7 @@ MainWindow::~MainWindow()
 void MainWindow::setupActions()
 {
 	actQuit         = KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(quit()), actionCollection() );
-	new KAction(i18n("Minimize"), "", 0,
+	new TDEAction(i18n("Minimize"), "", 0,
 				TQT_TQOBJECT(this), TQT_SLOT(minimizeRestore()), actionCollection(), "minimizeRestore" );
 	/** Settings : ************************************************************/
 //	m_actShowToolbar   = KStdAction::showToolbar(   TQT_TQOBJECT(this), TQT_SLOT(toggleToolBar()),   actionCollection());
@@ -145,7 +145,7 @@ void MainWindow::setupActions()
 
 	(void) KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configureToolbars()), actionCollection() );
 
-	//KAction *actCfgNotifs = KStdAction::configureNotifications(this, TQT_SLOT(configureNotifications()), actionCollection() );
+	//TDEAction *actCfgNotifs = KStdAction::configureNotifications(this, TQT_SLOT(configureNotifications()), actionCollection() );
 	//actCfgNotifs->setEnabled(false); // Not yet implemented !
 
 	actAppConfig = KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT(showSettingsDialog()), actionCollection() );
@@ -238,7 +238,7 @@ void MainWindow::polish()
 		//resize(Settings::mainWindowSize());
 	}
 
-	KMainWindow::polish();
+	TDEMainWindow::polish();
 
 	if (shouldSave) {
 //		std::cout << "Main Window Position: Save size and position in show(x="
@@ -260,7 +260,7 @@ void MainWindow::resizeEvent(TQResizeEvent *event)
 
 	// Added to make it work (previous lines do not work):
 	//saveMainWindowSettings( TDEGlobal::config(), autoSaveGroup() );
-	KMainWindow::resizeEvent(event);
+	TDEMainWindow::resizeEvent(event);
 }
 
 void MainWindow::moveEvent(TQMoveEvent *event)
@@ -271,7 +271,7 @@ void MainWindow::moveEvent(TQMoveEvent *event)
 
 	// Added to make it work (previous lines do not work):
 	//saveMainWindowSettings( TDEGlobal::config(), autoSaveGroup() );
-	KMainWindow::moveEvent(event);
+	TDEMainWindow::moveEvent(event);
 }
 
 bool MainWindow::queryExit()
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 89fedd5..77c236c 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -37,8 +37,8 @@
 
 class TQWidget;
 class TQPoint;
-class KAction;
-class KToggleAction;
+class TDEAction;
+class TDEToggleAction;
 class TQPopupMenu;
 class TQSignalMapper;
 class TQStringList;
@@ -57,7 +57,7 @@ namespace KSettings { class Dialog; };
 /** The window that contain baskets, organized by tabs.
   * @author S�astien Laot
   */
-class MainWindow : public KMainWindow
+class MainWindow : public TDEMainWindow
 {
   Q_OBJECT
   
@@ -91,11 +91,11 @@ class MainWindow : public KMainWindow
 
   private:
 	// Settings actions :
-//	KToggleAction *m_actShowToolbar;
-	KToggleAction *m_actShowStatusbar;
-	KAction       *actQuit;
-	KAction       *actAppConfig;
-	TQPtrList<KAction> actBasketsList;
+//	TDEToggleAction *m_actShowToolbar;
+	TDEToggleAction *m_actShowStatusbar;
+	TDEAction       *actQuit;
+	TDEAction       *actAppConfig;
+	TQPtrList<TDEAction> actBasketsList;
 
   private:
 	TQVBoxLayout        *m_layout;
diff --git a/src/noteedit.cpp b/src/noteedit.cpp
index 141db05..01dbf11 100644
--- a/src/noteedit.cpp
+++ b/src/noteedit.cpp
@@ -796,7 +796,7 @@ InlineEditors* InlineEditors::instance()
 	return instance;
 }
 
-void InlineEditors::initToolBars(KActionCollection *actionCollection)
+void InlineEditors::initToolBars(TDEActionCollection *actionCollection)
 {
 	TQFont defaultFont;
 	TQColor textColor = (Global::bnpView && Global::bnpView->currentBasket() ?
@@ -818,32 +818,32 @@ void InlineEditors::initToolBars(KActionCollection *actionCollection)
 	richTextColor = new FocusedColorCombo(Global::mainWindow());
 	richTextColor->setFixedWidth(richTextColor->sizeHint().height() * 2);
 	richTextColor->setColor(textColor);
-	action = new KWidgetAction(richTextColor, i18n("Color"), KShortcut(), 0, TQT_SLOT(), actionCollection, "richtext_color");
+	action = new KWidgetAction(richTextColor, i18n("Color"), TDEShortcut(), 0, TQT_SLOT(), actionCollection, "richtext_color");
 
-	richTextBold      = new KToggleAction( i18n("Bold"),        "text_bold",   "Ctrl+B", actionCollection, "richtext_bold"      );
-	richTextItalic    = new KToggleAction( i18n("Italic"),      "text_italic", "Ctrl+I", actionCollection, "richtext_italic"    );
-	richTextUnderline = new KToggleAction( i18n("Underline"),   "text_under",  "Ctrl+U", actionCollection, "richtext_underline" );
+	richTextBold      = new TDEToggleAction( i18n("Bold"),        "text_bold",   "Ctrl+B", actionCollection, "richtext_bold"      );
+	richTextItalic    = new TDEToggleAction( i18n("Italic"),      "text_italic", "Ctrl+I", actionCollection, "richtext_italic"    );
+	richTextUnderline = new TDEToggleAction( i18n("Underline"),   "text_under",  "Ctrl+U", actionCollection, "richtext_underline" );
 
-//	richTextSuper     = new KToggleAction( i18n("Superscript"), "text_super",  "",       actionCollection, "richtext_super"     );
-//	richTextSub       = new KToggleAction( i18n("Subscript"),   "text_sub",    "",       actionCollection, "richtext_sub"       );
+//	richTextSuper     = new TDEToggleAction( i18n("Superscript"), "text_super",  "",       actionCollection, "richtext_super"     );
+//	richTextSub       = new TDEToggleAction( i18n("Subscript"),   "text_sub",    "",       actionCollection, "richtext_sub"       );
 
-	richTextLeft      = new KToggleAction( i18n("Align Left"),  "text_left",   "",       actionCollection, "richtext_left"      );
-	richTextCenter    = new KToggleAction( i18n("Centered"),    "text_center", "",       actionCollection, "richtext_center"    );
-	richTextRight     = new KToggleAction( i18n("Align Right"), "text_right",  "",       actionCollection, "richtext_right"     );
-	richTextJustified = new KToggleAction( i18n("Justified"),   "text_block",  "",       actionCollection, "richtext_block"     );
+	richTextLeft      = new TDEToggleAction( i18n("Align Left"),  "text_left",   "",       actionCollection, "richtext_left"      );
+	richTextCenter    = new TDEToggleAction( i18n("Centered"),    "text_center", "",       actionCollection, "richtext_center"    );
+	richTextRight     = new TDEToggleAction( i18n("Align Right"), "text_right",  "",       actionCollection, "richtext_right"     );
+	richTextJustified = new TDEToggleAction( i18n("Justified"),   "text_block",  "",       actionCollection, "richtext_block"     );
 
 	richTextLeft->setExclusiveGroup("rt_justify");
 	richTextCenter->setExclusiveGroup("rt_justify");
 	richTextRight->setExclusiveGroup("rt_justify");
 	richTextJustified->setExclusiveGroup("rt_justify");
 
-	richTextUndo      = new KAction( i18n("Undo"), "undo", "", actionCollection, "richtext_undo");
-	richTextRedo      = new KAction( i18n("Redo"), "redo", "", actionCollection, "richtext_redo");
+	richTextUndo      = new TDEAction( i18n("Undo"), "undo", "", actionCollection, "richtext_undo");
+	richTextRedo      = new TDEAction( i18n("Redo"), "redo", "", actionCollection, "richtext_redo");
 
 	disableRichTextToolBar();
 }
 
-KToolBar* InlineEditors::richTextToolBar()
+TDEToolBar* InlineEditors::richTextToolBar()
 {
 	if (Global::mainWindow()) {
 		Global::mainWindow()->toolBar(); // Make sure we create the main toolbar FIRST, so it will be on top of the edit toolbar!
diff --git a/src/noteedit.h b/src/noteedit.h
index 449a620..722a046 100644
--- a/src/noteedit.h
+++ b/src/noteedit.h
@@ -31,9 +31,9 @@ class TQPushButton;
 class KIconButton;
 class KURLRequester;
 class KTextEdit;
-class KMainWindow;
+class TDEMainWindow;
 class KTooolBar;
-class KToggleAction;
+class TDEToggleAction;
 
 class FontSizeCombo;
 
@@ -276,28 +276,28 @@ class InlineEditors : public TQObject
   public:
 	InlineEditors();
 	~InlineEditors();
-	void initToolBars(KActionCollection *actionCollection);
+	void initToolBars(TDEActionCollection *actionCollection);
 	static InlineEditors* instance();
 
   public:
 	// Rich Text ToolBar:
-	KToolBar* richTextToolBar();
+	TDEToolBar* richTextToolBar();
 	void enableRichTextToolBar();
 	void disableRichTextToolBar();
 	FocusedFontCombo  *richTextFont;
 	FontSizeCombo     *richTextFontSize;
 	FocusedColorCombo *richTextColor;
-	KToggleAction     *richTextBold;
-	KToggleAction     *richTextItalic;
-	KToggleAction     *richTextUnderline;
-//	KToggleAction     *richTextSuper;
-//	KToggleAction     *richTextSub;
-	KToggleAction     *richTextLeft;
-	KToggleAction     *richTextCenter;
-	KToggleAction     *richTextRight;
-	KToggleAction     *richTextJustified;
-	KAction	  *richTextUndo;
-	KAction	  *richTextRedo;
+	TDEToggleAction     *richTextBold;
+	TDEToggleAction     *richTextItalic;
+	TDEToggleAction     *richTextUnderline;
+//	TDEToggleAction     *richTextSuper;
+//	TDEToggleAction     *richTextSub;
+	TDEToggleAction     *richTextLeft;
+	TDEToggleAction     *richTextCenter;
+	TDEToggleAction     *richTextRight;
+	TDEToggleAction     *richTextJustified;
+	TDEAction	  *richTextUndo;
+	TDEAction	  *richTextRedo;
 };
 
 #endif // NOTEEDIT_H
diff --git a/src/notefactory.cpp b/src/notefactory.cpp
index 97fc06c..81d40f1 100644
--- a/src/notefactory.cpp
+++ b/src/notefactory.cpp
@@ -499,7 +499,7 @@ Note* NoteFactory::dropURLs(KURL::List urls, Basket *parent, TQDropEvent::Action
 				break;
 			}
 			if (shouldAsk) {
-				KPopupMenu menu(parent);
+				TDEPopupMenu menu(parent);
 				menu.insertItem( SmallIconSet("goto"),     i18n("&Move Here\tShift"),      0 );
 				menu.insertItem( SmallIconSet("editcopy"), i18n("&Copy Here\tCtrl"),       1 );
 				menu.insertItem( SmallIconSet("www"),      i18n("&Link Here\tCtrl+Shift"), 2 );
diff --git a/src/popupmenu.h b/src/popupmenu.h
index e9bdaae..b5f6499 100644
--- a/src/popupmenu.h
+++ b/src/popupmenu.h
@@ -24,7 +24,7 @@
 class TQPopupMenu;
 class TQRect;
 
-/** TQPopupMenu/KPopupMenu doesn't provide metod to exec a menu
+/** TQPopupMenu/TDEPopupMenu doesn't provide metod to exec a menu
   * at a given rectangle !
   * eg, popup at bottom of a rectangle, and at top if not possible...
   * @author Sébastien Laoût
diff --git a/src/systemtray.cpp b/src/systemtray.cpp
index ee54d1d..e3aad0c 100644
--- a/src/systemtray.cpp
+++ b/src/systemtray.cpp
@@ -97,7 +97,7 @@ void KSystemTray2::displayCloseMessage(TQString fileMenu)
 	TQCString screenstr;
 	screenstr.setNum(tqt_xscreen());
 	TQCString trayatom = "_NET_SYSTEM_TRAY_S" + screenstr;
-	bool useSystray = (KSelectionWatcher(trayatom.data()).owner() != 0L);
+	bool useSystray = (TDESelectionWatcher(trayatom.data()).owner() != 0L);
 
 	// 2. And then if the icon is visible too (eg. this->show() has been called):
 	useSystray = useSystray && isVisible();
@@ -237,7 +237,7 @@ void SystemTray::mousePressEvent(TQMouseEvent *event)
 			Global::bnpView->showPassiveDropped(i18n("Pasted selection to basket <i>%1</i>"));
 		event->accept();
 	} else if (event->button() & Qt::RightButton) { // Popup menu
-		KPopupMenu menu(this);
+		TDEPopupMenu menu(this);
 		menu.insertTitle( SmallIcon("basket"), kapp->aboutData()->programName() );
 
 		Global::bnpView->actNewBasket->plug(&menu);
@@ -250,7 +250,7 @@ void SystemTray::mousePressEvent(TQMouseEvent *event)
 
 		if(!Global::bnpView->isPart())
 		{
-			KAction* action;
+			TDEAction* action;
 
 			menu.insertSeparator();
 
diff --git a/src/systemtray.h b/src/systemtray.h
index 8d18bae..ef341db 100644
--- a/src/systemtray.h
+++ b/src/systemtray.h
@@ -41,7 +41,7 @@ class KSystemTray2 : public KSystemTray
 	  * (the [x]) to inform him that the application sit in the system tray
 	  * and willn't be closed (as he is used to).
 	  *
-	  * You usualy call it from reimplemented KMainWindow::queryClose()
+	  * You usualy call it from reimplemented TDEMainWindow::queryClose()
 	  *
 	  * @since 3.4
 	  */
diff --git a/src/tag.cpp b/src/tag.cpp
index b7e9ea7..27327d1 100644
--- a/src/tag.cpp
+++ b/src/tag.cpp
@@ -223,7 +223,7 @@ Tag::Tag()
 	static int tagNumber = 0;
 	++tagNumber;
 	TQString sAction = "tag_shortcut_number_" + TQString::number(tagNumber);
-	m_action = new KAction("FAKE TEXT", "FAKE ICON", KShortcut(), TQT_TQOBJECT(Global::bnpView), TQT_SLOT(activatedTagShortcut()), Global::bnpView->actionCollection(), sAction);
+	m_action = new TDEAction("FAKE TEXT", "FAKE ICON", TDEShortcut(), TQT_TQOBJECT(Global::bnpView), TQT_SLOT(activatedTagShortcut()), Global::bnpView->actionCollection(), sAction);
 	m_action->setShortcutConfigurable(false); // We do it in the tag properties dialog
 
 	m_inheritedBySiblings = false;
@@ -249,7 +249,7 @@ State* Tag::stateForId(const TQString &id)
 	return 0;
 }
 
-Tag* Tag::tagForKAction(KAction *action)
+Tag* Tag::tagForTDEAction(TDEAction *action)
 {
 	for (List::iterator it = all.begin(); it != all.end(); ++it)
 		if ((*it)->m_action == action)
@@ -293,7 +293,7 @@ TQMap<TQString, TQString> Tag::loadTags(const TQString &path/* = TQString()*//*,
 			TQString shortcut  = XMLWork::getElementText(element, "shortcut");
 			TQString inherited = XMLWork::getElementText(element, "inherited", "false");
 			tag->setName(name);
-			tag->setShortcut(KShortcut(shortcut));
+			tag->setShortcut(TDEShortcut(shortcut));
 			tag->setInheritedBySiblings(XMLWork::trueOrFalse(inherited));
 			// Load states:
 			TQDomNode subNode = element.firstChild();
diff --git a/src/tag.h b/src/tag.h
index 4683a37..50e1fa6 100644
--- a/src/tag.h
+++ b/src/tag.h
@@ -113,7 +113,7 @@ class Tag
 	typedef TQValueList<Tag*> List;
 	static Tag::List all;
 	static State* stateForId(const TQString &id);
-	static Tag* tagForKAction(KAction *action);
+	static Tag* tagForTDEAction(TDEAction *action);
 	static Tag* tagSimilarTo(Tag *tagToTest);
 	static TQMap<TQString, TQString> loadTags(const TQString &path = TQString()/*, bool merge = false*/); /// << Load the tags contained in the XML file @p path or those in the application settings if @p path isEmpty(). If @p merge is true and a tag with the id of a tag that should be loaded already exist, the tag will get a new id. Otherwise, the tag will be dismissed.
 	static void saveTags();
@@ -129,13 +129,13 @@ class Tag
 	~Tag();
 	/// SET PROPERTIES:
 	void setName(const TQString &name);
-	void setShortcut(const KShortcut &shortcut) { m_action->setShortcut(shortcut);                   }
+	void setShortcut(const TDEShortcut &shortcut) { m_action->setShortcut(shortcut);                   }
 	void setInheritedBySiblings(bool inherited) { m_inheritedBySiblings = inherited;                 }
 	void appendState(State *state)              { m_states.append(state); state->setParentTag(this); }
 	void removeState(State *state)              { m_states.remove(state); state->setParentTag(0);    }
 	/// GET PROPERTIES:
 	TQString      name()                const { return m_name;                 }
-	KShortcut    shortcut()            const { return m_action->shortcut();   }
+	TDEShortcut    shortcut()            const { return m_action->shortcut();   }
 	bool         inheritedBySiblings() const { return m_inheritedBySiblings;  }
 	State::List& states()              const { return (State::List&)m_states; }
 	int          countStates()         const { return m_states.count();       }
@@ -143,7 +143,7 @@ class Tag
   private:
 	/// PROPERTIES:
 	TQString      m_name;
-	KAction     *m_action;
+	TDEAction     *m_action;
 	bool         m_inheritedBySiblings;
 	State::List  m_states;
 };
diff --git a/src/tagsedit.cpp b/src/tagsedit.cpp
index f1ad3bd..9ec4972 100644
--- a/src/tagsedit.cpp
+++ b/src/tagsedit.cpp
@@ -381,7 +381,7 @@ TagsEditDialog::TagsEditDialog(TQWidget *parent, State *stateToEdit, bool addNew
 	m_shortcut = new KKeyButton(tagWidget);
 	m_removeShortcut = new TQPushButton(i18n("Remove tag shortcut", "&Remove"), tagWidget);
 	TQLabel *shortcutLabel = new TQLabel(m_shortcut, i18n("S&hortcut:"), tagWidget);
-	connect( m_shortcut,       TQT_SIGNAL(capturedShortcut(const KShortcut&)), this, TQT_SLOT(capturedShortcut(const KShortcut&)) );
+	connect( m_shortcut,       TQT_SIGNAL(capturedShortcut(const TDEShortcut&)), this, TQT_SLOT(capturedShortcut(const TDEShortcut&)) );
 	connect( m_removeShortcut, TQT_SIGNAL(clicked()),                          this, TQT_SLOT(removeShortcut())                   );
 
 	m_inherit = new TQCheckBox(i18n("&Inherited by new sibling notes"), tagWidget);
@@ -466,7 +466,7 @@ TagsEditDialog::TagsEditDialog(TQWidget *parent, State *stateToEdit, bool addNew
 	m_textColor = new KColorCombo2(TQColor(), TDEGlobalSettings::textColor(), stateWidget);
 	TQLabel *textColorLabel = new TQLabel(m_textColor, i18n("Co&lor:"), stateWidget);
 
-	m_font = new KFontCombo(stateWidget);
+	m_font = new TDEFontCombo(stateWidget);
 	m_font->insertItem(i18n("(Default)"), 0);
 	TQLabel *fontLabel = new TQLabel(m_font, i18n("&Font:"), stateWidget);
 
@@ -589,7 +589,7 @@ TagsEditDialog::TagsEditDialog(TQWidget *parent, State *stateToEdit, bool addNew
 
 	// Connect Signals:
 	connect( m_tagName,         TQT_SIGNAL(textChanged(const TQString&)),        this, TQT_SLOT(modified()) );
-	connect( m_shortcut,        TQT_SIGNAL(capturedShortcut(const KShortcut&)), this, TQT_SLOT(modified()) );
+	connect( m_shortcut,        TQT_SIGNAL(capturedShortcut(const TDEShortcut&)), this, TQT_SLOT(modified()) );
 	connect( m_inherit,         TQT_SIGNAL(stateChanged(int)),                  this, TQT_SLOT(modified()) );
 	connect( m_stateName,       TQT_SIGNAL(textChanged(const TQString&)),        this, TQT_SLOT(modified()) );
 	connect( m_emblem,          TQT_SIGNAL(iconChanged(TQString)),               this, TQT_SLOT(modified()) );
@@ -962,7 +962,7 @@ void TagsEditDialog::renameIt()
 		m_stateName->setFocus();
 }
 
-void TagsEditDialog::capturedShortcut(const KShortcut &shortcut)
+void TagsEditDialog::capturedShortcut(const TDEShortcut &shortcut)
 {
 	// TODO: Validate it!
 	m_shortcut->setShortcut(shortcut, /*bTQtShortcut=*/true);
@@ -970,7 +970,7 @@ void TagsEditDialog::capturedShortcut(const KShortcut &shortcut)
 
 void TagsEditDialog::removeShortcut()
 {
-	m_shortcut->setShortcut(KShortcut(), /*bTQtShortcut=*/true);
+	m_shortcut->setShortcut(TDEShortcut(), /*bTQtShortcut=*/true);
 	modified();
 }
 
diff --git a/src/tagsedit.h b/src/tagsedit.h
index f371c73..90e3d1a 100644
--- a/src/tagsedit.h
+++ b/src/tagsedit.h
@@ -32,9 +32,9 @@ class TQCheckBox;
 class KPushButton;
 class KKeyButton;
 class KIconButton;
-class KFontCombo;
+class TDEFontCombo;
 class TQLabel;
-class KShortcut;
+class TDEShortcut;
 
 class KColorCombo2;
 
@@ -133,7 +133,7 @@ class TagsEditDialog : public KDialogBase
 	void moveDown();
 	void deleteTag();
 	void renameIt();
-	void capturedShortcut(const KShortcut &shortcut);
+	void capturedShortcut(const TDEShortcut &shortcut);
 	void removeShortcut();
 	void removeEmblem();
 	void modified();
@@ -171,7 +171,7 @@ class TagsEditDialog : public KDialogBase
 	TQPushButton   *m_italic;
 	TQPushButton   *m_strike;
 	KColorCombo2  *m_textColor;
-	KFontCombo    *m_font;
+	TDEFontCombo    *m_font;
 	FontSizeCombo *m_fontSize;
 	KColorCombo2  *m_backgroundColor;
 	TQLineEdit     *m_textEquivalent;
diff --git a/src/variouswidgets.cpp b/src/variouswidgets.cpp
index 705aa98..b1a4d49 100644
--- a/src/variouswidgets.cpp
+++ b/src/variouswidgets.cpp
@@ -276,7 +276,7 @@ FontSizeCombo::FontSizeCombo(bool rw, bool withDefault, TQWidget *parent, const
 //	connect( this, TQT_SIGNAL(acivated(const TQString&)), this, TQT_SLOT(textChangedInCombo(const TQString&)) );
 	connect( this, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(textChangedInCombo(const TQString&)) );
 
-	// TODO: 01617 void KFontSizeAction::setFontSize( int size )
+	// TODO: 01617 void TDEFontSizeAction::setFontSize( int size )
 }
 
 FontSizeCombo::~FontSizeCombo()
@@ -305,7 +305,7 @@ void FontSizeCombo::setFontSize(int size)
 {
 	setCurrentText(TQString::number(size));
 
-	// TODO: SEE KFontSizeAction::setFontSize( int size ) !!! for a more complete method!
+	// TODO: SEE TDEFontSizeAction::setFontSize( int size ) !!! for a more complete method!
 }
 
 int FontSizeCombo::fontSize()