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, 4 insertions, 4 deletions

diff --git a/kexi/plugins/forms/kexiformdataiteminterface.cpp b/kexi/plugins/forms/kexiformdataiteminterface.cpp
index c87a2dab..9a861917 100644
--- a/kexi/plugins/forms/kexiformdataiteminterface.cpp
+++ b/kexi/plugins/forms/kexiformdataiteminterface.cpp
@@ -40,7 +40,7 @@ KexiFormDataItemInterface::~KexiFormDataItemInterface()
 void KexiFormDataItemInterface::undoChanges()
 {
 //	m_disable_signalValueChanged = true;
-	setValueInternal(QString::null, false);
+	setValueInternal(TQString(), false);
 //	m_disable_signalValueChanged = false;
 }
 
@@ -49,7 +49,7 @@ KexiDB::Field* KexiFormDataItemInterface::field() const
 	return m_columnInfo ? m_columnInfo->field : 0;
 }
 
-void KexiFormDataItemInterface::setDisplayDefaultValue(QWidget* widget, bool displayDefaultValue)
+void KexiFormDataItemInterface::setDisplayDefaultValue(TQWidget* widget, bool displayDefaultValue)
 {
 	m_displayDefaultValue = displayDefaultValue;
 	if (!m_displayParametersForDefaultValue) {
@@ -61,8 +61,8 @@ void KexiFormDataItemInterface::setDisplayDefaultValue(QWidget* widget, bool dis
 
 void KexiFormDataItemInterface::cancelEditor()
 {
-	QWidget *parentWidget = dynamic_cast<QWidget*>(this)->parentWidget();
-	KexiFormScrollView* view = KexiUtils::findParent<KexiFormScrollView>(parentWidget, "KexiFormScrollView");
+	TQWidget *tqparentWidget = dynamic_cast<TQWidget*>(this)->tqparentWidget();
+	KexiFormScrollView* view = KexiUtils::findParent<KexiFormScrollView>(tqparentWidget, "KexiFormScrollView");
 	if (view)
 		view->cancelEditor();
 }