TQt4 port koffice

This should enable compilation under both Qt3 and Qt4; fixes for any missed components will be forthcoming


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1238284 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 111 insertions, 111 deletions

diff --git a/kexi/plugins/forms/kexiformpart.cpp b/kexi/plugins/forms/kexiformpart.cpp
index 8693cb5b..2486416e 100644
--- a/kexi/plugins/forms/kexiformpart.cpp
+++ b/kexi/plugins/forms/kexiformpart.cpp
@@ -71,14 +71,14 @@ class KexiFormPart::Private
 			delete static_cast<KFormDesigner::ObjectTreeView*>(objectTreeView);
 			delete static_cast<KexiDataSourcePage*>(dataSourcePage);
 		}
-//		QGuardedPtr<KFormDesigner::FormManager> manager;
-		QGuardedPtr<KFormDesigner::ObjectTreeView> objectTreeView;
-		QGuardedPtr<KexiDataSourcePage> dataSourcePage;
+//		TQGuardedPtr<KFormDesigner::FormManager> manager;
+		TQGuardedPtr<KFormDesigner::ObjectTreeView> objectTreeView;
+		TQGuardedPtr<KexiDataSourcePage> dataSourcePage;
 		KexiDataSourceComboBox *dataSourceCombo;
 };
 
-KexiFormPart::KexiFormPart(QObject *parent, const char *name, const QStringList &l)
- : KexiPart::Part(parent, name, l)
+KexiFormPart::KexiFormPart(TQObject *tqparent, const char *name, const TQStringList &l)
+ : KexiPart::Part(tqparent, name, l)
  , d(new Private())
 {
 	// REGISTERED ID:
@@ -102,18 +102,18 @@ KexiFormPart::KexiFormPart(QObject *parent, const char *name, const QStringList
 
 	// Create and store a handle to forms' library. Reports will have their own library too.
 /* @todo add configuration for supported factory groups */
-	QStringList supportedFactoryGroups;
+	TQStringList supportedFactoryGroups;
 	supportedFactoryGroups += "kexi";
 	static_formsLibrary = KFormDesigner::FormManager::createWidgetLibrary(
 		formManager, supportedFactoryGroups);
 	static_formsLibrary->setAdvancedPropertiesVisible(false);
-	connect(static_formsLibrary, SIGNAL(widgetCreated(QWidget*)),
-		this, SLOT(slotWidgetCreatedByFormsLibrary(QWidget*)));
+	connect(static_formsLibrary, TQT_SIGNAL(widgetCreated(TQWidget*)),
+		this, TQT_SLOT(slotWidgetCreatedByFormsLibrary(TQWidget*)));
 
-	connect(KFormDesigner::FormManager::self()->propertySet(), SIGNAL(widgetPropertyChanged(QWidget *, const QCString &, const QVariant&)),
-		this, SLOT(slotPropertyChanged(QWidget *, const QCString &, const QVariant&)));
-	connect(KFormDesigner::FormManager::self(), SIGNAL(autoTabStopsSet(KFormDesigner::Form*,bool)),
-		this, SLOT(slotAutoTabStopsSet(KFormDesigner::Form*,bool)));
+	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)));
 }
 
 KexiFormPart::~KexiFormPart()
@@ -143,8 +143,8 @@ void KexiFormPart::initInstanceActions( int mode, KActionCollection *col )
 {
 	if (mode==Kexi::DesignViewMode) {
 		KFormDesigner::FormManager::self()->createActions(col, 0);
-		new KAction(i18n("Edit Tab Order..."), "tab_order", KShortcut(0), KFormDesigner::FormManager::self(), SLOT(editTabOrder()), col, "taborder");
-		new KAction(i18n("Adjust Size"), "viewmagfit", KShortcut(0), KFormDesigner::FormManager::self(), SLOT(ajustWidgetSize()), col, "adjust");
+		new KAction(i18n("Edit Tab Order..."), "tab_order", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editTabOrder()), col, "taborder");
+		new KAction(i18n("Adjust Size"), "viewmagfit", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(ajustWidgetSize()), col, "adjust");
 	}
 	//TODO
 }
@@ -152,7 +152,7 @@ void KexiFormPart::initInstanceActions( int mode, KActionCollection *col )
 
 void KexiFormPart::initPartActions()
 {
-//	new KAction(i18n("Show Form UI Code"), "show_form_ui", CTRL+Key_U, m_manager, SLOT(showFormUICode()),
+//	new KAction(i18n("Show Form UI Code"), "show_form_ui", CTRL+Key_U, m_manager, TQT_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 KAction(i18n("Show Form UI Code"), "compfile", 
-			CTRL+Key_U, KFormDesigner::FormManager::self(), SLOT(showFormUICode()),
+			CTRL+Key_U, KFormDesigner::FormManager::self(), TQT_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"), SIGNAL(activated()), this, SLOT(slotAssignAction()));
+	connect( col->action("widget_assign_action"), TQT_SIGNAL(activated()), this, TQT_SLOT(slotAssignAction()));
 
 	createSharedAction(Kexi::DesignViewMode, i18n("Clear Widget Contents"), "editclear", 0, "formpart_clear_contents");
 	createSharedAction(Kexi::DesignViewMode, i18n("Edit Tab Order..."), "tab_order", 0, "formpart_taborder");
@@ -184,23 +184,23 @@ void KexiFormPart::initInstanceActions()
 	KActionMenu *menu = static_cast<KActionMenu*>(action);
 
 	menu->insert( createSharedAction(Kexi::DesignViewMode, i18n("&Horizontally"),
-		QString::null, 0, "formpart_layout_hbox"));
+		TQString(), 0, "formpart_layout_hbox"));
 	menu->insert( createSharedAction(Kexi::DesignViewMode, i18n("&Vertically"),
-		QString::null, 0, "formpart_layout_vbox"));
+		TQString(), 0, "formpart_layout_vbox"));
 	menu->insert( createSharedAction(Kexi::DesignViewMode, i18n("In &Grid"),
-		QString::null, 0, "formpart_layout_grid"));
+		TQString(), 0, "formpart_layout_grid"));
 #ifdef KEXI_SHOW_SPLITTER_WIDGET
 	menu->insert( createSharedAction(Kexi::DesignViewMode, i18n("Horizontally in &Splitter"),
-		QString::null, 0, "formpart_layout_hsplitter"));
+		TQString(), 0, "formpart_layout_hsplitter"));
 	menu->insert( createSharedAction(Kexi::DesignViewMode, i18n("Verti&cally in Splitter"),
-		QString::null, 0, "formpart_layout_vsplitter"));
+		TQString(), 0, "formpart_layout_vsplitter"));
 #endif
 
-	createSharedAction(Kexi::DesignViewMode, i18n("&Break Layout"), QString::null, 0, "formpart_break_layout");
+	createSharedAction(Kexi::DesignViewMode, i18n("&Break Layout"), TQString(), 0, "formpart_break_layout");
 /*
-	createSharedAction(Kexi::DesignViewMode, i18n("Lay Out Widgets &Horizontally"), QString::null, 0, "formpart_layout_hbox");
-	createSharedAction(Kexi::DesignViewMode, i18n("Lay Out Widgets &Vertically"), QString::null, 0, "formpart_layout_vbox");
-	createSharedAction(Kexi::DesignViewMode, i18n("Lay Out Widgets in &Grid"), QString::null, 0, "formpart_layout_grid");
+	createSharedAction(Kexi::DesignViewMode, i18n("Lay Out Widgets &Horizontally"), TQString(), 0, "formpart_layout_hbox");
+	createSharedAction(Kexi::DesignViewMode, i18n("Lay Out Widgets &Vertically"), TQString(), 0, "formpart_layout_vbox");
+	createSharedAction(Kexi::DesignViewMode, i18n("Lay Out Widgets in &Grid"), TQString(), 0, "formpart_layout_grid");
 */
 	createSharedAction(Kexi::DesignViewMode, i18n("Bring Widget to Front"), "raise", 0, "formpart_format_raise");
 	createSharedAction(Kexi::DesignViewMode, i18n("Send Widget to Back"), "lower", 0, "formpart_format_lower");
@@ -230,11 +230,11 @@ void KexiFormPart::initInstanceActions()
 KexiDialogTempData*
 KexiFormPart::createTempData(KexiDialogBase* dialog)
 {
-	return new KexiFormPart::TempData(dialog);
+	return new KexiFormPart::TempData(TQT_TQOBJECT(dialog));
 }
 
-KexiViewBase* KexiFormPart::createView(QWidget *parent, KexiDialogBase* dialog,
-	KexiPart::Item &item, int viewMode, QMap<QString,QString>*)
+KexiViewBase* KexiFormPart::createView(TQWidget *tqparent, KexiDialogBase* dialog,
+	KexiPart::Item &item, int viewMode, TQMap<TQString,TQString>*)
 {
 	Q_UNUSED( viewMode );
 
@@ -243,60 +243,60 @@ KexiViewBase* KexiFormPart::createView(QWidget *parent, KexiDialogBase* dialog,
 	if (!win || !win->project() || !win->project()->dbConnection())
 		return 0;
 
-	KexiFormView *view = new KexiFormView(win, parent, item.name().latin1(),
+	KexiFormView *view = new KexiFormView(win, tqparent, item.name().latin1(),
 		win->project()->dbConnection() );
 
 	return view;
 }
 
 void
-KexiFormPart::generateForm(KexiDB::FieldList *list, QDomDocument &domDoc)
+KexiFormPart::generateForm(KexiDB::FieldList *list, TQDomDocument &domDoc)
 {
 	//this form generates a .ui from FieldList list
 	//basically that is a Label and a LineEdit for each field
-	domDoc = QDomDocument("UI");
-        QDomElement uiElement = domDoc.createElement("UI");
+	domDoc = TQDomDocument("UI");
+        TQDomElement uiElement = domDoc.createElement("UI");
 	domDoc.appendChild(uiElement);
 	uiElement.setAttribute("version", "3.1");
 	uiElement.setAttribute("stdsetdef", 1);
 
-	QDomElement baseClass = domDoc.createElement("class");
+	TQDomElement baseClass = domDoc.createElement("class");
 	uiElement.appendChild(baseClass);
-	QDomText baseClassV = domDoc.createTextNode("QWidget");
+	TQDomText baseClassV = domDoc.createTextNode(TQWIDGET_OBJECT_NAME_STRING);
 	baseClass.appendChild(baseClassV);
-	QDomElement baseWidget = domDoc.createElement("widget");
-	baseWidget.setAttribute("class", "QWidget");
+	TQDomElement baseWidget = domDoc.createElement("widget");
+	baseWidget.setAttribute("class", TQWIDGET_OBJECT_NAME_STRING);
 
 	int y=0;
 
 	for(unsigned int i=0; i < list->fieldCount(); i++)
 	{
-		QDomElement lclass = domDoc.createElement("widget");
+		TQDomElement lclass = domDoc.createElement("widget");
 		baseWidget.appendChild(lclass);
-		lclass.setAttribute("class", "QLabel");
-		QDomElement lNameProperty = domDoc.createElement("property");
+		lclass.setAttribute("class", TQLABEL_OBJECT_NAME_STRING);
+		TQDomElement lNameProperty = domDoc.createElement("property");
 		lNameProperty.setAttribute("name", "name");
-		QDomElement lType = domDoc.createElement("cstring");
-		QDomText lClassN = domDoc.createTextNode(QString("l%1").arg(list->field(i)->name()));
+		TQDomElement lType = domDoc.createElement("cstring");
+		TQDomText lClassN = domDoc.createTextNode(TQString("l%1").tqarg(list->field(i)->name()));
 		lType.appendChild(lClassN);
 		lNameProperty.appendChild(lType);
 		lclass.appendChild(lNameProperty);
 
-		QDomElement gNameProperty = domDoc.createElement("property");
+		TQDomElement gNameProperty = domDoc.createElement("property");
 		gNameProperty.setAttribute("name", "geometry");
-		QDomElement lGType = domDoc.createElement("rect");
+		TQDomElement lGType = domDoc.createElement("rect");
 
-		QDomElement lx = domDoc.createElement("x");
-		QDomText lxV = domDoc.createTextNode("10");
+		TQDomElement lx = domDoc.createElement("x");
+		TQDomText lxV = domDoc.createTextNode("10");
 		lx.appendChild(lxV);
-		QDomElement ly = domDoc.createElement("y");
-		QDomText lyV = domDoc.createTextNode(QString::number(y + 10));
+		TQDomElement ly = domDoc.createElement("y");
+		TQDomText lyV = domDoc.createTextNode(TQString::number(y + 10));
 		ly.appendChild(lyV);
-		QDomElement lWidth = domDoc.createElement("width");
-		QDomText lWidthV = domDoc.createTextNode("100");
+		TQDomElement lWidth = domDoc.createElement("width");
+		TQDomText lWidthV = domDoc.createTextNode("100");
 		lWidth.appendChild(lWidthV);
-		QDomElement lHeight = domDoc.createElement("height");
-		QDomText lHeightV = domDoc.createTextNode("20");
+		TQDomElement lHeight = domDoc.createElement("height");
+		TQDomText lHeightV = domDoc.createTextNode("20");
 		lHeight.appendChild(lHeightV);
 
 		lGType.appendChild(lx);
@@ -307,10 +307,10 @@ KexiFormPart::generateForm(KexiDB::FieldList *list, QDomDocument &domDoc)
 		gNameProperty.appendChild(lGType);
 		lclass.appendChild(gNameProperty);
 
-		QDomElement tNameProperty = domDoc.createElement("property");
+		TQDomElement tNameProperty = domDoc.createElement("property");
 		tNameProperty.setAttribute("name", "text");
-		QDomElement lTType = domDoc.createElement("string");
-		QDomText lTextV = domDoc.createTextNode(list->field(i)->name());
+		TQDomElement lTType = domDoc.createElement("string");
+		TQDomText lTextV = domDoc.createTextNode(list->field(i)->name());
 		lTType.appendChild(lTextV);
 		tNameProperty.appendChild(lTType);
 		lclass.appendChild(tNameProperty);
@@ -319,32 +319,32 @@ KexiFormPart::generateForm(KexiDB::FieldList *list, QDomDocument &domDoc)
 		///line edit!
 
 
-		QDomElement vclass = domDoc.createElement("widget");
+		TQDomElement vclass = domDoc.createElement("widget");
 		baseWidget.appendChild(vclass);
 		vclass.setAttribute("class", "KLineEdit");
-		QDomElement vNameProperty = domDoc.createElement("property");
+		TQDomElement vNameProperty = domDoc.createElement("property");
 		vNameProperty.setAttribute("name", "name");
-		QDomElement vType = domDoc.createElement("cstring");
-		QDomText vClassN = domDoc.createTextNode(list->field(i)->name());
+		TQDomElement vType = domDoc.createElement("cstring");
+		TQDomText vClassN = domDoc.createTextNode(list->field(i)->name());
 		vType.appendChild(vClassN);
 		vNameProperty.appendChild(vType);
 		vclass.appendChild(vNameProperty);
 
-		QDomElement vgNameProperty = domDoc.createElement("property");
+		TQDomElement vgNameProperty = domDoc.createElement("property");
 		vgNameProperty.setAttribute("name", "geometry");
-		QDomElement vGType = domDoc.createElement("rect");
+		TQDomElement vGType = domDoc.createElement("rect");
 
-		QDomElement vx = domDoc.createElement("x");
-		QDomText vxV = domDoc.createTextNode("110");
+		TQDomElement vx = domDoc.createElement("x");
+		TQDomText vxV = domDoc.createTextNode("110");
 		vx.appendChild(vxV);
-		QDomElement vy = domDoc.createElement("y");
-		QDomText vyV = domDoc.createTextNode(QString::number(y + 10));
+		TQDomElement vy = domDoc.createElement("y");
+		TQDomText vyV = domDoc.createTextNode(TQString::number(y + 10));
 		vy.appendChild(vyV);
-		QDomElement vWidth = domDoc.createElement("width");
-		QDomText vWidthV = domDoc.createTextNode("200");
+		TQDomElement vWidth = domDoc.createElement("width");
+		TQDomText vWidthV = domDoc.createTextNode("200");
 		vWidth.appendChild(vWidthV);
-		QDomElement vHeight = domDoc.createElement("height");
-		QDomText vHeightV = domDoc.createTextNode("20");
+		TQDomElement vHeight = domDoc.createElement("height");
+		TQDomText vHeightV = domDoc.createTextNode("20");
 		vHeight.appendChild(vHeightV);
 
 		vGType.appendChild(vx);
@@ -358,29 +358,29 @@ KexiFormPart::generateForm(KexiDB::FieldList *list, QDomDocument &domDoc)
 		y += 20;
 	}
 
-	QDomElement lNameProperty = domDoc.createElement("property");
+	TQDomElement lNameProperty = domDoc.createElement("property");
 	lNameProperty.setAttribute("name", "name");
-	QDomElement lType = domDoc.createElement("cstring");
-	QDomText lClassN = domDoc.createTextNode("DBForm");
+	TQDomElement lType = domDoc.createElement("cstring");
+	TQDomText lClassN = domDoc.createTextNode("DBForm");
 	lType.appendChild(lClassN);
 	lNameProperty.appendChild(lType);
 	baseWidget.appendChild(lNameProperty);
 
-	QDomElement wNameProperty = domDoc.createElement("property");
+	TQDomElement wNameProperty = domDoc.createElement("property");
 	wNameProperty.setAttribute("name", "geometry");
-	QDomElement wGType = domDoc.createElement("rect");
+	TQDomElement wGType = domDoc.createElement("rect");
 
-	QDomElement wx = domDoc.createElement("x");
-	QDomText wxV = domDoc.createTextNode("0");
+	TQDomElement wx = domDoc.createElement("x");
+	TQDomText wxV = domDoc.createTextNode("0");
 	wx.appendChild(wxV);
-	QDomElement wy = domDoc.createElement("y");
-	QDomText wyV = domDoc.createTextNode("0");
+	TQDomElement wy = domDoc.createElement("y");
+	TQDomText wyV = domDoc.createTextNode("0");
 	wy.appendChild(wyV);
-	QDomElement wWidth = domDoc.createElement("width");
-	QDomText wWidthV = domDoc.createTextNode("340");
+	TQDomElement wWidth = domDoc.createElement("width");
+	TQDomText wWidthV = domDoc.createTextNode("340");
 	wWidth.appendChild(wWidthV);
-	QDomElement wHeight = domDoc.createElement("height");
-	QDomText wHeightV = domDoc.createTextNode(QString::number(y + 30));
+	TQDomElement wHeight = domDoc.createElement("height");
+	TQDomText wHeightV = domDoc.createTextNode(TQString::number(y + 30));
 	wHeight.appendChild(wHeightV);
 
 	wGType.appendChild(wx);
@@ -400,7 +400,7 @@ void KexiFormPart::slotAutoTabStopsSet(KFormDesigner::Form *form, bool set)
 
 	KoProperty::Property &p = (*KFormDesigner::FormManager::self()->propertySet())["autoTabStops"];
 	if (!p.isNull())
-		p.setValue(QVariant(set, 4));
+		p.setValue(TQVariant(set, 4));
 }
 
 void KexiFormPart::slotAssignAction()
@@ -424,15 +424,15 @@ void KexiFormPart::slotAssignAction()
 	KexiFormScrollView *scrollViewWidget = dynamic_cast<KexiFormScrollView*>(dbform->dataAwareObject());
 	if (!scrollViewWidget)
 		return;
-	KexiFormView* formViewWidget = dynamic_cast<KexiFormView*>(scrollViewWidget->parent());
+	KexiFormView* formViewWidget = dynamic_cast<KexiFormView*>(scrollViewWidget->tqparent());
 	if (!formViewWidget)
 		return;
 
-	KexiMainWindow * mainWin = formViewWidget->parentDialog()->mainWin();
+	KexiMainWindow * mainWin = formViewWidget->tqparentDialog()->mainWin();
 	KexiActionSelectionDialog dlg(mainWin, dbform, data, 
 		propSet->property("name").value().toCString());
 
-	if(dlg.exec() == QDialog::Accepted) {
+	if(dlg.exec() == TQDialog::Accepted) {
 		data = dlg.currentAction();
 		//update property value
 		propSet->property("onClickAction").setValue(data.string);
@@ -440,8 +440,8 @@ void KexiFormPart::slotAssignAction()
 	}
 }
 
-QString
-KexiFormPart::i18nMessage(const QCString& englishMessage, KexiDialogBase* dlg) const
+TQString
+KexiFormPart::i18nMessage(const TQCString& englishMessage, KexiDialogBase* dlg) const
 {
 	Q_UNUSED(dlg);
 	if (englishMessage=="Design of object \"%1\" has been modified.")
@@ -453,21 +453,21 @@ KexiFormPart::i18nMessage(const QCString& englishMessage, KexiDialogBase* dlg) c
 }
 
 void
-KexiFormPart::slotPropertyChanged(QWidget *w, const QCString &name, const QVariant &value)
+KexiFormPart::slotPropertyChanged(TQWidget *w, const TQCString &name, const TQVariant &value)
 {
 	Q_UNUSED( w );
 
 	if (!KFormDesigner::FormManager::self()->activeForm())
 		return;
 	if (name == "autoTabStops") {
-		//QWidget *w = KFormDesigner::FormManager::self()->activeForm()->selectedWidget();
+		//TQWidget *w = KFormDesigner::FormManager::self()->activeForm()->selectedWidget();
 		//update autoTabStops setting at KFD::Form level
 		KFormDesigner::FormManager::self()->activeForm()->setAutoTabStops( value.toBool() );
 	}
 	if (KFormDesigner::FormManager::self()->activeForm()->widget() && name == "geometry") {
 		//fall back to sizeInternal property....
-		if (KFormDesigner::FormManager::self()->propertySet()->contains("sizeInternal"))
-			KFormDesigner::FormManager::self()->propertySet()->property("sizeInternal").setValue(value.toRect().size());
+		if (KFormDesigner::FormManager::self()->propertySet()->tqcontains("sizeInternal"))
+			KFormDesigner::FormManager::self()->propertySet()->property("sizeInternal").setValue(TQSize(value.toRect().size()));
 	}
 }
 
@@ -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, SIGNAL(jumpToObjectRequested(const QCString&, const QCString&)),
-			mainWin, SLOT(highlightObject(const QCString&, const QCString&)));
-		connect(d->dataSourcePage, SIGNAL(formDataSourceChanged(const QCString&, const QCString&)),
-			KFormDesigner::FormManager::self(), SLOT(setFormDataSource(const QCString&, const QCString&)));
-		connect(d->dataSourcePage, SIGNAL(dataSourceFieldOrExpressionChanged(const QString&, const QString&, KexiDB::Field::Type)),
-			KFormDesigner::FormManager::self(), SLOT(setDataSourceFieldOrExpression(const QString&, const QString&, KexiDB::Field::Type)));
-		connect(d->dataSourcePage, SIGNAL(insertAutoFields(const QString&, const QString&, const QStringList&)),
-			KFormDesigner::FormManager::self(), SLOT(insertAutoFields(const QString&, const QString&, const QStringList&)));
+		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&)));
 	}
 
 	KexiProject *prj = mainWin->project();
@@ -508,28 +508,28 @@ void KexiFormPart::setupCustomPropertyPanelTabs(KTabWidget *tab, KexiMainWindow*
 	tab->setTabToolTip( d->objectTreeView, i18n("Widgets"));
 }
 
-void KexiFormPart::slotWidgetCreatedByFormsLibrary(QWidget* widget)
+void KexiFormPart::slotWidgetCreatedByFormsLibrary(TQWidget* widget)
 {
-	QStrList signalNames(widget->metaObject()->signalNames());
+	TQStrList signalNames(widget->tqmetaObject()->signalNames());
 	if (!signalNames.isEmpty()) {
-		const char *handleDragMoveEventSignal = "handleDragMoveEvent(QDragMoveEvent*)";
-		const char *handleDropEventSignal = "handleDropEvent(QDropEvent*)";
+		const char *handleDragMoveEventSignal = "handleDragMoveEvent(TQDragMoveEvent*)";
+		const char *handleDropEventSignal = "handleDropEvent(TQDropEvent*)";
 
-		for (QStrListIterator it(signalNames); it.current(); ++it) {
+		for (TQStrListIterator it(signalNames); it.current(); ++it) {
 			if (0==qstrcmp(it.current(), handleDragMoveEventSignal)) {
 				kdDebug() << it.current() <<  endl;
 				KexiFormView *formView = KexiUtils::findParent<KexiFormView>(widget, "KexiFormView");
 				if (formView) {
-					connect(widget, SIGNAL(handleDragMoveEvent(QDragMoveEvent*)), 
-						formView, SLOT(slotHandleDragMoveEvent(QDragMoveEvent*)));
+					connect(widget, TQT_SIGNAL(handleDragMoveEvent(TQDragMoveEvent*)), 
+						formView, TQT_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, SIGNAL(handleDropEvent(QDropEvent*)), 
-						formView, SLOT(slotHandleDropEvent(QDropEvent*)));
+					connect(widget, TQT_SIGNAL(handleDropEvent(TQDropEvent*)), 
+						formView, TQT_SLOT(slotHandleDropEvent(TQDropEvent*)));
 				}
 			}
 		}
@@ -538,8 +538,8 @@ void KexiFormPart::slotWidgetCreatedByFormsLibrary(QWidget* widget)
 
 //----------------
 
-KexiFormPart::TempData::TempData(QObject* parent)
- : KexiDialogTempData(parent)
+KexiFormPart::TempData::TempData(TQObject* tqparent)
+ : KexiDialogTempData(tqparent)
 {
 }