19 files changed, 192 insertions, 192 deletions

diff --git a/kexi/formeditor/connectiondialog.cpp b/kexi/formeditor/connectiondialog.cpp
index 0ddb7afa..d6c66aad 100644
--- a/kexi/formeditor/connectiondialog.cpp
+++ b/kexi/formeditor/connectiondialog.cpp
@@ -81,20 +81,20 @@ ConnectionDialog::ConnectionDialog(TQWidget *parent)
 	KPushButton *newItem = new KPushButton(SmallIconSet("document-new"), i18n("&New Connection"), frame);
 	vlayout->addWidget(newItem);
 	m_buttons.insert(BAdd, newItem);
-	connect(newItem, TQT_SIGNAL(clicked()), this, TQT_SLOT(newItem()));
+	connect(newItem, TQ_SIGNAL(clicked()), this, TQ_SLOT(newItem()));
 
 	KPushButton *delItem = new KPushButton(SmallIconSet("edit-delete"), i18n("&Remove Connection"), frame);
 	vlayout->addWidget(delItem);
 	m_buttons.insert(BRemove, delItem);
-	connect(delItem, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeItem()));
+	connect(delItem, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeItem()));
 
 	vlayout->addStretch();
 
 	setInitialSize(TQSize(600, 300));
 	//setWFlags(WDestructiveClose);
 
-	connect(m_table,TQT_SIGNAL(cellSelected(int, int)), this, TQT_SLOT(slotCellSelected(int, int)));
-	connect(m_table->KexiDataAwareObjectInterface::data(), TQT_SIGNAL(rowInserted(KexiTableItem*,bool)), this, TQT_SLOT(slotRowInserted(KexiTableItem*,bool)));
+	connect(m_table,TQ_SIGNAL(cellSelected(int, int)), this, TQ_SLOT(slotCellSelected(int, int)));
+	connect(m_table->KexiDataAwareObjectInterface::data(), TQ_SIGNAL(rowInserted(KexiTableItem*,bool)), this, TQ_SLOT(slotRowInserted(KexiTableItem*,bool)));
 	this->newItem();
 }
 
@@ -131,10 +131,10 @@ ConnectionDialog::initTable()
 	m_table->maximizeColumnsWidth(c);
 	m_table->setColumnStretchEnabled( true, 4 );
 
-	connect(m_data, TQT_SIGNAL(aboutToChangeCell(KexiTableItem*, int, TQVariant&, KexiDB::ResultInfo*)),
-	      this,TQT_SLOT(slotCellChanged(KexiTableItem*, int, TQVariant, KexiDB::ResultInfo*)));
-	connect(m_data, TQT_SIGNAL(rowUpdated(KexiTableItem*)), this, TQT_SLOT(checkConnection(KexiTableItem *)));
-	connect(m_table, TQT_SIGNAL(itemSelected(KexiTableItem *)), this, TQT_SLOT(checkConnection(KexiTableItem *)));
+	connect(m_data, TQ_SIGNAL(aboutToChangeCell(KexiTableItem*, int, TQVariant&, KexiDB::ResultInfo*)),
+	      this,TQ_SLOT(slotCellChanged(KexiTableItem*, int, TQVariant, KexiDB::ResultInfo*)));
+	connect(m_data, TQ_SIGNAL(rowUpdated(KexiTableItem*)), this, TQ_SLOT(checkConnection(KexiTableItem *)));
+	connect(m_table, TQ_SIGNAL(itemSelected(KexiTableItem *)), this, TQ_SLOT(checkConnection(KexiTableItem *)));
 }
 
 void
@@ -366,8 +366,8 @@ void
 ConnectionDialog::newItemByDragnDrop()
 {
 	KFormDesigner::FormManager::self()->startCreatingConnection();
-	connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(connectionAborted(KFormDesigner::Form*)), this, TQT_SLOT(slotConnectionAborted(KFormDesigner::Form*)));
-	connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(connectionCreated(KFormDesigner::Form*, Connection&)), this, TQT_SLOT(slotConnectionCreated(KFormDesigner::Form*, Connection&)) );
+	connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(connectionAborted(KFormDesigner::Form*)), this, TQ_SLOT(slotConnectionAborted(KFormDesigner::Form*)));
+	connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(connectionCreated(KFormDesigner::Form*, Connection&)), this, TQ_SLOT(slotConnectionCreated(KFormDesigner::Form*, Connection&)) );
 
 	hide();
 }
diff --git a/kexi/formeditor/container.cpp b/kexi/formeditor/container.cpp
index d1a4b1b6..6c477b5e 100644
--- a/kexi/formeditor/container.cpp
+++ b/kexi/formeditor/container.cpp
@@ -127,10 +127,10 @@ Container::Container(Container *toplevel, TQWidget *container, TQObject *parent,
 		else
 			m_form->objectTree()->addItem(toplevel->objectTree(), it);
 
-		connect(toplevel, TQT_SIGNAL(destroyed()), this, TQT_SLOT(widgetDeleted()));
+		connect(toplevel, TQ_SIGNAL(destroyed()), this, TQ_SLOT(widgetDeleted()));
 	}
 
-	connect(container, TQT_SIGNAL(destroyed()), this, TQT_SLOT(widgetDeleted()));
+	connect(container, TQ_SIGNAL(destroyed()), this, TQ_SLOT(widgetDeleted()));
 }
 
 Container::~Container()
diff --git a/kexi/formeditor/editlistviewdialog.cpp b/kexi/formeditor/editlistviewdialog.cpp
index 55bf34e1..b453bafb 100644
--- a/kexi/formeditor/editlistviewdialog.cpp
+++ b/kexi/formeditor/editlistviewdialog.cpp
@@ -55,35 +55,35 @@ EditListViewDialog::EditListViewDialog(TQWidget *parent)
 	newRow->setTextLabel(i18n("&Add Item"), true);
 	vlayout->addWidget(newRow);
 	m_buttons.insert(BNewRow, newRow);
-	connect(newRow, TQT_SIGNAL(clicked()), this, TQT_SLOT(newRow()));
+	connect(newRow, TQ_SIGNAL(clicked()), this, TQ_SLOT(newRow()));
 
 	TQToolButton *newChild = new TQToolButton(m_contents);
 	newChild->setIconSet(BarIconSet("1rightarrow"));
 	newChild->setTextLabel(i18n("New &Subitem"), true);
 	vlayout->addWidget(newChild);
 	m_buttons.insert(BNewChild, newChild);
-	connect(newChild, TQT_SIGNAL(clicked()), this, TQT_SLOT(newChildRow()));
+	connect(newChild, TQ_SIGNAL(clicked()), this, TQ_SLOT(newChildRow()));
 
 	TQToolButton *delRow = new TQToolButton(m_contents);
 	delRow->setIconSet(BarIconSet("edit_remove"));
 	delRow->setTextLabel(i18n("&Remove Item"), true);
 	vlayout->addWidget(delRow);
 	m_buttons.insert(BRemRow, delRow);
-	connect(delRow, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeRow()));
+	connect(delRow, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeRow()));
 
 	TQToolButton *rowUp = new TQToolButton(m_contents);
 	rowUp->setIconSet(BarIconSet("1uparrow"));
 	rowUp->setTextLabel(i18n("Move Item &Up"), true);
 	vlayout->addWidget(rowUp);
 	m_buttons.insert(BRowUp, rowUp);
-	connect(rowUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(MoveRowUp()));
+	connect(rowUp, TQ_SIGNAL(clicked()), this, TQ_SLOT(MoveRowUp()));
 
 	TQToolButton *rowDown = new TQToolButton(m_contents);
 	rowDown->setIconSet(BarIconSet("1downarrow"));
 	rowDown->setTextLabel(i18n("Move Item &Down"), true);
 	vlayout->addWidget(rowDown);
 	m_buttons.insert(BRowDown, rowDown);
-	connect(rowDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(MoveRowDown()));
+	connect(rowDown, TQ_SIGNAL(clicked()), this, TQ_SLOT(MoveRowDown()));
 	vlayout->addStretch();
 
 	//// The listview ///////////
@@ -98,8 +98,8 @@ EditListViewDialog::EditListViewDialog(TQWidget *parent)
 	m_listview->setSorting(-1);
 	layout->addWidget(m_listview);
 	m_listview->setFocus();
-	connect(m_listview, TQT_SIGNAL(currentChanged(TQListViewItem*)), this, TQT_SLOT(updateButtons(TQListViewItem*)));
-	connect(m_listview, TQT_SIGNAL(moved(TQListViewItem*, TQListViewItem*, TQListViewItem*)), this, TQT_SLOT(updateButtons(TQListViewItem*)));
+	connect(m_listview, TQ_SIGNAL(currentChanged(TQListViewItem*)), this, TQ_SLOT(updateButtons(TQListViewItem*)));
+	connect(m_listview, TQ_SIGNAL(moved(TQListViewItem*, TQListViewItem*, TQListViewItem*)), this, TQ_SLOT(updateButtons(TQListViewItem*)));
 
 	/////////////////// Setup the columns page ////////////////
 	TQHBoxLayout *hbox = new TQHBoxLayout(m_column, 0, 6);
@@ -113,8 +113,8 @@ EditListViewDialog::EditListViewDialog(TQWidget *parent)
 	m_propSet->addProperty(new KoProperty::Property("resizable", TQVariant(true), i18n("Resizable"), i18n("Resizable") ));
 	m_propSet->addProperty(new KoProperty::Property("fullwidth", TQVariant(false), i18n("Full Width"), i18n("Full Width") ));
 	m_editor->changeSet(m_propSet);
-	connect(m_propSet, TQT_SIGNAL(propertyChanged(KoProperty::Set & KoProperty::Property&)),
-		this, TQT_SLOT(changeProperty(KoProperty::Set & KoProperty::Property&)));
+	connect(m_propSet, TQ_SIGNAL(propertyChanged(KoProperty::Set & KoProperty::Property&)),
+		this, TQ_SLOT(changeProperty(KoProperty::Set & KoProperty::Property&)));
 
 	// Setup the icon toolbar //////////
 	TQVBoxLayout *vbox = new TQVBoxLayout(hbox, 3);
@@ -123,28 +123,28 @@ EditListViewDialog::EditListViewDialog(TQWidget *parent)
 	add->setTextLabel(i18n("&Add Item"), true);
 	vbox->addWidget(add);
 	m_buttons.insert(BColAdd, add);
-	connect(add, TQT_SIGNAL(clicked()), this, TQT_SLOT(newItem()));
+	connect(add, TQ_SIGNAL(clicked()), this, TQ_SLOT(newItem()));
 
 	TQToolButton *remove = new TQToolButton(m_column);
 	remove->setIconSet(BarIconSet("edit_remove"));
 	remove->setTextLabel(i18n("&Remove Item"), true);
 	vbox->addWidget(remove);
 	m_buttons.insert(BColRem, remove);
-	connect(remove, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeItem()));
+	connect(remove, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeItem()));
 
 	TQToolButton *up = new TQToolButton(m_column);
 	up->setIconSet(BarIconSet("1uparrow"));
 	up->setTextLabel(i18n("Move Item &Up"), true);
 	vbox->addWidget(up);
 	m_buttons.insert(BColUp, up);
-	connect(up, TQT_SIGNAL(clicked()), this, TQT_SLOT(MoveItemUp()));
+	connect(up, TQ_SIGNAL(clicked()), this, TQ_SLOT(MoveItemUp()));
 
 	TQToolButton *down = new TQToolButton(m_column);
 	down->setIconSet(BarIconSet("1downarrow"));
 	down->setTextLabel(i18n("Move Item &Down"), true);
 	vbox->addWidget(down);
 	m_buttons.insert(BColDown, down);
-	connect(down, TQT_SIGNAL(clicked()), this, TQT_SLOT(MoveItemDown()));
+	connect(down, TQ_SIGNAL(clicked()), this, TQ_SLOT(MoveItemDown()));
 	vbox->addStretch();
 
 	// The listbox with columns name /////
@@ -152,7 +152,7 @@ EditListViewDialog::EditListViewDialog(TQWidget *parent)
 	m_listbox->setFocus();
 	hbox->insertWidget(0, m_listbox);
 	hbox->addWidget(m_editor);
-	connect(m_listbox, TQT_SIGNAL(currentChanged(TQListBoxItem*)), this, TQT_SLOT(updateItemProperties(TQListBoxItem*)));
+	connect(m_listbox, TQ_SIGNAL(currentChanged(TQListBoxItem*)), this, TQ_SLOT(updateItemProperties(TQListBoxItem*)));
 
 	//// Init dialog and display it ////////////////////////
 	setInitialSize(TQSize(500, 300), true);
diff --git a/kexi/formeditor/factories/containerfactory.cpp b/kexi/formeditor/factories/containerfactory.cpp
index f2fde913..12a9760f 100644
--- a/kexi/formeditor/factories/containerfactory.cpp
+++ b/kexi/formeditor/factories/containerfactory.cpp
@@ -520,7 +520,7 @@ ContainerFactory::createWidget(const TQCString &c, TQWidget *p, const char *n,
 		KFDTabWidget *tab = new KFDTabWidget(p, n);
 #if defined(USE_KTabWidget) && TDE_VERSION >= TDE_MAKE_VERSION(3,1,9)
 		tab->setTabReorderingEnabled(true);
-		connect(tab, TQT_SIGNAL(movedTab(int,int)), this, TQT_SLOT(reorderTabs(int,int)));
+		connect(tab, TQ_SIGNAL(movedTab(int,int)), this, TQ_SLOT(reorderTabs(int,int)));
 #endif
 		container->form()->objectTree()->addItem(container->objectTree(),
 			new KFormDesigner::ObjectTreeItem(
@@ -660,9 +660,9 @@ ContainerFactory::createMenuActions(const TQCString &classname, TQWidget *w, TQP
 //			m_container = m_container->toplevel();
 		}
 
-		int id = menu->insertItem(SmallIconSet("tab_new"), i18n("Add Page"), this, TQT_SLOT(addTabPage()) );
-		id = menu->insertItem(SmallIconSet("edit"), i18n("Rename Page..."), this, TQT_SLOT(renameTabPage()));
-		id = menu->insertItem(SmallIconSet("tab_remove"), i18n("Remove Page"), this, TQT_SLOT(removeTabPage()));
+		int id = menu->insertItem(SmallIconSet("tab_new"), i18n("Add Page"), this, TQ_SLOT(addTabPage()) );
+		id = menu->insertItem(SmallIconSet("edit"), i18n("Rename Page..."), this, TQ_SLOT(renameTabPage()));
+		id = menu->insertItem(SmallIconSet("tab_remove"), i18n("Remove Page"), this, TQ_SLOT(removeTabPage()));
 //		if( dynamic_cast<TabWidgetBase*>(m_widget)->count() == 1)
 		if( dynamic_cast<TabWidgetBase*>(widget())->count() == 1)
 			menu->setItemEnabled(id, false);
@@ -679,18 +679,18 @@ ContainerFactory::createMenuActions(const TQCString &classname, TQWidget *w, TQP
 //		m_container = container->form()->objectTree()->lookup(m_widget->name())->parent()->container();
 //		m_container = container->form()->objectTree()->lookup(stack->name())->parent()->container();
 
-		int id = menu->insertItem(SmallIconSet("tab_new"), i18n("Add Page"), this, TQT_SLOT(addStackPage()) );
+		int id = menu->insertItem(SmallIconSet("tab_new"), i18n("Add Page"), this, TQ_SLOT(addStackPage()) );
 
-		id = menu->insertItem(SmallIconSet("tab_remove"), i18n("Remove Page"), this, TQT_SLOT(removeStackPage()) );
+		id = menu->insertItem(SmallIconSet("tab_remove"), i18n("Remove Page"), this, TQ_SLOT(removeStackPage()) );
 //		if( ((TQWidgetStack*)m_widget)->children()->count() == 4) // == the stack has only one page
 		if(stack->childrenListObject().count() == 4) // == the stack has only one page
 			menu->setItemEnabled(id, false);
 
-		id = menu->insertItem(SmallIconSet("go-next"), i18n("Jump to Next Page"), this, TQT_SLOT(nextStackPage()));
+		id = menu->insertItem(SmallIconSet("go-next"), i18n("Jump to Next Page"), this, TQ_SLOT(nextStackPage()));
 		if(!stack->widget(stack->id(stack->visibleWidget())+1))
 			menu->setItemEnabled(id, false);
 
-		id = menu->insertItem(SmallIconSet("go-previous"), i18n("Jump to Previous Page"), this, TQT_SLOT(prevStackPage()));
+		id = menu->insertItem(SmallIconSet("go-previous"), i18n("Jump to Previous Page"), this, TQ_SLOT(prevStackPage()));
 		if(!stack->widget(stack->id(stack->visibleWidget()) -1) )
 			menu->setItemEnabled(id, false);
 		return true;
diff --git a/kexi/formeditor/factories/stdwidgetfactory.cpp b/kexi/formeditor/factories/stdwidgetfactory.cpp
index 89326c20..e970b138 100644
--- a/kexi/formeditor/factories/stdwidgetfactory.cpp
+++ b/kexi/formeditor/factories/stdwidgetfactory.cpp
@@ -472,12 +472,12 @@ StdWidgetFactory::createMenuActions(const TQCString &classname, TQWidget *, TQPo
 {
 	if((classname == "TQLabel") || (classname == "KTextEdit"))
 	{
-		menu->insertItem(SmallIconSet("edit"), i18n("Edit Rich Text"), this, TQT_SLOT(editText()));
+		menu->insertItem(SmallIconSet("edit"), i18n("Edit Rich Text"), this, TQ_SLOT(editText()));
 		return true;
 	}
 	else if(classname == "TDEListView")
 	{
-		menu->insertItem(SmallIconSet("edit"), i18n("Edit Listview Contents"), this, TQT_SLOT(editListContents()));
+		menu->insertItem(SmallIconSet("edit"), i18n("Edit Listview Contents"), this, TQ_SLOT(editListContents()));
 		return true;
 	}
 
diff --git a/kexi/formeditor/form.cpp b/kexi/formeditor/form.cpp
index 349210f1..1089b5b3 100644
--- a/kexi/formeditor/form.cpp
+++ b/kexi/formeditor/form.cpp
@@ -99,8 +99,8 @@ Form::Form(WidgetLibrary* library, const char *name, bool designMode)
 	// Init actions
 	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()));
+	connect(d->history, TQ_SIGNAL(commandExecuted()), this, TQ_SLOT(slotCommandExecuted()));
+	connect(d->history, TQ_SIGNAL(documentRestored()), this, TQ_SLOT(slotFormRestored()));
 }
 
 Form::~Form()
@@ -141,7 +141,7 @@ Form::createToplevel(TQWidget *container, FormWidget *formWidget, const TQCStrin
 //	d->topTree->addModifiedProperty("caption", name());
 	//m_topTree->addModifiedProperty("icon");
 
-	connect(container, TQT_SIGNAL(destroyed()), this, TQT_SLOT(formDeleted()));
+	connect(container, TQ_SIGNAL(destroyed()), this, TQ_SLOT(formDeleted()));
 
 	kdDebug() << "Form::createToplevel(): d->toplevel=" << d->toplevel << endl;
 }
@@ -421,8 +421,8 @@ Form::slotCommandExecuted()
 	emit FormManager::self()->dirty(this, true);
 	d->dirty = true;
 	// because actions text is changed after the commandExecuted() signal is emitted
-	TQTimer::singleShot(10, this, TQT_SLOT(emitUndoEnabled()));
-	TQTimer::singleShot(10, this, TQT_SLOT(emitRedoEnabled()));
+	TQTimer::singleShot(10, this, TQ_SLOT(emitUndoEnabled()));
+	TQTimer::singleShot(10, this, TQ_SLOT(emitRedoEnabled()));
 }
 
 void
diff --git a/kexi/formeditor/formmanager.cpp b/kexi/formeditor/formmanager.cpp
index 14584e20..102acda3 100644
--- a/kexi/formeditor/formmanager.cpp
+++ b/kexi/formeditor/formmanager.cpp
@@ -121,7 +121,7 @@ FormManager::FormManager(TQObject *parent, int options, const char *name)
 	TDEGlobal::locale()->insertCatalogue("kformdesigner");
 #endif
 
-	connect( kapp, TQT_SIGNAL( settingsChanged(int) ), TQT_SLOT( slotSettingsChanged(int) ) );
+	connect( kapp, TQ_SIGNAL( settingsChanged(int) ), TQ_SLOT( slotSettingsChanged(int) ) );
 	slotSettingsChanged(TDEApplication::SETTINGS_SHORTCUTS);
 
 //moved to createWidgetLibrary()	m_lib = new WidgetLibrary(this, supportedFactoryGroups);
@@ -139,9 +139,9 @@ FormManager::FormManager(TQObject *parent, int options, const char *name)
 	m_domDoc.appendChild(m_domDoc.createElement("UI"));
 
 	m_deleteWidgetLater_list.setAutoDelete(true);
-	connect( &m_deleteWidgetLater_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(deleteWidgetLaterTimeout()));
-	connect( this, TQT_SIGNAL(connectionCreated(KFormDesigner::Form*, KFormDesigner::Connection&)),
-		this, TQT_SLOT(slotConnectionCreated(KFormDesigner::Form*, KFormDesigner::Connection&)));
+	connect( &m_deleteWidgetLater_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(deleteWidgetLaterTimeout()));
+	connect( this, TQ_SIGNAL(connectionCreated(KFormDesigner::Form*, KFormDesigner::Connection&)),
+		this, TQ_SLOT(slotConnectionCreated(KFormDesigner::Form*, KFormDesigner::Connection&)));
 
 	// register kfd custom editors
 	KoProperty::FactoryManager::self()->registerFactoryForEditor(KoProperty::Pixmap, 
@@ -187,8 +187,8 @@ FormManager::setObjectTreeView(ObjectTreeView *treeview)
 {
 	m_treeview = treeview;
 	if (m_treeview)
-		connect(m_propSet, TQT_SIGNAL(widgetNameChanged(const TQCString&, const TQCString&)),
-			m_treeview, TQT_SLOT(renameItem(const TQCString&, const TQCString&)));
+		connect(m_propSet, TQ_SIGNAL(widgetNameChanged(const TQCString&, const TQCString&)),
+			m_treeview, TQ_SLOT(renameItem(const TQCString&, const TQCString&)));
 }
 
 ActionList
@@ -196,13 +196,13 @@ FormManager::createActions(WidgetLibrary *lib, TDEActionCollection* collection,
 {
 	m_collection = collection;
 
-	ActionList actions = lib->createWidgetActions(client, m_collection, this, TQT_SLOT(insertWidget(const TQCString &)));
+	ActionList actions = lib->createWidgetActions(client, m_collection, this, TQ_SLOT(insertWidget(const TQCString &)));
 
 	if (m_options & HideSignalSlotConnections)
 		m_dragConnection = 0;
 	else {
 		m_dragConnection = new TDEToggleAction(i18n("Connect Signals/Slots"),
-			"signalslot", TDEShortcut(0), this, TQT_SLOT(startCreatingConnection()), m_collection,
+			"signalslot", TDEShortcut(0), this, TQ_SLOT(startCreatingConnection()), m_collection,
 			"drag_connection");
 		//to be exclusive with any 'widget' action
 		m_dragConnection->setExclusiveGroup("LibActionWidgets");
@@ -211,7 +211,7 @@ FormManager::createActions(WidgetLibrary *lib, TDEActionCollection* collection,
 	}
 
 	m_pointer = new TDEToggleAction(i18n("Pointer"), "mouse_pointer", TDEShortcut(0), 
-		this, TQT_SLOT(slotPointerClicked()), m_collection, "pointer");
+		this, TQ_SLOT(slotPointerClicked()), m_collection, "pointer");
 	m_pointer->setExclusiveGroup("LibActionWidgets"); //to be exclusive with any 'widget' action
 	m_pointer->setChecked(true);
 	actions.append(m_pointer);
@@ -223,7 +223,7 @@ FormManager::createActions(WidgetLibrary *lib, TDEActionCollection* collection,
 
 	// Create the Style selection action (with a combo box in toolbar and submenu items)
 	TDESelectAction *m_style = new TDESelectAction( i18n("Style"), TDEShortcut(0), 
-		this, TQT_SLOT(slotStyle()), m_collection, "change_style");
+		this, TQ_SLOT(slotStyle()), m_collection, "change_style");
 	m_style->setEditable(false);
 
 	TDEGlobal::config()->setGroup("General");
@@ -628,17 +628,17 @@ FormManager::initForm(Form *form)
 
 	m_active = form;
 
-	connect(form, TQT_SIGNAL(selectionChanged(TQWidget*, bool, bool)), 
-		m_propSet, TQT_SLOT(setSelectedWidgetWithoutReload(TQWidget*, bool, bool)));
+	connect(form, TQ_SIGNAL(selectionChanged(TQWidget*, bool, bool)), 
+		m_propSet, TQ_SLOT(setSelectedWidgetWithoutReload(TQWidget*, bool, bool)));
 	if(m_treeview)
 	{
-		connect(form, TQT_SIGNAL(selectionChanged(TQWidget*, bool, bool)), 
-			m_treeview, TQT_SLOT(setSelectedWidget(TQWidget*, bool)));
-		connect(form, TQT_SIGNAL(childAdded(ObjectTreeItem* )), m_treeview, TQT_SLOT(addItem(ObjectTreeItem*)));
-		connect(form, TQT_SIGNAL(childRemoved(ObjectTreeItem* )), m_treeview, TQT_SLOT(removeItem(ObjectTreeItem*)));
+		connect(form, TQ_SIGNAL(selectionChanged(TQWidget*, bool, bool)), 
+			m_treeview, TQ_SLOT(setSelectedWidget(TQWidget*, bool)));
+		connect(form, TQ_SIGNAL(childAdded(ObjectTreeItem* )), m_treeview, TQ_SLOT(addItem(ObjectTreeItem*)));
+		connect(form, TQ_SIGNAL(childRemoved(ObjectTreeItem* )), m_treeview, TQ_SLOT(removeItem(ObjectTreeItem*)));
 	}
-	connect(m_propSet, TQT_SIGNAL(widgetNameChanged(const TQCString&, const TQCString&)),
-		form, TQT_SLOT(changeName(const TQCString&, const TQCString&)));
+	connect(m_propSet, TQ_SIGNAL(widgetNameChanged(const TQCString&, const TQCString&)),
+		form, TQ_SLOT(changeName(const TQCString&, const TQCString&)));
 
 	form->setSelectedWidget(form->widget());
 	windowChanged(form->widget());
@@ -923,7 +923,7 @@ FormManager::createContextMenu(TQWidget *w, Container *container, bool popupAtCu
 
 		/*int id =*/ m_popup->insertItem(i18n("Choose Buddy..."), sub);
 //		menuIds->append(id);
-		connect(sub, TQT_SIGNAL(activated(int)), this, TQT_SLOT(buddyChosen(int)));
+		connect(sub, TQ_SIGNAL(activated(int)), this, TQ_SLOT(buddyChosen(int)));
 
 		separatorNeeded = true;
 	}
@@ -946,7 +946,7 @@ FormManager::createContextMenu(TQWidget *w, Container *container, bool popupAtCu
 //		menuIds->append(id);
 		if(list.isEmpty())
 			m_popup->setItemEnabled(id, false);
-		connect(sigMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(menuSignalChosen(int)));
+		connect(sigMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(menuSignalChosen(int)));
 		separatorNeeded = true;
 	}
 #endif
diff --git a/kexi/formeditor/libactionwidget.cpp b/kexi/formeditor/libactionwidget.cpp
index 4322ad18..b98843d2 100644
--- a/kexi/formeditor/libactionwidget.cpp
+++ b/kexi/formeditor/libactionwidget.cpp
@@ -26,7 +26,7 @@
 using namespace KFormDesigner;
 
 LibActionWidget::LibActionWidget(WidgetInfo *w, TDEActionCollection *c)
- : TDEToggleAction(w->name(), w->pixmap(), 0/*Key_F5*/, 0, 0 /*TQT_SLOT(slotWidget())*/, 
+ : TDEToggleAction(w->name(), w->pixmap(), 0/*Key_F5*/, 0, 0 /*TQ_SLOT(slotWidget())*/, 
 	c, TQString("library_widget_" + w->className()).latin1())
 {
 //	kdDebug() << "LibActionWidget::LibActionWidget(): " << TQString("library_widget_" + w->className()).latin1() << endl;
@@ -34,7 +34,7 @@ LibActionWidget::LibActionWidget(WidgetInfo *w, TDEActionCollection *c)
 	setExclusiveGroup("LibActionWidgets");
 	setToolTip(w->name());
 	setWhatsThis(w->description());
-//	connect(this, TQT_SIGNAL(activated()), this, TQT_SLOT(slotWidget()));
+//	connect(this, TQ_SIGNAL(activated()), this, TQ_SLOT(slotWidget()));
 }
 
 void
diff --git a/kexi/formeditor/objecttreeview.cpp b/kexi/formeditor/objecttreeview.cpp
index 22434c87..0614da0e 100644
--- a/kexi/formeditor/objecttreeview.cpp
+++ b/kexi/formeditor/objecttreeview.cpp
@@ -172,12 +172,12 @@ ObjectTreeView::ObjectTreeView(TQWidget *parent, const char *name, bool tabStop)
 
 	installEventFilter(this);
 
-	connect((TQObject*)header(), TQT_SIGNAL(sectionHandleDoubleClicked(int)), this, TQT_SLOT(slotColumnSizeChanged(int)));
+	connect((TQObject*)header(), TQ_SIGNAL(sectionHandleDoubleClicked(int)), this, TQ_SLOT(slotColumnSizeChanged(int)));
 	if(!tabStop)
 	{
 		setSelectionModeExt(Extended);
-		connect(this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()));
-		connect(this, TQT_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint&)), this, TQT_SLOT(displayContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
+		connect(this, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged()));
+		connect(this, TQ_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint&)), this, TQ_SLOT(displayContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
 	}
 
 	setFullWidth(true);
@@ -323,7 +323,7 @@ void
 ObjectTreeView::setForm(Form *form)
 {
 	if (m_form)
-		disconnect(m_form, TQT_SIGNAL(destroying()), this, TQT_SLOT(slotBeforeFormDestroyed()));
+		disconnect(m_form, TQ_SIGNAL(destroying()), this, TQ_SLOT(slotBeforeFormDestroyed()));
 	m_form = form;
 	m_topItem = 0;
 	clear();
@@ -331,7 +331,7 @@ ObjectTreeView::setForm(Form *form)
 	if(!m_form)
 		return;
 
-	connect(m_form, TQT_SIGNAL(destroying()), this, TQT_SLOT(slotBeforeFormDestroyed()));
+	connect(m_form, TQ_SIGNAL(destroying()), this, TQ_SLOT(slotBeforeFormDestroyed()));
 
 	// Creates the hidden top Item
 	m_topItem = new ObjectTreeViewItem(this);
diff --git a/kexi/formeditor/resizehandle.cpp b/kexi/formeditor/resizehandle.cpp
index ab46ecd7..13301789 100644
--- a/kexi/formeditor/resizehandle.cpp
+++ b/kexi/formeditor/resizehandle.cpp
@@ -109,7 +109,7 @@ bool ResizeHandle::eventFilter(TQObject *o, TQEvent *ev)
 {
 	if (((ev->type() == TQEvent::Move) || (ev->type() == TQEvent::Resize)) && o == m_set->m_widget)
 	{
-		//TQTimer::singleShot(0,this,TQT_SLOT(updatePos()));
+		//TQTimer::singleShot(0,this,TQ_SLOT(updatePos()));
 		updatePos();
 	}
 /*	else if (ev->type() == TQEvent::Paint && o == this) {
diff --git a/kexi/formeditor/richtextdialog.cpp b/kexi/formeditor/richtextdialog.cpp
index c2f47c6c..eed6ddcb 100644
--- a/kexi/formeditor/richtextdialog.cpp
+++ b/kexi/formeditor/richtextdialog.cpp
@@ -46,13 +46,13 @@ RichTextDialog::RichTextDialog(TQWidget *parent, const TQString &text)
 
 	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 &)));
+	connect(m_fcombo, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(changeFont(const TQString &)));
 
 	m_toolbar->insertSeparator();
 
 	m_colCombo = new KColorCombo(m_toolbar);
 	m_toolbar->insertWidget(TBColor, 30, m_colCombo);
-	connect(m_colCombo, TQT_SIGNAL(activated(const TQColor&)), this, TQT_SLOT(changeColor(const TQColor&)));
+	connect(m_colCombo, TQ_SIGNAL(activated(const TQColor&)), this, TQ_SLOT(changeColor(const TQColor&)));
 
 	m_toolbar->insertButton("format-text-bold", TBBold, true, i18n("Bold"));
 	m_toolbar->insertButton("format-text-italic", TBItalic, true, i18n("Italic"));
@@ -82,15 +82,15 @@ RichTextDialog::RichTextDialog(TQWidget *parent, const TQString &text)
 	m_toolbar->setToggle(TBJustify, true);
 	group->addButton(TBJustify);
 
-	connect(m_toolbar, TQT_SIGNAL(toggled(int)), this, TQT_SLOT(buttonToggled(int)));
+	connect(m_toolbar, TQ_SIGNAL(toggled(int)), this, TQ_SLOT(buttonToggled(int)));
 
 	m_edit = new KTextEdit(text, TQString(), frame, "richtext_edit");
 	m_edit->setTextFormat(RichText);
 	m_edit->setFocus();
 
-	connect(m_edit, TQT_SIGNAL(cursorPositionChanged(int, int)), this, TQT_SLOT(cursorPositionChanged(int, int)));
-	connect(m_edit, TQT_SIGNAL(clicked(int, int)), this, TQT_SLOT(cursorPositionChanged(int, int)));
-	connect(m_edit, TQT_SIGNAL(currentVerticalAlignmentChanged(VerticalAlignment)), this, TQT_SLOT(slotVerticalAlignmentChanged(VerticalAlignment)));
+	connect(m_edit, TQ_SIGNAL(cursorPositionChanged(int, int)), this, TQ_SLOT(cursorPositionChanged(int, int)));
+	connect(m_edit, TQ_SIGNAL(clicked(int, int)), this, TQ_SLOT(cursorPositionChanged(int, int)));
+	connect(m_edit, TQ_SIGNAL(currentVerticalAlignmentChanged(VerticalAlignment)), this, TQ_SLOT(slotVerticalAlignmentChanged(VerticalAlignment)));
 
 	m_edit->moveCursor(TQTextEdit::MoveEnd, false);
 	cursorPositionChanged(0, 0);
diff --git a/kexi/formeditor/scripting/scriptmanager.cpp b/kexi/formeditor/scripting/scriptmanager.cpp
index 73bf70e3..cf2929b7 100644
--- a/kexi/formeditor/scripting/scriptmanager.cpp
+++ b/kexi/formeditor/scripting/scriptmanager.cpp
@@ -56,8 +56,8 @@ void
 ScriptManager::setFormManager(FormManager *manager)
 {
 	m_formManager = manager;
-	connect(m_formManager, TQT_SIGNAL(aboutToDeleteForm(KFormDesigner::Form*)), this, TQT_SLOT(slotFormDeleted(KFormDesigner::Form*)));
-	connect(m_formManager, TQT_SIGNAL(formCreated(KFormDesigner::Form*)), this, TQT_SLOT(newFormScript(KFormDesigner::Form*)));
+	connect(m_formManager, TQ_SIGNAL(aboutToDeleteForm(KFormDesigner::Form*)), this, TQ_SLOT(slotFormDeleted(KFormDesigner::Form*)));
+	connect(m_formManager, TQ_SIGNAL(formCreated(KFormDesigner::Form*)), this, TQ_SLOT(newFormScript(KFormDesigner::Form*)));
 }
 
 void
diff --git a/kexi/formeditor/tabstopdialog.cpp b/kexi/formeditor/tabstopdialog.cpp
index bbc34098..2c1a5132 100644
--- a/kexi/formeditor/tabstopdialog.cpp
+++ b/kexi/formeditor/tabstopdialog.cpp
@@ -51,24 +51,24 @@ TabStopDialog::TabStopDialog(TQWidget *parent)
 	l->addWidget(m_treeview, 0, 0);
 
 	m_treeview->m_form = 0;
-	connect(m_treeview, TQT_SIGNAL(currentChanged(TQListViewItem*)), this, TQT_SLOT(updateButtons(TQListViewItem*)));
-	connect(m_treeview, TQT_SIGNAL(moved(TQListViewItem*, TQListViewItem*, TQListViewItem*)), this, TQT_SLOT(updateButtons(TQListViewItem*)));
+	connect(m_treeview, TQ_SIGNAL(currentChanged(TQListViewItem*)), this, TQ_SLOT(updateButtons(TQListViewItem*)));
+	connect(m_treeview, TQ_SIGNAL(moved(TQListViewItem*, TQListViewItem*, TQListViewItem*)), this, TQ_SLOT(updateButtons(TQListViewItem*)));
 
 	TQVBoxLayout *vbox = new TQVBoxLayout();
 	l->addLayout(vbox, 0, 1);
 	m_btnUp = new KPushButton(SmallIconSet("1uparrow"), i18n("Move Up"), frame);
 	TQToolTip::add( m_btnUp, i18n("Move widget up") );
 	vbox->addWidget(m_btnUp);
-	connect(m_btnUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveItemUp()));
+	connect(m_btnUp, TQ_SIGNAL(clicked()), this, TQ_SLOT(moveItemUp()));
 
 	m_btnDown = new KPushButton(SmallIconSet("1downarrow"), i18n("Move Down"), frame);
 	TQToolTip::add( m_btnDown, i18n("Move widget down") );
 	vbox->addWidget(m_btnDown);
-	connect(m_btnDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveItemDown()));
+	connect(m_btnDown, TQ_SIGNAL(clicked()), this, TQ_SLOT(moveItemDown()));
 	vbox->addStretch();
 
 	m_check = new TQCheckBox(i18n("Handle tab order automatically"), frame, "tabstops_check");
-	connect(m_check, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotRadioClicked(bool)));
+	connect(m_check, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotRadioClicked(bool)));
 	l->addMultiCellWidget(m_check, 1, 1, 0, 1);
 
 	updateGeometry();
diff --git a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
index dfd56a22..c200dc33 100644
--- a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
+++ b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
@@ -172,21 +172,21 @@ KFormDesignerKDevPart::KFormDesignerKDevPart(TQWidget *parent, const char *name,
 		setModified(false);
 
 		// action stuff
-		connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(widgetSelected(KFormDesigner::Form*, bool)), TQT_SLOT(slotWidgetSelected(KFormDesigner::Form*, bool)));
-		connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(formWidgetSelected(KFormDesigner::Form*)), TQT_SLOT(slotFormWidgetSelected(KFormDesigner::Form*)));
-		connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(noFormSelected()), TQT_SLOT(slotNoFormSelected()));
-		connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(undoEnabled(bool, const TQString&)), TQT_SLOT(setUndoEnabled(bool, const TQString&)));
-		connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(redoEnabled(bool, const TQString&)), TQT_SLOT(setRedoEnabled(bool, const TQString&)));
+		connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(widgetSelected(KFormDesigner::Form*, bool)), TQ_SLOT(slotWidgetSelected(KFormDesigner::Form*, bool)));
+		connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(formWidgetSelected(KFormDesigner::Form*)), TQ_SLOT(slotFormWidgetSelected(KFormDesigner::Form*)));
+		connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(noFormSelected()), TQ_SLOT(slotNoFormSelected()));
+		connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(undoEnabled(bool, const TQString&)), TQ_SLOT(setUndoEnabled(bool, const TQString&)));
+		connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(redoEnabled(bool, const TQString&)), TQ_SLOT(setRedoEnabled(bool, const TQString&)));
 
-		connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(dirty(KFormDesigner::Form*, bool)), this, TQT_SLOT(slotFormModified(KFormDesigner::Form*, bool)));
+		connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(dirty(KFormDesigner::Form*, bool)), this, TQ_SLOT(slotFormModified(KFormDesigner::Form*, bool)));
 
-		connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(createFormSlot(KFormDesigner::Form*, const TQString&, const TQString&)),
-			this, TQT_SLOT(slotCreateFormSlot(KFormDesigner::Form*, const TQString&, const TQString &)));
+		connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(createFormSlot(KFormDesigner::Form*, const TQString&, const TQString&)),
+			this, TQ_SLOT(slotCreateFormSlot(KFormDesigner::Form*, const TQString&, const TQString &)));
 	}
 
 	container->show();
 	setWidget(container);
-	connect(m_workspace, TQT_SIGNAL(windowActivated(TQWidget*)), KFormDesigner::FormManager::self(), TQT_SLOT(windowChanged(TQWidget*)));
+	connect(m_workspace, TQ_SIGNAL(windowActivated(TQWidget*)), KFormDesigner::FormManager::self(), TQ_SLOT(windowChanged(TQWidget*)));
 	slotNoFormSelected();
 }
 
@@ -198,45 +198,45 @@ KFormDesigner::WidgetLibrary* KFormDesignerKDevPart::formsLibrary()
 void
 KFormDesignerKDevPart::setupActions()
 {
-	KStdAction::open(this, TQT_SLOT(open()), actionCollection());
-	KStdAction::openNew(this, TQT_SLOT(createBlankForm()), actionCollection());
-	KStdAction::save(this, TQT_SLOT(save()), actionCollection());
-	KStdAction::saveAs(this, TQT_SLOT(saveAs()), actionCollection());
-	KStdAction::cut(KFormDesigner::FormManager::self(), TQT_SLOT(cutWidget()), actionCollection());
-	KStdAction::copy(KFormDesigner::FormManager::self(), TQT_SLOT(copyWidget()), actionCollection());
-	KStdAction::paste(KFormDesigner::FormManager::self(), TQT_SLOT(pasteWidget()), actionCollection());
-	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 TDEAction(i18n("Clear Widget Contents"), "edit-clear", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(clearWidgetContent()), actionCollection(), "clear_contents");
-	new TDEAction(i18n("Delete Widget"), "edit-delete", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(deleteWidget()), actionCollection(), "edit_delete");
-	new TDEAction(i18n("Preview Form"), "document-print-preview", "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");
+	KStdAction::open(this, TQ_SLOT(open()), actionCollection());
+	KStdAction::openNew(this, TQ_SLOT(createBlankForm()), actionCollection());
+	KStdAction::save(this, TQ_SLOT(save()), actionCollection());
+	KStdAction::saveAs(this, TQ_SLOT(saveAs()), actionCollection());
+	KStdAction::cut(KFormDesigner::FormManager::self(), TQ_SLOT(cutWidget()), actionCollection());
+	KStdAction::copy(KFormDesigner::FormManager::self(), TQ_SLOT(copyWidget()), actionCollection());
+	KStdAction::paste(KFormDesigner::FormManager::self(), TQ_SLOT(pasteWidget()), actionCollection());
+	KStdAction::undo(KFormDesigner::FormManager::self(), TQ_SLOT(undo()), actionCollection());
+	KStdAction::redo(KFormDesigner::FormManager::self(), TQ_SLOT(redo()), actionCollection());
+	KStdAction::selectAll(KFormDesigner::FormManager::self(), TQ_SLOT(selectAll()), actionCollection());
+	new TDEAction(i18n("Clear Widget Contents"), "edit-clear", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(clearWidgetContent()), actionCollection(), "clear_contents");
+	new TDEAction(i18n("Delete Widget"), "edit-delete", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(deleteWidget()), actionCollection(), "edit_delete");
+	new TDEAction(i18n("Preview Form"), "document-print-preview", "Ctrl+T", this, TQ_SLOT(slotPreviewForm()), actionCollection(), "preview_form");
+	new TDEAction(i18n("Edit Tab Order"), "tab_order", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(editTabOrder()), actionCollection(), "taborder");
+	new TDEAction(i18n("Edit Pixmap Collection"), "icons", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(editFormPixmapCollection()), actionCollection(), "pixmap_collection");
+	new TDEAction(i18n("Edit Form Connections"), "connections", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(editConnections()), actionCollection(), "form_connections");
+
+	new TDEAction(i18n("Lay Out Widgets &Horizontally"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(layoutHBox()), actionCollection(), "layout_hbox");
+	new TDEAction(i18n("Lay Out Widgets &Vertically"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(layoutVBox()), actionCollection(), "layout_vbox");
+	new TDEAction(i18n("Lay Out Widgets in &Grid"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(layoutGrid()), actionCollection(), "layout_grid");
+	new TDEAction(i18n("&Break Layout"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(breakLayout()), actionCollection(), "break_layout");
+
+	new TDEAction(i18n("Bring Widget to Front"), "raise", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(bringWidgetToFront()), actionCollection(), "format_raise");
+	new TDEAction(i18n("Send Widget to Back"), "lower", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_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") );
+	alignMenu->insert( new TDEAction(i18n("To Left"), "aoleft", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToLeft()), actionCollection(), "align_to_left") );
+	alignMenu->insert( new TDEAction(i18n("To Right"), "aoright", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToRight()), actionCollection(), "align_to_right") );
+	alignMenu->insert( new TDEAction(i18n("To Top"), "aotop", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToTop()), actionCollection(), "align_to_top") );
+	alignMenu->insert( new TDEAction(i18n("To Bottom"), "aobottom", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToBottom()), actionCollection(), "align_to_bottom") );
+	alignMenu->insert( new TDEAction(i18n("To Grid"), "aopos2grid", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_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") );
+	sizeMenu->insert( new TDEAction(i18n("To Fit"), "aofit", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(adjustWidgetSize()), actionCollection(), "adjust_to_fit") );
+	sizeMenu->insert( new TDEAction(i18n("To Grid"), "aogrid", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(adjustSizeToGrid()), actionCollection(), "adjust_size_grid") );
+	sizeMenu->insert( new TDEAction(i18n("To Shortest"), "aoshortest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(adjustHeightToSmall()), actionCollection(), "adjust_height_small") );
+	sizeMenu->insert( new TDEAction(i18n("To Tallest"), "aotallest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(adjustHeightToBig()), actionCollection(), "adjust_height_big") );
+	sizeMenu->insert( new TDEAction(i18n("To Narrowest"), "aonarrowest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(adjustWidthToSmall()), actionCollection(), "adjust_width_small") );
+	sizeMenu->insert( new TDEAction(i18n("To Widest"), "aowidest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(adjustWidthToBig()), actionCollection(), "adjust_width_big") );
 
 	if(m_inShell)
 		setXMLFile("kformdesigner_part_shell.rc");
diff --git a/kexi/formeditor/test/kfd_mainwindow.cpp b/kexi/formeditor/test/kfd_mainwindow.cpp
index 455fd311..e8adc2ac 100644
--- a/kexi/formeditor/test/kfd_mainwindow.cpp
+++ b/kexi/formeditor/test/kfd_mainwindow.cpp
@@ -73,7 +73,7 @@ KFDMainWindow::loadUIFile(const KURL &url)
 void
 KFDMainWindow::setupActions()
 {
-	KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection());
+	KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection());
 }
 
 bool
diff --git a/kexi/formeditor/test/kfd_part.cpp b/kexi/formeditor/test/kfd_part.cpp
index 735b9a9e..7c9dd774 100644
--- a/kexi/formeditor/test/kfd_part.cpp
+++ b/kexi/formeditor/test/kfd_part.cpp
@@ -172,19 +172,19 @@ KFormDesignerPart::KFormDesignerPart(TQWidget *parent, const char *name, bool re
 		setModified(false);
 
 		// action stuff
-//		connect(m_manager, TQT_SIGNAL(widgetSelected(KFormDesigner::Form*, bool)), TQT_SLOT(slotWidgetSelected(KFormDesigner::Form*, bool)));
-//		connect(m_manager, TQT_SIGNAL(formWidgetSelected(KFormDesigner::Form*)), TQT_SLOT(slotFormWidgetSelected(KFormDesigner::Form*)));
-//		connect(m_manager, TQT_SIGNAL(noFormSelected()), TQT_SLOT(slotNoFormSelected()));
-		connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(undoEnabled(bool, const TQString&)), TQT_SLOT(setUndoEnabled(bool, const TQString&)));
-		connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(redoEnabled(bool, const TQString&)), TQT_SLOT(setRedoEnabled(bool, const TQString&)));
-		connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(dirty(KFormDesigner::Form*, bool)), this, TQT_SLOT(slotFormModified(KFormDesigner::Form*, bool)));
+//		connect(m_manager, TQ_SIGNAL(widgetSelected(KFormDesigner::Form*, bool)), TQ_SLOT(slotWidgetSelected(KFormDesigner::Form*, bool)));
+//		connect(m_manager, TQ_SIGNAL(formWidgetSelected(KFormDesigner::Form*)), TQ_SLOT(slotFormWidgetSelected(KFormDesigner::Form*)));
+//		connect(m_manager, TQ_SIGNAL(noFormSelected()), TQ_SLOT(slotNoFormSelected()));
+		connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(undoEnabled(bool, const TQString&)), TQ_SLOT(setUndoEnabled(bool, const TQString&)));
+		connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(redoEnabled(bool, const TQString&)), TQ_SLOT(setRedoEnabled(bool, const TQString&)));
+		connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(dirty(KFormDesigner::Form*, bool)), this, TQ_SLOT(slotFormModified(KFormDesigner::Form*, bool)));
 	}
 
 	container->show();
 	setWidget(container);
-	connect(m_workspace, TQT_SIGNAL(windowActivated(TQWidget*)), KFormDesigner::FormManager::self(), TQT_SLOT(windowChanged(TQWidget*)));
-	connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(propertySetSwitched(KoProperty::Set*, bool, const TQCString&)),
-		this, TQT_SLOT(slotPropertySetSwitched(KoProperty::Set*, bool, const TQCString&)));
+	connect(m_workspace, TQ_SIGNAL(windowActivated(TQWidget*)), KFormDesigner::FormManager::self(), TQ_SLOT(windowChanged(TQWidget*)));
+	connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(propertySetSwitched(KoProperty::Set*, bool, const TQCString&)),
+		this, TQ_SLOT(slotPropertySetSwitched(KoProperty::Set*, bool, const TQCString&)));
 
 //	slotNoFormSelected();
 	KFormDesigner::FormManager::self()->emitNoFormSelected();
@@ -202,58 +202,58 @@ KFormDesigner::WidgetLibrary* KFormDesignerPart::formsLibrary()
 void
 KFormDesignerPart::setupActions()
 {
-	KStdAction::open(this, TQT_SLOT(open()), actionCollection());
-	KStdAction::openNew(this, TQT_SLOT(createBlankForm()), actionCollection());
-	KStdAction::save(this, TQT_SLOT(save()), actionCollection());
-	KStdAction::saveAs(this, TQT_SLOT(saveAs()), actionCollection());
-	KStdAction::cut(KFormDesigner::FormManager::self(), TQT_SLOT(cutWidget()), actionCollection());
-	KStdAction::copy(KFormDesigner::FormManager::self(), TQT_SLOT(copyWidget()), actionCollection());
-	KStdAction::paste(KFormDesigner::FormManager::self(), TQT_SLOT(pasteWidget()), actionCollection());
-	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 TDEAction(i18n("Clear Widget Contents"), "edit-clear", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(clearWidgetContent()), actionCollection(), "clear_contents");
-	new TDEAction(i18n("Delete Widget"), "edit-delete", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(deleteWidget()), actionCollection(), "edit_delete");
-	new TDEAction(i18n("Preview Form"), "document-print-preview", 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");
+	KStdAction::open(this, TQ_SLOT(open()), actionCollection());
+	KStdAction::openNew(this, TQ_SLOT(createBlankForm()), actionCollection());
+	KStdAction::save(this, TQ_SLOT(save()), actionCollection());
+	KStdAction::saveAs(this, TQ_SLOT(saveAs()), actionCollection());
+	KStdAction::cut(KFormDesigner::FormManager::self(), TQ_SLOT(cutWidget()), actionCollection());
+	KStdAction::copy(KFormDesigner::FormManager::self(), TQ_SLOT(copyWidget()), actionCollection());
+	KStdAction::paste(KFormDesigner::FormManager::self(), TQ_SLOT(pasteWidget()), actionCollection());
+	KStdAction::undo(KFormDesigner::FormManager::self(), TQ_SLOT(undo()), actionCollection());
+	KStdAction::redo(KFormDesigner::FormManager::self(), TQ_SLOT(redo()), actionCollection());
+	KStdAction::selectAll(KFormDesigner::FormManager::self(), TQ_SLOT(selectAll()), actionCollection());
+	new TDEAction(i18n("Clear Widget Contents"), "edit-clear", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(clearWidgetContent()), actionCollection(), "clear_contents");
+	new TDEAction(i18n("Delete Widget"), "edit-delete", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(deleteWidget()), actionCollection(), "edit_delete");
+	new TDEAction(i18n("Preview Form"), "document-print-preview", CTRL+Key_T, this, TQ_SLOT(slotPreviewForm()), actionCollection(), "preview_form");
+	new TDEAction(i18n("Edit Tab Order"), "tab_order", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(editTabOrder()), actionCollection(), "taborder");
+	new TDEAction(i18n("Edit Pixmap Collection"), "icons", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(editFormPixmapCollection()), actionCollection(), "pixmap_collection");
+	new TDEAction(i18n("Edit Form Connections"), "connections", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_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");
+	layoutMenu->insert(new TDEAction(i18n("&Horizontally"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(layoutHBox()), actionCollection(), "layout_hbox"));
+	layoutMenu->insert(new TDEAction(i18n("&Vertically"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(layoutVBox()), actionCollection(), "layout_vbox"));
+	layoutMenu->insert(new TDEAction(i18n("In &Grid"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(layoutGrid()), actionCollection(), "layout_grid"));
+	layoutMenu->insert(new TDEAction(i18n("By &Rows"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(layoutHFlow()), actionCollection(), "layout_hflow"));
+	layoutMenu->insert(new TDEAction(i18n("By &Columns"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(layoutVFlow()), actionCollection(), "layout_vflow"));
+	layoutMenu->insert(new TDEAction(i18n("Horizontally in &Splitter"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(layoutHSplitter()), actionCollection(), "layout_hsplitter"));
+	layoutMenu->insert(new TDEAction(i18n("Verti&cally in Splitter"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(layoutVSplitter()), actionCollection(), "layout_vsplitter"));
+	new TDEAction(i18n("&Ungroup Widgets"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_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 TDEAction(i18n("Lay Out Widgets &Horizontally"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(layoutHBox()), actionCollection(), "layout_hbox");
+	new TDEAction(i18n("Lay Out Widgets &Vertically"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(layoutVBox()), actionCollection(), "layout_vbox");
+	new TDEAction(i18n("Lay Out Widgets in &Grid"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(layoutGrid()), actionCollection(), "layout_grid");
+	new TDEAction(i18n("Lay Out Widgets H&orizontally in Splitter"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(layoutHSplitter()), actionCollection(), "layout_hsplitter");
+	new TDEAction(i18n("Lay Out Widgets Verti&cally in Splitter"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(layoutVSplitter()), actionCollection(), "layout_vsplitter");
+	new TDEAction(i18n("&Break Layout"), TQString(), TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_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");
+	new TDEAction(i18n("Bring Widget to Front"), "raise", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(bringWidgetToFront()), actionCollection(), "format_raise");
+	new TDEAction(i18n("Send Widget to Back"), "lower", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_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") );
+	alignMenu->insert( new TDEAction(i18n("To Left"), "aoleft", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToLeft()), actionCollection(), "align_to_left") );
+	alignMenu->insert( new TDEAction(i18n("To Right"), "aoright", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToRight()), actionCollection(), "align_to_right") );
+	alignMenu->insert( new TDEAction(i18n("To Top"), "aotop", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToTop()), actionCollection(), "align_to_top") );
+	alignMenu->insert( new TDEAction(i18n("To Bottom"), "aobottom", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToBottom()), actionCollection(), "align_to_bottom") );
+	alignMenu->insert( new TDEAction(i18n("To Grid"), "aopos2grid", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_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") );
+	sizeMenu->insert( new TDEAction(i18n("To Fit"), "aofit", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(adjustWidgetSize()), actionCollection(), "adjust_to_fit") );
+	sizeMenu->insert( new TDEAction(i18n("To Grid"), "aogrid", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(adjustSizeToGrid()), actionCollection(), "adjust_size_grid") );
+	sizeMenu->insert( new TDEAction(i18n("To Shortest"), "aoshortest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(adjustHeightToSmall()), actionCollection(), "adjust_height_small") );
+	sizeMenu->insert( new TDEAction(i18n("To Tallest"), "aotallest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(adjustHeightToBig()), actionCollection(), "adjust_height_big") );
+	sizeMenu->insert( new TDEAction(i18n("To Narrowest"), "aonarrowest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(adjustWidthToSmall()), actionCollection(), "adjust_width_small") );
+	sizeMenu->insert( new TDEAction(i18n("To Widest"), "aowidest", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(adjustWidthToBig()), actionCollection(), "adjust_width_big") );
 
 	if(m_inShell)
 		setXMLFile("kformdesigner_part_shell.rc");
diff --git a/kexi/formeditor/widgetfactory.cpp b/kexi/formeditor/widgetfactory.cpp
index 6611be2f..b4825825 100644
--- a/kexi/formeditor/widgetfactory.cpp
+++ b/kexi/formeditor/widgetfactory.cpp
@@ -222,9 +222,9 @@ WidgetFactory::createEditor(const TQCString &classname, const TQString &text,
 		textedit->selectAll();
 		setEditor(w, textedit);
 
-		connect(textedit, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged()));
-		connect(w, TQT_SIGNAL(destroyed()), this, TQT_SLOT(widgetDestroyed()));
-		connect(textedit, TQT_SIGNAL(destroyed()), this, TQT_SLOT(editorDeleted()));
+		connect(textedit, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotTextChanged()));
+		connect(w, TQ_SIGNAL(destroyed()), this, TQ_SLOT(widgetDestroyed()));
+		connect(textedit, TQ_SIGNAL(destroyed()), this, TQ_SLOT(editorDeleted()));
 //#else
 	}
 	else {
@@ -243,9 +243,9 @@ WidgetFactory::createEditor(const TQCString &classname, const TQString &text,
 		editor->show();
 		editor->setFocus();
 		editor->selectAll();
-		connect(editor, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(changeTextInternal(const TQString&)));
-		connect(w, TQT_SIGNAL(destroyed()), this, TQT_SLOT(widgetDestroyed()));
-		connect(editor, TQT_SIGNAL(destroyed()), this, TQT_SLOT(editorDeleted()));
+		connect(editor, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(changeTextInternal(const TQString&)));
+		connect(w, TQ_SIGNAL(destroyed()), this, TQ_SLOT(widgetDestroyed()));
+		connect(editor, TQ_SIGNAL(destroyed()), this, TQ_SLOT(editorDeleted()));
 
 		setEditor(w, editor);
 //		m_editor = editor;
@@ -308,7 +308,7 @@ WidgetFactory::disableFilter(TQWidget *w, Container *container)
 		w->setPalette(p);
 	}
 
-	connect(w, TQT_SIGNAL(destroyed()), this, TQT_SLOT(widgetDestroyed()));
+	connect(w, TQ_SIGNAL(destroyed()), this, TQ_SLOT(widgetDestroyed()));
 }
 
 bool
diff --git a/kexi/formeditor/widgetlibrary.cpp b/kexi/formeditor/widgetlibrary.cpp
index f5da30e1..ca086432 100644
--- a/kexi/formeditor/widgetlibrary.cpp
+++ b/kexi/formeditor/widgetlibrary.cpp
@@ -341,7 +341,7 @@ WidgetLibrary::createWidgetActions(KXMLGUIClient* client, TDEActionCollection *p
 		LibActionWidget *a = new LibActionWidget(it.current(),
 			it.current()->factory()->m_guiClient
 			? it.current()->factory()->m_guiClient->actionCollection() : parent);
-		connect(a, TQT_SIGNAL(prepareInsert(const TQCString &)), receiver, slot);
+		connect(a, TQ_SIGNAL(prepareInsert(const TQCString &)), receiver, slot);
 		actions.append(a);
 	}
 	return actions;
diff --git a/kexi/formeditor/widgetpropertyset.cpp b/kexi/formeditor/widgetpropertyset.cpp
index 9da235d2..ae5ac033 100644
--- a/kexi/formeditor/widgetpropertyset.cpp
+++ b/kexi/formeditor/widgetpropertyset.cpp
@@ -94,10 +94,10 @@ WidgetPropertySet::WidgetPropertySet(TQObject *parent)
 	d = new WidgetPropertySetPrivate();
 //	d->manager = manager;
 
-	connect(&d->set, TQT_SIGNAL(propertyChanged(KoProperty::Set&, KoProperty::Property&)),
-		this, TQT_SLOT(slotPropertyChanged(KoProperty::Set&, KoProperty::Property&)));
-	connect(&d->set, TQT_SIGNAL(propertyReset(KoProperty::Set&, KoProperty::Property&)),
-		this, TQT_SLOT(slotPropertyReset(KoProperty::Set&, KoProperty::Property&)));
+	connect(&d->set, TQ_SIGNAL(propertyChanged(KoProperty::Set&, KoProperty::Property&)),
+		this, TQ_SLOT(slotPropertyChanged(KoProperty::Set&, KoProperty::Property&)));
+	connect(&d->set, TQ_SIGNAL(propertyReset(KoProperty::Set&, KoProperty::Property&)),
+		this, TQ_SLOT(slotPropertyReset(KoProperty::Set&, KoProperty::Property&)));
 
 	initPropertiesDescription();
 }
@@ -216,7 +216,7 @@ WidgetPropertySet::setSelectedWidget(TQWidget *w, bool add, bool forceReload, bo
 		createPropertiesForWidget(w);
 
 		w->installEventFilter(this);
-		connect(w, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotWidgetDestroyed()));
+		connect(w, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotWidgetDestroyed()));
 	}
 
 	if (!moreWillBeSelected)