Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit c0332621bc998c9786f4841e86a62b7711fe4abf)

18 files changed, 143 insertions, 143 deletions

diff --git a/kexi/plugins/forms/kexiactionselectiondialog.cpp b/kexi/plugins/forms/kexiactionselectiondialog.cpp
index 9b1af9c1..b282385b 100644
--- a/kexi/plugins/forms/kexiactionselectiondialog.cpp
+++ b/kexi/plugins/forms/kexiactionselectiondialog.cpp
@@ -430,8 +430,8 @@ KexiActionSelectionDialog::KexiActionSelectionDialog(KexiMainWindow* mainWin, TQ
 	d->actionCategoriesListView = new ActionCategoriesListView(mainWidget);
 	d->actionCategoriesListView->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum);
 	d->glyr->addWidget(d->actionCategoriesListView, 1, 0);
-	connect( d->actionCategoriesListView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), 
-		this, TQT_SLOT(slotActionCategorySelected(TQListViewItem*)));
+	connect( d->actionCategoriesListView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), 
+		this, TQ_SLOT(slotActionCategorySelected(TQListViewItem*)));
 
 	TQLabel *lbl = new TQLabel(d->actionCategoriesListView, i18n("Action category:"), mainWidget);
 	lbl->setMinimumHeight(lbl->fontMetrics().height()*2);
@@ -453,8 +453,8 @@ KexiActionSelectionDialog::KexiActionSelectionDialog(KexiMainWindow* mainWin, TQ
 	// 2nd column: list of actions/objects
 	d->objectsListView = new KexiBrowser(d->secondAnd3rdColumnMainWidget, d->mainWin, 0/*features*/);
 	d->secondAnd3rdColumnGrLyr->addWidget(d->objectsListView, 1, 0);
-	connect(d->objectsListView, TQT_SIGNAL(selectionChanged(KexiPart::Item*)),
-		this, TQT_SLOT(slotItemForOpeningOrExecutingSelected(KexiPart::Item*)));
+	connect(d->objectsListView, TQ_SIGNAL(selectionChanged(KexiPart::Item*)),
+		this, TQ_SLOT(slotItemForOpeningOrExecutingSelected(KexiPart::Item*)));
 
 	d->selectActionToBeExecutedLbl = new TQLabel(d->secondAnd3rdColumnMainWidget);
 	d->selectActionToBeExecutedLbl->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed);
@@ -470,10 +470,10 @@ KexiActionSelectionDialog::KexiActionSelectionDialog(KexiMainWindow* mainWin, TQ
 	d->actionToExecuteListView->installEventFilter(this); //to be able to disable painting
 	d->actionToExecuteListView->viewport()->installEventFilter(this); //to be able to disable painting
 	d->actionToExecuteListView->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum);
-	connect(d->actionToExecuteListView, TQT_SIGNAL(executed(TQListViewItem*)),
-		this, TQT_SLOT(slotActionToExecuteItemExecuted(TQListViewItem*)));
-	connect(d->actionToExecuteListView, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
-		this, TQT_SLOT(slotActionToExecuteItemSelected(TQListViewItem*)));
+	connect(d->actionToExecuteListView, TQ_SIGNAL(executed(TQListViewItem*)),
+		this, TQ_SLOT(slotActionToExecuteItemExecuted(TQListViewItem*)));
+	connect(d->actionToExecuteListView, TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+		this, TQ_SLOT(slotActionToExecuteItemSelected(TQListViewItem*)));
 	d->secondAnd3rdColumnGrLyr->addWidget(d->actionToExecuteListView, 1, 1);
 
 	d->actionToExecuteLbl = new TQLabel(d->actionToExecuteListView, 
@@ -594,10 +594,10 @@ void KexiActionSelectionDialog::slotActionCategorySelected(TQListViewItem* item)
 				vlyr->addWidget(lbl);
 				vlyr->addWidget(d->tdeactionListView);
 				d->secondAnd3rdColumnStack->addWidget(d->tdeactionPageWidget);
-				connect(d->tdeactionListView, TQT_SIGNAL(executed(TQListViewItem*)),
-					this, TQT_SLOT(slotTDEActionItemExecuted(TQListViewItem*)));
-				connect( d->tdeactionListView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), 
-					this, TQT_SLOT(slotTDEActionItemSelected(TQListViewItem*)));
+				connect(d->tdeactionListView, TQ_SIGNAL(executed(TQListViewItem*)),
+					this, TQ_SLOT(slotTDEActionItemExecuted(TQListViewItem*)));
+				connect( d->tdeactionListView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), 
+					this, TQ_SLOT(slotTDEActionItemSelected(TQListViewItem*)));
 			}
 			d->setActionToExecuteSectionVisible(false);
 			d->raiseWidget(d->tdeactionPageWidget);
@@ -619,10 +619,10 @@ void KexiActionSelectionDialog::slotActionCategorySelected(TQListViewItem* item)
 				vlyr->addWidget(lbl);
 				vlyr->addWidget(d->currentFormActionsListView);
 				d->secondAnd3rdColumnStack->addWidget(d->currentFormActionsPageWidget);
-				connect(d->currentFormActionsListView, TQT_SIGNAL(executed(TQListViewItem*)),
-					this, TQT_SLOT(slotCurrentFormActionItemExecuted(TQListViewItem*)));
-				connect( d->currentFormActionsListView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), 
-					this, TQT_SLOT(slotCurrentFormActionItemSelected(TQListViewItem*)));
+				connect(d->currentFormActionsListView, TQ_SIGNAL(executed(TQListViewItem*)),
+					this, TQ_SLOT(slotCurrentFormActionItemExecuted(TQListViewItem*)));
+				connect( d->currentFormActionsListView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), 
+					this, TQ_SLOT(slotCurrentFormActionItemSelected(TQListViewItem*)));
 			}
 			d->setActionToExecuteSectionVisible(false);
 			d->raiseWidget(d->currentFormActionsPageWidget);
diff --git a/kexi/plugins/forms/kexidatasourcepage.cpp b/kexi/plugins/forms/kexidatasourcepage.cpp
index ba21827e..d673f5f3 100644
--- a/kexi/plugins/forms/kexidatasourcepage.cpp
+++ b/kexi/plugins/forms/kexidatasourcepage.cpp
@@ -88,7 +88,7 @@ KexiDataSourcePage::KexiDataSourcePage(TQWidget *parent, const char *name)
 	m_clearWidgetDSButton->setMinimumHeight(m_widgetDSLabel->minimumHeight());
 	TQToolTip::add(m_clearWidgetDSButton, i18n("Clear widget's data source"));
 	hlyr->addWidget(m_clearWidgetDSButton);
-	connect(m_clearWidgetDSButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(clearWidgetDataSourceSelection()));
+	connect(m_clearWidgetDSButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(clearWidgetDataSourceSelection()));
 
 	m_sourceFieldCombo = new KexiFieldComboBox(contents, "sourceFieldCombo");
 	m_widgetDSLabel->setBuddy(m_sourceFieldCombo);
@@ -114,13 +114,13 @@ KexiDataSourcePage::KexiDataSourcePage(TQWidget *parent, const char *name)
 	m_gotoButton->setMinimumHeight(m_dataSourceLabel->minimumHeight());
 	TQToolTip::add(m_gotoButton, i18n("Go to selected form's data source"));
 	hlyr->addWidget(m_gotoButton);
-	connect(m_gotoButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotGotoSelected()));
+	connect(m_gotoButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotGotoSelected()));
 
 	m_clearDSButton = new KexiSmallToolButton(contents, TQString(), "clear_left", "clearDSButton");
 	m_clearDSButton->setMinimumHeight(m_dataSourceLabel->minimumHeight());
 	TQToolTip::add(m_clearDSButton, i18n("Clear form's data source"));
 	hlyr->addWidget(m_clearDSButton);
-	connect(m_clearDSButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(clearDataSourceSelection()));
+	connect(m_clearDSButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(clearDataSourceSelection()));
 
 	m_dataSourceCombo = new KexiDataSourceComboBox(contents, "dataSourceCombo");
 	m_dataSourceLabel->setBuddy(m_dataSourceCombo);
@@ -179,23 +179,23 @@ KexiDataSourcePage::KexiDataSourcePage(TQWidget *parent, const char *name)
 	m_addField->setFocusPolicy(TQWidget::StrongFocus);
 	TQToolTip::add(m_addField, i18n("Insert selected fields into form"));
 	hlyr->addWidget(m_addField);
-	connect(m_addField, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotInsertSelectedFields()));
+	connect(m_addField, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotInsertSelectedFields()));
 
 	m_fieldListView = new KexiFieldListView(contents, "fieldListView",
 		KexiFieldListView::ShowDataTypes | KexiFieldListView::AllowMultiSelection );
 	m_fieldListView->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding));
 	m_availableFieldsLabel->setBuddy(m_fieldListView);
 	contentsVlyr->addWidget(m_fieldListView, 1);
-	connect(m_fieldListView, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotFieldListViewSelectionChanged()));
-	connect(m_fieldListView, TQT_SIGNAL(fieldDoubleClicked(const TQString&, const TQString&, const TQString&)),
-		this, TQT_SLOT(slotFieldDoubleClicked(const TQString&, const TQString&, const TQString&)));
+	connect(m_fieldListView, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotFieldListViewSelectionChanged()));
+	connect(m_fieldListView, TQ_SIGNAL(fieldDoubleClicked(const TQString&, const TQString&, const TQString&)),
+		this, TQ_SLOT(slotFieldDoubleClicked(const TQString&, const TQString&, const TQString&)));
 #endif
 
 	vlyr->addStretch(1);
 
-	connect(m_dataSourceCombo, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotDataSourceTextChanged(const TQString &)));
-	connect(m_dataSourceCombo, TQT_SIGNAL(dataSourceChanged()), this, TQT_SLOT(slotDataSourceChanged()));
-	connect(m_sourceFieldCombo, TQT_SIGNAL(selected()), this, TQT_SLOT(slotFieldSelected()));
+	connect(m_dataSourceCombo, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotDataSourceTextChanged(const TQString &)));
+	connect(m_dataSourceCombo, TQ_SIGNAL(dataSourceChanged()), this, TQ_SLOT(slotDataSourceChanged()));
+	connect(m_sourceFieldCombo, TQ_SIGNAL(selected()), this, TQ_SLOT(slotFieldSelected()));
 
 	clearDataSourceSelection();
 	slotFieldListViewSelectionChanged();
diff --git a/kexi/plugins/forms/kexidbfactory.cpp b/kexi/plugins/forms/kexidbfactory.cpp
index 19241a36..1dbffdb1 100644
--- a/kexi/plugins/forms/kexidbfactory.cpp
+++ b/kexi/plugins/forms/kexidbfactory.cpp
@@ -384,7 +384,7 @@ KexiDBFactory::createWidget(const TQCString &c, TQWidget *p, const char *n,
 #ifndef KEXI_NO_IMAGEBOX_WIDGET
 	else if(c == "KexiDBImageBox") {
 		w = new KexiDBImageBox(designMode, p, n);
-		connect(w, TQT_SIGNAL(idChanged(long)), this, TQT_SLOT(slotImageBoxIdChanged(long)));
+		connect(w, TQ_SIGNAL(idChanged(long)), this, TQ_SLOT(slotImageBoxIdChanged(long)));
 	}
 #endif
 #ifndef KEXI_NO_AUTOFIELD_WIDGET
diff --git a/kexi/plugins/forms/kexiformeventhandler.cpp b/kexi/plugins/forms/kexiformeventhandler.cpp
index aae99906..f7a247ec 100644
--- a/kexi/plugins/forms/kexiformeventhandler.cpp
+++ b/kexi/plugins/forms/kexiformeventhandler.cpp
@@ -174,14 +174,14 @@ void KexiFormEventHandler::setMainWidgetForEventHandling(KexiMainWindow *mainWin
 			TDEAction *action = mainWin->actionCollection()->action( actionArg.latin1() );
 			if (!action)
 				continue;
-			TQObject::disconnect( obj, TQT_SIGNAL(clicked()), action, TQT_SLOT(activate()) ); //safety
-			TQObject::connect( obj, TQT_SIGNAL(clicked()), action, TQT_SLOT(activate()) );
+			TQObject::disconnect( obj, TQ_SIGNAL(clicked()), action, TQ_SLOT(activate()) ); //safety
+			TQObject::connect( obj, TQ_SIGNAL(clicked()), action, TQ_SLOT(activate()) );
 		}
 		else if (partInfo) { //'open or execute' action
 			KexiFormEventAction* action = new KexiFormEventAction(mainWin, obj, actionType, actionArg, 
 				data.option);
-			TQObject::disconnect( obj, TQT_SIGNAL(clicked()), action, TQT_SLOT(activate()) );
-			TQObject::connect( obj, TQT_SIGNAL(clicked()), action, TQT_SLOT(activate()) );
+			TQObject::disconnect( obj, TQ_SIGNAL(clicked()), action, TQ_SLOT(activate()) );
+			TQObject::connect( obj, TQ_SIGNAL(clicked()), action, TQ_SLOT(activate()) );
 		}
 	}
 	delete l;
diff --git a/kexi/plugins/forms/kexiformpart.cpp b/kexi/plugins/forms/kexiformpart.cpp
index e5d7addf..4ba0442a 100644
--- a/kexi/plugins/forms/kexiformpart.cpp
+++ b/kexi/plugins/forms/kexiformpart.cpp
@@ -107,13 +107,13 @@ KexiFormPart::KexiFormPart(TQObject *parent, const char *name, const TQStringLis
 	static_formsLibrary = KFormDesigner::FormManager::createWidgetLibrary(
 		formManager, supportedFactoryGroups);
 	static_formsLibrary->setAdvancedPropertiesVisible(false);
-	connect(static_formsLibrary, TQT_SIGNAL(widgetCreated(TQWidget*)),
-		this, TQT_SLOT(slotWidgetCreatedByFormsLibrary(TQWidget*)));
+	connect(static_formsLibrary, TQ_SIGNAL(widgetCreated(TQWidget*)),
+		this, TQ_SLOT(slotWidgetCreatedByFormsLibrary(TQWidget*)));
 
-	connect(KFormDesigner::FormManager::self()->propertySet(), TQT_SIGNAL(widgetPropertyChanged(TQWidget *, const TQCString &, const TQVariant&)),
-		this, TQT_SLOT(slotPropertyChanged(TQWidget *, const TQCString &, const TQVariant&)));
-	connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(autoTabStopsSet(KFormDesigner::Form*,bool)),
-		this, TQT_SLOT(slotAutoTabStopsSet(KFormDesigner::Form*,bool)));
+	connect(KFormDesigner::FormManager::self()->propertySet(), TQ_SIGNAL(widgetPropertyChanged(TQWidget *, const TQCString &, const TQVariant&)),
+		this, TQ_SLOT(slotPropertyChanged(TQWidget *, const TQCString &, const TQVariant&)));
+	connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(autoTabStopsSet(KFormDesigner::Form*,bool)),
+		this, TQ_SLOT(slotAutoTabStopsSet(KFormDesigner::Form*,bool)));
 }
 
 KexiFormPart::~KexiFormPart()
@@ -143,8 +143,8 @@ void KexiFormPart::initInstanceActions( int mode, TDEActionCollection *col )
 {
 	if (mode==Kexi::DesignViewMode) {
 		KFormDesigner::FormManager::self()->createActions(col, 0);
-		new TDEAction(i18n("Edit Tab Order..."), "tab_order", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editTabOrder()), col, "taborder");
-		new TDEAction(i18n("Adjust Size"), "zoom-fit-best", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(ajustWidgetSize()), col, "adjust");
+		new TDEAction(i18n("Edit Tab Order..."), "tab_order", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(editTabOrder()), col, "taborder");
+		new TDEAction(i18n("Adjust Size"), "zoom-fit-best", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(ajustWidgetSize()), col, "adjust");
 	}
 	//TODO
 }
@@ -152,7 +152,7 @@ void KexiFormPart::initInstanceActions( int mode, TDEActionCollection *col )
 
 void KexiFormPart::initPartActions()
 {
-//	new TDEAction(i18n("Show Form UI Code"), "show_form_ui", CTRL+Key_U, m_manager, TQT_SLOT(showFormUICode()),
+//	new TDEAction(i18n("Show Form UI Code"), "show_form_ui", CTRL+Key_U, m_manager, TQ_SLOT(showFormUICode()),
 //		guiClient()->actionCollection(), "show_form_ui");
 }
 
@@ -162,7 +162,7 @@ void KexiFormPart::initInstanceActions()
 	kapp->config()->setGroup("General");
 	if (kapp->config()->readBoolEntry("showInternalDebugger", false)) {
 		new TDEAction(i18n("Show Form UI Code"), "compfile", 
-			CTRL+Key_U, KFormDesigner::FormManager::self(), TQT_SLOT(showFormUICode()),
+			CTRL+Key_U, KFormDesigner::FormManager::self(), TQ_SLOT(showFormUICode()),
 			actionCollectionForMode(Kexi::DesignViewMode), "show_form_ui");
 	}
 #endif
@@ -171,7 +171,7 @@ void KexiFormPart::initInstanceActions()
 	KFormDesigner::FormManager::self()->createActions( library(), col, (KXMLGUIClient*)col->parentGUIClient() ); //guiClient() );
 
 	//connect actions provided by widget factories
-	connect( col->action("widget_assign_action"), TQT_SIGNAL(activated()), this, TQT_SLOT(slotAssignAction()));
+	connect( col->action("widget_assign_action"), TQ_SIGNAL(activated()), this, TQ_SLOT(slotAssignAction()));
 
 	createSharedAction(Kexi::DesignViewMode, i18n("Clear Widget Contents"), "edit-clear", 0, "formpart_clear_contents");
 	createSharedAction(Kexi::DesignViewMode, i18n("Edit Tab Order..."), "tab_order", 0, "formpart_taborder");
@@ -488,14 +488,14 @@ void KexiFormPart::setupCustomPropertyPanelTabs(KTabWidget *tab, KexiMainWindow*
 		d->objectTreeView = new KFormDesigner::ObjectTreeView(0, "KexiFormPart:ObjectTreeView");
 		KFormDesigner::FormManager::self()->setObjectTreeView(d->objectTreeView); //important: assign to manager
 		d->dataSourcePage = new KexiDataSourcePage(0, "dataSourcePage");
-		connect(d->dataSourcePage, TQT_SIGNAL(jumpToObjectRequested(const TQCString&, const TQCString&)),
-			mainWin, TQT_SLOT(highlightObject(const TQCString&, const TQCString&)));
-		connect(d->dataSourcePage, TQT_SIGNAL(formDataSourceChanged(const TQCString&, const TQCString&)),
-			KFormDesigner::FormManager::self(), TQT_SLOT(setFormDataSource(const TQCString&, const TQCString&)));
-		connect(d->dataSourcePage, TQT_SIGNAL(dataSourceFieldOrExpressionChanged(const TQString&, const TQString&, KexiDB::Field::Type)),
-			KFormDesigner::FormManager::self(), TQT_SLOT(setDataSourceFieldOrExpression(const TQString&, const TQString&, KexiDB::Field::Type)));
-		connect(d->dataSourcePage, TQT_SIGNAL(insertAutoFields(const TQString&, const TQString&, const TQStringList&)),
-			KFormDesigner::FormManager::self(), TQT_SLOT(insertAutoFields(const TQString&, const TQString&, const TQStringList&)));
+		connect(d->dataSourcePage, TQ_SIGNAL(jumpToObjectRequested(const TQCString&, const TQCString&)),
+			mainWin, TQ_SLOT(highlightObject(const TQCString&, const TQCString&)));
+		connect(d->dataSourcePage, TQ_SIGNAL(formDataSourceChanged(const TQCString&, const TQCString&)),
+			KFormDesigner::FormManager::self(), TQ_SLOT(setFormDataSource(const TQCString&, const TQCString&)));
+		connect(d->dataSourcePage, TQ_SIGNAL(dataSourceFieldOrExpressionChanged(const TQString&, const TQString&, KexiDB::Field::Type)),
+			KFormDesigner::FormManager::self(), TQ_SLOT(setDataSourceFieldOrExpression(const TQString&, const TQString&, KexiDB::Field::Type)));
+		connect(d->dataSourcePage, TQ_SIGNAL(insertAutoFields(const TQString&, const TQString&, const TQStringList&)),
+			KFormDesigner::FormManager::self(), TQ_SLOT(insertAutoFields(const TQString&, const TQString&, const TQStringList&)));
 	}
 
 	KexiProject *prj = mainWin->project();
@@ -520,16 +520,16 @@ void KexiFormPart::slotWidgetCreatedByFormsLibrary(TQWidget* widget)
 				kdDebug() << it.current() <<  endl;
 				KexiFormView *formView = KexiUtils::findParent<KexiFormView>(widget, "KexiFormView");
 				if (formView) {
-					connect(widget, TQT_SIGNAL(handleDragMoveEvent(TQDragMoveEvent*)), 
-						formView, TQT_SLOT(slotHandleDragMoveEvent(TQDragMoveEvent*)));
+					connect(widget, TQ_SIGNAL(handleDragMoveEvent(TQDragMoveEvent*)), 
+						formView, TQ_SLOT(slotHandleDragMoveEvent(TQDragMoveEvent*)));
 				}
 			}
 			else if (0==qstrcmp(it.current(), handleDropEventSignal)) {
 				kdDebug() << it.current() <<  endl;
 				KexiFormView *formView = KexiUtils::findParent<KexiFormView>(widget, "KexiFormView");
 				if (formView) {
-					connect(widget, TQT_SIGNAL(handleDropEvent(TQDropEvent*)), 
-						formView, TQT_SLOT(slotHandleDropEvent(TQDropEvent*)));
+					connect(widget, TQ_SIGNAL(handleDropEvent(TQDropEvent*)), 
+						formView, TQ_SLOT(slotHandleDropEvent(TQDropEvent*)));
 				}
 			}
 		}
diff --git a/kexi/plugins/forms/kexiformscrollview.cpp b/kexi/plugins/forms/kexiformscrollview.cpp
index 4e0677f8..86d66517 100644
--- a/kexi/plugins/forms/kexiformscrollview.cpp
+++ b/kexi/plugins/forms/kexiformscrollview.cpp
@@ -49,7 +49,7 @@ KexiFormScrollView::KexiFormScrollView(TQWidget *parent, bool preview)
 //		recordNavigator()->showEditingIndicator(true);
 	}
 
-	connect(this, TQT_SIGNAL(resizingStarted()), this, TQT_SLOT(slotResizingStarted()));
+	connect(this, TQ_SIGNAL(resizingStarted()), this, TQ_SLOT(slotResizingStarted()));
 
 	m_popupMenu = new TDEPopupMenu(this, "contextMenu");
 
@@ -288,9 +288,9 @@ KexiDataItemInterface *KexiFormScrollView::editor( int col, bool ignoreMissingEd
 		return 0;
 	}
 	editor->hide();
-	connect(editor,TQT_SIGNAL(editRequested()),this,TQT_SLOT(slotEditRequested()));
-	connect(editor,TQT_SIGNAL(cancelRequested()),this,TQT_SLOT(cancelEditor()));
-	connect(editor,TQT_SIGNAL(acceptRequested()),this,TQT_SLOT(acceptEditor()));
+	connect(editor,TQ_SIGNAL(editRequested()),this,TQ_SLOT(slotEditRequested()));
+	connect(editor,TQ_SIGNAL(cancelRequested()),this,TQ_SLOT(cancelEditor()));
+	connect(editor,TQ_SIGNAL(acceptRequested()),this,TQ_SLOT(acceptEditor()));
 
 	editor->resize(columnWidth(col)-1, rowHeight()-1);
 	editor->installEventFilter(this);
diff --git a/kexi/plugins/forms/kexiformview.cpp b/kexi/plugins/forms/kexiformview.cpp
index 6ea8bd15..d9423cd8 100644
--- a/kexi/plugins/forms/kexiformview.cpp
+++ b/kexi/plugins/forms/kexiformview.cpp
@@ -91,67 +91,67 @@ KexiFormView::KexiFormView(KexiMainWindow *mainWin, TQWidget *parent,
 	if (viewMode()==Kexi::DataViewMode) {
 		m_scrollView->recordNavigator()->setRecordHandler( m_scrollView );
 		m_scrollView->viewport()->setPaletteBackgroundColor(m_dbform->palette().active().background());
-//moved to formmanager		connect(formPart()->manager(), TQT_SIGNAL(noFormSelected()), TQT_SLOT(slotNoFormSelected()));
+//moved to formmanager		connect(formPart()->manager(), TQ_SIGNAL(noFormSelected()), TQ_SLOT(slotNoFormSelected()));
 	}
 	else
 	{
-		connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(propertySetSwitched(KoProperty::Set*, bool, const TQCString&)),
-			this, TQT_SLOT(slotPropertySetSwitched(KoProperty::Set*, bool, const TQCString&)));
-		connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(dirty(KFormDesigner::Form *, bool)),
-			this, TQT_SLOT(slotDirty(KFormDesigner::Form *, bool)));
+		connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(propertySetSwitched(KoProperty::Set*, bool, const TQCString&)),
+			this, TQ_SLOT(slotPropertySetSwitched(KoProperty::Set*, bool, const TQCString&)));
+		connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(dirty(KFormDesigner::Form *, bool)),
+			this, TQ_SLOT(slotDirty(KFormDesigner::Form *, bool)));
 
-		connect(m_dbform, TQT_SIGNAL(handleDragMoveEvent(TQDragMoveEvent*)), 
-			this, TQT_SLOT(slotHandleDragMoveEvent(TQDragMoveEvent*)));
-		connect(m_dbform, TQT_SIGNAL(handleDropEvent(TQDropEvent*)), 
-			this, TQT_SLOT(slotHandleDropEvent(TQDropEvent*)));
+		connect(m_dbform, TQ_SIGNAL(handleDragMoveEvent(TQDragMoveEvent*)), 
+			this, TQ_SLOT(slotHandleDragMoveEvent(TQDragMoveEvent*)));
+		connect(m_dbform, TQ_SIGNAL(handleDropEvent(TQDropEvent*)), 
+			this, TQ_SLOT(slotHandleDropEvent(TQDropEvent*)));
 
 		// action stuff
-		plugSharedAction("formpart_taborder", KFormDesigner::FormManager::self(), TQT_SLOT(editTabOrder()));
-		plugSharedAction("formpart_adjust_size", KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidgetSize()));
-//TODO		plugSharedAction("formpart_pixmap_collection", formPart()->manager(), TQT_SLOT(editFormPixmapCollection()));
-//TODO		plugSharedAction("formpart_connections", formPart()->manager(), TQT_SLOT(editConnections()));
-
-		plugSharedAction("edit_copy", KFormDesigner::FormManager::self(), TQT_SLOT(copyWidget()));
-		plugSharedAction("edit_cut", KFormDesigner::FormManager::self(), TQT_SLOT(cutWidget()));
-		plugSharedAction("edit_paste", KFormDesigner::FormManager::self(), TQT_SLOT(pasteWidget()));
-		plugSharedAction("edit_delete", KFormDesigner::FormManager::self(), TQT_SLOT(deleteWidget()));
-		plugSharedAction("edit_select_all", KFormDesigner::FormManager::self(), TQT_SLOT(selectAll()));
-		plugSharedAction("formpart_clear_contents", KFormDesigner::FormManager::self(), TQT_SLOT(clearWidgetContent()));
-		plugSharedAction("edit_undo", KFormDesigner::FormManager::self(), TQT_SLOT(undo()));
-		plugSharedAction("edit_redo", KFormDesigner::FormManager::self(), TQT_SLOT(redo()));
+		plugSharedAction("formpart_taborder", KFormDesigner::FormManager::self(), TQ_SLOT(editTabOrder()));
+		plugSharedAction("formpart_adjust_size", KFormDesigner::FormManager::self(), TQ_SLOT(adjustWidgetSize()));
+//TODO		plugSharedAction("formpart_pixmap_collection", formPart()->manager(), TQ_SLOT(editFormPixmapCollection()));
+//TODO		plugSharedAction("formpart_connections", formPart()->manager(), TQ_SLOT(editConnections()));
+
+		plugSharedAction("edit_copy", KFormDesigner::FormManager::self(), TQ_SLOT(copyWidget()));
+		plugSharedAction("edit_cut", KFormDesigner::FormManager::self(), TQ_SLOT(cutWidget()));
+		plugSharedAction("edit_paste", KFormDesigner::FormManager::self(), TQ_SLOT(pasteWidget()));
+		plugSharedAction("edit_delete", KFormDesigner::FormManager::self(), TQ_SLOT(deleteWidget()));
+		plugSharedAction("edit_select_all", KFormDesigner::FormManager::self(), TQ_SLOT(selectAll()));
+		plugSharedAction("formpart_clear_contents", KFormDesigner::FormManager::self(), TQ_SLOT(clearWidgetContent()));
+		plugSharedAction("edit_undo", KFormDesigner::FormManager::self(), TQ_SLOT(undo()));
+		plugSharedAction("edit_redo", KFormDesigner::FormManager::self(), TQ_SLOT(redo()));
 
 		plugSharedAction("formpart_layout_menu", KFormDesigner::FormManager::self(), 0 );
-		plugSharedAction("formpart_layout_hbox", KFormDesigner::FormManager::self(), TQT_SLOT(layoutHBox()) );
-		plugSharedAction("formpart_layout_vbox", KFormDesigner::FormManager::self(), TQT_SLOT(layoutVBox()) );
-		plugSharedAction("formpart_layout_grid", KFormDesigner::FormManager::self(), TQT_SLOT(layoutGrid()) );
+		plugSharedAction("formpart_layout_hbox", KFormDesigner::FormManager::self(), TQ_SLOT(layoutHBox()) );
+		plugSharedAction("formpart_layout_vbox", KFormDesigner::FormManager::self(), TQ_SLOT(layoutVBox()) );
+		plugSharedAction("formpart_layout_grid", KFormDesigner::FormManager::self(), TQ_SLOT(layoutGrid()) );
 #ifdef KEXI_SHOW_SPLITTER_WIDGET
-		plugSharedAction("formpart_layout_hsplitter", KFormDesigner::FormManager::self(), TQT_SLOT(layoutHSplitter()) );
-		plugSharedAction("formpart_layout_vsplitter", KFormDesigner::FormManager::self(), TQT_SLOT(layoutVSplitter()) );
+		plugSharedAction("formpart_layout_hsplitter", KFormDesigner::FormManager::self(), TQ_SLOT(layoutHSplitter()) );
+		plugSharedAction("formpart_layout_vsplitter", KFormDesigner::FormManager::self(), TQ_SLOT(layoutVSplitter()) );
 #endif
-		plugSharedAction("formpart_break_layout", KFormDesigner::FormManager::self(), TQT_SLOT(breakLayout()) );
+		plugSharedAction("formpart_break_layout", KFormDesigner::FormManager::self(), TQ_SLOT(breakLayout()) );
 
-		plugSharedAction("formpart_format_raise", KFormDesigner::FormManager::self(), TQT_SLOT(bringWidgetToFront()) );
-		plugSharedAction("formpart_format_lower", KFormDesigner::FormManager::self(), TQT_SLOT(sendWidgetToBack()) );
+		plugSharedAction("formpart_format_raise", KFormDesigner::FormManager::self(), TQ_SLOT(bringWidgetToFront()) );
+		plugSharedAction("formpart_format_lower", KFormDesigner::FormManager::self(), TQ_SLOT(sendWidgetToBack()) );
 
 		plugSharedAction("other_widgets_menu", KFormDesigner::FormManager::self(), 0 );
 		setAvailable("other_widgets_menu", true);
 
 		plugSharedAction("formpart_align_menu", KFormDesigner::FormManager::self(), 0 );
-		plugSharedAction("formpart_align_to_left", KFormDesigner::FormManager::self(),TQT_SLOT(alignWidgetsToLeft()) );
-		plugSharedAction("formpart_align_to_right", KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToRight()) );
-		plugSharedAction("formpart_align_to_top", KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToTop()) );
-		plugSharedAction("formpart_align_to_bottom", KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToBottom()) );
-		plugSharedAction("formpart_align_to_grid", KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToGrid()) );
+		plugSharedAction("formpart_align_to_left", KFormDesigner::FormManager::self(),TQ_SLOT(alignWidgetsToLeft()) );
+		plugSharedAction("formpart_align_to_right", KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToRight()) );
+		plugSharedAction("formpart_align_to_top", KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToTop()) );
+		plugSharedAction("formpart_align_to_bottom", KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToBottom()) );
+		plugSharedAction("formpart_align_to_grid", KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToGrid()) );
 
 		plugSharedAction("formpart_adjust_size_menu", KFormDesigner::FormManager::self(), 0 );
-		plugSharedAction("formpart_adjust_to_fit", KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidgetSize()) );
-		plugSharedAction("formpart_adjust_size_grid", KFormDesigner::FormManager::self(), TQT_SLOT(adjustSizeToGrid()) );
-		plugSharedAction("formpart_adjust_height_small", KFormDesigner::FormManager::self(),  TQT_SLOT(adjustHeightToSmall()) );
-		plugSharedAction("formpart_adjust_height_big", KFormDesigner::FormManager::self(), TQT_SLOT(adjustHeightToBig()) );
-		plugSharedAction("formpart_adjust_width_small", KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidthToSmall()) );
-		plugSharedAction("formpart_adjust_width_big", KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidthToBig()) );
-
-		plugSharedAction("format_font", KFormDesigner::FormManager::self(), TQT_SLOT(changeFont()) );
+		plugSharedAction("formpart_adjust_to_fit", KFormDesigner::FormManager::self(), TQ_SLOT(adjustWidgetSize()) );
+		plugSharedAction("formpart_adjust_size_grid", KFormDesigner::FormManager::self(), TQ_SLOT(adjustSizeToGrid()) );
+		plugSharedAction("formpart_adjust_height_small", KFormDesigner::FormManager::self(),  TQ_SLOT(adjustHeightToSmall()) );
+		plugSharedAction("formpart_adjust_height_big", KFormDesigner::FormManager::self(), TQ_SLOT(adjustHeightToBig()) );
+		plugSharedAction("formpart_adjust_width_small", KFormDesigner::FormManager::self(), TQ_SLOT(adjustWidthToSmall()) );
+		plugSharedAction("formpart_adjust_width_big", KFormDesigner::FormManager::self(), TQ_SLOT(adjustWidthToBig()) );
+
+		plugSharedAction("format_font", KFormDesigner::FormManager::self(), TQ_SLOT(changeFont()) );
 	}
 
 	initForm();
@@ -159,7 +159,7 @@ KexiFormView::KexiFormView(KexiMainWindow *mainWin, TQWidget *parent,
 	KexiDataAwareView::init( m_scrollView, m_scrollView, m_scrollView,
 		/* skip data-awarness if design mode */ viewMode()==Kexi::DesignViewMode );
 
-	connect(this, TQT_SIGNAL(focus(bool)), this, TQT_SLOT(slotFocus(bool)));
+	connect(this, TQ_SIGNAL(focus(bool)), this, TQ_SLOT(slotFocus(bool)));
 	/// @todo skip this if ther're no borders
 //	m_dbform->resize( m_dbform->size()+TQSize(m_scrollView->verticalScrollBar()->width(), m_scrollView->horizontalScrollBar()->height()) );
 }
@@ -225,8 +225,8 @@ KexiFormView::initForm()
 
 	if (viewMode()==Kexi::DesignViewMode) {
 		//we want to be informed about executed commands
-		connect(form()->commandHistory(), TQT_SIGNAL(commandExecuted()),
-			KFormDesigner::FormManager::self(), TQT_SLOT(slotHistoryCommandExecuted()));
+		connect(form()->commandHistory(), TQ_SIGNAL(commandExecuted()),
+			KFormDesigner::FormManager::self(), TQ_SLOT(slotHistoryCommandExecuted()));
 	}
 
 	const bool newForm = parentDialog()->id() < 0;
diff --git a/kexi/plugins/forms/widgets/kexidbcheckbox.cpp b/kexi/plugins/forms/widgets/kexidbcheckbox.cpp
index d97fe7d9..0f36a427 100644
--- a/kexi/plugins/forms/widgets/kexidbcheckbox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbcheckbox.cpp
@@ -31,7 +31,7 @@ KexiDBCheckBox::KexiDBCheckBox(const TQString &text, TQWidget *parent, const cha
 {
 	setFocusPolicy(TQWidget::StrongFocus);
 	updateTristate();
-	connect(this, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(slotStateChanged(int)));
+	connect(this, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(slotStateChanged(int)));
 }
 
 KexiDBCheckBox::~KexiDBCheckBox()
diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.cpp b/kexi/plugins/forms/widgets/kexidbcombobox.cpp
index 5fb89443..ac97d639 100644
--- a/kexi/plugins/forms/widgets/kexidbcombobox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbcombobox.cpp
@@ -317,7 +317,7 @@ void KexiDBComboBox::mousePressEvent( TQMouseEvent *e )
 	if (handleMousePressEvent(e))
 		return;
 
-//	TQTimer::singleShot( 200, this, TQT_SLOT(internalClickTimeout()));
+//	TQTimer::singleShot( 200, this, TQ_SLOT(internalClickTimeout()));
 //	d->shortClick = TRUE;
 //  }
 	KexiDBAutoField::mousePressEvent( e );
diff --git a/kexi/plugins/forms/widgets/kexidbdateedit.cpp b/kexi/plugins/forms/widgets/kexidbdateedit.cpp
index da8c9fc4..58dee2e6 100644
--- a/kexi/plugins/forms/widgets/kexidbdateedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidbdateedit.cpp
@@ -38,8 +38,8 @@ KexiDBDateEdit::KexiDBDateEdit(const TQDate &date, TQWidget *parent, const char
 	m_edit = new TQDateEdit(date, this);
 	m_edit->setAutoAdvance(true);
 	m_edit->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding);
-	connect( m_edit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SLOT(slotValueChanged(const TQDate&)) );
-	connect( m_edit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SIGNAL(dateChanged(const TQDate&)) );
+	connect( m_edit, TQ_SIGNAL(valueChanged(const TQDate&)), this, TQ_SLOT(slotValueChanged(const TQDate&)) );
+	connect( m_edit, TQ_SIGNAL(valueChanged(const TQDate&)), this, TQ_SIGNAL(dateChanged(const TQDate&)) );
 
 	TQToolButton* btn = new TQToolButton(this);
 	btn->setText("...");
@@ -53,12 +53,12 @@ KexiDBDateEdit::KexiDBDateEdit(const TQDate &date, TQWidget *parent, const char
 #endif
 
 	m_datePickerPopupMenu = new TDEPopupMenu(0, "date_popup");
-	connect(m_datePickerPopupMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotShowDatePicker()));
+	connect(m_datePickerPopupMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotShowDatePicker()));
 	m_datePicker = new KDatePicker(m_datePickerPopupMenu, TQDate::currentDate(), 0);
 
 	KDateTable *dt = KexiUtils::findFirstChild<KDateTable>(m_datePicker, "KDateTable");
 	if (dt)
-		connect(dt, TQT_SIGNAL(tableClicked()), this, TQT_SLOT(acceptDate()));
+		connect(dt, TQ_SIGNAL(tableClicked()), this, TQ_SLOT(acceptDate()));
 	m_datePicker->setCloseButton(true);
 	m_datePicker->installEventFilter(this);
 	m_datePickerPopupMenu->insertItem(m_datePicker);
diff --git a/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp b/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp
index 35506591..6b62f805 100644
--- a/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp
@@ -38,8 +38,8 @@ KexiDBDateTimeEdit::KexiDBDateTimeEdit(const TQDateTime &datetime, TQWidget *par
 	m_dateEdit->setAutoAdvance(true);
 	m_dateEdit->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding);
 //	m_dateEdit->setFixedWidth( TQFontMetrics(m_dateEdit->font()).width("8888-88-88___") );
-	connect(m_dateEdit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SLOT(slotValueChanged()));
-	connect(m_dateEdit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SIGNAL(dateTimeChanged()));
+	connect(m_dateEdit, TQ_SIGNAL(valueChanged(const TQDate&)), this, TQ_SLOT(slotValueChanged()));
+	connect(m_dateEdit, TQ_SIGNAL(valueChanged(const TQDate&)), this, TQ_SIGNAL(dateTimeChanged()));
 
 	TQToolButton* btn = new TQToolButton(this);
 	btn->setText("...");
@@ -49,8 +49,8 @@ KexiDBDateTimeEdit::KexiDBDateTimeEdit(const TQDateTime &datetime, TQWidget *par
 	m_timeEdit = new TQTimeEdit(datetime.time(), this);;
 	m_timeEdit->setAutoAdvance(true);
 	m_timeEdit->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding);
-	connect(m_timeEdit, TQT_SIGNAL(valueChanged(const TQTime&)), this, TQT_SLOT(slotValueChanged()));
-	connect(m_timeEdit, TQT_SIGNAL(valueChanged(const TQTime&)), this, TQT_SIGNAL(dateTimeChanged()));
+	connect(m_timeEdit, TQ_SIGNAL(valueChanged(const TQTime&)), this, TQ_SLOT(slotValueChanged()));
+	connect(m_timeEdit, TQ_SIGNAL(valueChanged(const TQTime&)), this, TQ_SIGNAL(dateTimeChanged()));
 
 #ifdef TQDateTimeEditor_HACK
 	m_dte_date = KexiUtils::findFirstChild<TQDateTimeEditor>(m_dateEdit, "TQDateTimeEditor");
@@ -60,12 +60,12 @@ KexiDBDateTimeEdit::KexiDBDateTimeEdit(const TQDateTime &datetime, TQWidget *par
 #endif
 
 	m_datePickerPopupMenu = new TDEPopupMenu(0, "date_popup");
-	connect(m_datePickerPopupMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotShowDatePicker()));
+	connect(m_datePickerPopupMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotShowDatePicker()));
 	m_datePicker = new KDatePicker(m_datePickerPopupMenu, TQDate::currentDate(), 0);
 
 	KDateTable *dt = KexiUtils::findFirstChild<KDateTable>(m_datePicker, "KDateTable");
 	if (dt)
-		connect(dt, TQT_SIGNAL(tableClicked()), this, TQT_SLOT(acceptDate()));
+		connect(dt, TQ_SIGNAL(tableClicked()), this, TQ_SLOT(acceptDate()));
 	m_datePicker->setCloseButton(true);
 	m_datePicker->installEventFilter(this);
 	m_datePickerPopupMenu->insertItem(m_datePicker);
diff --git a/kexi/plugins/forms/widgets/kexidbdoublespinbox.cpp b/kexi/plugins/forms/widgets/kexidbdoublespinbox.cpp
index 0fdc08cf..195cecc1 100644
--- a/kexi/plugins/forms/widgets/kexidbdoublespinbox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbdoublespinbox.cpp
@@ -25,7 +25,7 @@
 KexiDBDoubleSpinBox::KexiDBDoubleSpinBox(TQWidget *parent, const char *name)
  : KDoubleSpinBox(parent, name) , KexiFormDataItemInterface()
 {
-	connect(this, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(slotValueChanged()));
+	connect(this, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(slotValueChanged()));
 }
 
 KexiDBDoubleSpinBox::~KexiDBDoubleSpinBox()
diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.cpp b/kexi/plugins/forms/widgets/kexidbimagebox.cpp
index 1d74f94f..2fec335d 100644
--- a/kexi/plugins/forms/widgets/kexidbimagebox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbimagebox.cpp
@@ -106,29 +106,29 @@ KexiDBImageBox::KexiDBImageBox( bool designMode, TQWidget *parent, const char *n
 	
 	m_paletteBackgroundColorChanged = false; //set this here, not before
 
-	connect(m_popupMenu, TQT_SIGNAL(updateActionsAvailabilityRequested(bool&, bool&)), 
-		this, TQT_SLOT(slotUpdateActionsAvailabilityRequested(bool&, bool&)));
-	connect(m_popupMenu, TQT_SIGNAL(insertFromFileRequested(const KURL&)),
-		this, TQT_SLOT(handleInsertFromFileAction(const KURL&)));
-	connect(m_popupMenu, TQT_SIGNAL(saveAsRequested(const TQString&)),
-		this, TQT_SLOT(handleSaveAsAction(const TQString&)));
-	connect(m_popupMenu, TQT_SIGNAL(cutRequested()),
-		this, TQT_SLOT(handleCutAction()));
-	connect(m_popupMenu, TQT_SIGNAL(copyRequested()),
-		this, TQT_SLOT(handleCopyAction()));
-	connect(m_popupMenu, TQT_SIGNAL(pasteRequested()),
-		this, TQT_SLOT(handlePasteAction()));
-	connect(m_popupMenu, TQT_SIGNAL(clearRequested()),
-		this, TQT_SLOT(clear()));
-	connect(m_popupMenu, TQT_SIGNAL(showPropertiesRequested()),
-		this, TQT_SLOT(handleShowPropertiesAction()));
-
-//	connect(m_popupMenu, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(slotAboutToHidePopupMenu()));
+	connect(m_popupMenu, TQ_SIGNAL(updateActionsAvailabilityRequested(bool&, bool&)), 
+		this, TQ_SLOT(slotUpdateActionsAvailabilityRequested(bool&, bool&)));
+	connect(m_popupMenu, TQ_SIGNAL(insertFromFileRequested(const KURL&)),
+		this, TQ_SLOT(handleInsertFromFileAction(const KURL&)));
+	connect(m_popupMenu, TQ_SIGNAL(saveAsRequested(const TQString&)),
+		this, TQ_SLOT(handleSaveAsAction(const TQString&)));
+	connect(m_popupMenu, TQ_SIGNAL(cutRequested()),
+		this, TQ_SLOT(handleCutAction()));
+	connect(m_popupMenu, TQ_SIGNAL(copyRequested()),
+		this, TQ_SLOT(handleCopyAction()));
+	connect(m_popupMenu, TQ_SIGNAL(pasteRequested()),
+		this, TQ_SLOT(handlePasteAction()));
+	connect(m_popupMenu, TQ_SIGNAL(clearRequested()),
+		this, TQ_SLOT(clear()));
+	connect(m_popupMenu, TQ_SIGNAL(showPropertiesRequested()),
+		this, TQ_SLOT(handleShowPropertiesAction()));
+
+//	connect(m_popupMenu, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(slotAboutToHidePopupMenu()));
 //	if (m_chooser) {
 		//we couldn't use m_chooser->setPopup() because of drawing problems
-//		connect(m_chooser, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotChooserPressed()));
-//		connect(m_chooser, TQT_SIGNAL(released()), this, TQT_SLOT(slotChooserReleased()));
-//		connect(m_chooser, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggled(bool)));
+//		connect(m_chooser, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotChooserPressed()));
+//		connect(m_chooser, TQ_SIGNAL(released()), this, TQ_SLOT(slotChooserReleased()));
+//		connect(m_chooser, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggled(bool)));
 //	}
 
 	setDataSource( TQString() ); //to initialize popup menu and actions availability
diff --git a/kexi/plugins/forms/widgets/kexidbintspinbox.cpp b/kexi/plugins/forms/widgets/kexidbintspinbox.cpp
index 633fe6fc..d574963b 100644
--- a/kexi/plugins/forms/widgets/kexidbintspinbox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbintspinbox.cpp
@@ -26,7 +26,7 @@
 KexiDBIntSpinBox::KexiDBIntSpinBox(TQWidget *parent, const char *name)
  : KIntSpinBox(parent, name) , KexiFormDataItemInterface()
 {
-	connect(this, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotValueChanged()));
+	connect(this, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotValueChanged()));
 }
 
 KexiDBIntSpinBox::~KexiDBIntSpinBox()
diff --git a/kexi/plugins/forms/widgets/kexidblabel.cpp b/kexi/plugins/forms/widgets/kexidblabel.cpp
index 93f35027..7df46895 100644
--- a/kexi/plugins/forms/widgets/kexidblabel.cpp
+++ b/kexi/plugins/forms/widgets/kexidblabel.cpp
@@ -433,7 +433,7 @@ void KexiDBLabel::updatePixmapLater() {
 	if (d->resizeEvent) {
 		if (!d->timer) {
 			d->timer = new TQTimer(this, "KexiDBLabelTimer");
-			connect(d->timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updatePixmap()));
+			connect(d->timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updatePixmap()));
 		}
 		d->timer->start(100, true);
 		d->resizeEvent = false;
diff --git a/kexi/plugins/forms/widgets/kexidblineedit.cpp b/kexi/plugins/forms/widgets/kexidblineedit.cpp
index e0395cde..eebe699d 100644
--- a/kexi/plugins/forms/widgets/kexidblineedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidblineedit.cpp
@@ -67,7 +67,7 @@ KexiDBLineEdit::KexiDBLineEdit(TQWidget *parent, const char *name)
 	widget->setPalette(p);
 #endif
 
-	connect(this, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotTextChanged(const TQString&)));
+	connect(this, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotTextChanged(const TQString&)));
 }
 
 KexiDBLineEdit::~KexiDBLineEdit()
diff --git a/kexi/plugins/forms/widgets/kexidbtextedit.cpp b/kexi/plugins/forms/widgets/kexidbtextedit.cpp
index b99eb609..11e88b1a 100644
--- a/kexi/plugins/forms/widgets/kexidbtextedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidbtextedit.cpp
@@ -35,7 +35,7 @@ KexiDBTextEdit::KexiDBTextEdit(TQWidget *parent, const char *name)
  , m_menuExtender(this, this)
  , m_slotTextChanged_enabled(true)
 {
-	connect(this, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged()));
+	connect(this, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotTextChanged()));
 	installEventFilter(this);
 }
 
diff --git a/kexi/plugins/forms/widgets/kexidbtimeedit.cpp b/kexi/plugins/forms/widgets/kexidbtimeedit.cpp
index ac42fa85..1233c1dd 100644
--- a/kexi/plugins/forms/widgets/kexidbtimeedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidbtimeedit.cpp
@@ -42,7 +42,7 @@ KexiDBTimeEdit::KexiDBTimeEdit(const TQTime &time, TQWidget *parent, const char
 	m_dte_time = 0;
 #endif
 
-	connect(this, TQT_SIGNAL(valueChanged(const TQTime&)), this, TQT_SLOT(slotValueChanged(const TQTime&)));
+	connect(this, TQ_SIGNAL(valueChanged(const TQTime&)), this, TQ_SLOT(slotValueChanged(const TQTime&)));
 }
 
 KexiDBTimeEdit::~KexiDBTimeEdit()