Rename a number of classes to enhance compatibility with KDE4

26 files changed, 232 insertions, 232 deletions

diff --git a/kexi/formeditor/TODO b/kexi/formeditor/TODO
index 611d5c0c..bb435414 100644
--- a/kexi/formeditor/TODO
+++ b/kexi/formeditor/TODO
@@ -1,6 +1,6 @@
 ^^^^^^^^^^^^^^^  IMPORTANT  ^^^^^^^^^^^^^^^^^^^^^^
 **** New Features : ******
-* KMainWindow support : Make an action editor + a toolbar editor (as in MozillaFirebird ?) + a menu editor
+* TDEMainWindow support : Make an action editor + a toolbar editor (as in MozillaFirebird ?) + a menu editor
   (see Gambas and askk other devs if they already have done this)
 * Automatically set label name to the text
 * Create an event editor and manage signals/slots (EventBuffer ?)
@@ -61,6 +61,6 @@
 * Manage label buddies using a popup menu (24/05/04)
 * dragging with CTRL key can cause object's copying (25/05/04)
 * Create a PixmapCollection with an editor which allow to choose pixmaps by path or from KDE icons, no inline saving of pixmaps (9/06/04)
-* Make actions toggable (with KToggleAction) (js 11/06/04)
+* Make actions toggable (with TDEToggleAction) (js 11/06/04)
 * Make FormWidget pure virtual (17/06/04)
 * Resize label to fit the text (22/06/04)
diff --git a/kexi/formeditor/commands.cpp b/kexi/formeditor/commands.cpp
index 929624ab..fece5065 100644
--- a/kexi/formeditor/commands.cpp
+++ b/kexi/formeditor/commands.cpp
@@ -748,7 +748,7 @@ InsertWidgetCommand::execute()
 //! @todo allow setting this for data view mode as well
 	if (m_form->designMode()) {
 		//don't generate accelerators for widgets in design mode
-		KAcceleratorManager::setNoAccel(w);
+		TDEAcceleratorManager::setNoAccel(w);
 	}
 #endif
 
@@ -902,7 +902,7 @@ CreateLayoutCommand::execute()
 	if (w) {
 		if (m_form->designMode()) {
 			//don't generate accelerators for widgets in design mode
-			KAcceleratorManager::setNoAccel(w);
+			TDEAcceleratorManager::setNoAccel(w);
 		}
 	}
 #endif
diff --git a/kexi/formeditor/editlistviewdialog.cpp b/kexi/formeditor/editlistviewdialog.cpp
index 281e5604..0287135e 100644
--- a/kexi/formeditor/editlistviewdialog.cpp
+++ b/kexi/formeditor/editlistviewdialog.cpp
@@ -87,7 +87,7 @@ EditListViewDialog::EditListViewDialog(TQWidget *parent)
 	vlayout->addStretch();
 
 	//// The listview ///////////
-	m_listview = new KListView(m_contents, "editlistview_listview");
+	m_listview = new TDEListView(m_contents, "editlistview_listview");
 	m_listview->setItemsRenameable(true);
 	m_listview->setItemsMovable(true);
 	m_listview->setDragEnabled(true);
@@ -148,7 +148,7 @@ EditListViewDialog::EditListViewDialog(TQWidget *parent)
 	vbox->addStretch();
 
 	// The listbox with columns name /////
-	m_listbox = new KListBox(m_column, "editlistview_columns");
+	m_listbox = new TDEListBox(m_column, "editlistview_columns");
 	m_listbox->setFocus();
 	hbox->insertWidget(0, m_listbox);
 	hbox->addWidget(m_editor);
@@ -364,12 +364,12 @@ void
 EditListViewDialog::loadChildNodes(TQListView *listview, TQListViewItem *item, TQListViewItem *parent)
 {
 	TQListViewItem *newItem;
-	if(listview->inherits("KListView"))
+	if(listview->inherits("TDEListView"))
 	{
 		if(parent)
-			newItem = new KListViewItem(parent);
+			newItem = new TDEListViewItem(parent);
 		else
-			newItem = new KListViewItem(listview);
+			newItem = new TDEListViewItem(listview);
 	}
 	else
 	{
@@ -406,14 +406,14 @@ EditListViewDialog::loadChildNodes(TQListView *listview, TQListViewItem *item, T
 void
 EditListViewDialog::newRow()
 {
-	KListViewItem *parent = (KListViewItem*)m_listview->selectedItem();
+	TDEListViewItem *parent = (TDEListViewItem*)m_listview->selectedItem();
 	if(parent)
-		parent = (KListViewItem*)parent->parent();
-	KListViewItem *item;
+		parent = (TDEListViewItem*)parent->parent();
+	TDEListViewItem *item;
 	if(parent)
-		item = new KListViewItem(parent, m_listview->selectedItem());
+		item = new TDEListViewItem(parent, m_listview->selectedItem());
 	else
-		item = new KListViewItem(m_listview, m_listview->selectedItem());
+		item = new TDEListViewItem(m_listview, m_listview->selectedItem());
 	item->setText(0, i18n("New Item"));
 	m_listview->setCurrentItem(item);
 }
@@ -421,12 +421,12 @@ EditListViewDialog::newRow()
 void
 EditListViewDialog::newChildRow()
 {
-	KListViewItem *parent = (KListViewItem*)m_listview->currentItem();
-	KListViewItem *item;
+	TDEListViewItem *parent = (TDEListViewItem*)m_listview->currentItem();
+	TDEListViewItem *item;
 	if(parent)
-		item = new KListViewItem(parent);
+		item = new TDEListViewItem(parent);
 	else
-		item = new KListViewItem(m_listview, m_listview->currentItem());
+		item = new TDEListViewItem(m_listview, m_listview->currentItem());
 	item->setText(0, i18n("Sub Item"));
 
 	m_listview->setCurrentItem(item);
diff --git a/kexi/formeditor/editlistviewdialog.h b/kexi/formeditor/editlistviewdialog.h
index 0eb3017b..cfbaadbb 100644
--- a/kexi/formeditor/editlistviewdialog.h
+++ b/kexi/formeditor/editlistviewdialog.h
@@ -27,9 +27,9 @@
 class TQFrame;
 class TQListView;
 class TQListViewItem;
-class KListViewItem;
-class KListView;
-class KListBox;
+class TDEListViewItem;
+class TDEListView;
+class TDEListBox;
 class TQListBoxItem;
 
 namespace KoProperty {
@@ -40,12 +40,12 @@ namespace KoProperty {
 
 namespace KFormDesigner {
 
-//! A dialog to edit the contents of a listvuew (KListView or TQListView)
+//! A dialog to edit the contents of a listvuew (TDEListView or TQListView)
 /*! The dialog contains two pages, one to edit columns and one to edit ist items. 
  KoProperty::Editor is used in columns to edit column properties
  (there are two properties not supported by TQt Designer: 'width' and 'resizable'). 
  The user can enter list contents inside the list
- using KListViewItem::setRenameable(). Pixmaps are not yet supported. */
+ using TDEListViewItem::setRenameable(). Pixmaps are not yet supported. */
 class KFORMEDITOR_EXPORT EditListViewDialog : public KDialogBase
 {
 	Q_OBJECT
@@ -84,8 +84,8 @@ class KFORMEDITOR_EXPORT EditListViewDialog : public KDialogBase
 		KoProperty::Editor  *m_editor;
 		KoProperty::Set  *m_propSet;
 		TQFrame   *m_contents, *m_column;
-		KListBox  *m_listbox;
-		KListView  *m_listview;
+		TDEListBox  *m_listbox;
+		TDEListView  *m_listview;
 		TQIntDict<TQToolButton>  m_buttons;
 };
 
diff --git a/kexi/formeditor/factories/stdwidgetfactory.cpp b/kexi/formeditor/factories/stdwidgetfactory.cpp
index be97d921..1669b329 100644
--- a/kexi/formeditor/factories/stdwidgetfactory.cpp
+++ b/kexi/formeditor/factories/stdwidgetfactory.cpp
@@ -217,7 +217,7 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin
 
 	KFormDesigner::WidgetInfo *wListBox = new KFormDesigner::WidgetInfo(this);
 	wListBox->setPixmap("listbox");
-	wListBox->setClassName("KListBox");
+	wListBox->setClassName("TDEListBox");
 	wListBox->addAlternateClassName(TQLISTBOX_OBJECT_NAME_STRING);
 	wListBox->setIncludeFileName("klistbox.h");
 	wListBox->setName(i18n("List Box"));
@@ -239,7 +239,7 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin
 
 	KFormDesigner::WidgetInfo *wListView = new KFormDesigner::WidgetInfo(this);
 	wListView->setPixmap("listview");
-	wListView->setClassName("KListView");
+	wListView->setClassName("TDEListView");
 	wListView->addAlternateClassName(TQLISTVIEW_OBJECT_NAME_STRING);
 	wListView->setIncludeFileName("klistview.h");
 	wListView->setName(i18n("List View"));
@@ -411,18 +411,18 @@ StdWidgetFactory::createWidget(const TQCString &c, TQWidget *p, const char *n,
 	else if(c == "KComboBox")
 		w = new KComboBox(p, n);
 
-	else if(c == "KListBox")
-		w = new KListBox(p, n);
+	else if(c == "TDEListBox")
+		w = new TDEListBox(p, n);
 
 	else if(c == "KTextEdit")
 		w = new KTextEdit(/*i18n("Enter your text here")*/text, TQString(), p, n);
 
-	else if(c == "KListView")
+	else if(c == "TDEListView")
 	{
-		w = new KListView(p, n);
+		w = new TDEListView(p, n);
 		if(container->form()->interactiveMode())
-			((KListView*)w)->addColumn(i18n("Column 1"));
-		((KListView*)w)->setRootIsDecorated(true);
+			((TDEListView*)w)->addColumn(i18n("Column 1"));
+		((TDEListView*)w)->setRootIsDecorated(true);
 	}
 	else if(c == TQSLIDER_OBJECT_NAME_STRING)
 		w = new TQSlider(Qt::Horizontal, p, n);
@@ -475,7 +475,7 @@ StdWidgetFactory::createMenuActions(const TQCString &classname, TQWidget *, TQPo
 		menu->insertItem(SmallIconSet("edit"), i18n("Edit Rich Text"), this, TQT_SLOT(editText()));
 		return true;
 	}
-	else if(classname == "KListView")
+	else if(classname == "TDEListView")
 	{
 		menu->insertItem(SmallIconSet("edit"), i18n("Edit Listview Contents"), this, TQT_SLOT(editListContents()));
 		return true;
@@ -538,12 +538,12 @@ StdWidgetFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDes
 		createEditor(classname, check->text(), check, container, editorRect, TQt::AlignAuto);
 		return true;
 	}
-	else if((classname == "KComboBox") || (classname == "KListBox"))
+	else if((classname == "KComboBox") || (classname == "TDEListBox"))
 	{
 		TQStringList list;
-		if(classname == "KListBox")
+		if(classname == "TDEListBox")
 		{
-			KListBox *listbox = (KListBox*)w;
+			TDEListBox *listbox = (TDEListBox*)w;
 			for(uint i=0; i < listbox->count(); i++)
 				list.append(listbox->text(i));
 		}
@@ -556,10 +556,10 @@ StdWidgetFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDes
 
 		if(editList(w, list))
 		{
-			if(classname == "KListBox")
+			if(classname == "TDEListBox")
 			{
-				((KListBox*)w)->clear();
-				((KListBox*)w)->insertStringList(list);
+				((TDEListBox*)w)->clear();
+				((TDEListBox*)w)->insertStringList(list);
 			}
 			else if(classname == "KComboBox")
 			{
@@ -582,10 +582,10 @@ StdWidgetFactory::clearWidgetContent(const TQCString &classname, TQWidget *w)
 {
 	if(classname == "KLineEdit")
 		((KLineEdit*)w)->clear();
-	else if(classname == "KListBox")
-		((KListBox*)w)->clear();
-	else if(classname == "KListView")
-		((KListView*)w)->clear();
+	else if(classname == "TDEListBox")
+		((TDEListBox*)w)->clear();
+	else if(classname == "TDEListView")
+		((TDEListView*)w)->clear();
 	else if(classname == "KComboBox")
 		((KComboBox*)w)->clear();
 	else if(classname == "KTextEdit")
@@ -680,9 +680,9 @@ StdWidgetFactory::saveSpecialProperty(const TQCString &classname, const TQString
 		}
 		return true;
 	}
-	else if(name == "list_items" && classname == "KListBox")
+	else if(name == "list_items" && classname == "TDEListBox")
 	{
-		KListBox *listbox = (KListBox*)w;
+		TDEListBox *listbox = (TDEListBox*)w;
 		for(uint i=0; i < listbox->count(); i++)
 		{
 			TQDomElement item = domDoc.createElement("item");
@@ -691,9 +691,9 @@ StdWidgetFactory::saveSpecialProperty(const TQCString &classname, const TQString
 		}
 		return true;
 	}
-	else if(name == "list_contents" && classname == "KListView")
+	else if(name == "list_contents" && classname == "TDEListView")
 	{
-		KListView *listview = (KListView*)w;
+		TDEListView *listview = (TDEListView*)w;
 		// First we save the columns
 		for(int i = 0; i < listview->columns(); i++)
 		{
@@ -755,9 +755,9 @@ StdWidgetFactory::readSpecialProperty(const TQCString &classname, TQDomElement &
 		return true;
 	}
 
-	if((tag == "item") && (classname == "KListBox"))
+	if((tag == "item") && (classname == "TDEListBox"))
 	{
-		KListBox *listbox = (KListBox*)w;
+		TDEListBox *listbox = (TDEListBox*)w;
 		TQVariant val = KFormDesigner::FormIO::readPropertyValue(node.firstChild().firstChild(), TQT_TQOBJECT(w), name);
 		if(val.canCast(TQVariant::Pixmap))
 			listbox->insertItem(val.toPixmap());
@@ -766,9 +766,9 @@ StdWidgetFactory::readSpecialProperty(const TQCString &classname, TQDomElement &
 		return true;
 	}
 
-	if((tag == "column") && (classname == "KListView"))
+	if((tag == "column") && (classname == "TDEListView"))
 	{
-		KListView *listview = (KListView*)w;
+		TDEListView *listview = (TDEListView*)w;
 		int id=0;
 		for(TQDomNode n = node.firstChild(); !n.isNull(); n = n.nextSibling())
 		{
@@ -787,9 +787,9 @@ StdWidgetFactory::readSpecialProperty(const TQCString &classname, TQDomElement &
 		}
 		return true;
 	}
-	else if((tag == "item") && (classname == "KListView"))
+	else if((tag == "item") && (classname == "TDEListView"))
 	{
-		KListView *listview = (KListView*)w;
+		TDEListView *listview = (TDEListView*)w;
 		readListItem(node, 0, listview);
 		return true;
 	}
@@ -798,13 +798,13 @@ StdWidgetFactory::readSpecialProperty(const TQCString &classname, TQDomElement &
 }
 
 void
-StdWidgetFactory::readListItem(TQDomElement &node, TQListViewItem *parent, KListView *listview)
+StdWidgetFactory::readListItem(TQDomElement &node, TQListViewItem *parent, TDEListView *listview)
 {
 	TQListViewItem *item;
 	if(parent)
-		item = new KListViewItem(parent);
+		item = new TDEListViewItem(parent);
 	else
-		item = new KListViewItem(listview);
+		item = new TDEListViewItem(listview);
 
 	// We need to move the item at the end of the list
 	TQListViewItem *last;
@@ -919,9 +919,9 @@ StdWidgetFactory::autoSaveProperties(const TQCString &classname)
 		l << "pixmap";
 	else if(classname == "KComboBox")
 		l << "list_items";
-	else if(classname == "KListBox")
+	else if(classname == "TDEListBox")
 		l << "list_items";
-	else if(classname == "KListView")
+	else if(classname == "TDEListView")
 		l << "list_contents";
 	else if(classname == "Line")
 		l << "orientation";
diff --git a/kexi/formeditor/factories/stdwidgetfactory.h b/kexi/formeditor/factories/stdwidgetfactory.h
index a99bf6a8..32898782 100644
--- a/kexi/formeditor/factories/stdwidgetfactory.h
+++ b/kexi/formeditor/factories/stdwidgetfactory.h
@@ -92,7 +92,7 @@ class StdWidgetFactory : public KFormDesigner::WidgetFactory
 		virtual bool changeText(const TQString &newText);
 		virtual void resizeEditor(TQWidget *editor, TQWidget *widget, const TQCString &classname);
 		void saveListItem(TQListViewItem *item, TQDomNode &parentNode, TQDomDocument &domDoc);
-		void readListItem(TQDomElement &node, TQListViewItem *parent, KListView *listview);
+		void readListItem(TQDomElement &node, TQListViewItem *parent, TDEListView *listview);
 
 	private:
 //		KFormDesigner::Container *m_container;
diff --git a/kexi/formeditor/form.cpp b/kexi/formeditor/form.cpp
index 52d44966..31344419 100644
--- a/kexi/formeditor/form.cpp
+++ b/kexi/formeditor/form.cpp
@@ -97,7 +97,7 @@ Form::Form(WidgetLibrary* library, const char *name, bool designMode)
 	d->design = designMode;
 
 	// Init actions
-	d->collection = new KActionCollection(0, this);
+	d->collection = new TDEActionCollection(0, this);
 	d->history = new KCommandHistory(d->collection, true);
 	connect(d->history, TQT_SIGNAL(commandExecuted()), this, TQT_SLOT(slotCommandExecuted()));
 	connect(d->history, TQT_SIGNAL(documentRestored()), this, TQT_SLOT(slotFormRestored()));
@@ -321,11 +321,11 @@ Form::emitActionSignals(bool withUndoAction)
 	if(!withUndoAction)
 		return;
 
-	KAction *undoAction = d->collection->action("edit_undo");
+	TDEAction *undoAction = d->collection->action("edit_undo");
 	if(undoAction)
 		FormManager::self()->emitUndoEnabled(undoAction->isEnabled(), undoAction->text());
 
-	KAction *redoAction = d->collection->action("edit_redo");
+	TDEAction *redoAction = d->collection->action("edit_redo");
 	if(redoAction)
 		FormManager::self()->emitRedoEnabled(redoAction->isEnabled(), redoAction->text());
 }
@@ -428,7 +428,7 @@ Form::slotCommandExecuted()
 void
 Form::emitUndoEnabled()
 {
-	KAction *undoAction = d->collection->action("edit_undo");
+	TDEAction *undoAction = d->collection->action("edit_undo");
 	if(undoAction)
 		FormManager::self()->emitUndoEnabled(undoAction->isEnabled(), undoAction->text());
 }
@@ -436,7 +436,7 @@ Form::emitUndoEnabled()
 void
 Form::emitRedoEnabled()
 {
-	KAction *redoAction = d->collection->action("edit_redo");
+	TDEAction *redoAction = d->collection->action("edit_redo");
 	if(redoAction)
 		FormManager::self()->emitRedoEnabled(redoAction->isEnabled(), redoAction->text());
 }
diff --git a/kexi/formeditor/form.h b/kexi/formeditor/form.h
index 084e7d20..7f79cf79 100644
--- a/kexi/formeditor/form.h
+++ b/kexi/formeditor/form.h
@@ -31,7 +31,7 @@
 
 class TQWidget;
 class TQDomElement;
-class KActionCollection;
+class TDEActionCollection;
 class KCommandHistory;
 class KCommand;
 class PixmapCollection;
@@ -101,7 +101,7 @@ class FormPrivate
 		TQString  filename;
 
 		KCommandHistory  *history;
-		KActionCollection  *collection;
+		TDEActionCollection  *collection;
 
 		ObjectTreeList  tabstops;
 		bool  autoTabstops;
diff --git a/kexi/formeditor/formIO.cpp b/kexi/formeditor/formIO.cpp
index f90efddd..993b2451 100644
--- a/kexi/formeditor/formIO.cpp
+++ b/kexi/formeditor/formIO.cpp
@@ -1201,7 +1201,7 @@ FormIO::loadWidget(Container *container, const TQDomElement &el, TQWidget *paren
 //! @todo allow setting this for data view mode as well
 	if (m_currentForm->designMode()) {
 		//don't generate accelerators for widgets in design mode
-		KAcceleratorManager::setNoAccel(w);
+		TDEAcceleratorManager::setNoAccel(w);
 	}
 #endif
 	w->setStyle(&(container->widget()->style()));
diff --git a/kexi/formeditor/formmanager.cpp b/kexi/formeditor/formmanager.cpp
index f9849c35..284ce405 100644
--- a/kexi/formeditor/formmanager.cpp
+++ b/kexi/formeditor/formmanager.cpp
@@ -192,7 +192,7 @@ FormManager::setObjectTreeView(ObjectTreeView *treeview)
 }
 
 ActionList
-FormManager::createActions(WidgetLibrary *lib, KActionCollection* collection, KXMLGUIClient* client)
+FormManager::createActions(WidgetLibrary *lib, TDEActionCollection* collection, KXMLGUIClient* client)
 {
 	m_collection = collection;
 
@@ -201,8 +201,8 @@ FormManager::createActions(WidgetLibrary *lib, KActionCollection* collection, KX
 	if (m_options & HideSignalSlotConnections)
 		m_dragConnection = 0;
 	else {
-		m_dragConnection = new KToggleAction(i18n("Connect Signals/Slots"),
-			"signalslot", KShortcut(0), this, TQT_SLOT(startCreatingConnection()), m_collection,
+		m_dragConnection = new TDEToggleAction(i18n("Connect Signals/Slots"),
+			"signalslot", TDEShortcut(0), this, TQT_SLOT(startCreatingConnection()), m_collection,
 			"drag_connection");
 		//to be exclusive with any 'widget' action
 		m_dragConnection->setExclusiveGroup("LibActionWidgets");
@@ -210,19 +210,19 @@ FormManager::createActions(WidgetLibrary *lib, KActionCollection* collection, KX
 		actions.append(m_dragConnection);
 	}
 
-	m_pointer = new KToggleAction(i18n("Pointer"), "mouse_pointer", KShortcut(0), 
+	m_pointer = new TDEToggleAction(i18n("Pointer"), "mouse_pointer", TDEShortcut(0), 
 		this, TQT_SLOT(slotPointerClicked()), m_collection, "pointer");
 	m_pointer->setExclusiveGroup("LibActionWidgets"); //to be exclusive with any 'widget' action
 	m_pointer->setChecked(true);
 	actions.append(m_pointer);
 
-	m_snapToGrid = new KToggleAction(i18n("Snap to Grid"), TQString(), KShortcut(0), 
+	m_snapToGrid = new TDEToggleAction(i18n("Snap to Grid"), TQString(), TDEShortcut(0), 
 		0, 0, m_collection, "snap_to_grid");
 	m_snapToGrid->setChecked(true);
 	actions.append(m_snapToGrid);
 
 	// Create the Style selection action (with a combo box in toolbar and submenu items)
-	KSelectAction *m_style = new KSelectAction( i18n("Style"), KShortcut(0), 
+	TDESelectAction *m_style = new TDESelectAction( i18n("Style"), TDEShortcut(0), 
 		this, TQT_SLOT(slotStyle()), m_collection, "change_style");
 	m_style->setEditable(false);
 
@@ -501,7 +501,7 @@ FormManager::windowChanged(TQWidget *w)
 			{
 #ifndef KFD_NO_STYLES
 				// update the 'style' action
-				KSelectAction *m_style = (KSelectAction*)m_collection->action("change_style", "KSelectAction");
+				TDESelectAction *m_style = (TDESelectAction*)m_collection->action("change_style", "TDESelectAction");
 				const TQString currentStyle = form->widget()->style().name();
 				const TQStringList styles = m_style->items();
 
@@ -544,7 +544,7 @@ FormManager::windowChanged(TQWidget *w)
 			{
 #ifndef KFD_NO_STYLES
 				// update the 'style' action
-				KSelectAction *m_style = (KSelectAction*)m_collection->action("change_style", "KSelectAction");
+				TDESelectAction *m_style = (TDESelectAction*)m_collection->action("change_style", "TDESelectAction");
 				const TQString currentStyle = form->widget()->style().name();
 				const TQStringList styles = m_style->items();
 
@@ -787,7 +787,7 @@ FormManager::setInsertPoint(const TQPoint &p)
 void
 FormManager::createSignalMenu(TQWidget *w)
 {
-	m_sigSlotMenu = new KPopupMenu();
+	m_sigSlotMenu = new TDEPopupMenu();
 	m_sigSlotMenu->insertTitle(SmallIcon("connection"), i18n("Signals"));
 
 	TQStrList list = w->metaObject()->signalNames(true);
@@ -808,7 +808,7 @@ FormManager::createSignalMenu(TQWidget *w)
 void
 FormManager::createSlotMenu(TQWidget *w)
 {
-	m_sigSlotMenu = new KPopupMenu();
+	m_sigSlotMenu = new TDEPopupMenu();
 	m_sigSlotMenu->insertTitle(SmallIcon("connection"), i18n("Slots"));
 
 	TQString signalArg( m_connection->signal().remove( TQRegExp(".*[(]|[)]") ) );
@@ -853,7 +853,7 @@ FormManager::createContextMenu(TQWidget *w, Container *container, bool popupAtCu
 //	TQValueVector<int> menuIds();
 
 	if (!m_popup) {
-		m_popup = new KPopupMenu();
+		m_popup = new TDEPopupMenu();
 	}
 	else {
 		m_popup->clear();
@@ -872,7 +872,7 @@ FormManager::createContextMenu(TQWidget *w, Container *container, bool popupAtCu
 		m_popup->insertTitle(SmallIcon("multiple_obj"), i18n("Multiple Widgets")
 		+ TQString(" (%1)").arg(widgetsCount));
 
-	KAction *a;
+	TDEAction *a;
 #define PLUG_ACTION(_name, forceVisible) \
 	{ a = action(_name); \
 	if (a && (forceVisible || a->isEnabled())) { \
@@ -903,7 +903,7 @@ FormManager::createContextMenu(TQWidget *w, Container *container, bool popupAtCu
 		if (separatorNeeded)
 			m_popup->insertSeparator();
 
-		KPopupMenu *sub = new KPopupMenu(w);
+		TDEPopupMenu *sub = new TDEPopupMenu(w);
 		TQWidget *buddy = ((TQLabel*)w)->buddy();
 
 		sub->insertItem(i18n("No Buddy"), MenuNoBuddy);
@@ -936,7 +936,7 @@ FormManager::createContextMenu(TQWidget *w, Container *container, bool popupAtCu
 			m_popup->insertSeparator();
 
 		// We create the signals menu
-		KPopupMenu *sigMenu = new KPopupMenu();
+		TDEPopupMenu *sigMenu = new TDEPopupMenu();
 		TQStrList list = w->metaObject()->signalNames(true);
 		TQStrListIterator it(list);
 		for(; it.current() != 0; ++it)
@@ -1206,7 +1206,7 @@ FormManager::slotStyle()
 	if(!activeForm())
 		return;
 
-	KSelectAction *m_style = (KSelectAction*)m_collection->action("change_style", "KSelectAction");
+	TDESelectAction *m_style = (TDESelectAction*)m_collection->action("change_style", "TDESelectAction");
 	TQString style = m_style->currentText();
 	activeForm()->widget()->setStyle( style );
 
@@ -1684,26 +1684,26 @@ FormManager::changeFont()
 		//single widget's settings
 		widget = widgetsWithFontProperty.first();
 		KoProperty::Property &fontProp = m_propSet->property("font");
-		if (TQDialog::Accepted != KFontDialog::getFont(font, false, m_active->widget()))
+		if (TQDialog::Accepted != TDEFontDialog::getFont(font, false, m_active->widget()))
 			return;
 		fontProp = font;
 		return;
 	}
 	//multiple widgets
 	int diffFlags=0;
-	if (TQDialog::Accepted != KFontDialog::getFontDiff(font, diffFlags, false, m_active->widget())
+	if (TQDialog::Accepted != TDEFontDialog::getFontDiff(font, diffFlags, false, m_active->widget())
 		|| 0==diffFlags)
 		return;
 	//update font
 	for (WidgetListIterator it(widgetsWithFontProperty); (widget = it.current()); ++it) {
 		TQFont prevFont( widget->font() );
-		if (diffFlags & KFontChooser::FontDiffFamily)
+		if (diffFlags & TDEFontChooser::FontDiffFamily)
 			prevFont.setFamily( font.family() );
-		if (diffFlags & KFontChooser::FontDiffStyle) {
+		if (diffFlags & TDEFontChooser::FontDiffStyle) {
 			prevFont.setBold( font.bold() );
 			prevFont.setItalic( font.italic() );
 		}
-		if (diffFlags & KFontChooser::FontDiffSize)
+		if (diffFlags & TDEFontChooser::FontDiffSize)
 			prevFont.setPointSize( font.pointSize() );
 /*! @todo this modification is not added to UNDO BUFFER:
           do it when KoProperty::Set supports multiple selections */
diff --git a/kexi/formeditor/formmanager.h b/kexi/formeditor/formmanager.h
index 39006a7b..036bf90e 100644
--- a/kexi/formeditor/formmanager.h
+++ b/kexi/formeditor/formmanager.h
@@ -30,14 +30,14 @@
 
 class TQWidget;
 class TQWorkspace;
-class KPopupMenu;
-class KActionCollection;
-class KAction;
-class KToggleAction;
+class TDEPopupMenu;
+class TDEActionCollection;
+class TDEAction;
+class TDEToggleAction;
 class KDialogBase;
 class KTextEdit;
 class KXMLGUIClient;
-class KMainWindow;
+class TDEMainWindow;
 
 namespace KoProperty {
 	class Editor;
@@ -55,7 +55,7 @@ class WidgetLibrary;
 class ObjectTreeView;
 class Connection;
 class FormManager;
-typedef TQPtrList<KAction> ActionList;
+typedef TQPtrList<TDEAction> ActionList;
 
 //! @internal
 //static FormManager* FormManager_static = 0;
@@ -95,13 +95,13 @@ class KFORMEDITOR_EXPORT FormManager : public TQObject
 		enum Options { HideEventsInPopupMenu = 1, SkipFileActions = 2,
 			HideSignalSlotConnections = 4 }; //todo
 
-		/*! Creates all the KActions related to widget insertion, and plug them
+		/*! Creates all the TDEActions related to widget insertion, and plug them
 		  into the \a collection. \a client XML GUI client is used to call
 			lib->addCustomWidgetActions(client).
 		  These actions are automatically connected to \ref insertWidget() slot.
 		  \return a TQPtrList of the created actions.
 		 */
-		ActionList createActions(WidgetLibrary *lib, KActionCollection* collection, KXMLGUIClient *client);
+		ActionList createActions(WidgetLibrary *lib, TDEActionCollection* collection, KXMLGUIClient *client);
 
 		/*! Enables or disables actions \a name.
 		 KFD uses KPart's, action collection here.
@@ -109,7 +109,7 @@ class KFORMEDITOR_EXPORT FormManager : public TQObject
 		virtual void enableAction( const char* name, bool enable ) = 0;
 
 		/*! \return action for \a name. @see enableAction() */
-		virtual KAction* action(const char* name) = 0;
+		virtual TDEAction* action(const char* name) = 0;
 
 		bool isPasteEnabled();
 
@@ -453,7 +453,7 @@ class KFORMEDITOR_EXPORT FormManager : public TQObject
 
 		// Copy/Paste
 		TQDomDocument m_domDoc;
-		KPopupMenu *m_popup;
+		TDEPopupMenu *m_popup;
 		TQPoint m_insertPoint;
 		TQGuardedPtr<TQWidget> m_menuWidget;
 
@@ -464,11 +464,11 @@ class KFORMEDITOR_EXPORT FormManager : public TQObject
 		// Connection stuff
 		bool m_drawingSlot;
 		Connection *m_connection;
-		KPopupMenu *m_sigSlotMenu;
+		TDEPopupMenu *m_sigSlotMenu;
 
 		// Actions
-		KActionCollection *m_collection;
-		KToggleAction *m_pointer, *m_dragConnection, *m_snapToGrid;
+		TDEActionCollection *m_collection;
+		TDEToggleAction *m_pointer, *m_dragConnection, *m_snapToGrid;
 
 		//! Used to delayed widgets deletion
 		TQTimer m_deleteWidgetLater_timer;
diff --git a/kexi/formeditor/libactionwidget.cpp b/kexi/formeditor/libactionwidget.cpp
index 0edc2433..4322ad18 100644
--- a/kexi/formeditor/libactionwidget.cpp
+++ b/kexi/formeditor/libactionwidget.cpp
@@ -25,8 +25,8 @@
 
 using namespace KFormDesigner;
 
-LibActionWidget::LibActionWidget(WidgetInfo *w, KActionCollection *c)
- : KToggleAction(w->name(), w->pixmap(), 0/*Key_F5*/, 0, 0 /*TQT_SLOT(slotWidget())*/, 
+LibActionWidget::LibActionWidget(WidgetInfo *w, TDEActionCollection *c)
+ : TDEToggleAction(w->name(), w->pixmap(), 0/*Key_F5*/, 0, 0 /*TQT_SLOT(slotWidget())*/, 
 	c, TQString("library_widget_" + w->className()).latin1())
 {
 //	kdDebug() << "LibActionWidget::LibActionWidget(): " << TQString("library_widget_" + w->className()).latin1() << endl;
@@ -40,7 +40,7 @@ LibActionWidget::LibActionWidget(WidgetInfo *w, KActionCollection *c)
 void
 LibActionWidget::slotActivated()
 {
-	KToggleAction::slotActivated();
+	TDEToggleAction::slotActivated();
 	if (isChecked())
 		emit prepareInsert(m_className);
 }
diff --git a/kexi/formeditor/libactionwidget.h b/kexi/formeditor/libactionwidget.h
index 8247d69c..c546ac9d 100644
--- a/kexi/formeditor/libactionwidget.h
+++ b/kexi/formeditor/libactionwidget.h
@@ -30,16 +30,16 @@ namespace KFormDesigner
 class WidgetInfo;
 
 /**
- * KToggleAction subclass which remembers the matching class name.
+ * TDEToggleAction subclass which remembers the matching class name.
  */
-class KFORMEDITOR_EXPORT LibActionWidget : public KToggleAction
+class KFORMEDITOR_EXPORT LibActionWidget : public TDEToggleAction
 {
 	Q_OBJECT
   
 	public:
 		/** LibActionWidget object is initialized to be mutually
 			exclusive with all other LibActionWidget objects */
-		LibActionWidget(WidgetInfo *, KActionCollection *collection);
+		LibActionWidget(WidgetInfo *, TDEActionCollection *collection);
 		virtual ~LibActionWidget();
 
 	signals:
@@ -49,7 +49,7 @@ class KFORMEDITOR_EXPORT LibActionWidget : public KToggleAction
 		void prepareInsert(const TQCString &className);
 
 	protected slots:
-		/** reimplemented from KToggleAction */
+		/** reimplemented from TDEToggleAction */
 		virtual void slotActivated();
 
 	private:
diff --git a/kexi/formeditor/objecttreeview.cpp b/kexi/formeditor/objecttreeview.cpp
index 82cb67bb..5146576c 100644
--- a/kexi/formeditor/objecttreeview.cpp
+++ b/kexi/formeditor/objecttreeview.cpp
@@ -35,13 +35,13 @@
 using namespace KFormDesigner;
 
 ObjectTreeViewItem::ObjectTreeViewItem(ObjectTreeViewItem *parent, ObjectTreeItem *item)
- : KListViewItem(parent, item->name(), item->className())
+ : TDEListViewItem(parent, item->name(), item->className())
 {
 	m_item = item;
 }
 
-ObjectTreeViewItem::ObjectTreeViewItem(KListView *list, ObjectTreeItem *item)
- : KListViewItem(list, item ? item->name() : TQString(), item ? item->className() : TQString())
+ObjectTreeViewItem::ObjectTreeViewItem(TDEListView *list, ObjectTreeItem *item)
+ : TDEListViewItem(list, item ? item->name() : TQString(), item ? item->className() : TQString())
 {
 	m_item = item;
 }
@@ -67,7 +67,7 @@ ObjectTreeViewItem::paintCell(TQPainter *p, const TQColorGroup & cg, int column,
 	{
 		if(!m_item)
 			return;
-		KListViewItem::paintCell(p, cg, column, width, align);
+		TDEListViewItem::paintCell(p, cg, column, width, align);
 	}
 	else
 	{
@@ -148,7 +148,7 @@ ObjectTreeViewItem::paintBranches(TQPainter *p, const TQColorGroup &cg, int w, i
 void
 ObjectTreeViewItem::setup()
 {
-	KListViewItem::setup();
+	TDEListViewItem::setup();
 	if(!m_item)
 		setHeight(0);
 }
@@ -158,13 +158,13 @@ ObjectTreeViewItem::setOpen( bool o )
 {
 	//don't allow to collapse the node, user may be tricked because we're not displaying [+] marks
 	if (o)
-		KListViewItem::setOpen(o);
+		TDEListViewItem::setOpen(o);
 }
 
 // ObjectTreeView itself ----------------
 
 ObjectTreeView::ObjectTreeView(TQWidget *parent, const char *name, bool tabStop)
- : KListView(parent, name)
+ : TDEListView(parent, name)
  , m_form(0)
 {
 	addColumn(i18n("Name"), 130);
@@ -177,7 +177,7 @@ ObjectTreeView::ObjectTreeView(TQWidget *parent, const char *name, bool tabStop)
 	{
 		setSelectionModeExt(Extended);
 		connect(this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()));
-		connect(this, TQT_SIGNAL(contextMenu(KListView *, TQListViewItem *, const TQPoint&)), this, TQT_SLOT(displayContextMenu(KListView*, TQListViewItem*, const TQPoint&)));
+		connect(this, TQT_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint&)), this, TQT_SLOT(displayContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
 	}
 
 	setFullWidth(true);
@@ -194,7 +194,7 @@ TQSize
 ObjectTreeView::sizeHint() const
 {
 	return TQSize( TQFontMetrics(font()).width(columnText(0)+columnText(1)+"   "),
-		KListView::sizeHint().height());
+		TDEListView::sizeHint().height());
 }
 
 TQString
@@ -210,7 +210,7 @@ ObjectTreeView::slotColumnSizeChanged(int)
 }
 
 void
-ObjectTreeView::displayContextMenu(KListView *list, TQListViewItem *item, const TQPoint &)
+ObjectTreeView::displayContextMenu(TDEListView *list, TQListViewItem *item, const TQPoint &)
 {
 	if(list != this || !m_form || !item)
 		return;
diff --git a/kexi/formeditor/objecttreeview.h b/kexi/formeditor/objecttreeview.h
index 1da1a398..e1b6932b 100644
--- a/kexi/formeditor/objecttreeview.h
+++ b/kexi/formeditor/objecttreeview.h
@@ -28,11 +28,11 @@ class ObjectTreeItem;
 class Form;
 
 //! @short An item in ObjectTreeView associated with an ObjectTreeItem.
-class KFORMEDITOR_EXPORT ObjectTreeViewItem : public KListViewItem
+class KFORMEDITOR_EXPORT ObjectTreeViewItem : public TDEListViewItem
 {
 	public:
 		ObjectTreeViewItem(ObjectTreeViewItem *parent, ObjectTreeItem *item);
-		ObjectTreeViewItem(KListView *list, ObjectTreeItem *item=0);
+		ObjectTreeViewItem(TDEListView *list, ObjectTreeItem *item=0);
 		virtual ~ObjectTreeViewItem();
 
 		//! \return the item name, ie the ObjectTreeItem name
@@ -60,11 +60,11 @@ class KFORMEDITOR_EXPORT ObjectTreeViewItem : public KListViewItem
 };
 
 /*! @short A graphical view of Form's ObjectTree.
- This is a KListView which represents an item for each widget in the form. 
+ This is a TDEListView which represents an item for each widget in the form. 
  The actually selected widget is written bold
  and selected. Clicking on a list item selects the corresponding widget in the Form.
  */
-class KFORMEDITOR_EXPORT ObjectTreeView : public KListView
+class KFORMEDITOR_EXPORT ObjectTreeView : public TDEListView
 {
 	Q_OBJECT
   
@@ -101,7 +101,7 @@ class KFORMEDITOR_EXPORT ObjectTreeView : public KListView
 	protected slots:
 		/*! This slot is called when the user right-click a list item. 
 		 The widget context menu is shown, as inisde the Form. */
-		void displayContextMenu(KListView *list, TQListViewItem *item, const TQPoint &p);
+		void displayContextMenu(TDEListView *list, TQListViewItem *item, const TQPoint &p);
 
 		void slotColumnSizeChanged(int);
 
diff --git a/kexi/formeditor/richtextdialog.cpp b/kexi/formeditor/richtextdialog.cpp
index a8605e7b..1461536d 100644
--- a/kexi/formeditor/richtextdialog.cpp
+++ b/kexi/formeditor/richtextdialog.cpp
@@ -40,11 +40,11 @@ RichTextDialog::RichTextDialog(TQWidget *parent, const TQString &text)
 	TQVBoxLayout *l = new TQVBoxLayout(frame);
 	l->setAutoAdd(true);
 
-	m_toolbar = new KToolBar(frame);
+	m_toolbar = new TDEToolBar(frame);
 	m_toolbar->setFlat(true);
 	m_toolbar->show();
 
-	m_fcombo = new KFontCombo(m_toolbar);
+	m_fcombo = new TDEFontCombo(m_toolbar);
 	m_toolbar->insertWidget(TBFont, 40, m_fcombo);
 	connect(m_fcombo, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(changeFont(const TQString &)));
 
@@ -68,7 +68,7 @@ RichTextDialog::RichTextDialog(TQWidget *parent, const TQString &text)
 	m_toolbar->setToggle(TBSub, true);
 	m_toolbar->insertSeparator();
 
-	KToolBarRadioGroup *group = new KToolBarRadioGroup(m_toolbar);
+	TDEToolBarRadioGroup *group = new TDEToolBarRadioGroup(m_toolbar);
 	m_toolbar->insertButton("text_left", TBLeft, true, i18n("Left Align"));
 	m_toolbar->setToggle(TBLeft, true);
 	group->addButton(TBLeft);
diff --git a/kexi/formeditor/richtextdialog.h b/kexi/formeditor/richtextdialog.h
index 585e65df..366a1cd2 100644
--- a/kexi/formeditor/richtextdialog.h
+++ b/kexi/formeditor/richtextdialog.h
@@ -23,8 +23,8 @@
 #include <kdialogbase.h>
 #include <ktextedit.h>
 
-class KToolBar;
-class KFontCombo;
+class TDEToolBar;
+class TDEFontCombo;
 class KColorCombo;
 
 namespace KFormDesigner {
@@ -53,9 +53,9 @@ class KFORMEDITOR_EXPORT RichTextDialog : public KDialogBase
 
 	private:
 		enum { TBFont = 100, TBColor, TBBold, TBItalic, TBUnder, TBSuper, TBSub, TBLeft = 201, TBCenter, TBRight, TBJustify };
-		KToolBar  *m_toolbar;
+		TDEToolBar  *m_toolbar;
 		KTextEdit  *m_edit;
-		KFontCombo  *m_fcombo;
+		TDEFontCombo  *m_fcombo;
 		KColorCombo  *m_colCombo;
 };
 
diff --git a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
index e6c09927..c897f243 100644
--- a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
+++ b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
@@ -106,7 +106,7 @@ class KFDPart_FormManager : public KFormDesigner::FormManager
 		{
 		}
 
-		virtual KAction* action( const char* name)
+		virtual TDEAction* action( const char* name)
 		{
 			return m_part->actionCollection()->action( name );
 		}
@@ -208,35 +208,35 @@ KFormDesignerKDevPart::setupActions()
 	KStdAction::undo(KFormDesigner::FormManager::self(), TQT_SLOT(undo()), actionCollection());
 	KStdAction::redo(KFormDesigner::FormManager::self(), TQT_SLOT(redo()), actionCollection());
 	KStdAction::selectAll(KFormDesigner::FormManager::self(), TQT_SLOT(selectAll()), actionCollection());
-	new KAction(i18n("Clear Widget Contents"), "editclear", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(clearWidgetContent()), actionCollection(), "clear_contents");
-	new KAction(i18n("Delete Widget"), "editdelete", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(deleteWidget()), actionCollection(), "edit_delete");
-	new KAction(i18n("Preview Form"), "filequickprint", "Ctrl+T", this, TQT_SLOT(slotPreviewForm()), actionCollection(), "preview_form");
-	new KAction(i18n("Edit Tab Order"), "tab_order", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editTabOrder()), actionCollection(), "taborder");
-	new KAction(i18n("Edit Pixmap Collection"), "icons", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editFormPixmapCollection()), actionCollection(), "pixmap_collection");
-	new KAction(i18n("Edit Form Connections"), "connections", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editConnections()), actionCollection(), "form_connections");
-
-	new KAction(i18n("Lay Out Widgets &Horizontally"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHBox()), actionCollection(), "layout_hbox");
-	new KAction(i18n("Lay Out Widgets &Vertically"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVBox()), actionCollection(), "layout_vbox");
-	new KAction(i18n("Lay Out Widgets in &Grid"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutGrid()), actionCollection(), "layout_grid");
-	new KAction(i18n("&Break Layout"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(breakLayout()), actionCollection(), "break_layout");
-
-	new KAction(i18n("Bring Widget to Front"), "raise", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(bringWidgetToFront()), actionCollection(), "format_raise");
-	new KAction(i18n("Send Widget to Back"), "lower", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(sendWidgetToBack()), actionCollection(), "format_lower");
-
-	KActionMenu *alignMenu = new KActionMenu(i18n("Align Widgets' Positions"), "aopos2grid", actionCollection(), "align_menu");
-	alignMenu->insert( new KAction(i18n("To Left"), "aoleft", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToLeft()), actionCollection(), "align_to_left") );
-	alignMenu->insert( new KAction(i18n("To Right"), "aoright", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToRight()), actionCollection(), "align_to_right") );
-	alignMenu->insert( new KAction(i18n("To Top"), "aotop", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToTop()), actionCollection(), "align_to_top") );
-	alignMenu->insert( new KAction(i18n("To Bottom"), "aobottom", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToBottom()), actionCollection(), "align_to_bottom") );
-	alignMenu->insert( new KAction(i18n("To Grid"), "aopos2grid", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToGrid()), actionCollection(), "align_to_grid") );
-
-	KActionMenu *sizeMenu = new KActionMenu(i18n("Adjust Widgets' Sizes"), "aogrid", actionCollection(), "adjust_size_menu");
-	sizeMenu->insert( new KAction(i18n("To Fit"), "aofit", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidgetSize()), actionCollection(), "adjust_to_fit") );
-	sizeMenu->insert( new KAction(i18n("To Grid"), "aogrid", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustSizeToGrid()), actionCollection(), "adjust_size_grid") );
-	sizeMenu->insert( new KAction(i18n("To Shortest"), "aoshortest", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustHeightToSmall()), actionCollection(), "adjust_height_small") );
-	sizeMenu->insert( new KAction(i18n("To Tallest"), "aotallest", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustHeightToBig()), actionCollection(), "adjust_height_big") );
-	sizeMenu->insert( new KAction(i18n("To Narrowest"), "aonarrowest", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidthToSmall()), actionCollection(), "adjust_width_small") );
-	sizeMenu->insert( new KAction(i18n("To Widest"), "aowidest", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidthToBig()), actionCollection(), "adjust_width_big") );
+	new TDEAction(i18n("Clear Widget Contents"), "editclear", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(clearWidgetContent()), actionCollection(), "clear_contents");
+	new TDEAction(i18n("Delete Widget"), "editdelete", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(deleteWidget()), actionCollection(), "edit_delete");
+	new TDEAction(i18n("Preview Form"), "filequickprint", "Ctrl+T", this, TQT_SLOT(slotPreviewForm()), actionCollection(), "preview_form");
+	new TDEAction(i18n("Edit Tab Order"), "tab_order", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editTabOrder()), actionCollection(), "taborder");
+	new TDEAction(i18n("Edit Pixmap Collection"), "icons", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editFormPixmapCollection()), actionCollection(), "pixmap_collection");
+	new TDEAction(i18n("Edit Form Connections"), "connections", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editConnections()), actionCollection(), "form_connections");
+
+	new TDEAction(i18n("Lay Out Widgets &Horizontally"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHBox()), actionCollection(), "layout_hbox");
+	new TDEAction(i18n("Lay Out Widgets &Vertically"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVBox()), actionCollection(), "layout_vbox");
+	new TDEAction(i18n("Lay Out Widgets in &Grid"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutGrid()), actionCollection(), "layout_grid");
+	new TDEAction(i18n("&Break Layout"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(breakLayout()), actionCollection(), "break_layout");
+
+	new TDEAction(i18n("Bring Widget to Front"), "raise", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(bringWidgetToFront()), actionCollection(), "format_raise");
+	new TDEAction(i18n("Send Widget to Back"), "lower", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(sendWidgetToBack()), actionCollection(), "format_lower");
+
+	TDEActionMenu *alignMenu = new TDEActionMenu(i18n("Align Widgets' Positions"), "aopos2grid", actionCollection(), "align_menu");
+	alignMenu->insert( new TDEAction(i18n("To Left"), "aoleft", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToLeft()), actionCollection(), "align_to_left") );
+	alignMenu->insert( new TDEAction(i18n("To Right"), "aoright", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToRight()), actionCollection(), "align_to_right") );
+	alignMenu->insert( new TDEAction(i18n("To Top"), "aotop", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToTop()), actionCollection(), "align_to_top") );
+	alignMenu->insert( new TDEAction(i18n("To Bottom"), "aobottom", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToBottom()), actionCollection(), "align_to_bottom") );
+	alignMenu->insert( new TDEAction(i18n("To Grid"), "aopos2grid", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToGrid()), actionCollection(), "align_to_grid") );
+
+	TDEActionMenu *sizeMenu = new TDEActionMenu(i18n("Adjust Widgets' Sizes"), "aogrid", actionCollection(), "adjust_size_menu");
+	sizeMenu->insert( new TDEAction(i18n("To Fit"), "aofit", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidgetSize()), actionCollection(), "adjust_to_fit") );
+	sizeMenu->insert( new TDEAction(i18n("To Grid"), "aogrid", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustSizeToGrid()), actionCollection(), "adjust_size_grid") );
+	sizeMenu->insert( new TDEAction(i18n("To Shortest"), "aoshortest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustHeightToSmall()), actionCollection(), "adjust_height_small") );
+	sizeMenu->insert( new TDEAction(i18n("To Tallest"), "aotallest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustHeightToBig()), actionCollection(), "adjust_height_big") );
+	sizeMenu->insert( new TDEAction(i18n("To Narrowest"), "aonarrowest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidthToSmall()), actionCollection(), "adjust_width_small") );
+	sizeMenu->insert( new TDEAction(i18n("To Widest"), "aowidest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidthToBig()), actionCollection(), "adjust_width_big") );
 
 	if(m_inShell)
 		setXMLFile("kformdesigner_part_shell.rc");
@@ -495,7 +495,7 @@ KFormDesignerKDevPart::disableWidgetActions()
 void
 KFormDesignerKDevPart::setUndoEnabled(bool enabled, const TQString &text)
 {
-	KAction *undoAction = actionCollection()->action("edit_undo");
+	TDEAction *undoAction = actionCollection()->action("edit_undo");
 	if(undoAction)
 	{
 		undoAction->setEnabled(enabled);
@@ -507,7 +507,7 @@ KFormDesignerKDevPart::setUndoEnabled(bool enabled, const TQString &text)
 void
 KFormDesignerKDevPart::setRedoEnabled(bool enabled, const TQString &text)
 {
-	KAction *redoAction = actionCollection()->action("edit_redo");
+	TDEAction *redoAction = actionCollection()->action("edit_redo");
 	if(redoAction)
 	{
 		redoAction->setEnabled(enabled);
diff --git a/kexi/formeditor/tdevelop_plugin/kformdesigner_part.rc b/kexi/formeditor/tdevelop_plugin/kformdesigner_part.rc
index 3cadda53..38ab2ee4 100644
--- a/kexi/formeditor/tdevelop_plugin/kformdesigner_part.rc
+++ b/kexi/formeditor/tdevelop_plugin/kformdesigner_part.rc
@@ -42,9 +42,9 @@
    <Action name="library_widget_QCheckBox"/>
    <Action name="library_widget_KIntSpinBox"/>
    <Action name="library_widget_KComboBox"/>
-   <Action name="library_widget_KListBox"/>
+   <Action name="library_widget_TDEListBox"/>
    <Action name="library_widget_KTextEdit"/>
-   <Action name="library_widget_KListView"/>
+   <Action name="library_widget_TDEListView"/>
    <Action name="library_widget_QSlider"/>
    <Action name="library_widget_KProgress"/>
    <Action name="library_widget_KTimeWidget"/>
@@ -103,9 +103,9 @@
    <Action name="library_widget_QCheckBox"/>
    <Action name="library_widget_KIntSpinBox"/>
    <Action name="library_widget_KComboBox"/>
-   <Action name="library_widget_KListBox"/>
+   <Action name="library_widget_TDEListBox"/>
    <Action name="library_widget_KTextEdit"/>
-   <Action name="library_widget_KListView"/>
+   <Action name="library_widget_TDEListView"/>
    <Action name="library_widget_QSlider"/>
    <Action name="library_widget_KProgress"/>
    <Action name="library_widget_KTimeWidget"/>
diff --git a/kexi/formeditor/tdevelop_plugin/kformdesigner_part_shell.rc b/kexi/formeditor/tdevelop_plugin/kformdesigner_part_shell.rc
index 8b592752..95916698 100644
--- a/kexi/formeditor/tdevelop_plugin/kformdesigner_part_shell.rc
+++ b/kexi/formeditor/tdevelop_plugin/kformdesigner_part_shell.rc
@@ -52,9 +52,9 @@
    <Action name="library_widget_QCheckBox"/>
    <Action name="library_widget_KIntSpinBox"/>
    <Action name="library_widget_KComboBox"/>
-   <Action name="library_widget_KListBox"/>
+   <Action name="library_widget_TDEListBox"/>
    <Action name="library_widget_KTextEdit"/>
-   <Action name="library_widget_KListView"/>
+   <Action name="library_widget_TDEListView"/>
    <Action name="library_widget_QSlider"/>
    <Action name="library_widget_KProgress"/>
    <Action name="library_widget_KTimeWidget"/>
@@ -116,9 +116,9 @@
    <Action name="library_widget_QCheckBox"/>
    <Action name="library_widget_KIntSpinBox"/>
    <Action name="library_widget_KComboBox"/>
-   <Action name="library_widget_KListBox"/>
+   <Action name="library_widget_TDEListBox"/>
    <Action name="library_widget_KTextEdit"/>
-   <Action name="library_widget_KListView"/>
+   <Action name="library_widget_TDEListView"/>
    <Action name="library_widget_QSlider"/>
    <Action name="library_widget_KProgress"/>
    <Action name="library_widget_KTimeWidget"/>
diff --git a/kexi/formeditor/test/kfd_part.cpp b/kexi/formeditor/test/kfd_part.cpp
index a6b24574..38d99e5a 100644
--- a/kexi/formeditor/test/kfd_part.cpp
+++ b/kexi/formeditor/test/kfd_part.cpp
@@ -68,7 +68,7 @@ class KFDPart_FormManager : public KFormDesigner::FormManager
 		{
 		}
 
-		virtual KAction* action( const char* name)
+		virtual TDEAction* action( const char* name)
 		{
 			return m_part->actionCollection()->action( name );
 		}
@@ -212,48 +212,48 @@ KFormDesignerPart::setupActions()
 	KStdAction::undo(KFormDesigner::FormManager::self(), TQT_SLOT(undo()), actionCollection());
 	KStdAction::redo(KFormDesigner::FormManager::self(), TQT_SLOT(redo()), actionCollection());
 	KStdAction::selectAll(KFormDesigner::FormManager::self(), TQT_SLOT(selectAll()), actionCollection());
-	new KAction(i18n("Clear Widget Contents"), "editclear", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(clearWidgetContent()), actionCollection(), "clear_contents");
-	new KAction(i18n("Delete Widget"), "editdelete", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(deleteWidget()), actionCollection(), "edit_delete");
-	new KAction(i18n("Preview Form"), "filequickprint", CTRL+Key_T, this, TQT_SLOT(slotPreviewForm()), actionCollection(), "preview_form");
-	new KAction(i18n("Edit Tab Order"), "tab_order", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editTabOrder()), actionCollection(), "taborder");
-	new KAction(i18n("Edit Pixmap Collection"), "icons", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editFormPixmapCollection()), actionCollection(), "pixmap_collection");
-	new KAction(i18n("Edit Form Connections"), "connections", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editConnections()), actionCollection(), "form_connections");
-
-	KActionMenu *layoutMenu = new KActionMenu(i18n("Group Widgets"), "", actionCollection(), "layout_menu");
-	layoutMenu->insert(new KAction(i18n("&Horizontally"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHBox()), actionCollection(), "layout_hbox"));
-	layoutMenu->insert(new KAction(i18n("&Vertically"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVBox()), actionCollection(), "layout_vbox"));
-	layoutMenu->insert(new KAction(i18n("In &Grid"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutGrid()), actionCollection(), "layout_grid"));
-	layoutMenu->insert(new KAction(i18n("By &Rows"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHFlow()), actionCollection(), "layout_hflow"));
-	layoutMenu->insert(new KAction(i18n("By &Columns"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVFlow()), actionCollection(), "layout_vflow"));
-	layoutMenu->insert(new KAction(i18n("Horizontally in &Splitter"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHSplitter()), actionCollection(), "layout_hsplitter"));
-	layoutMenu->insert(new KAction(i18n("Verti&cally in Splitter"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVSplitter()), actionCollection(), "layout_vsplitter"));
-	new KAction(i18n("&Ungroup Widgets"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(breakLayout()), actionCollection(), "break_layout");
+	new TDEAction(i18n("Clear Widget Contents"), "editclear", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(clearWidgetContent()), actionCollection(), "clear_contents");
+	new TDEAction(i18n("Delete Widget"), "editdelete", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(deleteWidget()), actionCollection(), "edit_delete");
+	new TDEAction(i18n("Preview Form"), "filequickprint", CTRL+Key_T, this, TQT_SLOT(slotPreviewForm()), actionCollection(), "preview_form");
+	new TDEAction(i18n("Edit Tab Order"), "tab_order", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editTabOrder()), actionCollection(), "taborder");
+	new TDEAction(i18n("Edit Pixmap Collection"), "icons", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editFormPixmapCollection()), actionCollection(), "pixmap_collection");
+	new TDEAction(i18n("Edit Form Connections"), "connections", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editConnections()), actionCollection(), "form_connections");
+
+	TDEActionMenu *layoutMenu = new TDEActionMenu(i18n("Group Widgets"), "", actionCollection(), "layout_menu");
+	layoutMenu->insert(new TDEAction(i18n("&Horizontally"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHBox()), actionCollection(), "layout_hbox"));
+	layoutMenu->insert(new TDEAction(i18n("&Vertically"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVBox()), actionCollection(), "layout_vbox"));
+	layoutMenu->insert(new TDEAction(i18n("In &Grid"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutGrid()), actionCollection(), "layout_grid"));
+	layoutMenu->insert(new TDEAction(i18n("By &Rows"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHFlow()), actionCollection(), "layout_hflow"));
+	layoutMenu->insert(new TDEAction(i18n("By &Columns"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVFlow()), actionCollection(), "layout_vflow"));
+	layoutMenu->insert(new TDEAction(i18n("Horizontally in &Splitter"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHSplitter()), actionCollection(), "layout_hsplitter"));
+	layoutMenu->insert(new TDEAction(i18n("Verti&cally in Splitter"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVSplitter()), actionCollection(), "layout_vsplitter"));
+	new TDEAction(i18n("&Ungroup Widgets"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(breakLayout()), actionCollection(), "break_layout");
 
 /*
-	new KAction(i18n("Lay Out Widgets &Horizontally"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHBox()), actionCollection(), "layout_hbox");
-	new KAction(i18n("Lay Out Widgets &Vertically"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVBox()), actionCollection(), "layout_vbox");
-	new KAction(i18n("Lay Out Widgets in &Grid"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutGrid()), actionCollection(), "layout_grid");
-	new KAction(i18n("Lay Out Widgets H&orizontally in Splitter"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHSplitter()), actionCollection(), "layout_hsplitter");
-	new KAction(i18n("Lay Out Widgets Verti&cally in Splitter"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVSplitter()), actionCollection(), "layout_vsplitter");
-	new KAction(i18n("&Break Layout"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(breakLayout()), actionCollection(), "break_layout");
+	new TDEAction(i18n("Lay Out Widgets &Horizontally"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHBox()), actionCollection(), "layout_hbox");
+	new TDEAction(i18n("Lay Out Widgets &Vertically"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVBox()), actionCollection(), "layout_vbox");
+	new TDEAction(i18n("Lay Out Widgets in &Grid"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutGrid()), actionCollection(), "layout_grid");
+	new TDEAction(i18n("Lay Out Widgets H&orizontally in Splitter"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHSplitter()), actionCollection(), "layout_hsplitter");
+	new TDEAction(i18n("Lay Out Widgets Verti&cally in Splitter"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVSplitter()), actionCollection(), "layout_vsplitter");
+	new TDEAction(i18n("&Break Layout"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(breakLayout()), actionCollection(), "break_layout");
 */
-	new KAction(i18n("Bring Widget to Front"), "raise", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(bringWidgetToFront()), actionCollection(), "format_raise");
-	new KAction(i18n("Send Widget to Back"), "lower", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(sendWidgetToBack()), actionCollection(), "format_lower");
-
-	KActionMenu *alignMenu = new KActionMenu(i18n("Align Widgets' Positions"), "aopos2grid", actionCollection(), "align_menu");
-	alignMenu->insert( new KAction(i18n("To Left"), "aoleft", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToLeft()), actionCollection(), "align_to_left") );
-	alignMenu->insert( new KAction(i18n("To Right"), "aoright", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToRight()), actionCollection(), "align_to_right") );
-	alignMenu->insert( new KAction(i18n("To Top"), "aotop", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToTop()), actionCollection(), "align_to_top") );
-	alignMenu->insert( new KAction(i18n("To Bottom"), "aobottom", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToBottom()), actionCollection(), "align_to_bottom") );
-	alignMenu->insert( new KAction(i18n("To Grid"), "aopos2grid", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToGrid()), actionCollection(), "align_to_grid") );
-
-	KActionMenu *sizeMenu = new KActionMenu(i18n("Adjust Widgets' Sizes"), "aogrid", actionCollection(), "adjust_size_menu");
-	sizeMenu->insert( new KAction(i18n("To Fit"), "aofit", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidgetSize()), actionCollection(), "adjust_to_fit") );
-	sizeMenu->insert( new KAction(i18n("To Grid"), "aogrid", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustSizeToGrid()), actionCollection(), "adjust_size_grid") );
-	sizeMenu->insert( new KAction(i18n("To Shortest"), "aoshortest", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustHeightToSmall()), actionCollection(), "adjust_height_small") );
-	sizeMenu->insert( new KAction(i18n("To Tallest"), "aotallest", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustHeightToBig()), actionCollection(), "adjust_height_big") );
-	sizeMenu->insert( new KAction(i18n("To Narrowest"), "aonarrowest", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidthToSmall()), actionCollection(), "adjust_width_small") );
-	sizeMenu->insert( new KAction(i18n("To Widest"), "aowidest", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidthToBig()), actionCollection(), "adjust_width_big") );
+	new TDEAction(i18n("Bring Widget to Front"), "raise", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(bringWidgetToFront()), actionCollection(), "format_raise");
+	new TDEAction(i18n("Send Widget to Back"), "lower", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(sendWidgetToBack()), actionCollection(), "format_lower");
+
+	TDEActionMenu *alignMenu = new TDEActionMenu(i18n("Align Widgets' Positions"), "aopos2grid", actionCollection(), "align_menu");
+	alignMenu->insert( new TDEAction(i18n("To Left"), "aoleft", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToLeft()), actionCollection(), "align_to_left") );
+	alignMenu->insert( new TDEAction(i18n("To Right"), "aoright", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToRight()), actionCollection(), "align_to_right") );
+	alignMenu->insert( new TDEAction(i18n("To Top"), "aotop", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToTop()), actionCollection(), "align_to_top") );
+	alignMenu->insert( new TDEAction(i18n("To Bottom"), "aobottom", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToBottom()), actionCollection(), "align_to_bottom") );
+	alignMenu->insert( new TDEAction(i18n("To Grid"), "aopos2grid", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToGrid()), actionCollection(), "align_to_grid") );
+
+	TDEActionMenu *sizeMenu = new TDEActionMenu(i18n("Adjust Widgets' Sizes"), "aogrid", actionCollection(), "adjust_size_menu");
+	sizeMenu->insert( new TDEAction(i18n("To Fit"), "aofit", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidgetSize()), actionCollection(), "adjust_to_fit") );
+	sizeMenu->insert( new TDEAction(i18n("To Grid"), "aogrid", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustSizeToGrid()), actionCollection(), "adjust_size_grid") );
+	sizeMenu->insert( new TDEAction(i18n("To Shortest"), "aoshortest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustHeightToSmall()), actionCollection(), "adjust_height_small") );
+	sizeMenu->insert( new TDEAction(i18n("To Tallest"), "aotallest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustHeightToBig()), actionCollection(), "adjust_height_big") );
+	sizeMenu->insert( new TDEAction(i18n("To Narrowest"), "aonarrowest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidthToSmall()), actionCollection(), "adjust_width_small") );
+	sizeMenu->insert( new TDEAction(i18n("To Widest"), "aowidest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidthToBig()), actionCollection(), "adjust_width_big") );
 
 	if(m_inShell)
 		setXMLFile("kformdesigner_part_shell.rc");
@@ -536,7 +536,7 @@ KFormDesignerPart::disableWidgetActions()
 void
 KFormDesignerPart::setUndoEnabled(bool enabled, const TQString &text)
 {
-	KAction *undoAction = actionCollection()->action("edit_undo");
+	TDEAction *undoAction = actionCollection()->action("edit_undo");
 	if(undoAction)
 	{
 		if(!text.isNull())
@@ -547,7 +547,7 @@ KFormDesignerPart::setUndoEnabled(bool enabled, const TQString &text)
 void
 KFormDesignerPart::setRedoEnabled(bool enabled, const TQString &text)
 {
-	KAction *redoAction = actionCollection()->action("edit_redo");
+	TDEAction *redoAction = actionCollection()->action("edit_redo");
 	if(redoAction)
 	{
 		if(!text.isNull())
diff --git a/kexi/formeditor/test/kformdesigner_part.rc b/kexi/formeditor/test/kformdesigner_part.rc
index 03c25f19..4fde21b4 100644
--- a/kexi/formeditor/test/kformdesigner_part.rc
+++ b/kexi/formeditor/test/kformdesigner_part.rc
@@ -41,9 +41,9 @@
    <Action name="library_widget_QCheckBox"/>
    <Action name="library_widget_KIntSpinBox"/>
    <Action name="library_widget_KComboBox"/>
-   <Action name="library_widget_KListBox"/>
+   <Action name="library_widget_TDEListBox"/>
    <Action name="library_widget_KTextEdit"/>
-   <Action name="library_widget_KListView"/>
+   <Action name="library_widget_TDEListView"/>
    <Action name="library_widget_QSlider"/>
    <Action name="library_widget_KProgress"/>
    <Action name="library_widget_KTimeWidget"/>
@@ -99,9 +99,9 @@
    <Action name="library_widget_QCheckBox"/>
    <Action name="library_widget_KIntSpinBox"/>
    <Action name="library_widget_KComboBox"/>
-   <Action name="library_widget_KListBox"/>
+   <Action name="library_widget_TDEListBox"/>
    <Action name="library_widget_KTextEdit"/>
-   <Action name="library_widget_KListView"/>
+   <Action name="library_widget_TDEListView"/>
    <Action name="library_widget_QSlider"/>
    <Action name="library_widget_KProgress"/>
    <Action name="library_widget_KTimeWidget"/>
diff --git a/kexi/formeditor/test/kformdesigner_part_shell.rc b/kexi/formeditor/test/kformdesigner_part_shell.rc
index 8163cab3..c4dc3a20 100644
--- a/kexi/formeditor/test/kformdesigner_part_shell.rc
+++ b/kexi/formeditor/test/kformdesigner_part_shell.rc
@@ -52,9 +52,9 @@
    <Action name="library_widget_QCheckBox"/>
    <Action name="library_widget_KIntSpinBox"/>
    <Action name="library_widget_KComboBox"/>
-   <Action name="library_widget_KListBox"/>
+   <Action name="library_widget_TDEListBox"/>
    <Action name="library_widget_KTextEdit"/>
-   <Action name="library_widget_KListView"/>
+   <Action name="library_widget_TDEListView"/>
    <Action name="library_widget_QSlider"/>
    <Action name="library_widget_KProgress"/>
    <Action name="library_widget_KTimeWidget"/>
@@ -112,9 +112,9 @@
    <Action name="library_widget_QCheckBox"/>
    <Action name="library_widget_KIntSpinBox"/>
    <Action name="library_widget_KComboBox"/>
-   <Action name="library_widget_KListBox"/>
+   <Action name="library_widget_TDEListBox"/>
    <Action name="library_widget_KTextEdit"/>
-   <Action name="library_widget_KListView"/>
+   <Action name="library_widget_TDEListView"/>
    <Action name="library_widget_QSlider"/>
    <Action name="library_widget_KProgress"/>
    <Action name="library_widget_KTimeWidget"/>
diff --git a/kexi/formeditor/widgetfactory.h b/kexi/formeditor/widgetfactory.h
index 0bc2b47c..7be11444 100644
--- a/kexi/formeditor/widgetfactory.h
+++ b/kexi/formeditor/widgetfactory.h
@@ -40,7 +40,7 @@ class TQDomElement;
 class TQDomDocument;
 class TQVariant;
 class TQListView;
-class KActionCollection;
+class TDEActionCollection;
 class KTextEdit;
 class KLineEdit;
 class KXMLGUIClient;
@@ -107,7 +107,7 @@ class KFORMEDITOR_EXPORT WidgetInfo
 		 If this name is found when loading a .ui file, the className() will be used instead.
 		 It allows to support both KDE and TQt versions of widget, without duplicating code.
 		 As a rule, className() should always return a class name which is inherited from
-		 alternate class. For example KListView class has alternate TQListView class.
+		 alternate class. For example TDEListView class has alternate TQListView class.
 
 		 \a override parameter overrides class name of a widget,
 		 even if it was implemented in other factory.
@@ -300,7 +300,7 @@ class KFORMEDITOR_EXPORT WidgetFactory : public TQObject
 
 		/*! Creates custom actions. Reimplement this if you need to add some 
 		 actions coming from the factory. */
-		virtual void createCustomActions(KActionCollection *col) { Q_UNUSED(col); };
+		virtual void createCustomActions(TDEActionCollection *col) { Q_UNUSED(col); };
 
 		/*! This function can be used to add custom items in widget \a w context
 		menu \a menu. */
diff --git a/kexi/formeditor/widgetlibrary.cpp b/kexi/formeditor/widgetlibrary.cpp
index c15c3a9c..a21c4f3f 100644
--- a/kexi/formeditor/widgetlibrary.cpp
+++ b/kexi/formeditor/widgetlibrary.cpp
@@ -319,7 +319,7 @@ WidgetLibrary::createXML()
 }*/
 
 ActionList
-WidgetLibrary::createWidgetActions(KXMLGUIClient* client, KActionCollection *parent, 
+WidgetLibrary::createWidgetActions(KXMLGUIClient* client, TDEActionCollection *parent, 
 	TQObject *receiver, const char *slot)
 {
 	loadFactories();
@@ -348,7 +348,7 @@ WidgetLibrary::createWidgetActions(KXMLGUIClient* client, KActionCollection *par
 }
 
 void
-WidgetLibrary::addCustomWidgetActions(KActionCollection *col)
+WidgetLibrary::addCustomWidgetActions(TDEActionCollection *col)
 {
 	for (TQAsciiDictIterator<WidgetFactory> it(d->factories); it.current(); ++it)
 	{
@@ -738,7 +738,7 @@ WidgetFactory::CreateWidgetOptions WidgetLibrary::showOrientationSelectionPopup(
 	if (textVertical.isEmpty()) //default
 		textVertical = i18n("InsertQt::Vertical Widget", "InsertQt::Vertical");
 
-	KPopupMenu* popup = new KPopupMenu(parent, "orientationSelectionPopup");
+	TDEPopupMenu* popup = new TDEPopupMenu(parent, "orientationSelectionPopup");
 	popup->insertTitle(SmallIcon(wclass->pixmap()), i18n("Insert Widget: %1").arg(wclass->name()));
 	popup->insertItem(iconHorizontal, textHorizontal, 1);
 	popup->insertItem(iconVertical, textVertical, 2);
diff --git a/kexi/formeditor/widgetlibrary.h b/kexi/formeditor/widgetlibrary.h
index f9db38aa..ca041396 100644
--- a/kexi/formeditor/widgetlibrary.h
+++ b/kexi/formeditor/widgetlibrary.h
@@ -30,8 +30,8 @@
 
 template<class type> class TQPtrList;
 template<class type> class TQValueVector;
-class KActionCollection;
-class KAction;
+class TDEActionCollection;
+class TDEAction;
 class TQWidget;
 class TQPopupMenu;
 class TQVariant;
@@ -45,10 +45,10 @@ class ObjectTreeItem;
 class WidgetLibraryPrivate;
 class WidgetPropertySet;
 
-typedef TQPtrList<KAction> ActionList;
+typedef TQPtrList<TDEAction> ActionList;
 
 /**
- * This class searches for factories and provides KActions for widget creation.
+ * This class searches for factories and provides TDEActions for widget creation.
  * Every widget can be located using this library.
  * You call WidgetLibrary functions instead of calling directly factories.
  * See WidgetFactory for a description of the functions.
@@ -73,10 +73,10 @@ class KFORMEDITOR_EXPORT WidgetLibrary : public TQObject
 		/**
 		 * creates actions for widget creating
 		 */
-		ActionList createWidgetActions(KXMLGUIClient* client, KActionCollection *parent, 
+		ActionList createWidgetActions(KXMLGUIClient* client, TDEActionCollection *parent, 
 			TQObject *receiver, const char *slot);
 
-		void addCustomWidgetActions(KActionCollection *col);
+		void addCustomWidgetActions(TDEActionCollection *col);
 
 //old		/**
 //old		 * creates the XML for widget actions