Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

3 files changed, 39 insertions, 39 deletions

diff --git a/kexi/plugins/tables/kexilookupcolumnpage.cpp b/kexi/plugins/tables/kexilookupcolumnpage.cpp
index f718efd0..c25bbc99 100644
--- a/kexi/plugins/tables/kexilookupcolumnpage.cpp
+++ b/kexi/plugins/tables/kexilookupcolumnpage.cpp
@@ -152,14 +152,14 @@ KexiLookupColumnPage::KexiLookupColumnPage(TQWidget *parent)
 	d->gotoRowSourceButton->setMinimumHeight(d->rowSourceLabel->minimumHeight());
 	TQToolTip::add(d->gotoRowSourceButton, i18n("Go to selected row source"));
 	hlyr->addWidget(d->gotoRowSourceButton);
-	connect(d->gotoRowSourceButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotGotoSelectedRowSource()));
+	connect(d->gotoRowSourceButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotGotoSelectedRowSource()));
 
 	d->clearRowSourceButton = new KexiSmallToolButton(contents, TQString(),
 		"clear_left", "clearRowSourceButton");
 	d->clearRowSourceButton->setMinimumHeight(d->rowSourceLabel->minimumHeight());
 	TQToolTip::add(d->clearRowSourceButton, i18n("Clear row source"));
 	hlyr->addWidget(d->clearRowSourceButton);
-	connect(d->clearRowSourceButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(clearRowSourceSelection()));
+	connect(d->clearRowSourceButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(clearRowSourceSelection()));
 
 	d->rowSourceCombo = new KexiDataSourceComboBox(contents, "rowSourceCombo");
 	d->rowSourceLabel->setBuddy(d->rowSourceCombo);
@@ -181,7 +181,7 @@ KexiLookupColumnPage::KexiLookupColumnPage(TQWidget *parent)
 	d->clearBoundColumnButton->setMinimumHeight(d->boundColumnLabel->minimumHeight());
 	TQToolTip::add(d->clearBoundColumnButton, i18n("Clear bound column"));
 	hlyr->addWidget(d->clearBoundColumnButton);
-	connect(d->clearBoundColumnButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(clearBoundColumnSelection()));
+	connect(d->clearBoundColumnButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(clearBoundColumnSelection()));
 
 	d->boundColumnCombo = new KexiFieldComboBox(contents, "boundColumnCombo");
 	d->boundColumnLabel->setBuddy(d->boundColumnCombo);
@@ -203,7 +203,7 @@ KexiLookupColumnPage::KexiLookupColumnPage(TQWidget *parent)
 	d->clearVisibleColumnButton->setMinimumHeight(d->visibleColumnLabel->minimumHeight());
 	TQToolTip::add(d->clearVisibleColumnButton, i18n("Clear visible column"));
 	hlyr->addWidget(d->clearVisibleColumnButton);
-	connect(d->clearVisibleColumnButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(clearVisibleColumnSelection()));
+	connect(d->clearVisibleColumnButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(clearVisibleColumnSelection()));
 
 	d->visibleColumnCombo = new KexiFieldComboBox(contents, "visibleColumnCombo");
 	d->visibleColumnLabel->setBuddy(d->visibleColumnCombo);
@@ -211,11 +211,11 @@ KexiLookupColumnPage::KexiLookupColumnPage(TQWidget *parent)
 
 	vlyr->addStretch(1);
 
-	connect(d->rowSourceCombo, TQT_SIGNAL(textChanged(const TQString &)), 
-		this, TQT_SLOT(slotRowSourceTextChanged(const TQString &)));
-	connect(d->rowSourceCombo, TQT_SIGNAL(dataSourceChanged()), this, TQT_SLOT(slotRowSourceChanged()));
-	connect(d->boundColumnCombo, TQT_SIGNAL(selected()), this, TQT_SLOT(slotBoundColumnSelected()));
-	connect(d->visibleColumnCombo, TQT_SIGNAL(selected()), this, TQT_SLOT(slotVisibleColumnSelected()));
+	connect(d->rowSourceCombo, TQ_SIGNAL(textChanged(const TQString &)), 
+		this, TQ_SLOT(slotRowSourceTextChanged(const TQString &)));
+	connect(d->rowSourceCombo, TQ_SIGNAL(dataSourceChanged()), this, TQ_SLOT(slotRowSourceChanged()));
+	connect(d->boundColumnCombo, TQ_SIGNAL(selected()), this, TQ_SLOT(slotBoundColumnSelected()));
+	connect(d->visibleColumnCombo, TQ_SIGNAL(selected()), this, TQ_SLOT(slotVisibleColumnSelected()));
 
 	clearBoundColumnSelection();
 	clearVisibleColumnSelection();
diff --git a/kexi/plugins/tables/kexitabledesignerview.cpp b/kexi/plugins/tables/kexitabledesignerview.cpp
index d092bf89..c641c9cd 100644
--- a/kexi/plugins/tables/kexitabledesignerview.cpp
+++ b/kexi/plugins/tables/kexitabledesignerview.cpp
@@ -159,46 +159,46 @@ KexiTableDesignerView::KexiTableDesignerView(KexiMainWindow *win, TQWidget *pare
 
 	d->view->setSpreadSheetMode();
 
-	connect(d->data, TQT_SIGNAL(aboutToChangeCell(KexiTableItem*,int,TQVariant&,KexiDB::ResultInfo*)),
-		this, TQT_SLOT(slotBeforeCellChanged(KexiTableItem*,int,TQVariant&,KexiDB::ResultInfo*)));
-	connect(d->data, TQT_SIGNAL(rowUpdated(KexiTableItem*)),
-		this, TQT_SLOT(slotRowUpdated(KexiTableItem*)));
-	//connect(d->data, TQT_SIGNAL(aboutToInsertRow(KexiTableItem*,KexiDB::ResultInfo*,bool)),
-	//	this, TQT_SLOT(slotAboutToInsertRow(KexiTableItem*,KexiDB::ResultInfo*,bool)));
-	connect(d->data, TQT_SIGNAL(aboutToDeleteRow(KexiTableItem&,KexiDB::ResultInfo*,bool)),
-		this, TQT_SLOT(slotAboutToDeleteRow(KexiTableItem&,KexiDB::ResultInfo*,bool)));
+	connect(d->data, TQ_SIGNAL(aboutToChangeCell(KexiTableItem*,int,TQVariant&,KexiDB::ResultInfo*)),
+		this, TQ_SLOT(slotBeforeCellChanged(KexiTableItem*,int,TQVariant&,KexiDB::ResultInfo*)));
+	connect(d->data, TQ_SIGNAL(rowUpdated(KexiTableItem*)),
+		this, TQ_SLOT(slotRowUpdated(KexiTableItem*)));
+	//connect(d->data, TQ_SIGNAL(aboutToInsertRow(KexiTableItem*,KexiDB::ResultInfo*,bool)),
+	//	this, TQ_SLOT(slotAboutToInsertRow(KexiTableItem*,KexiDB::ResultInfo*,bool)));
+	connect(d->data, TQ_SIGNAL(aboutToDeleteRow(KexiTableItem&,KexiDB::ResultInfo*,bool)),
+		this, TQ_SLOT(slotAboutToDeleteRow(KexiTableItem&,KexiDB::ResultInfo*,bool)));
 
 	setMinimumSize(d->view->minimumSizeHint().width(), d->view->minimumSizeHint().height());
 	d->view->setFocus();
 
 	d->sets = new KexiDataAwarePropertySet( this, d->view );
-	connect(d->sets, TQT_SIGNAL(rowDeleted()), this, TQT_SLOT(updateActions()));
-	connect(d->sets, TQT_SIGNAL(rowInserted()), this, TQT_SLOT(slotRowInserted()));
+	connect(d->sets, TQ_SIGNAL(rowDeleted()), this, TQ_SLOT(updateActions()));
+	connect(d->sets, TQ_SIGNAL(rowInserted()), this, TQ_SLOT(slotRowInserted()));
 
 	d->contextMenuTitle = new TDEPopupTitle(d->view->contextMenu());
 	d->view->contextMenu()->insertItem(d->contextMenuTitle, -1, 0);
-	connect(d->view->contextMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotAboutToShowContextMenu()));
+	connect(d->view->contextMenu(), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotAboutToShowContextMenu()));
 
-	plugSharedAction("tablepart_toggle_pkey", this, TQT_SLOT(slotTogglePrimaryKey()));
+	plugSharedAction("tablepart_toggle_pkey", this, TQ_SLOT(slotTogglePrimaryKey()));
 	d->action_toggle_pkey = static_cast<TDEToggleAction*>( sharedAction("tablepart_toggle_pkey") );
 	d->action_toggle_pkey->plug(d->view->contextMenu(), 1); //add at the beginning
 	d->view->contextMenu()->insertSeparator(2);
 	setAvailable("tablepart_toggle_pkey", !conn->isReadOnly());
 
 #ifndef KEXI_NO_UNDOREDO_ALTERTABLE
-	plugSharedAction("edit_undo", this, TQT_SLOT(slotUndo()));
-	plugSharedAction("edit_redo", this, TQT_SLOT(slotRedo()));
+	plugSharedAction("edit_undo", this, TQ_SLOT(slotUndo()));
+	plugSharedAction("edit_redo", this, TQ_SLOT(slotRedo()));
 	setAvailable("edit_undo", false);
 	setAvailable("edit_redo", false);
-	connect(d->history, TQT_SIGNAL(commandExecuted(KCommand*)), this, TQT_SLOT(slotCommandExecuted(KCommand*)));
+	connect(d->history, TQ_SIGNAL(commandExecuted(KCommand*)), this, TQ_SLOT(slotCommandExecuted(KCommand*)));
 #endif
 
 #ifdef KEXI_DEBUG_GUI
 	KexiUtils::addAlterTableActionDebug(TQString()); //to create the tab
 	KexiUtils::connectPushButtonActionForDebugWindow( 
-		"simulateAlterTableExecution", this, TQT_SLOT(slotSimulateAlterTableExecution()));
+		"simulateAlterTableExecution", this, TQ_SLOT(slotSimulateAlterTableExecution()));
 	KexiUtils::connectPushButtonActionForDebugWindow( 
-		"executeRealAlterTable", this, TQT_SLOT(executeRealAlterTable()));
+		"executeRealAlterTable", this, TQ_SLOT(executeRealAlterTable()));
 #endif
 }
 
@@ -308,8 +308,8 @@ KexiTableDesignerView::createPropertySet( int row, const KexiDB::Field& field, b
 	KoProperty::Set *set = new KoProperty::Set(d->sets, typeName);
 	if (mainWin()->project()->dbConnection()->isReadOnly())
 		set->setReadOnly( true );
-//	connect(buff,TQT_SIGNAL(propertyChanged(KexiPropertyBuffer&,KexiProperty&)),
-//		this, TQT_SLOT(slotPropertyChanged(KexiPropertyBuffer&,KexiProperty&)));
+//	connect(buff,TQ_SIGNAL(propertyChanged(KexiPropertyBuffer&,KexiProperty&)),
+//		this, TQ_SLOT(slotPropertyChanged(KexiPropertyBuffer&,KexiProperty&)));
 
 	KoProperty::Property *prop;
 
@@ -456,8 +456,8 @@ KexiTableDesignerView::createPropertySet( int row, const KexiDB::Field& field, b
 	//----
 	d->updatePropertiesVisibility(field.type(), *set);
 
-	connect(set, TQT_SIGNAL(propertyChanged(KoProperty::Set&, KoProperty::Property&)),
-		this, TQT_SLOT(slotPropertyChanged(KoProperty::Set&, KoProperty::Property&)));
+	connect(set, TQ_SIGNAL(propertyChanged(KoProperty::Set&, KoProperty::Property&)),
+		this, TQ_SLOT(slotPropertyChanged(KoProperty::Set&, KoProperty::Property&)));
 
 	d->sets->insert(row, set, newOne);
 	return set;
@@ -1556,7 +1556,7 @@ void KexiTableDesignerView::slotSimulateAlterTableExecution()
 tristate KexiTableDesignerView::executeRealAlterTable()
 {
 	TQSignal signal;
-	signal.connect( mainWin(), TQT_SLOT(slotProjectSave()) );
+	signal.connect( mainWin(), TQ_SLOT(slotProjectSave()) );
 	d->tempStoreDataUsingRealAlterTable = true;
 	d->recentResultOfStoreData = false;
 	signal.activate(); //will call KexiMainWindowImpl::slotProjectSaveAs() and thus storeData()
diff --git a/kexi/plugins/tables/kexitablepart.cpp b/kexi/plugins/tables/kexitablepart.cpp
index e1c3cd22..d709da33 100644
--- a/kexi/plugins/tables/kexitablepart.cpp
+++ b/kexi/plugins/tables/kexitablepart.cpp
@@ -222,18 +222,18 @@ void KexiTablePart::setupCustomPropertyPanelTabs(KTabWidget *tab, KexiMainWindow
 {
 	if (!d->lookupColumnPage) {
 		d->lookupColumnPage = new KexiLookupColumnPage(0);
-		connect(d->lookupColumnPage, TQT_SIGNAL(jumpToObjectRequested(const TQCString&, const TQCString&)),
-			mainWin, TQT_SLOT(highlightObject(const TQCString&, const TQCString&)));
+		connect(d->lookupColumnPage, TQ_SIGNAL(jumpToObjectRequested(const TQCString&, const TQCString&)),
+			mainWin, TQ_SLOT(highlightObject(const TQCString&, const TQCString&)));
 
 //! @todo add "Table" tab
 
 	/*
-		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(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();