1 files changed, 11 insertions, 11 deletions

diff --git a/kexi/formeditor/container.cpp b/kexi/formeditor/container.cpp
index ae75caa2..d1a4b1b6 100644
--- a/kexi/formeditor/container.cpp
+++ b/kexi/formeditor/container.cpp
@@ -50,7 +50,7 @@ EventEater::EventEater(TQWidget *widget, TQObject *container)
 	m_widget = widget;
 	m_container = container;
 
-	installRecursiveEventFilter(TQT_TQOBJECT(m_widget), this);
+	installRecursiveEventFilter(m_widget, this);
 }
 
 bool
@@ -83,7 +83,7 @@ EventEater::eventFilter(TQObject *, TQEvent *ev)
 EventEater::~EventEater()
 {
 	if(m_widget)
-		removeRecursiveEventFilter(TQT_TQOBJECT(m_widget), TQT_TQOBJECT(this));
+		removeRecursiveEventFilter(m_widget, this);
 }
 
 // Container itself
@@ -161,7 +161,7 @@ Container::eventFilter(TQObject *s, TQEvent *e)
 				<< "of type " << s->className() << endl;
 			kdDebug() << "TQEvent::MouseButtonPress this          = " << name() << endl;
 
-			m_moving = TQT_TQWIDGET(s);
+			m_moving = static_cast<TQWidget*>(s);
 			TQMouseEvent *mev = static_cast<TQMouseEvent*>(e);
 			m_grab = TQPoint(mev->x(), mev->y());
 
@@ -217,7 +217,7 @@ Container::eventFilter(TQObject *s, TQEvent *e)
 					tmpy *= gridX;
 				}
 
-				m_insertBegin = (TQT_TQWIDGET(s))->mapTo(m_container, TQPoint(tmpx, tmpy));
+				m_insertBegin = (static_cast<TQWidget*>(s))->mapTo(m_container, TQPoint(tmpx, tmpy));
 				if(m_form->formWidget())
 					m_form->formWidget()->initBuffer();
 
@@ -268,7 +268,7 @@ Container::eventFilter(TQObject *s, TQEvent *e)
 					return true;
 
 				if(m_form->formWidget() && (tree->widget() != s))
-					m_form->formWidget()->highlightWidgets(tree->widget(), TQT_TQWIDGET(s));
+					m_form->formWidget()->highlightWidgets(tree->widget(), static_cast<TQWidget*>(s));
 			}
 			else if(m_insertBegin!=TQPoint(-1,-1) && s == m_container && !m_toplevel && (mev->state() != TQt::ControlButton) && !FormManager::self()->isCreatingConnection()) // draw the selection rect
 			{
@@ -379,7 +379,7 @@ Container::eventFilter(TQObject *s, TQEvent *e)
 			}
 			else if(kev->key() == FormManager::self()->contextMenuKey())
 			{
-					FormManager::self()->createContextMenu(TQT_TQWIDGET(s), this, false);
+					FormManager::self()->createContextMenu(static_cast<TQWidget*>(s), this, false);
 					return true;
 			}
 			else if (kev->key() == Key_Delete)
@@ -448,7 +448,7 @@ Container::eventFilter(TQObject *s, TQEvent *e)
 		case TQEvent::MouseButtonDblClick: // editing
 		{
 			kdDebug() << "Container: Mouse dbl click for widget " << s->name() << endl;
-			TQWidget *w = TQT_TQWIDGET(s);
+			TQWidget *w = static_cast<TQWidget*>(s);
 			if(!w)
 				return false;
 
@@ -494,7 +494,7 @@ Container::handleMouseReleaseEvent(TQObject *s, TQMouseEvent *mev)
 	}
 	if(mev->button() == TQt::RightButton) // Right-click -> context menu
 	{
-		FormManager::self()->createContextMenu(TQT_TQWIDGET(s), this);
+		FormManager::self()->createContextMenu(static_cast<TQWidget*>(s), this);
 	}
 	else if(mev->state() == (TQt::LeftButton|TQt::ControlButton))// && (m_copyRect.isValid()))
 	{
@@ -519,7 +519,7 @@ Container::handleMouseReleaseEvent(TQObject *s, TQMouseEvent *mev)
 		if(m_form->selectedWidgets()->count() > 1)
 			FormManager::self()->setInsertPoint( mev->pos() );
 		else
-			FormManager::self()->setInsertPoint( TQT_TQWIDGET(s)->mapTo(m_container, mev->pos() - m_grab) );
+			FormManager::self()->setInsertPoint( static_cast<TQWidget*>(s)->mapTo(m_container, mev->pos() - m_grab) );
 		FormManager::self()->pasteWidget();
 		m_form->setInteractiveMode(true);
 
@@ -1020,7 +1020,7 @@ void
 Container::drawInsertRect(TQMouseEvent *mev, TQObject *s)
 {
 	int tmpx, tmpy;
-	TQPoint pos = TQT_TQWIDGET(s)->mapTo(m_container, mev->pos());
+	TQPoint pos = static_cast<TQWidget*>(s)->mapTo(m_container, mev->pos());
 	int gridX = m_form->gridSize();
 	int gridY = m_form->gridSize();
 	if(!FormManager::self()->snapWidgetsToGrid() || (mev->state() == (TQt::LeftButton|TQt::ControlButton|TQt::AltButton)) )
@@ -1175,7 +1175,7 @@ void
 DesignTimeDynamicChildWidgetHandler::childWidgetAdded(TQWidget* w)
 {
 	if (m_item) {
-		installRecursiveEventFilter(TQT_TQOBJECT(w), m_item->eventEater());
+		installRecursiveEventFilter(w, m_item->eventEater());
 	}
 }