Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>

31 files changed, 258 insertions, 258 deletions

diff --git a/kexi/widget/kexibrowser.cpp b/kexi/widget/kexibrowser.cpp
index 6a17bc94..44b957af 100644
--- a/kexi/widget/kexibrowser.cpp
+++ b/kexi/widget/kexibrowser.cpp
@@ -91,7 +91,7 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features
 	lyr->addWidget(m_list);
 	m_list->installEventFilter(this);
 	m_list->renameLineEdit()->installEventFilter(this);
-	connect( kapp, TQT_SIGNAL( settingsChanged(int) ), TQT_SLOT( slotSettingsChanged(int) ) );
+	connect( kapp, TQ_SIGNAL( settingsChanged(int) ), TQ_SLOT( slotSettingsChanged(int) ) );
 	slotSettingsChanged(0);
 
 	m_list->header()->hide();
@@ -103,28 +103,28 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features
 	m_list->setTooltipColumn(0);
 	m_list->renameLineEdit()->setValidator( new KexiUtils::IdentifierValidator(this) );
 	m_list->setResizeMode(TQListView::LastColumn);
-	connect(m_list, TQT_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint &)),
-		this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem *, const TQPoint&)));
-	connect(m_list, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this,
-		TQT_SLOT(slotSelectionChanged(TQListViewItem*)));
+	connect(m_list, TQ_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint &)),
+		this, TQ_SLOT(slotContextMenu(TDEListView*, TQListViewItem *, const TQPoint&)));
+	connect(m_list, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this,
+		TQ_SLOT(slotSelectionChanged(TQListViewItem*)));
 	
 	TDEConfig *config = kapp->config();
 	config->setGroup("MainWindow");
 	if ((m_features & SingleClickOpensItemOptionEnabled) 
 		&& config->readBoolEntry("SingleClickOpensItem", false))
 	{
-		connect(m_list, TQT_SIGNAL(executed(TQListViewItem*)), this,
-			TQT_SLOT(slotExecuteItem(TQListViewItem*)));
+		connect(m_list, TQ_SIGNAL(executed(TQListViewItem*)), this,
+			TQ_SLOT(slotExecuteItem(TQListViewItem*)));
 	}
 	else {
-		connect(m_list, TQT_SIGNAL(doubleClicked(TQListViewItem*)), this,
-			TQT_SLOT(slotExecuteItem(TQListViewItem*)));
+		connect(m_list, TQ_SIGNAL(doubleClicked(TQListViewItem*)), this,
+			TQ_SLOT(slotExecuteItem(TQListViewItem*)));
 		m_list->enableExecuteArea = false;
 	}
 
 	// actions
 	m_openAction = new TDEAction(i18n("&Open"), "document-open", 0/*TQt::Key_Enter conflict!*/, this, 
-		TQT_SLOT(slotOpenObject()), this, "open_object");
+		TQ_SLOT(slotOpenObject()), this, "open_object");
 	m_openAction->setToolTip(i18n("Open object"));
 	m_openAction->setWhatsThis(i18n("Opens object selected in the list"));
 
@@ -146,20 +146,20 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features
 	}
 	else {
 		m_deleteAction = new TDEAction(i18n("&Delete"), "edit-delete", 0/*TQt::Key_Delete*/, 
-			this, TQT_SLOT(slotRemove()), m_actions, "edit_delete");
+			this, TQ_SLOT(slotRemove()), m_actions, "edit_delete");
 	//! @todo 1.1: just add "Delete" tooltip and what's this
 		m_deleteAction->setToolTip(i18n("&Delete").replace("&",""));
 
 		m_renameAction = new TDEAction(i18n("&Rename"), "", 0, 
-			this, TQT_SLOT(slotRename()), m_actions, "edit_rename");
+			this, TQ_SLOT(slotRename()), m_actions, "edit_rename");
 #ifdef KEXI_SHOW_UNIMPLEMENTED
-		//todo	plugSharedAction("edit_cut",TQT_SLOT(slotCut()));
-		//todo	plugSharedAction("edit_copy",TQT_SLOT(slotCopy()));
-		//todo	plugSharedAction("edit_paste",TQT_SLOT(slotPaste()));
+		//todo	plugSharedAction("edit_cut",TQ_SLOT(slotCut()));
+		//todo	plugSharedAction("edit_copy",TQ_SLOT(slotCopy()));
+		//todo	plugSharedAction("edit_paste",TQ_SLOT(slotPaste()));
 #endif
 
 		m_designAction = new TDEAction(i18n("&Design"), "edit", 0/*TQt::CTRL + TQt::Key_Enter conflict!*/, this, 
-			TQT_SLOT(slotDesignObject()), this, "design_object");
+			TQ_SLOT(slotDesignObject()), this, "design_object");
 		m_designAction->setToolTip(i18n("Design object"));
 		m_designAction->setWhatsThis(i18n("Starts designing of the object selected in the list"));
 		if (m_features & Toolbar) {
@@ -168,20 +168,20 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features
 		}
 
 		m_editTextAction = new TDEAction(i18n("Open in &Text View"), "", 0, this, 
-			TQT_SLOT(slotEditTextObject()), this, "editText_object");
+			TQ_SLOT(slotEditTextObject()), this, "editText_object");
 		m_editTextAction->setToolTip(i18n("Open object in text view"));
 		m_editTextAction->setWhatsThis(i18n("Opens selected object in the list in text view"));
 
-		m_newObjectAction = new TDEAction("", "document-new", 0, this, TQT_SLOT(slotNewObject()), this, "new_object");
+		m_newObjectAction = new TDEAction("", "document-new", 0, this, TQ_SLOT(slotNewObject()), this, "new_object");
 		if (m_features & Toolbar) {
 			m_newObjectToolButton = new KexiSmallToolButton(this, "", TQIconSet(), "new_object");
 			m_newObjectPopup = new TDEPopupMenu(this, "newObjectPopup");
-			connect(m_newObjectPopup, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotNewObjectPopupAboutToShow()));
+			connect(m_newObjectPopup, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotNewObjectPopupAboutToShow()));
 		//	KexiPart::Part* part = Kexi::partManager().part("kexi/table");
 		//	m_newObjectPopup->insertItem( SmallIconSet(part->info()->createItemIcon()), part->instanceName() );
 			m_newObjectToolButton->setPopup(m_newObjectPopup);
 			m_newObjectToolButton->setPopupDelay(TQApplication::startDragTime());
-			connect(m_newObjectToolButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewObject()));
+			connect(m_newObjectToolButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNewObject()));
 			buttons_flyr->add(m_newObjectToolButton);
 
 			m_deleteObjectToolButton = new KexiSmallToolButton(this, m_deleteAction);
@@ -191,21 +191,21 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features
 	}
 
 	m_executeAction = new TDEAction(i18n("Execute"), "media-playback-start", 0, this,
-		TQT_SLOT(slotExecuteObject()), this, "data_execute");
+		TQ_SLOT(slotExecuteObject()), this, "data_execute");
 
 	m_exportActionMenu = new TDEActionMenu(i18n("Export"));
 	m_dataExportAction = new TDEAction(i18n("Export->To File as Data &Table... ", "To &File as Data Table..."), 
-		"table", 0, this, TQT_SLOT(slotExportAsDataTable()), this, "exportAsDataTable");
+		"table", 0, this, TQ_SLOT(slotExportAsDataTable()), this, "exportAsDataTable");
 	m_dataExportAction->setWhatsThis(
 		i18n("Exports data from the currently selected table or query data to a file."));
 	m_exportActionMenu->insert( m_dataExportAction );
 
 	m_printAction = new TDEAction(i18n("&Print..."), "document-print", 0, this, 
-		TQT_SLOT(slotPrintItem()), this, "printItem");
+		TQ_SLOT(slotPrintItem()), this, "printItem");
 	m_printAction->setWhatsThis(
 		i18n("Prints data from the currently selected table or query."));
 	m_pageSetupAction = new TDEAction(i18n("Page Setup..."), "", 0, this, 
-		TQT_SLOT(slotPageSetupForItem()), this, "pageSetupForItem");
+		TQ_SLOT(slotPageSetupForItem()), this, "pageSetupForItem");
 	m_pageSetupAction->setWhatsThis(
 		i18n("Shows page setup for printing the active table or query."));
 
diff --git a/kexi/widget/kexidataawareview.cpp b/kexi/widget/kexidataawareview.cpp
index 6c61009b..893a9103 100644
--- a/kexi/widget/kexidataawareview.cpp
+++ b/kexi/widget/kexidataawareview.cpp
@@ -45,15 +45,15 @@ void KexiDataAwareView::init( TQWidget* viewWidget, KexiSharedActionClient* acti
 	setViewWidget(m_internalView, true);
 
 	if (!noDataAware) {
-		m_dataAwareObject->connectCellSelectedSignal(this, TQT_SLOT(slotCellSelected(int,int)));
+		m_dataAwareObject->connectCellSelectedSignal(this, TQ_SLOT(slotCellSelected(int,int)));
 
 		//! before closing - we'are accepting editing
-		connect(this, TQT_SIGNAL(closing(bool&)), this, TQT_SLOT(slotClosing(bool&)));
+		connect(this, TQ_SIGNAL(closing(bool&)), this, TQ_SLOT(slotClosing(bool&)));
 
 		//! updating actions on start/stop editing
-		m_dataAwareObject->connectRowEditStartedSignal(this, TQT_SLOT(slotUpdateRowActions(int)));
-		m_dataAwareObject->connectRowEditTerminatedSignal(this, TQT_SLOT(slotUpdateRowActions(int)));
-		m_dataAwareObject->connectReloadActionsSignal(this, TQT_SLOT(reloadActions()));
+		m_dataAwareObject->connectRowEditStartedSignal(this, TQ_SLOT(slotUpdateRowActions(int)));
+		m_dataAwareObject->connectRowEditTerminatedSignal(this, TQ_SLOT(slotUpdateRowActions(int)));
+		m_dataAwareObject->connectReloadActionsSignal(this, TQ_SLOT(reloadActions()));
 	}
 
 	TQVBoxLayout *box = new TQVBoxLayout(this);
@@ -72,37 +72,37 @@ void KexiDataAwareView::init( TQWidget* viewWidget, KexiSharedActionClient* acti
 
 void KexiDataAwareView::initActions()
 {
-	plugSharedAction("edit_delete_row", this, TQT_SLOT(deleteCurrentRow()));
+	plugSharedAction("edit_delete_row", this, TQ_SLOT(deleteCurrentRow()));
 	m_actionClient->plugSharedAction(sharedAction("edit_delete_row")); //for proper shortcut
 
-	plugSharedAction("edit_delete", this, TQT_SLOT(deleteAndStartEditCurrentCell()));
+	plugSharedAction("edit_delete", this, TQ_SLOT(deleteAndStartEditCurrentCell()));
 	m_actionClient->plugSharedAction(sharedAction("edit_delete")); //for proper shortcut
 
-	plugSharedAction("edit_edititem", this, TQT_SLOT(startEditOrToggleValue()));
+	plugSharedAction("edit_edititem", this, TQ_SLOT(startEditOrToggleValue()));
 	m_actionClient->plugSharedAction(sharedAction("edit_edititem")); //for proper shortcut
 
-	plugSharedAction("data_save_row", this, TQT_SLOT(acceptRowEdit()));
+	plugSharedAction("data_save_row", this, TQ_SLOT(acceptRowEdit()));
 	m_actionClient->plugSharedAction(sharedAction("data_save_row")); //for proper shortcut
 
-	plugSharedAction("data_cancel_row_changes", this, TQT_SLOT(cancelRowEdit()));
+	plugSharedAction("data_cancel_row_changes", this, TQ_SLOT(cancelRowEdit()));
 	m_actionClient->plugSharedAction(sharedAction("data_cancel_row_changes")); //for proper shortcut
 
 	if (m_dataAwareObject->isSortingEnabled()) {
-		plugSharedAction("data_sort_az", this, TQT_SLOT(sortAscending()));
-		plugSharedAction("data_sort_za", this, TQT_SLOT(sortDescending()));
+		plugSharedAction("data_sort_az", this, TQ_SLOT(sortAscending()));
+		plugSharedAction("data_sort_za", this, TQ_SLOT(sortDescending()));
 	}
 
 	m_actionClient->plugSharedAction(sharedAction("edit_insert_empty_row")); //for proper shortcut
 
 	setAvailable("data_sort_az", m_dataAwareObject->isSortingEnabled());
 	setAvailable("data_sort_za", m_dataAwareObject->isSortingEnabled());
-//! \todo 	plugSharedAction("data_filter", this, TQT_SLOT(???()));
+//! \todo 	plugSharedAction("data_filter", this, TQ_SLOT(???()));
 
-	plugSharedAction("data_go_to_first_record", this, TQT_SLOT(slotGoToFirstRow()));
-	plugSharedAction("data_go_to_previous_record", this, TQT_SLOT(slotGoToPreviusRow()));
-	plugSharedAction("data_go_to_next_record", this, TQT_SLOT(slotGoToNextRow()));
-	plugSharedAction("data_go_to_last_record", this, TQT_SLOT(slotGoToLastRow()));
-	plugSharedAction("data_go_to_new_record", this, TQT_SLOT(slotGoToNewRow()));
+	plugSharedAction("data_go_to_first_record", this, TQ_SLOT(slotGoToFirstRow()));
+	plugSharedAction("data_go_to_previous_record", this, TQ_SLOT(slotGoToPreviusRow()));
+	plugSharedAction("data_go_to_next_record", this, TQ_SLOT(slotGoToNextRow()));
+	plugSharedAction("data_go_to_last_record", this, TQ_SLOT(slotGoToLastRow()));
+	plugSharedAction("data_go_to_new_record", this, TQ_SLOT(slotGoToNewRow()));
 
 //! \todo update availability
 	setAvailable("data_go_to_first_record", true);
@@ -111,25 +111,25 @@ void KexiDataAwareView::initActions()
 	setAvailable("data_go_to_last_record", true);
 	setAvailable("data_go_to_new_record", true);
 
-	plugSharedAction("edit_copy", this, TQT_SLOT(copySelection()));
+	plugSharedAction("edit_copy", this, TQ_SLOT(copySelection()));
 	m_actionClient->plugSharedAction(sharedAction("edit_copy")); //for proper shortcut
 
-	plugSharedAction("edit_cut", this, TQT_SLOT(cutSelection()));
+	plugSharedAction("edit_cut", this, TQ_SLOT(cutSelection()));
 	m_actionClient->plugSharedAction(sharedAction("edit_cut")); //for proper shortcut
 
-	plugSharedAction("edit_paste", this, TQT_SLOT(paste()));
+	plugSharedAction("edit_paste", this, TQ_SLOT(paste()));
 	m_actionClient->plugSharedAction(sharedAction("edit_paste")); //for proper shortcut
 
-//	plugSharedAction("edit_find", this, TQT_SLOT(editFind()));
+//	plugSharedAction("edit_find", this, TQ_SLOT(editFind()));
 //	m_actionClient->plugSharedAction(sharedAction("edit_find")); //for proper shortcut
 
-//	plugSharedAction("edit_findnext", this, TQT_SLOT(editFindNext()));
+//	plugSharedAction("edit_findnext", this, TQ_SLOT(editFindNext()));
 //	m_actionClient->plugSharedAction(sharedAction("edit_findnext")); //for proper shortcut
 
-//	plugSharedAction("edit_findprevious", this, TQT_SLOT(editFindPrevious()));
+//	plugSharedAction("edit_findprevious", this, TQ_SLOT(editFindPrevious()));
 //	m_actionClient->plugSharedAction(sharedAction("edit_findprev")); //for proper shortcut
 
-//! @todo	plugSharedAction("edit_replace", this, TQT_SLOT(editReplace()));
+//! @todo	plugSharedAction("edit_replace", this, TQ_SLOT(editReplace()));
 //! @todo	m_actionClient->plugSharedAction(sharedAction("edit_replace")); //for proper shortcut
 
 //	setAvailable("edit_find", true);
@@ -188,7 +188,7 @@ void KexiDataAwareView::reloadActions()
 //warning FIXME Move this to the table part
 /*
 	kdDebug()<<"INIT ACTIONS***********************************************************************"<<endl;
-	new TDEAction(i18n("Filter"), "filter", 0, this, TQT_SLOT(filter()), actionCollection(), "tablepart_filter");
+	new TDEAction(i18n("Filter"), "filter", 0, this, TQ_SLOT(filter()), actionCollection(), "tablepart_filter");
 	setXMLFile("kexidatatableui.rc");
 */
 	m_dataAwareObject->contextMenu()->clear();
@@ -200,11 +200,11 @@ void KexiDataAwareView::reloadActions()
 	bool separatorNeeded = true;
 
 	unplugSharedAction("edit_clear_table");
-	plugSharedAction("edit_clear_table", this, TQT_SLOT(deleteAllRows()));
+	plugSharedAction("edit_clear_table", this, TQ_SLOT(deleteAllRows()));
 
 	if (m_dataAwareObject->isEmptyRowInsertingEnabled()) {
 		unplugSharedAction("edit_insert_empty_row");
-		plugSharedAction("edit_insert_empty_row", m_internalView, TQT_SLOT(insertEmptyRow()));
+		plugSharedAction("edit_insert_empty_row", m_internalView, TQ_SLOT(insertEmptyRow()));
 		if (separatorNeeded)
 			m_dataAwareObject->contextMenu()->insertSeparator();
 		plugSharedAction("edit_insert_empty_row", m_dataAwareObject->contextMenu());
diff --git a/kexi/widget/kexidatasourcecombobox.cpp b/kexi/widget/kexidatasourcecombobox.cpp
index 4299017d..dab210a9 100644
--- a/kexi/widget/kexidatasourcecombobox.cpp
+++ b/kexi/widget/kexidatasourcecombobox.cpp
@@ -76,8 +76,8 @@ KexiDataSourceComboBox::KexiDataSourceComboBox(TQWidget *parent, const char *nam
 	setInsertionPolicy(NoInsertion);
 	setCompletionMode(TDEGlobalSettings::CompletionPopupAuto);
 	setSizeLimit( 16 );
-	connect(this, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated(int)));
-	connect(this, TQT_SIGNAL(returnPressed(const TQString &)), this, TQT_SLOT(slotReturnPressed(const TQString &)));
+	connect(this, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated(int)));
+	connect(this, TQ_SIGNAL(returnPressed(const TQString &)), this, TQ_SLOT(slotReturnPressed(const TQString &)));
 
 	d->tableIcon = SmallIcon("table");
 	d->queryIcon = SmallIcon("query");
@@ -110,12 +110,12 @@ void KexiDataSourceComboBox::setProject(KexiProject *prj, bool showTables, bool
 		return;
 
 	//needed for updating contents of the combo box
-	connect(d->prj, TQT_SIGNAL(newItemStored(KexiPart::Item&)),
-		this, TQT_SLOT(slotNewItemStored(KexiPart::Item&)));
-	connect(d->prj, TQT_SIGNAL(itemRemoved(const KexiPart::Item&)),
-		this, TQT_SLOT(slotItemRemoved(const KexiPart::Item&)));
-	connect(d->prj, TQT_SIGNAL(itemRenamed(const KexiPart::Item&, const TQCString&)),
-		this, TQT_SLOT(slotItemRenamed(const KexiPart::Item&, const TQCString&)));
+	connect(d->prj, TQ_SIGNAL(newItemStored(KexiPart::Item&)),
+		this, TQ_SLOT(slotNewItemStored(KexiPart::Item&)));
+	connect(d->prj, TQ_SIGNAL(itemRemoved(const KexiPart::Item&)),
+		this, TQ_SLOT(slotItemRemoved(const KexiPart::Item&)));
+	connect(d->prj, TQ_SIGNAL(itemRenamed(const KexiPart::Item&, const TQCString&)),
+		this, TQ_SLOT(slotItemRenamed(const KexiPart::Item&, const TQCString&)));
 
 	KexiDB::Connection *conn = d->prj->dbConnection();
 	if (!conn)
diff --git a/kexi/widget/kexidbconnectionwidget.cpp b/kexi/widget/kexidbconnectionwidget.cpp
index c36df02f..f3a9f0ad 100644
--- a/kexi/widget/kexidbconnectionwidget.cpp
+++ b/kexi/widget/kexidbconnectionwidget.cpp
@@ -105,10 +105,10 @@ KexiDBConnectionWidget::KexiDBConnectionWidget( TQWidget* parent,  const char* n
 	TQWidget::setTabOrder(d->btnSaveChanges, d->btnTestConnection);
 	d->btnTestConnection->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
 
-	connect( locationBGrp, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotLocationBGrpClicked(int)) );
-	connect( chkPortDefault, TQT_SIGNAL(toggled(bool)), this , TQT_SLOT(slotCBToggled(bool)) );
-	connect( btnLoadDBList, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(loadDBList()) );
-	connect( d->btnSaveChanges, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(saveChanges()) );
+	connect( locationBGrp, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotLocationBGrpClicked(int)) );
+	connect( chkPortDefault, TQ_SIGNAL(toggled(bool)), this , TQ_SLOT(slotCBToggled(bool)) );
+	connect( btnLoadDBList, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(loadDBList()) );
+	connect( d->btnSaveChanges, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(saveChanges()) );
 }
 
 KexiDBConnectionWidget::~KexiDBConnectionWidget()
@@ -237,7 +237,7 @@ KexiDBConnectionTabWidget::KexiDBConnectionTabWidget( TQWidget* parent, const ch
 	detailsWidget = new KexiDBConnectionWidgetDetailsBase(this, "detailsWidget");
 	addTab( detailsWidget, i18n("Details") );
 
-	connect( mainWidget->testConnectionButton(), TQT_SIGNAL(clicked()), this, TQT_SLOT(slotTestConnection()) );
+	connect( mainWidget->testConnectionButton(), TQ_SIGNAL(clicked()), this, TQ_SLOT(slotTestConnection()) );
 }
 
 KexiDBConnectionTabWidget::~KexiDBConnectionTabWidget()
@@ -372,10 +372,10 @@ KexiDBConnectionDialog::~KexiDBConnectionDialog()
 
 void KexiDBConnectionDialog::init()
 {
-	connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(accept()));
+	connect( this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(accept()));
 	setMainWidget(tabWidget);
-	connect(tabWidget->mainWidget, TQT_SIGNAL(saveChanges()), this, TQT_SIGNAL(saveChanges()));
-	connect(tabWidget, TQT_SIGNAL(testConnection()), this, TQT_SIGNAL(testConnection()));
+	connect(tabWidget->mainWidget, TQ_SIGNAL(saveChanges()), this, TQ_SIGNAL(saveChanges()));
+	connect(tabWidget, TQ_SIGNAL(testConnection()), this, TQ_SIGNAL(testConnection()));
 
 	adjustSize();
 	resize(width(), tabWidget->height());
diff --git a/kexi/widget/kexidswelcome.cpp b/kexi/widget/kexidswelcome.cpp
index 6f722f0e..fb78ca04 100644
--- a/kexi/widget/kexidswelcome.cpp
+++ b/kexi/widget/kexidswelcome.cpp
@@ -39,7 +39,7 @@ KexiDSWelcome::KexiDSWelcome(KexiDataSourceWizard *parent)
 	TQLabel *lText = new TQLabel(i18n("Kexi can help you with creation of %2 using data sources in almost no time with the \"%1 Wizard\""), this);
 	lText->setAlignment(AlignTop | AlignLeft | WordBreak);
 	TQCheckBox *useWizard = new TQCheckBox(i18n("Create %1 using the \"%1 Wizard\""), this);
-	connect(useWizard, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setUseWizard(bool)));
+	connect(useWizard, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setUseWizard(bool)));
 	useWizard->setChecked(true);
 
 	TQSpacerItem *spacer = new TQSpacerItem(320, 220);
diff --git a/kexi/widget/kexieditor.cpp b/kexi/widget/kexieditor.cpp
index 01000882..ff598a05 100644
--- a/kexi/widget/kexieditor.cpp
+++ b/kexi/widget/kexieditor.cpp
@@ -54,13 +54,13 @@ public:
 		: KexiSharedActionConnector( proxy, obj )
 	{
 #ifdef KTEXTEDIT_BASED_SQL_EDITOR
-		plugSharedAction("edit_cut", TQT_SLOT(cut()));
-		plugSharedAction("edit_copy", TQT_SLOT(copy()));
-		plugSharedAction("edit_paste", TQT_SLOT(paste()));
-		plugSharedAction("edit_clear", TQT_SLOT(clear()));
-		plugSharedAction("edit_undo", TQT_SLOT(undo()));
-		plugSharedAction("edit_redo", TQT_SLOT(redo()));
-                plugSharedAction("edit_select_all", TQT_SLOT(selectAll()));
+		plugSharedAction("edit_cut", TQ_SLOT(cut()));
+		plugSharedAction("edit_copy", TQ_SLOT(copy()));
+		plugSharedAction("edit_paste", TQ_SLOT(paste()));
+		plugSharedAction("edit_clear", TQ_SLOT(clear()));
+		plugSharedAction("edit_undo", TQ_SLOT(undo()));
+		plugSharedAction("edit_redo", TQ_SLOT(redo()));
+                plugSharedAction("edit_select_all", TQ_SLOT(selectAll()));
 #else
 		TQValueList<TQCString> actions;
 		actions << "edit_cut" << "edit_copy" << "edit_paste" << "edit_clear"
@@ -89,7 +89,7 @@ KexiEditor::KexiEditor(KexiMainWindow *mainWin, TQWidget *parent, const char *na
 #ifdef KTEXTEDIT_BASED_SQL_EDITOR
 	d->view = new KTextEdit( "", TQString(), this, "kexi_editor" );
 	//adjust font
-	connect(d->view, TQT_SIGNAL(textChanged()), this, TQT_SIGNAL(textChanged()));
+	connect(d->view, TQ_SIGNAL(textChanged()), this, TQ_SIGNAL(textChanged()));
 	TQFont f("Courier");
 	f.setStyleStrategy(TQFont::PreferAntialias);
 	f.setPointSize(d->view->font().pointSize());
@@ -116,7 +116,7 @@ KexiEditor::KexiEditor(KexiMainWindow *mainWin, TQWidget *parent, const char *na
 			}
 	}
 
-	connect(d->doc, TQT_SIGNAL(textChanged()), this, TQT_SIGNAL(textChanged()));
+	connect(d->doc, TQ_SIGNAL(textChanged()), this, TQ_SIGNAL(textChanged()));
 #endif
 	KexiEditorSharedActionConnector c(this, d->view);
 	d->view->installEventFilter(this);
diff --git a/kexi/widget/kexifieldcombobox.cpp b/kexi/widget/kexifieldcombobox.cpp
index 875425de..eb65fe22 100644
--- a/kexi/widget/kexifieldcombobox.cpp
+++ b/kexi/widget/kexifieldcombobox.cpp
@@ -77,8 +77,8 @@ KexiFieldComboBox::KexiFieldComboBox(TQWidget *parent, const char *name)
 	setInsertionPolicy(NoInsertion);
 	setCompletionMode(TDEGlobalSettings::CompletionPopupAuto);
 	setSizeLimit( 16 );
-	connect(this, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated(int)));
-	connect(this, TQT_SIGNAL(returnPressed(const TQString &)), this, TQT_SLOT(slotReturnPressed(const TQString &)));
+	connect(this, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated(int)));
+	connect(this, TQ_SIGNAL(returnPressed(const TQString &)), this, TQ_SLOT(slotReturnPressed(const TQString &)));
 
 //	setAcceptDrops(true);
 //	viewport()->setAcceptDrops(true);
diff --git a/kexi/widget/kexifieldlistview.cpp b/kexi/widget/kexifieldlistview.cpp
index 348e9ee0..64d38a32 100644
--- a/kexi/widget/kexifieldlistview.cpp
+++ b/kexi/widget/kexifieldlistview.cpp
@@ -65,8 +65,8 @@ KexiFieldListView::KexiFieldListView(TQWidget *parent, const char *name, int opt
 	setSorting(-1, true); // disable sorting
 	setDragEnabled(true);
 	
-	connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint &, int)), 
-		this, TQT_SLOT(slotDoubleClicked(TQListViewItem*)));
+	connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint &, int)), 
+		this, TQ_SLOT(slotDoubleClicked(TQListViewItem*)));
 }
 
 KexiFieldListView::~KexiFieldListView()
diff --git a/kexi/widget/kexipropertyeditorview.cpp b/kexi/widget/kexipropertyeditorview.cpp
index 6af497d1..35d5d0f3 100644
--- a/kexi/widget/kexipropertyeditorview.cpp
+++ b/kexi/widget/kexipropertyeditorview.cpp
@@ -134,8 +134,8 @@ KexiPropertyEditorView::KexiPropertyEditorView(KexiMainWindow *mainWin, TQWidget
 	d->objectInfoLabel->setBuddy(d->editor);
 	setFocusPolicy(TQWidget::WheelFocus);
 
-	connect(d->editor, TQT_SIGNAL(propertySetChanged(KoProperty::Set*)), 
-		this, TQT_SLOT(slotPropertySetChanged(KoProperty::Set*)));
+	connect(d->editor, TQ_SIGNAL(propertySetChanged(KoProperty::Set*)), 
+		this, TQ_SLOT(slotPropertySetChanged(KoProperty::Set*)));
 
 //	d->iconName = "dummy";
 	slotPropertySetChanged(0);
diff --git a/kexi/widget/kexiscrollview.cpp b/kexi/widget/kexiscrollview.cpp
index ea456b21..c5f05032 100644
--- a/kexi/widget/kexiscrollview.cpp
+++ b/kexi/widget/kexiscrollview.cpp
@@ -73,7 +73,7 @@ KexiScrollView::KexiScrollView(TQWidget *parent, bool preview)
 	m_gridSize = 0;
 	m_outerAreaVisible = true;
 
-	connect(&m_delayedResize, TQT_SIGNAL(timeout()), this, TQT_SLOT(refreshContentsSize()));
+	connect(&m_delayedResize, TQ_SIGNAL(timeout()), this, TQ_SLOT(refreshContentsSize()));
 	m_smodeSet = false;
 	if (m_preview) {
 		refreshContentsSizeLater(true, true);
diff --git a/kexi/widget/kexisectionheader.cpp b/kexi/widget/kexisectionheader.cpp
index 7ff39106..2ad8b428 100644
--- a/kexi/widget/kexisectionheader.cpp
+++ b/kexi/widget/kexisectionheader.cpp
@@ -85,7 +85,7 @@ void KexiSectionHeader::addButton(const TQString& icon, const TQString& toolTip,
 	btn->setFocusPolicy(TQWidget::NoFocus);
 	btn->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred);
 	if (receiver && member) {
-		connect(btn, TQT_SIGNAL(clicked()), receiver, member);
+		connect(btn, TQ_SIGNAL(clicked()), receiver, member);
 	}
 
 	if (!icon.isEmpty()) {
@@ -151,7 +151,7 @@ void KexiSectionHeader::BoxLayout::addItem( TQLayoutItem * item )
 		if (item->widget()->inherits("KexiViewBase")) {
 			view = static_cast<KexiViewBase*>(item->widget());
 			KexiSectionHeader *sh = static_cast<KexiSectionHeader*>(mainWidget());
-			connect(view,TQT_SIGNAL(focus(bool)),sh,TQT_SLOT(slotFocus(bool)));
+			connect(view,TQ_SIGNAL(focus(bool)),sh,TQ_SLOT(slotFocus(bool)));
 			sh->d->lbl->setBuddy(item->widget());
 		}
 	}
diff --git a/kexi/widget/kexismalltoolbutton.cpp b/kexi/widget/kexismalltoolbutton.cpp
index e7d5c6b9..890d5549 100644
--- a/kexi/widget/kexismalltoolbutton.cpp
+++ b/kexi/widget/kexismalltoolbutton.cpp
@@ -49,8 +49,8 @@ KexiSmallToolButton::KexiSmallToolButton(TQWidget* parent, TDEAction* action)
  , m_action(action)
 {
 	init();
-	connect(this, TQT_SIGNAL(clicked()), action, TQT_SLOT(activate()));
-	connect(action, TQT_SIGNAL(enabled(bool)), this, TQT_SLOT(setEnabled(bool)));
+	connect(this, TQ_SIGNAL(clicked()), action, TQ_SLOT(activate()));
+	connect(action, TQ_SIGNAL(enabled(bool)), this, TQ_SLOT(setEnabled(bool)));
 	updateAction();
 }
 
diff --git a/kexi/widget/pixmapcollection.cpp b/kexi/widget/pixmapcollection.cpp
index 9248916c..d28759e9 100644
--- a/kexi/widget/pixmapcollection.cpp
+++ b/kexi/widget/pixmapcollection.cpp
@@ -176,7 +176,7 @@ LoadIconDialog::LoadIconDialog(TQWidget *parent)
 	list << i18n("Small") << i18n("Medium") << i18n("Large") << i18n("Huge");
 	combo->insertStringList(list);
 	combo->setCurrentItem(2);
-	connect(combo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changeIconSize(int)));
+	connect(combo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changeIconSize(int)));
 
 
 	// Icon chooser button
@@ -184,8 +184,8 @@ LoadIconDialog::LoadIconDialog(TQWidget *parent)
 	m_button->setIcon("kexi");
 	m_button->setIconSize(TDEIcon::SizeMedium);
 	l->addMultiCellWidget(m_button, 0, 1, 2, 2);
-	connect(m_button, TQT_SIGNAL(iconChanged(TQString)), this, TQT_SLOT(updateIconName(TQString)));
-	connect(m_nameInput, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(setIcon(const TQString &)));
+	connect(m_button, TQ_SIGNAL(iconChanged(TQString)), this, TQ_SLOT(updateIconName(TQString)));
+	connect(m_nameInput, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(setIcon(const TQString &)));
 }
 
 void
@@ -246,21 +246,21 @@ PixmapCollectionEditor::PixmapCollectionEditor(PixmapCollection *collection, TQW
 	newItemPath->setTextLabel(i18n("&Add File"), true);
 	vlayout->addWidget(newItemPath);
 	m_buttons.insert(BNewItemPath, newItemPath);
-	connect(newItemPath, TQT_SIGNAL(clicked()), this, TQT_SLOT(newItemByPath()));
+	connect(newItemPath, TQ_SIGNAL(clicked()), this, TQ_SLOT(newItemByPath()));
 
 	TQToolButton *newItemName = new TQToolButton(frame);
 	newItemName->setIconSet(BarIconSet("icons"));
 	newItemName->setTextLabel(i18n("&Add an Icon"), true);
 	vlayout->addWidget(newItemName);
 	m_buttons.insert(BNewItemName, newItemName);
-	connect(newItemName, TQT_SIGNAL(clicked()), this, TQT_SLOT(newItemByName()));
+	connect(newItemName, TQ_SIGNAL(clicked()), this, TQ_SLOT(newItemByName()));
 
 	TQToolButton *delItem = new TQToolButton(frame);
 	delItem->setIconSet(BarIconSet("edit_remove"));
 	delItem->setTextLabel(i18n("&Remove Selected Item"), true);
 	vlayout->addWidget(delItem);
 	m_buttons.insert(BDelItem, delItem);
-	connect(delItem, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeItem()));
+	connect(delItem, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeItem()));
 	vlayout->addStretch();
 
 	// Setup the iconView
@@ -270,8 +270,8 @@ PixmapCollectionEditor::PixmapCollectionEditor(PixmapCollection *collection, TQW
 	m_iconView->setAutoArrange(true);
 	m_iconView->setMode(TDEIconView::Select);
 	l->addWidget(m_iconView);
-	connect(m_iconView, TQT_SIGNAL(contextMenuRequested(TQIconViewItem*, const TQPoint&)), this, TQT_SLOT(displayMenu(TQIconViewItem*, const TQPoint&)));
-	connect(m_iconView, TQT_SIGNAL(itemRenamed(TQIconViewItem*, const TQString &)), this, TQT_SLOT(renameCollectionItem(TQIconViewItem*, const TQString&)));
+	connect(m_iconView, TQ_SIGNAL(contextMenuRequested(TQIconViewItem*, const TQPoint&)), this, TQ_SLOT(displayMenu(TQIconViewItem*, const TQPoint&)));
+	connect(m_iconView, TQ_SIGNAL(itemRenamed(TQIconViewItem*, const TQString &)), this, TQ_SLOT(renameCollectionItem(TQIconViewItem*, const TQString&)));
 
 	PixmapMap::ConstIterator it;
 	PixmapMap::ConstIterator endIt = collection->m_pixmaps.end();
@@ -366,8 +366,8 @@ PixmapCollectionEditor::displayMenu(TQIconViewItem *it, const TQPoint &p)
 {
 	if(!it) return;
 	TDEPopupMenu *menu = new TDEPopupMenu();
-	menu->insertItem(SmallIconSet("edit"), i18n("Rename Item"), this, TQT_SLOT(renameItem()));
-	menu->insertItem(SmallIconSet("remove"), i18n("Remove Item"), this, TQT_SLOT(removeItem()));
+	menu->insertItem(SmallIconSet("edit"), i18n("Rename Item"), this, TQ_SLOT(renameItem()));
+	menu->insertItem(SmallIconSet("remove"), i18n("Remove Item"), this, TQ_SLOT(removeItem()));
 	menu->exec(p);
 }
 
diff --git a/kexi/widget/relations/kexirelationview.cpp b/kexi/widget/relations/kexirelationview.cpp
index 81ce1382..150ab65f 100644
--- a/kexi/widget/relations/kexirelationview.cpp
+++ b/kexi/widget/relations/kexirelationview.cpp
@@ -55,7 +55,7 @@ KexiRelationView::KexiRelationView(TQWidget *parent, const char *name)
 	m_focusedTableView = 0;
 	setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken);
 
-//	connect(relation, TQT_SIGNAL(relationListUpdated(TQObject *)), this, TQT_SLOT(slotListUpdate(TQObject *)));
+//	connect(relation, TQ_SIGNAL(relationListUpdated(TQObject *)), this, TQ_SLOT(slotListUpdate(TQObject *)));
 
 	viewport()->setPaletteBackgroundColor(colorGroup().mid());
 	setFocusPolicy(TQWidget::WheelFocus);
@@ -70,15 +70,15 @@ KexiRelationView::KexiRelationView(TQWidget *parent, const char *name)
 	
 	plugSharedAction("edit_delete", i18n("Hide Table"), m_tableQueryPopup);
 	plugSharedAction("edit_delete",m_connectionPopup);
-	plugSharedAction("edit_delete",this, TQT_SLOT(removeSelectedObject()));
+	plugSharedAction("edit_delete",this, TQ_SLOT(removeSelectedObject()));
 */	
 #if 0
 	m_removeSelectedTableQueryAction = new TDEAction(i18n("&Hide Selected Table/Query"), "edit-delete", "",
-		this, TQT_SLOT(removeSelectedTableQuery()), parent->actionCollection(), "relationsview_removeSelectedTableQuery");
+		this, TQ_SLOT(removeSelectedTableQuery()), parent->actionCollection(), "relationsview_removeSelectedTableQuery");
 	m_removeSelectedConnectionAction = new TDEAction(i18n("&Remove Selected Relationship"), "button_cancel", "",
-		this, TQT_SLOT(removeSelectedConnection()), parent->actionCollection(), "relationsview_removeSelectedConnection");
+		this, TQ_SLOT(removeSelectedConnection()), parent->actionCollection(), "relationsview_removeSelectedConnection");
 	m_openSelectedTableQueryAction = new TDEAction(i18n("&Open Selected Table/Query"), "", "",
-		this, TQT_SLOT(openSelectedTableQuery()), 0/*parent->actionCollection()*/, "relationsview_openSelectedTableQuery");
+		this, TQ_SLOT(openSelectedTableQuery()), 0/*parent->actionCollection()*/, "relationsview_openSelectedTableQuery");
 #endif
 
 //	invalidateActions();
@@ -137,12 +137,12 @@ KexiRelationView::addTableContainer(KexiDB::TableSchema *t, const TQRect &rect)
 /*! @todo what about query? */
 		new KexiDB::TableOrQuerySchema(t)
 	);
-	connect(c, TQT_SIGNAL(endDrag()), this, TQT_SLOT(slotTableViewEndDrag()));
-	connect(c, TQT_SIGNAL(gotFocus()), this, TQT_SLOT(slotTableViewGotFocus()));
-//	connect(c, TQT_SIGNAL(headerContextMenuRequest(const TQPoint&)), 
-//		this, TQT_SLOT(tableHeaderContextMenuRequest(const TQPoint&)));
-	connect(c, TQT_SIGNAL(contextMenuRequest(const TQPoint&)), 
-		this, TQT_SIGNAL(tableContextMenuRequest(const TQPoint&)));
+	connect(c, TQ_SIGNAL(endDrag()), this, TQ_SLOT(slotTableViewEndDrag()));
+	connect(c, TQ_SIGNAL(gotFocus()), this, TQ_SLOT(slotTableViewGotFocus()));
+//	connect(c, TQ_SIGNAL(headerContextMenuRequest(const TQPoint&)), 
+//		this, TQ_SLOT(tableHeaderContextMenuRequest(const TQPoint&)));
+	connect(c, TQ_SIGNAL(contextMenuRequest(const TQPoint&)), 
+		this, TQ_SIGNAL(tableContextMenuRequest(const TQPoint&)));
 	
 	addChild(c, 100,100);
 	if (rect.isValid()) {//predefined size
@@ -195,8 +195,8 @@ KexiRelationView::addTableContainer(KexiDB::TableSchema *t, const TQRect &rect)
 
 	m_tables.insert(t->name(), c);
 
-	connect(c, TQT_SIGNAL(moved(KexiRelationViewTableContainer *)), this,
-            TQT_SLOT(containerMoved(KexiRelationViewTableContainer *)));
+	connect(c, TQ_SIGNAL(moved(KexiRelationViewTableContainer *)), this,
+            TQ_SLOT(containerMoved(KexiRelationViewTableContainer *)));
 	
 	if (hasFocus()) //ok?
 		c->setFocus();
diff --git a/kexi/widget/relations/kexirelationviewtable.cpp b/kexi/widget/relations/kexirelationviewtable.cpp
index 7053c778..7c28d463 100644
--- a/kexi/widget/relations/kexirelationviewtable.cpp
+++ b/kexi/widget/relations/kexirelationviewtable.cpp
@@ -63,8 +63,8 @@ KexiRelationViewTableContainer::KexiRelationViewTableContainer(
 	m_tableHeader->unsetFocus();
 	m_tableHeader->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed));
 	lyr->addWidget(m_tableHeader);
-	connect(m_tableHeader,TQT_SIGNAL(moved()),this,TQT_SLOT(moved()));
-	connect(m_tableHeader, TQT_SIGNAL(endDrag()), this, TQT_SIGNAL(endDrag()));
+	connect(m_tableHeader,TQ_SIGNAL(moved()),this,TQ_SLOT(moved()));
+	connect(m_tableHeader, TQ_SIGNAL(endDrag()), this, TQ_SIGNAL(endDrag()));
 
 	m_tableView = new KexiRelationViewTable(schema, parent, this, "KexiRelationViewTable");
 	//m_tableHeader->setFocusProxy( m_tableView );
@@ -74,9 +74,9 @@ KexiRelationViewTableContainer::KexiRelationViewTableContainer(
 	
 //	m_tableView->resize( m_tableView->sizeHint() );
 	lyr->addWidget(m_tableView, 0);
-	connect(m_tableView, TQT_SIGNAL(tableScrolling()), this, TQT_SLOT(moved()));
-	connect(m_tableView, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
-		this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
+	connect(m_tableView, TQ_SIGNAL(tableScrolling()), this, TQ_SLOT(moved()));
+	connect(m_tableView, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
+		this, TQ_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
 }
 
 KexiRelationViewTableContainer::~KexiRelationViewTableContainer()
@@ -299,8 +299,8 @@ KexiRelationViewTable::KexiRelationViewTable(KexiDB::TableOrQuerySchema* tableOr
 	setSchema(tableOrQuerySchema);
 	header()->hide();
 
-	connect(this, TQT_SIGNAL(dropped(TQDropEvent *, TQListViewItem *)), this, TQT_SLOT(slotDropped(TQDropEvent *)));
-	connect(this, TQT_SIGNAL(contentsMoving(int, int)), this, TQT_SLOT(slotContentsMoving(int,int)));
+	connect(this, TQ_SIGNAL(dropped(TQDropEvent *, TQListViewItem *)), this, TQ_SLOT(slotDropped(TQDropEvent *)));
+	connect(this, TQ_SIGNAL(contentsMoving(int, int)), this, TQ_SLOT(slotContentsMoving(int,int)));
 }
 
 KexiRelationViewTable::~KexiRelationViewTable()
diff --git a/kexi/widget/relations/kexirelationwidget.cpp b/kexi/widget/relations/kexirelationwidget.cpp
index e3a2e8b2..2fbda78e 100644
--- a/kexi/widget/relations/kexirelationwidget.cpp
+++ b/kexi/widget/relations/kexirelationwidget.cpp
@@ -65,7 +65,7 @@ KexiRelationWidget::KexiRelationWidget(KexiMainWindow *win, TQWidget *parent,
 	m_btnAdd = new KPushButton(i18n("&Add"), this);
 	hlyr->addWidget(m_btnAdd);
 	hlyr->addStretch(1);
-	connect(m_btnAdd, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddTable()));
+	connect(m_btnAdd, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddTable()));
 
 	m_relationView = new KexiRelationView(this, "relation_view");
 	setViewWidget(m_relationView);
@@ -75,19 +75,19 @@ KexiRelationWidget::KexiRelationWidget(KexiMainWindow *win, TQWidget *parent,
 	//actions
 	m_tableQueryPopup = new TDEPopupMenu(this, "m_popup");
 	m_tableQueryPopupTitleID = m_tableQueryPopup->insertTitle(SmallIcon("table"), "");
-	connect(m_tableQueryPopup, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShowPopupMenu()));
+	connect(m_tableQueryPopup, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(aboutToShowPopupMenu()));
 
 	m_connectionPopup = new TDEPopupMenu(this, "m_connectionPopup");
 	m_connectionPopupTitleID = m_connectionPopup->insertTitle("");
-	connect(m_connectionPopup, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShowPopupMenu()));
+	connect(m_connectionPopup, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(aboutToShowPopupMenu()));
 
 	m_areaPopup = new TDEPopupMenu(this, "m_areaPopup");
 	
 	m_openSelectedTableAction = new TDEAction(i18n("&Open Table"), SmallIcon("document-open"), TDEShortcut(),
-		this, TQT_SLOT(openSelectedTable()), this, "relationsview_openTable");
+		this, TQ_SLOT(openSelectedTable()), this, "relationsview_openTable");
 	m_openSelectedTableAction->plug( m_tableQueryPopup );
 	m_designSelectedTableAction = new TDEAction(i18n("&Design Table"), SmallIcon("edit"), TDEShortcut(),
-		this, TQT_SLOT(designSelectedTable()), this, "relationsview_designTable");
+		this, TQ_SLOT(designSelectedTable()), this, "relationsview_designTable");
 	m_designSelectedTableAction->plug( m_tableQueryPopup );
 	m_tableQueryPopup->insertSeparator();
 
@@ -95,24 +95,24 @@ KexiRelationWidget::KexiRelationWidget(KexiMainWindow *win, TQWidget *parent,
 	hide_action->setIconSet(TQIconSet());
 
 	plugSharedAction("edit_delete",m_connectionPopup);
-	plugSharedAction("edit_delete",this, TQT_SLOT(removeSelectedObject()));
-
-	connect(m_relationView, TQT_SIGNAL(tableViewGotFocus()),
-		this, TQT_SLOT(tableViewGotFocus()));
-	connect(m_relationView, TQT_SIGNAL(connectionViewGotFocus()),
-		this, TQT_SLOT(connectionViewGotFocus()));
-	connect(m_relationView, TQT_SIGNAL(emptyAreaGotFocus()),
-		this, TQT_SLOT(emptyAreaGotFocus()));
-	connect(m_relationView, TQT_SIGNAL(tableContextMenuRequest( const TQPoint& )),
-		this, TQT_SLOT(tableContextMenuRequest( const TQPoint& )));
-	connect(m_relationView, TQT_SIGNAL(connectionContextMenuRequest( const TQPoint& )),
-		this, TQT_SLOT(connectionContextMenuRequest( const TQPoint& )));
-	connect(m_relationView, TQT_SIGNAL(tableHidden(KexiDB::TableSchema&)),
-		this, TQT_SLOT(slotTableHidden(KexiDB::TableSchema&)));
-	connect(m_relationView, TQT_SIGNAL(tablePositionChanged(KexiRelationViewTableContainer*)),
-		this, TQT_SIGNAL(tablePositionChanged(KexiRelationViewTableContainer*)));
-	connect(m_relationView, TQT_SIGNAL(aboutConnectionRemove(KexiRelationViewConnection*)),
-		this, TQT_SIGNAL(aboutConnectionRemove(KexiRelationViewConnection*)));
+	plugSharedAction("edit_delete",this, TQ_SLOT(removeSelectedObject()));
+
+	connect(m_relationView, TQ_SIGNAL(tableViewGotFocus()),
+		this, TQ_SLOT(tableViewGotFocus()));
+	connect(m_relationView, TQ_SIGNAL(connectionViewGotFocus()),
+		this, TQ_SLOT(connectionViewGotFocus()));
+	connect(m_relationView, TQ_SIGNAL(emptyAreaGotFocus()),
+		this, TQ_SLOT(emptyAreaGotFocus()));
+	connect(m_relationView, TQ_SIGNAL(tableContextMenuRequest( const TQPoint& )),
+		this, TQ_SLOT(tableContextMenuRequest( const TQPoint& )));
+	connect(m_relationView, TQ_SIGNAL(connectionContextMenuRequest( const TQPoint& )),
+		this, TQ_SLOT(connectionContextMenuRequest( const TQPoint& )));
+	connect(m_relationView, TQ_SIGNAL(tableHidden(KexiDB::TableSchema&)),
+		this, TQ_SLOT(slotTableHidden(KexiDB::TableSchema&)));
+	connect(m_relationView, TQ_SIGNAL(tablePositionChanged(KexiRelationViewTableContainer*)),
+		this, TQ_SIGNAL(tablePositionChanged(KexiRelationViewTableContainer*)));
+	connect(m_relationView, TQ_SIGNAL(aboutConnectionRemove(KexiRelationViewConnection*)),
+		this, TQ_SIGNAL(aboutConnectionRemove(KexiRelationViewConnection*)));
 
 #if 0
 	if(!embedd)
@@ -126,7 +126,7 @@ KexiRelationWidget::KexiRelationWidget(KexiMainWindow *win, TQWidget *parent,
 
 #ifdef TESTING_KexiRelationWidget
 	for (int i=0;i<(int)m_db->tableNames().count();i++)
-		TQTimer::singleShot(100,this,TQT_SLOT(slotAddTable()));
+		TQTimer::singleShot(100,this,TQ_SLOT(slotAddTable()));
 #endif
 
 	invalidateActions();
@@ -171,8 +171,8 @@ KexiRelationWidget::addTable(KexiDB::TableSchema *t, const TQRect &rect)
 		kdDebug() << "KexiRelationWidget::slotAddTable(): adding table " << t->name() << endl;
 		if (!c)
 			return;
-		connect(c->tableView(), TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)),
-			this, TQT_SLOT(slotTableFieldDoubleClicked(TQListViewItem*,const TQPoint&,int)));
+		connect(c->tableView(), TQ_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)),
+			this, TQ_SLOT(slotTableFieldDoubleClicked(TQListViewItem*,const TQPoint&,int)));
 	}
 
 	const TQString tname = t->name().lower();
diff --git a/kexi/widget/tableview/kexiblobtableedit.cpp b/kexi/widget/tableview/kexiblobtableedit.cpp
index b3de3419..b02a74a6 100644
--- a/kexi/widget/tableview/kexiblobtableedit.cpp
+++ b/kexi/widget/tableview/kexiblobtableedit.cpp
@@ -101,25 +101,25 @@ KexiBlobTableEdit::KexiBlobTableEdit(KexiTableViewColumn &column, TQWidget *pare
 	d->button->setPopup( d->popup );
 
 	//force edit requested to start editing... (this will call slotUpdateActionsAvailabilityRequested())
-	//connect(d->popup, TQT_SIGNAL(aboutToShow()), this, TQT_SIGNAL(editRequested()));
-
-	connect(d->popup, TQT_SIGNAL(updateActionsAvailabilityRequested(bool&, bool&)), 
-		this, TQT_SLOT(slotUpdateActionsAvailabilityRequested(bool&, bool&)));
-
-	connect(d->popup, TQT_SIGNAL(insertFromFileRequested(const KURL&)),
-		this, TQT_SLOT(handleInsertFromFileAction(const KURL&)));
-	connect(d->popup, TQT_SIGNAL(saveAsRequested(const TQString&)),
-		this, TQT_SLOT(handleSaveAsAction(const TQString&)));
-	connect(d->popup, TQT_SIGNAL(cutRequested()),
-		this, TQT_SLOT(handleCutAction()));
-	connect(d->popup, TQT_SIGNAL(copyRequested()),
-		this, TQT_SLOT(handleCopyAction()));
-	connect(d->popup, TQT_SIGNAL(pasteRequested()),
-		this, TQT_SLOT(handlePasteAction()));
-	connect(d->popup, TQT_SIGNAL(clearRequested()),
-		this, TQT_SLOT(clear()));
-	connect(d->popup, TQT_SIGNAL(showPropertiesRequested()),
-		this, TQT_SLOT(handleShowPropertiesAction()));
+	//connect(d->popup, TQ_SIGNAL(aboutToShow()), this, TQ_SIGNAL(editRequested()));
+
+	connect(d->popup, TQ_SIGNAL(updateActionsAvailabilityRequested(bool&, bool&)), 
+		this, TQ_SLOT(slotUpdateActionsAvailabilityRequested(bool&, bool&)));
+
+	connect(d->popup, TQ_SIGNAL(insertFromFileRequested(const KURL&)),
+		this, TQ_SLOT(handleInsertFromFileAction(const KURL&)));
+	connect(d->popup, TQ_SIGNAL(saveAsRequested(const TQString&)),
+		this, TQ_SLOT(handleSaveAsAction(const TQString&)));
+	connect(d->popup, TQ_SIGNAL(cutRequested()),
+		this, TQ_SLOT(handleCutAction()));
+	connect(d->popup, TQ_SIGNAL(copyRequested()),
+		this, TQ_SLOT(handleCopyAction()));
+	connect(d->popup, TQ_SIGNAL(pasteRequested()),
+		this, TQ_SLOT(handlePasteAction()));
+	connect(d->popup, TQ_SIGNAL(clearRequested()),
+		this, TQ_SLOT(clear()));
+	connect(d->popup, TQ_SIGNAL(showPropertiesRequested()),
+		this, TQ_SLOT(handleShowPropertiesAction()));
 }
 
 KexiBlobTableEdit::~KexiBlobTableEdit()
diff --git a/kexi/widget/tableview/kexicomboboxbase.cpp b/kexi/widget/tableview/kexicomboboxbase.cpp
index 89ba63cf..d2aaee78 100644
--- a/kexi/widget/tableview/kexicomboboxbase.cpp
+++ b/kexi/widget/tableview/kexicomboboxbase.cpp
@@ -357,10 +357,10 @@ void KexiComboBoxBase::createPopup(bool show)
 	if (!popup()) {
 		setPopup( column() ? new KexiComboBoxPopup(thisWidget, *column()) 
 			: new KexiComboBoxPopup(thisWidget, *field()) );
-		TQObject::connect(popup(), TQT_SIGNAL(rowAccepted(KexiTableItem*,int)), 
-			thisWidget, TQT_SLOT(slotRowAccepted(KexiTableItem*,int)));
-		TQObject::connect(popup()->tableView(), TQT_SIGNAL(itemSelected(KexiTableItem*)),
-			thisWidget, TQT_SLOT(slotItemSelected(KexiTableItem*)));
+		TQObject::connect(popup(), TQ_SIGNAL(rowAccepted(KexiTableItem*,int)), 
+			thisWidget, TQ_SLOT(slotRowAccepted(KexiTableItem*,int)));
+		TQObject::connect(popup()->tableView(), TQ_SIGNAL(itemSelected(KexiTableItem*)),
+			thisWidget, TQ_SLOT(slotItemSelected(KexiTableItem*)));
 
 		popup()->setFocusProxy( widgetToFocus );	
 		popup()->tableView()->setFocusProxy( widgetToFocus );
diff --git a/kexi/widget/tableview/kexicomboboxpopup.cpp b/kexi/widget/tableview/kexicomboboxpopup.cpp
index 6877bd78..b0f6621c 100644
--- a/kexi/widget/tableview/kexicomboboxpopup.cpp
+++ b/kexi/widget/tableview/kexicomboboxpopup.cpp
@@ -134,14 +134,14 @@ void KexiComboBoxPopup::init()
 	d->tv = new KexiComboBoxPopup_KexiTableView(this);
 	installEventFilter(this);
 	
-	connect(d->tv, TQT_SIGNAL(itemReturnPressed(KexiTableItem*,int,int)),
-		this, TQT_SLOT(slotTVItemAccepted(KexiTableItem*,int,int)));
+	connect(d->tv, TQ_SIGNAL(itemReturnPressed(KexiTableItem*,int,int)),
+		this, TQ_SLOT(slotTVItemAccepted(KexiTableItem*,int,int)));
 
-	connect(d->tv, TQT_SIGNAL(itemMouseReleased(KexiTableItem*,int,int)),
-		this, TQT_SLOT(slotTVItemAccepted(KexiTableItem*,int,int)));
+	connect(d->tv, TQ_SIGNAL(itemMouseReleased(KexiTableItem*,int,int)),
+		this, TQ_SLOT(slotTVItemAccepted(KexiTableItem*,int,int)));
 
-	connect(d->tv, TQT_SIGNAL(itemDblClicked(KexiTableItem*,int,int)),
-		this, TQT_SLOT(slotTVItemAccepted(KexiTableItem*,int,int)));
+	connect(d->tv, TQ_SIGNAL(itemDblClicked(KexiTableItem*,int,int)),
+		this, TQ_SLOT(slotTVItemAccepted(KexiTableItem*,int,int)));
 }
 
 void KexiComboBoxPopup::setData(KexiTableViewColumn *column, KexiDB::Field *field)
@@ -258,7 +258,7 @@ void KexiComboBoxPopup::setData(KexiTableViewColumn *column, KexiDB::Field *fiel
 			d->tv->KexiDataAwareObjectInterface::data()->disconnect( this );
 		d->tv->setData( cursor );
 
-		connect( d->tv, TQT_SIGNAL(dataRefreshed()), this, TQT_SLOT(slotDataReloadRequested()));
+		connect( d->tv, TQ_SIGNAL(dataRefreshed()), this, TQ_SLOT(slotDataReloadRequested()));
 		updateSize();
 		return;
 	}
@@ -287,7 +287,7 @@ void KexiComboBoxPopup::setDataInternal( KexiTableViewData *data, bool owner )
 	if (d->tv->KexiDataAwareObjectInterface::data())
 		d->tv->KexiDataAwareObjectInterface::data()->disconnect( this );
 	d->tv->setData( data, owner );
-	connect( d->tv, TQT_SIGNAL(dataRefreshed()), this, TQT_SLOT(slotDataReloadRequested()));
+	connect( d->tv, TQ_SIGNAL(dataRefreshed()), this, TQ_SLOT(slotDataReloadRequested()));
 
 	updateSize();
 }
diff --git a/kexi/widget/tableview/kexicomboboxtableedit.cpp b/kexi/widget/tableview/kexicomboboxtableedit.cpp
index 0ac9923e..2d771041 100644
--- a/kexi/widget/tableview/kexicomboboxtableedit.cpp
+++ b/kexi/widget/tableview/kexicomboboxtableedit.cpp
@@ -71,9 +71,9 @@ KexiComboBoxTableEdit::KexiComboBoxTableEdit(KexiTableViewColumn &column, TQWidg
 	d->button = new KexiComboBoxDropDownButton( parentWidget() /*usually a viewport*/ );
 	d->button->hide();
 	d->button->setFocusPolicy( TQWidget::NoFocus );
-	connect(d->button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotButtonClicked()));
+	connect(d->button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotButtonClicked()));
 
-	connect(m_lineedit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotLineEditTextChanged(const TQString&)));
+	connect(m_lineedit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotLineEditTextChanged(const TQString&)));
 
 //	m_lineedit = new KLineEdit(this, "lineedit");
 //	m_lineedit->setFrame(false);
diff --git a/kexi/widget/tableview/kexidataawareobjectiface.cpp b/kexi/widget/tableview/kexidataawareobjectiface.cpp
index 2ba85294..bcb510d2 100644
--- a/kexi/widget/tableview/kexidataawareobjectiface.cpp
+++ b/kexi/widget/tableview/kexidataawareobjectiface.cpp
@@ -158,29 +158,29 @@ void KexiDataAwareObjectInterface::setData( KexiTableViewData *data, bool owner
 	if (m_data && !theSameData) {
 //! @todo: store sorting settings?
 		setSorting(-1);
-//		connect(m_data, TQT_SIGNAL(refreshRequested()), this, TQT_SLOT(slotRefreshRequested()));
-		connectToReloadDataSlot(m_data, TQT_SIGNAL(reloadRequested()));
+//		connect(m_data, TQ_SIGNAL(refreshRequested()), this, TQ_SLOT(slotRefreshRequested()));
+		connectToReloadDataSlot(m_data, TQ_SIGNAL(reloadRequested()));
 		TQObject* thisObject = dynamic_cast<TQObject*>(this);
 		if (thisObject) {
-			TQObject::connect(m_data, TQT_SIGNAL(destroying()), thisObject, TQT_SLOT(slotDataDestroying()));
-			TQObject::connect(m_data, TQT_SIGNAL(rowsDeleted( const TQValueList<int> & )), 
-				thisObject, TQT_SLOT(slotRowsDeleted( const TQValueList<int> & )));
-			TQObject::connect(m_data, TQT_SIGNAL(aboutToDeleteRow(KexiTableItem&,KexiDB::ResultInfo*,bool)),
-				thisObject, TQT_SLOT(slotAboutToDeleteRow(KexiTableItem&,KexiDB::ResultInfo*,bool)));
-			TQObject::connect(m_data, TQT_SIGNAL(rowDeleted()), thisObject, TQT_SLOT(slotRowDeleted()));
-			TQObject::connect(m_data, TQT_SIGNAL(rowInserted(KexiTableItem*,bool)), 
-				thisObject, TQT_SLOT(slotRowInserted(KexiTableItem*,bool)));
-			TQObject::connect(m_data, TQT_SIGNAL(rowInserted(KexiTableItem*,uint,bool)), 
-				thisObject, TQT_SLOT(slotRowInserted(KexiTableItem*,uint,bool))); //not db-aware
-			TQObject::connect(m_data, TQT_SIGNAL(rowRepaintRequested(KexiTableItem&)), 
-				thisObject, TQT_SLOT(slotRowRepaintRequested(KexiTableItem&)));
+			TQObject::connect(m_data, TQ_SIGNAL(destroying()), thisObject, TQ_SLOT(slotDataDestroying()));
+			TQObject::connect(m_data, TQ_SIGNAL(rowsDeleted( const TQValueList<int> & )), 
+				thisObject, TQ_SLOT(slotRowsDeleted( const TQValueList<int> & )));
+			TQObject::connect(m_data, TQ_SIGNAL(aboutToDeleteRow(KexiTableItem&,KexiDB::ResultInfo*,bool)),
+				thisObject, TQ_SLOT(slotAboutToDeleteRow(KexiTableItem&,KexiDB::ResultInfo*,bool)));
+			TQObject::connect(m_data, TQ_SIGNAL(rowDeleted()), thisObject, TQ_SLOT(slotRowDeleted()));
+			TQObject::connect(m_data, TQ_SIGNAL(rowInserted(KexiTableItem*,bool)), 
+				thisObject, TQ_SLOT(slotRowInserted(KexiTableItem*,bool)));
+			TQObject::connect(m_data, TQ_SIGNAL(rowInserted(KexiTableItem*,uint,bool)), 
+				thisObject, TQ_SLOT(slotRowInserted(KexiTableItem*,uint,bool))); //not db-aware
+			TQObject::connect(m_data, TQ_SIGNAL(rowRepaintRequested(KexiTableItem&)), 
+				thisObject, TQ_SLOT(slotRowRepaintRequested(KexiTableItem&)));
 			// setup scrollbar's tooltip
-			TQObject::connect(verticalScrollBar(),TQT_SIGNAL(sliderReleased()),
-				thisObject,TQT_SLOT(vScrollBarSliderReleased()));
-			TQObject::connect(verticalScrollBar(),TQT_SIGNAL(valueChanged(int)),
-				thisObject,TQT_SLOT(vScrollBarValueChanged(int)));
-			TQObject::connect(&m_scrollBarTipTimer,TQT_SIGNAL(timeout()),
-				thisObject,TQT_SLOT(scrollBarTipTimeout()));
+			TQObject::connect(verticalScrollBar(),TQ_SIGNAL(sliderReleased()),
+				thisObject,TQ_SLOT(vScrollBarSliderReleased()));
+			TQObject::connect(verticalScrollBar(),TQ_SIGNAL(valueChanged(int)),
+				thisObject,TQ_SLOT(vScrollBarValueChanged(int)));
+			TQObject::connect(&m_scrollBarTipTimer,TQ_SIGNAL(timeout()),
+				thisObject,TQ_SLOT(scrollBarTipTimeout()));
 		}
 	}
 
diff --git a/kexi/widget/tableview/kexidataawareobjectiface.h b/kexi/widget/tableview/kexidataawareobjectiface.h
index d9819f5d..31bfcc29 100644
--- a/kexi/widget/tableview/kexidataawareobjectiface.h
+++ b/kexi/widget/tableview/kexidataawareobjectiface.h
@@ -896,23 +896,23 @@ inline KexiTableItem *KexiDataAwareObjectInterface::itemAt(int row) const
 #define KEXI_DATAAWAREOBJECTINTERFACE \
 public: \
 	void connectCellSelectedSignal(const TQObject* receiver, const char* intIntMember) { \
-		connect(this, TQT_SIGNAL(cellSelected(int,int)), receiver, intIntMember); \
+		connect(this, TQ_SIGNAL(cellSelected(int,int)), receiver, intIntMember); \
 	} \
 	void connectRowEditStartedSignal(const TQObject* receiver, const char* intMember) { \
-		connect(this, TQT_SIGNAL(rowEditStarted(int)), receiver, intMember); \
+		connect(this, TQ_SIGNAL(rowEditStarted(int)), receiver, intMember); \
 	} \
 	void connectRowEditTerminatedSignal(const TQObject* receiver, const char* voidMember) { \
-		connect(this, TQT_SIGNAL(rowEditTerminated(int)), receiver, voidMember); \
+		connect(this, TQ_SIGNAL(rowEditTerminated(int)), receiver, voidMember); \
 	} \
 	void connectReloadActionsSignal(const TQObject* receiver, const char* voidMember) { \
-		connect(this, TQT_SIGNAL(reloadActions()), receiver, voidMember); \
+		connect(this, TQ_SIGNAL(reloadActions()), receiver, voidMember); \
 	} \
 	void connectDataSetSignal(const TQObject* receiver, \
 		const char* kexiTableViewDataMember) { \
-		connect(this, TQT_SIGNAL(dataSet(KexiTableViewData*)), receiver, kexiTableViewDataMember); \
+		connect(this, TQ_SIGNAL(dataSet(KexiTableViewData*)), receiver, kexiTableViewDataMember); \
 	} \
 	void connectToReloadDataSlot(const TQObject* sender, const char* voidSignal) { \
-		connect(sender, voidSignal, this, TQT_SLOT(reloadData())); \
+		connect(sender, voidSignal, this, TQ_SLOT(reloadData())); \
 	}
 
 #endif
diff --git a/kexi/widget/tableview/kexidataawarepropertyset.cpp b/kexi/widget/tableview/kexidataawarepropertyset.cpp
index 8b0fdff7..2219cf97 100644
--- a/kexi/widget/tableview/kexidataawarepropertyset.cpp
+++ b/kexi/widget/tableview/kexidataawarepropertyset.cpp
@@ -35,12 +35,12 @@ KexiDataAwarePropertySet::KexiDataAwarePropertySet(KexiViewBase *view,
 {
 	m_sets.setAutoDelete(true);
 
-//	connect(m_dataObject, TQT_SIGNAL(dataSet(KexiTableViewData*)),
-//		this, TQT_SLOT(slotDataSet(KexiTableViewData*)));
-	m_dataObject->connectDataSetSignal(this, TQT_SLOT(slotDataSet(KexiTableViewData*)));
-//	connect(m_dataObject, TQT_SIGNAL(cellSelected(int,int)),
-//		this, TQT_SLOT(slotCellSelected(int,int)));
-	m_dataObject->connectCellSelectedSignal(this, TQT_SLOT(slotCellSelected(int,int)));
+//	connect(m_dataObject, TQ_SIGNAL(dataSet(KexiTableViewData*)),
+//		this, TQ_SLOT(slotDataSet(KexiTableViewData*)));
+	m_dataObject->connectDataSetSignal(this, TQ_SLOT(slotDataSet(KexiTableViewData*)));
+//	connect(m_dataObject, TQ_SIGNAL(cellSelected(int,int)),
+//		this, TQ_SLOT(slotCellSelected(int,int)));
+	m_dataObject->connectCellSelectedSignal(this, TQ_SLOT(slotCellSelected(int,int)));
 //
 	slotDataSet( m_dataObject->data() );
 	const bool wasDirty = view->dirty();
@@ -61,13 +61,13 @@ void KexiDataAwarePropertySet::slotDataSet( KexiTableViewData *data )
 	}
 	m_currentTVData = data;
 	if (!m_currentTVData.isNull()) {
-		connect(m_currentTVData, TQT_SIGNAL(rowDeleted()), this, TQT_SLOT(slotRowDeleted()));
-		connect(m_currentTVData, TQT_SIGNAL(rowsDeleted( const TQValueList<int> & )),
-			this, TQT_SLOT(slotRowsDeleted( const TQValueList<int> & )));
-		connect(m_currentTVData, TQT_SIGNAL(rowInserted(KexiTableItem*,uint,bool)),
-			this, TQT_SLOT(slotRowInserted(KexiTableItem*,uint,bool)));
-		connect(m_currentTVData, TQT_SIGNAL(reloadRequested()),
-			this, TQT_SLOT(slotReloadRequested()));
+		connect(m_currentTVData, TQ_SIGNAL(rowDeleted()), this, TQ_SLOT(slotRowDeleted()));
+		connect(m_currentTVData, TQ_SIGNAL(rowsDeleted( const TQValueList<int> & )),
+			this, TQ_SLOT(slotRowsDeleted( const TQValueList<int> & )));
+		connect(m_currentTVData, TQ_SIGNAL(rowInserted(KexiTableItem*,uint,bool)),
+			this, TQ_SLOT(slotRowInserted(KexiTableItem*,uint,bool)));
+		connect(m_currentTVData, TQ_SIGNAL(reloadRequested()),
+			this, TQ_SLOT(slotReloadRequested()));
 	}
 }
 
@@ -118,7 +118,7 @@ void KexiDataAwarePropertySet::insert(uint row, KoProperty::Set* set, bool newOn
 
 	m_sets.insert(row, set);
 
-	connect(set, TQT_SIGNAL(propertyChanged(KoProperty::Set&, KoProperty::Property&)), m_view, TQT_SLOT(setDirty()));
+	connect(set, TQ_SIGNAL(propertyChanged(KoProperty::Set&, KoProperty::Property&)), m_view, TQ_SLOT(setDirty()));
 
 	if (newOne) {
 		//add a special property indicating that this is brand new set,
diff --git a/kexi/widget/tableview/kexidatatableview.cpp b/kexi/widget/tableview/kexidatatableview.cpp
index 800c76e7..3c7a3e27 100644
--- a/kexi/widget/tableview/kexidatatableview.cpp
+++ b/kexi/widget/tableview/kexidatatableview.cpp
@@ -59,14 +59,14 @@ KexiDataTableView::init()
 //	m_records = 0;
 //	m_first = false;
 
-//	connect(this, TQT_SIGNAL(contentsMoving(int, int)), this, TQT_SLOT(slotMoving(int)));
-//	connect(verticalScrollBar(), TQT_SIGNAL(sliderMoved(int)), this, TQT_SLOT(slotMoving(int)));
+//	connect(this, TQ_SIGNAL(contentsMoving(int, int)), this, TQ_SLOT(slotMoving(int)));
+//	connect(verticalScrollBar(), TQ_SIGNAL(sliderMoved(int)), this, TQ_SLOT(slotMoving(int)));
 }
 
 /*void KexiDataTableView::initActions(TDEActionCollection *col)
 {
 	KexiTableView::initActions(col);
-	new TDEAction(i18n("Filter"), "filter", 0, this, TQT_SLOT(filter()), col, "tablepart_filter");
+	new TDEAction(i18n("Filter"), "filter", 0, this, TQ_SLOT(filter()), col, "tablepart_filter");
 }*/
 
 bool KexiDataTableView::setData(KexiDB::Cursor *cursor)
diff --git a/kexi/widget/tableview/kexiinputtableedit.cpp b/kexi/widget/tableview/kexiinputtableedit.cpp
index b6853037..5fe56aa9 100644
--- a/kexi/widget/tableview/kexiinputtableedit.cpp
+++ b/kexi/widget/tableview/kexiinputtableedit.cpp
@@ -107,10 +107,10 @@ void KexiInputTableEdit::init()
 	m_calculatedCell = false;
 
 #if 0 //js TODO
-	connect(m_cview->completionBox(), TQT_SIGNAL(activated(const TQString &)),
-	 this, TQT_SLOT(completed(const TQString &)));
-	connect(m_cview->completionBox(), TQT_SIGNAL(highlighted(const TQString &)),
-	 this, TQT_SLOT(completed(const TQString &)));
+	connect(m_cview->completionBox(), TQ_SIGNAL(activated(const TQString &)),
+	 this, TQ_SLOT(completed(const TQString &)));
+	connect(m_cview->completionBox(), TQ_SIGNAL(highlighted(const TQString &)),
+	 this, TQ_SLOT(completed(const TQString &)));
 	 m_cview->completionBox()->setTabHandling(true);
 #endif
 
diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp
index 11ff828d..61655424 100644
--- a/kexi/widget/tableview/kexitableview.cpp
+++ b/kexi/widget/tableview/kexitableview.cpp
@@ -184,7 +184,7 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch
 
 	d = new KexiTableViewPrivate(this);
 
-	connect( kapp, TQT_SIGNAL( settingsChanged(int) ), TQT_SLOT( slotSettingsChanged(int) ) );
+	connect( kapp, TQ_SIGNAL( settingsChanged(int) ), TQ_SLOT( slotSettingsChanged(int) ) );
 	slotSettingsChanged(TDEApplication::SETTINGS_SHORTCUTS);
 
 	m_data = new KexiTableViewData(); //to prevent crash because m_data==0
@@ -219,10 +219,10 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch
 	//context menu
 	m_popupMenu = new TDEPopupMenu(this, "contextMenu");
 #if 0 //moved to mainwindow's actions
-	d->menu_id_addRecord = m_popupMenu->insertItem(i18n("Add Record"), this, TQT_SLOT(addRecord()), TQt::CTRL+TQt::Key_Insert);
+	d->menu_id_addRecord = m_popupMenu->insertItem(i18n("Add Record"), this, TQ_SLOT(addRecord()), TQt::CTRL+TQt::Key_Insert);
 	d->menu_id_removeRecord = m_popupMenu->insertItem(
 		kapp->iconLoader()->loadIcon("button_cancel", TDEIcon::Small),
-		i18n("Remove Record"), this, TQT_SLOT(removeRecord()), TQt::CTRL+TQt::Key_Delete);
+		i18n("Remove Record"), this, TQ_SLOT(removeRecord()), TQt::CTRL+TQt::Key_Delete);
 #endif
 
 #ifdef TQ_WS_WIN
@@ -244,7 +244,7 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch
 	m_horizontalHeader->setOrientation(TQt::Horizontal);
 	m_horizontalHeader->setTracking(false);
 	m_horizontalHeader->setMovingEnabled(false);
-	connect(m_horizontalHeader, TQT_SIGNAL(sizeChange(int,int,int)), this, TQT_SLOT(slotTopHeaderSizeChange(int,int,int)));
+	connect(m_horizontalHeader, TQ_SIGNAL(sizeChange(int,int,int)), this, TQ_SLOT(slotTopHeaderSizeChange(int,int,int)));
 
 	m_verticalHeader = new KexiRecordMarker(this, "rm");
 	m_verticalHeader->setSelectionBackgroundColor( palette().active().highlight() );
@@ -268,7 +268,7 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch
 
 #if 0//(js) doesn't work!
 	d->scrollTimer = new TQTimer(this);
-	connect(d->scrollTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAutoScroll()));
+	connect(d->scrollTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAutoScroll()));
 #endif
 
 //	setBackgroundAltering(true);
@@ -278,13 +278,13 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch
 	viewport()->setAcceptDrops(true);
 
 	// Connect header, table and scrollbars
-	connect(horizontalScrollBar(), TQT_SIGNAL(valueChanged(int)), m_horizontalHeader, TQT_SLOT(setOffset(int)));
-	connect(verticalScrollBar(), TQT_SIGNAL(valueChanged(int)), m_verticalHeader, TQT_SLOT(setOffset(int)));
-	connect(m_horizontalHeader, TQT_SIGNAL(sizeChange(int, int, int)), this, TQT_SLOT(slotColumnWidthChanged(int, int, int)));
-	connect(m_horizontalHeader, TQT_SIGNAL(sectionHandleDoubleClicked(int)), this, TQT_SLOT(slotSectionHandleDoubleClicked(int)));
-	connect(m_horizontalHeader, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(sortColumnInternal(int)));
+	connect(horizontalScrollBar(), TQ_SIGNAL(valueChanged(int)), m_horizontalHeader, TQ_SLOT(setOffset(int)));
+	connect(verticalScrollBar(), TQ_SIGNAL(valueChanged(int)), m_verticalHeader, TQ_SLOT(setOffset(int)));
+	connect(m_horizontalHeader, TQ_SIGNAL(sizeChange(int, int, int)), this, TQ_SLOT(slotColumnWidthChanged(int, int, int)));
+	connect(m_horizontalHeader, TQ_SIGNAL(sectionHandleDoubleClicked(int)), this, TQ_SLOT(slotSectionHandleDoubleClicked(int)));
+	connect(m_horizontalHeader, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(sortColumnInternal(int)));
 
-	connect(d->pUpdateTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotUpdate()));
+	connect(d->pUpdateTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotUpdate()));
 	
 //	horizontalScrollBar()->show();
 	updateScrollBars();
@@ -1010,7 +1010,7 @@ void KexiTableView::contentsMousePressEvent( TQMouseEvent* e )
 	}
 //	d->contentsMousePressEvent_ev = *e;
 //	d->contentsMousePressEvent_enabled = true;
-//	TQTimer::singleShot(2000, this, TQT_SLOT( contentsMousePressEvent_Internal() ));
+//	TQTimer::singleShot(2000, this, TQ_SLOT( contentsMousePressEvent_Internal() ));
 //	d->contentsMousePressEvent_timer.start(100,true);
 	
 //	if (!d->contentsMousePressEvent_enabled)
@@ -1495,9 +1495,9 @@ KexiDataItemInterface *KexiTableView::editor( int col, bool ignoreMissingEditor
 	if (m_data->cursor() && m_data->cursor()->query())
 		editor->createInternalEditor(*m_data->cursor()->query());
 
-	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/widget/tableview/kexitableviewheader.cpp b/kexi/widget/tableview/kexitableviewheader.cpp
index 305222ca..ec1326ae 100644
--- a/kexi/widget/tableview/kexitableviewheader.cpp
+++ b/kexi/widget/tableview/kexitableviewheader.cpp
@@ -67,8 +67,8 @@ KexiTableViewHeader::KexiTableViewHeader(TQWidget * parent, const char * name)
 {
 	styleChange( style() );
 	installEventFilter(this);
-	connect(this, TQT_SIGNAL(sizeChange(int,int,int)), 
-		this, TQT_SLOT(slotSizeChange(int,int,int)));
+	connect(this, TQ_SIGNAL(sizeChange(int,int,int)), 
+		this, TQ_SLOT(slotSizeChange(int,int,int)));
 }
 
 KexiTableViewHeader::~KexiTableViewHeader()
diff --git a/kexi/widget/utils/kexiarrowtip.cpp b/kexi/widget/utils/kexiarrowtip.cpp
index f22248e6..027af36e 100644
--- a/kexi/widget/utils/kexiarrowtip.cpp
+++ b/kexi/widget/utils/kexiarrowtip.cpp
@@ -88,7 +88,7 @@ void KexiArrowTip::increaseOpacity()
 	m_opacity += 0.10;
 	setWindowOpacity(m_opacity);
 	if (m_opacity < 1.0)
-		TQTimer::singleShot(25, this, TQT_SLOT(increaseOpacity()));
+		TQTimer::singleShot(25, this, TQ_SLOT(increaseOpacity()));
 }
 
 void KexiArrowTip::decreaseOpacity()
@@ -100,7 +100,7 @@ void KexiArrowTip::decreaseOpacity()
 	}
 	m_opacity -= 0.10;
 	setWindowOpacity(m_opacity);
-	TQTimer::singleShot(25, this, TQT_SLOT(decreaseOpacity()));
+	TQTimer::singleShot(25, this, TQ_SLOT(decreaseOpacity()));
 }
 
 bool KexiArrowTip::close ( bool alsoDelete )
diff --git a/kexi/widget/utils/kexicontextmenuutils.cpp b/kexi/widget/utils/kexicontextmenuutils.cpp
index e127bea6..e59d93f1 100644
--- a/kexi/widget/utils/kexicontextmenuutils.cpp
+++ b/kexi/widget/utils/kexicontextmenuutils.cpp
@@ -63,30 +63,30 @@ KexiImageContextMenu::KexiImageContextMenu(TQWidget* parent)
 	insertTitle(TQString());
 
 	d->insertFromFileAction = new TDEAction(i18n("Insert From &File..."), SmallIconSet("document-open"), 0,
-			this, TQT_SLOT(insertFromFile()), &d->actionCollection, "insert");
+			this, TQ_SLOT(insertFromFile()), &d->actionCollection, "insert");
 	d->insertFromFileAction->plug(this);
-	d->saveAsAction = KStdAction::saveAs(this, TQT_SLOT(saveAs()), &d->actionCollection);
+	d->saveAsAction = KStdAction::saveAs(this, TQ_SLOT(saveAs()), &d->actionCollection);
 //	d->saveAsAction->setText(i18n("&Save &As..."));
 	d->saveAsAction->plug(this);
 	insertSeparator();
-	d->cutAction = KStdAction::cut(this, TQT_SLOT(cut()), &d->actionCollection);
+	d->cutAction = KStdAction::cut(this, TQ_SLOT(cut()), &d->actionCollection);
 	d->cutAction->plug(this);
-	d->copyAction = KStdAction::copy(this, TQT_SLOT(copy()), &d->actionCollection);
+	d->copyAction = KStdAction::copy(this, TQ_SLOT(copy()), &d->actionCollection);
 	d->copyAction->plug(this);
-	d->pasteAction = KStdAction::paste(this, TQT_SLOT(paste()), &d->actionCollection);
+	d->pasteAction = KStdAction::paste(this, TQ_SLOT(paste()), &d->actionCollection);
 	d->pasteAction->plug(this);
 	d->deleteAction = new TDEAction(i18n("&Clear"), SmallIconSet("edit-delete"), 0,
-		this, TQT_SLOT(clear()), &d->actionCollection, "delete");
+		this, TQ_SLOT(clear()), &d->actionCollection, "delete");
 	d->deleteAction->plug(this);
 #ifdef KEXI_NO_UNFINISHED 
 	d->propertiesAction = 0;
 #else
 	insertSeparator();
 	d->propertiesAction = new TDEAction(i18n("Properties"), 0, 0,
-		this, TQT_SLOT(showProperties()), &d->actionCollection, "properties");
+		this, TQ_SLOT(showProperties()), &d->actionCollection, "properties");
 	d->propertiesAction->plug(this);
 #endif
-	connect(this, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(updateActionsAvailability()));
+	connect(this, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(updateActionsAvailability()));
 }
 
 KexiImageContextMenu::~KexiImageContextMenu()
diff --git a/kexi/widget/utils/kexigradientwidget.cpp b/kexi/widget/utils/kexigradientwidget.cpp
index 4aa7341c..331fabe9 100644
--- a/kexi/widget/utils/kexigradientwidget.cpp
+++ b/kexi/widget/utils/kexigradientwidget.cpp
@@ -40,7 +40,7 @@ KexiGradientWidget::KexiGradientWidget( TQWidget *parent, const char *name, WFla
 
 	p_backgroundColor = TQWidget::paletteBackgroundColor();
 
-	connect ( &p_rebuildDelayTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( setCacheDirty() ) );
+	connect ( &p_rebuildDelayTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( setCacheDirty() ) );
 
 	installEventFilter( this );
 }
diff --git a/kexi/widget/utils/kexirecordnavigator.cpp b/kexi/widget/utils/kexirecordnavigator.cpp
index 5e3cfae8..a7ff7d01 100644
--- a/kexi/widget/utils/kexirecordnavigator.cpp
+++ b/kexi/widget/utils/kexirecordnavigator.cpp
@@ -157,11 +157,11 @@ KexiRecordNavigator::KexiRecordNavigator(TQWidget *parent, int leftMargin, const
 	d->lyr->addSpacing( 6 );
 	d->lyr->addStretch(10);
 
-	connect(m_navBtnPrev,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotPrevButtonClicked()));
-	connect(m_navBtnNext,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotNextButtonClicked()));
-	connect(m_navBtnLast,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotLastButtonClicked()));
-	connect(m_navBtnFirst,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotFirstButtonClicked()));
-	connect(m_navBtnNew,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotNewButtonClicked()));
+	connect(m_navBtnPrev,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotPrevButtonClicked()));
+	connect(m_navBtnNext,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotNextButtonClicked()));
+	connect(m_navBtnLast,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotLastButtonClicked()));
+	connect(m_navBtnFirst,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotFirstButtonClicked()));
+	connect(m_navBtnNew,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotNewButtonClicked()));
 
 	setRecordCount(0);
 	setCurrentRecordNumber(0);