5 files changed, 10 insertions, 10 deletions

diff --git a/kexi/plugins/forms/kexiformpart.cpp b/kexi/plugins/forms/kexiformpart.cpp
index cce155d4c..e5d7addf6 100644
--- a/kexi/plugins/forms/kexiformpart.cpp
+++ b/kexi/plugins/forms/kexiformpart.cpp
@@ -230,7 +230,7 @@ void KexiFormPart::initInstanceActions()
 KexiDialogTempData*
 KexiFormPart::createTempData(KexiDialogBase* dialog)
 {
-	return new KexiFormPart::TempData(TQT_TQOBJECT(dialog));
+	return new KexiFormPart::TempData(dialog);
 }
 
 KexiViewBase* KexiFormPart::createView(TQWidget *parent, KexiDialogBase* dialog,
diff --git a/kexi/plugins/forms/widgets/kexidbform.cpp b/kexi/plugins/forms/widgets/kexidbform.cpp
index 41e8cc64e..263f327bd 100644
--- a/kexi/plugins/forms/widgets/kexidbform.cpp
+++ b/kexi/plugins/forms/widgets/kexidbform.cpp
@@ -131,7 +131,7 @@ static void repaintAll(TQWidget *w)
 	TQObjectList *list = w->queryList("TQWidget");
 	TQObjectListIt it(*list);
 	for (TQObject *obj; (obj=it.current()); ++it ) {
-		TQT_TQWIDGET(obj)->repaint();
+		static_cast<TQWidget*>(obj)->repaint();
 	}
 	delete list;
 }
@@ -320,7 +320,7 @@ void KexiDBForm::updateTabStopsOrder(KFormDesigner::Form* form)
 						kexipluginsdbg << "KexiDBForm::updateTabStopsOrder(): also adding '" 
 							<< childrenIt.current()->className() << " " << childrenIt.current()->name()  
 							<< "' child to filtered widgets" << endl;
-						//it.current()->widget()->installEventFilter(TQT_TQWIDGET(childrenIt.current()));
+						//it.current()->widget()->installEventFilter(childrenIt.current());
 						childrenIt.current()->installEventFilter(this);
 		//			}
 				}
@@ -495,7 +495,7 @@ bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e )
 				if (!realWidget)
 					return true; //ignore
 				//the watched widget can be a subwidget of a real widget, e.g. autofield: find it
-				//TQWidget* realWidget = TQT_TQWIDGET(watched);
+				//TQWidget* realWidget = static_cast<TQWidget*>(watched);
 				while (dynamic_cast<KexiDataItemInterface*>(realWidget) && dynamic_cast<KexiDataItemInterface*>(realWidget)->parentInterface())
 					realWidget = dynamic_cast<TQWidget*>( dynamic_cast<KexiDataItemInterface*>(realWidget)->parentInterface() );
 
@@ -548,7 +548,7 @@ bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e )
 				//behaves differently (e.g. TQLineEdit calls selectAll()) when 
 				//focus event's reason is TQFocusEvent::Tab
 				if (widgetToFocus->focusProxy())
-					widgetToFocus = TQT_TQWIDGET(widgetToFocus->focusProxy());
+					widgetToFocus = widgetToFocus->focusProxy();
 				if (widgetToFocus && d->dataAwareObject->acceptEditor()) {
 					if (tab) {
 						//try to accept this will validate the current input (if any)
diff --git a/kexi/plugins/forms/widgets/kexidblineedit.cpp b/kexi/plugins/forms/widgets/kexidblineedit.cpp
index 5e2ac08ab..e0395cde6 100644
--- a/kexi/plugins/forms/widgets/kexidblineedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidblineedit.cpp
@@ -56,7 +56,7 @@ KexiDBLineEdit::KexiDBLineEdit(TQWidget *parent, const char *name)
  , KexiFormDataItemInterface()
 //moved , m_dateFormatter(0)
 //moved , m_timeFormatter(0)
- , m_menuExtender(TQT_TQOBJECT(this), this)
+ , m_menuExtender(this, this)
  , m_internalReadOnly(false)
  , m_slotTextChanged_enabled(true)
 {
@@ -254,7 +254,7 @@ void KexiDBLineEdit::setReadOnly( bool readOnly )
 	if (m_internalReadOnly) {
 		m_readWriteValidator = validator();
 		if (!m_readOnlyValidator)
-		m_readOnlyValidator = new KexiDBLineEdit_ReadOnlyValidator(TQT_TQOBJECT(this));
+		m_readOnlyValidator = new KexiDBLineEdit_ReadOnlyValidator(this);
 		setValidator( m_readOnlyValidator );
 	}
 	else {
diff --git a/kexi/plugins/forms/widgets/kexidbsubform.cpp b/kexi/plugins/forms/widgets/kexidbsubform.cpp
index 8b4149a97..d021bcb2a 100644
--- a/kexi/plugins/forms/widgets/kexidbsubform.cpp
+++ b/kexi/plugins/forms/widgets/kexidbsubform.cpp
@@ -124,8 +124,8 @@ KexiDBSubForm::setFormName(const TQString &name)
 	m_form->setDesignMode(false);
 
 	// Install event filters on the whole newly created form
-	KFormDesigner::ObjectTreeItem *tree = m_parentForm->objectTree()->lookup(TQT_TQOBJECT(this)->name());
-	KFormDesigner::installRecursiveEventFilter(TQT_TQOBJECT(this), tree->eventEater());
+	KFormDesigner::ObjectTreeItem *tree = m_parentForm->objectTree()->lookup(this->name());
+	KFormDesigner::installRecursiveEventFilter(this, tree->eventEater());
 }
 
 #include "kexidbsubform.moc"
diff --git a/kexi/plugins/forms/widgets/kexidbtextedit.cpp b/kexi/plugins/forms/widgets/kexidbtextedit.cpp
index 07e932b4b..3b9c6f09c 100644
--- a/kexi/plugins/forms/widgets/kexidbtextedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidbtextedit.cpp
@@ -32,7 +32,7 @@ KexiDBTextEdit::KexiDBTextEdit(TQWidget *parent, const char *name)
  : KTextEdit(parent, name)
  , KexiDBTextWidgetInterface()
  , KexiFormDataItemInterface()
- , m_menuExtender(TQT_TQOBJECT(this), this)
+ , m_menuExtender(this, this)
  , m_slotTextChanged_enabled(true)
 {
 	connect(this, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged()));