summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kate/part/katecodecompletion.cpp2
-rw-r--r--tdecore/kcheckaccelerators.cpp4
-rw-r--r--tdecore/tdeapplication.cpp8
-rw-r--r--tdehtml/rendering/render_form.cpp4
-rw-r--r--tdehtml/rendering/render_replaced.cpp40
-rw-r--r--tdehtml/tdehtmlview.cpp12
-rw-r--r--tdemdi/tdemdi/dockcontainer.cpp2
-rw-r--r--tdemdi/tdemdidockcontainer.cpp2
-rw-r--r--tdeparts/partmanager.cpp6
-rw-r--r--tdestyles/keramik/keramik.cpp6
-rw-r--r--tdeui/klineedit.cpp4
-rw-r--r--tdeui/ksyntaxhighlighter.cpp2
-rw-r--r--tdeui/kurllabel.cpp8
-rw-r--r--tdeui/tdecompletionbox.cpp6
-rw-r--r--tdeui/tdetoolbarbutton.cpp4
15 files changed, 55 insertions, 55 deletions
diff --git a/kate/part/katecodecompletion.cpp b/kate/part/katecodecompletion.cpp
index a161534e6..41d57dc29 100644
--- a/kate/part/katecodecompletion.cpp
+++ b/kate/part/katecodecompletion.cpp
@@ -533,7 +533,7 @@ void KateArgHint::show()
bool KateArgHint::eventFilter( TQObject*, TQEvent* e )
{
if( isVisible() && e->type() == TQEvent::KeyPress ){
- TQKeyEvent* ke = TQT_TQKEYEVENT( e );
+ TQKeyEvent* ke = static_cast<TQKeyEvent*>( e );
if( (ke->state() & ControlButton) && ke->key() == Key_Left ){
setCurrentFunction( currentFunction() - 1 );
ke->accept();
diff --git a/tdecore/kcheckaccelerators.cpp b/tdecore/kcheckaccelerators.cpp
index 306591e67..b71084243 100644
--- a/tdecore/kcheckaccelerators.cpp
+++ b/tdecore/kcheckaccelerators.cpp
@@ -99,11 +99,11 @@ bool KCheckAccelerators::eventFilter( TQObject * , TQEvent * e)
switch ( e->type() ) { // just simplify debuggin
case TQEvent::Accel:
- if ( key && (TQT_TQKEYEVENT(e)->key() == key) ) {
+ if ( key && (static_cast<TQKeyEvent*>(e)->key() == key) ) {
block = true;
checkAccelerators( false );
block = false;
- TQT_TQKEYEVENT(e)->accept();
+ static_cast<TQKeyEvent*>(e)->accept();
return true;
}
break;
diff --git a/tdecore/tdeapplication.cpp b/tdecore/tdeapplication.cpp
index de4ab2afc..fd1e04c32 100644
--- a/tdecore/tdeapplication.cpp
+++ b/tdecore/tdeapplication.cpp
@@ -557,7 +557,7 @@ bool TDEApplication::notify(TQObject *receiver, TQEvent *event)
// Indicate that the accelerator has been overridden.
if (t == TQEvent::AccelOverride)
{
- TQT_TQKEYEVENT(event)->accept();
+ static_cast<TQKeyEvent*>(event)->accept();
return true;
}
else
@@ -571,7 +571,7 @@ bool TDEApplication::notify(TQObject *receiver, TQEvent *event)
if (edit)
{
// We have a keypress for a lineedit...
- TQKeyEvent *kevent = TQT_TQKEYEVENT(event);
+ TQKeyEvent *kevent = static_cast<TQKeyEvent*>(event);
KKey key(kevent);
if (_selectAll.contains(key))
{
@@ -609,7 +609,7 @@ bool TDEApplication::notify(TQObject *receiver, TQEvent *event)
if (medit)
{
// We have a keypress for a multilineedit...
- TQKeyEvent *kevent = TQT_TQKEYEVENT(event);
+ TQKeyEvent *kevent = static_cast<TQKeyEvent*>(event);
if (_selectAll.contains(KKey(kevent)))
{
if (t == TQEvent::KeyPress)
@@ -628,7 +628,7 @@ bool TDEApplication::notify(TQObject *receiver, TQEvent *event)
{
TQWidget* w = TQT_TQWIDGET( receiver );
#if defined Q_WS_X11
- if( w->isTopLevel() && !startupId().isEmpty() && !TQT_TQSHOWEVENT(event)->spontaneous()) // TODO better done using window group leader?
+ if( w->isTopLevel() && !startupId().isEmpty() && !static_cast<TQShowEvent*>(event)->spontaneous()) // TODO better done using window group leader?
TDEStartupInfo::setWindowStartupId( w->winId(), startupId());
#endif
if( w->isTopLevel() && !w->testWFlags( WX11BypassWM ) && !w->isPopup() && !event->spontaneous())
diff --git a/tdehtml/rendering/render_form.cpp b/tdehtml/rendering/render_form.cpp
index 63bba2914..8462f711b 100644
--- a/tdehtml/rendering/render_form.cpp
+++ b/tdehtml/rendering/render_form.cpp
@@ -890,7 +890,7 @@ bool ComboBoxWidget::event(TQEvent *e)
return true;
if (e->type()==TQEvent::KeyPress)
{
- TQKeyEvent *ke = TQT_TQKEYEVENT(e);
+ TQKeyEvent *ke = static_cast<TQKeyEvent*>(e);
switch(ke->key())
{
case Key_Return:
@@ -909,7 +909,7 @@ bool ComboBoxWidget::eventFilter(TQObject *dest, TQEvent *e)
{
if (dest==listBox() && e->type()==TQEvent::KeyPress)
{
- TQKeyEvent *ke = TQT_TQKEYEVENT(e);
+ TQKeyEvent *ke = static_cast<TQKeyEvent*>(e);
bool forward = false;
switch(ke->key())
{
diff --git a/tdehtml/rendering/render_replaced.cpp b/tdehtml/rendering/render_replaced.cpp
index ddf4dfb4b..3c71656e1 100644
--- a/tdehtml/rendering/render_replaced.cpp
+++ b/tdehtml/rendering/render_replaced.cpp
@@ -642,7 +642,7 @@ bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e)
// Don't count popup as a valid reason for losing the focus
// (example: opening the options of a select combobox shouldn't emit onblur)
- if ( TQT_TQFOCUSEVENT(e)->reason() != TQFocusEvent::Popup )
+ if ( static_cast<TQFocusEvent*>(e)->reason() != TQFocusEvent::Popup )
handleFocusOut();
break;
case TQEvent::FocusIn:
@@ -663,7 +663,7 @@ bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e)
case TQEvent::KeyRelease:
// TODO this seems wrong - Qt events are not correctly translated to DOM ones,
// like in TDEHTMLView::dispatchKeyEvent()
- if (element()->dispatchKeyEvent(TQT_TQKEYEVENT(e),false))
+ if (element()->dispatchKeyEvent(static_cast<TQKeyEvent*>(e),false))
filtered = true;
break;
@@ -674,7 +674,7 @@ bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e)
// or something while wheeling a webpage.
if (tqApp->focusWidget() != widget() &&
widget()->focusPolicy() <= TQWidget::StrongFocus) {
- TQT_TQWHEELEVENT(e)->ignore();
+ static_cast<TQWheelEvent*>(e)->ignore();
TQApplication::sendEvent(view(), e);
filtered = true;
}
@@ -697,22 +697,22 @@ bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e)
void RenderWidget::EventPropagator::sendEvent(TQEvent *e) {
switch(e->type()) {
case TQEvent::MouseButtonPress:
- mousePressEvent(TQT_TQMOUSEEVENT(e));
+ mousePressEvent(static_cast<TQMouseEvent*>(e));
break;
case TQEvent::MouseButtonRelease:
- mouseReleaseEvent(TQT_TQMOUSEEVENT(e));
+ mouseReleaseEvent(static_cast<TQMouseEvent*>(e));
break;
case TQEvent::MouseButtonDblClick:
- mouseDoubleClickEvent(TQT_TQMOUSEEVENT(e));
+ mouseDoubleClickEvent(static_cast<TQMouseEvent*>(e));
break;
case TQEvent::MouseMove:
- mouseMoveEvent(TQT_TQMOUSEEVENT(e));
+ mouseMoveEvent(static_cast<TQMouseEvent*>(e));
break;
case TQEvent::KeyPress:
- keyPressEvent(TQT_TQKEYEVENT(e));
+ keyPressEvent(static_cast<TQKeyEvent*>(e));
break;
case TQEvent::KeyRelease:
- keyReleaseEvent(TQT_TQKEYEVENT(e));
+ keyReleaseEvent(static_cast<TQKeyEvent*>(e));
break;
default:
break;
@@ -722,22 +722,22 @@ void RenderWidget::EventPropagator::sendEvent(TQEvent *e) {
void RenderWidget::ScrollViewEventPropagator::sendEvent(TQEvent *e) {
switch(e->type()) {
case TQEvent::MouseButtonPress:
- viewportMousePressEvent(TQT_TQMOUSEEVENT(e));
+ viewportMousePressEvent(static_cast<TQMouseEvent*>(e));
break;
case TQEvent::MouseButtonRelease:
- viewportMouseReleaseEvent(TQT_TQMOUSEEVENT(e));
+ viewportMouseReleaseEvent(static_cast<TQMouseEvent*>(e));
break;
case TQEvent::MouseButtonDblClick:
- viewportMouseDoubleClickEvent(TQT_TQMOUSEEVENT(e));
+ viewportMouseDoubleClickEvent(static_cast<TQMouseEvent*>(e));
break;
case TQEvent::MouseMove:
- viewportMouseMoveEvent(TQT_TQMOUSEEVENT(e));
+ viewportMouseMoveEvent(static_cast<TQMouseEvent*>(e));
break;
case TQEvent::KeyPress:
- keyPressEvent(TQT_TQKEYEVENT(e));
+ keyPressEvent(static_cast<TQKeyEvent*>(e));
break;
case TQEvent::KeyRelease:
- keyReleaseEvent(TQT_TQKEYEVENT(e));
+ keyReleaseEvent(static_cast<TQKeyEvent*>(e));
break;
default:
break;
@@ -811,9 +811,9 @@ bool RenderWidget::handleEvent(const DOM::EventImpl& ev)
TQMouseEvent e(type, p, button, state);
TQScrollView * sc = ::tqt_cast<TQScrollView*>(m_widget);
if (sc && !::tqt_cast<TQListBox*>(m_widget))
- static_cast<ScrollViewEventPropagator *>(sc)->sendEvent(TQT_TQEVENT(&e));
+ static_cast<ScrollViewEventPropagator *>(sc)->sendEvent(static_cast<TQEvent*>(&e));
else
- static_cast<EventPropagator *>(m_widget)->sendEvent(TQT_TQEVENT(&e));
+ static_cast<EventPropagator *>(m_widget)->sendEvent(static_cast<TQEvent*>(&e));
ret = e.isAccepted();
break;
}
@@ -827,7 +827,7 @@ bool RenderWidget::handleEvent(const DOM::EventImpl& ev)
if (domKeyEv.isSynthetic() && !acceptsSyntheticEvents()) break;
TQKeyEvent* const ke = domKeyEv.qKeyEvent();
- static_cast<EventPropagator *>(m_widget)->sendEvent(TQT_TQEVENT(ke));
+ static_cast<EventPropagator *>(m_widget)->sendEvent(static_cast<TQEvent*>(ke));
ret = ke->isAccepted();
break;
}
@@ -854,9 +854,9 @@ bool RenderWidget::handleEvent(const DOM::EventImpl& ev)
if (ke->isAutoRepeat()) {
TQKeyEvent releaseEv( TQEvent::KeyRelease, ke->key(), ke->ascii(), ke->state(),
ke->text(), ke->isAutoRepeat(), ke->count() );
- static_cast<EventPropagator *>(m_widget)->sendEvent(TQT_TQEVENT(&releaseEv));
+ static_cast<EventPropagator *>(m_widget)->sendEvent(static_cast<TQEvent*>(&releaseEv));
}
- static_cast<EventPropagator *>(m_widget)->sendEvent(TQT_TQEVENT(ke));
+ static_cast<EventPropagator *>(m_widget)->sendEvent(static_cast<TQEvent*>(ke));
ret = ke->isAccepted();
break;
}
diff --git a/tdehtml/tdehtmlview.cpp b/tdehtml/tdehtmlview.cpp
index ae2be579a..b3d3d2579 100644
--- a/tdehtml/tdehtmlview.cpp
+++ b/tdehtml/tdehtmlview.cpp
@@ -1114,9 +1114,9 @@ static inline void forwardPeripheralEvent(tdehtml::RenderWidget* r, TQMouseEvent
TQWidget* w = r->widget();
TQScrollView* sc = ::tqt_cast<TQScrollView*>(w);
if (sc && !::tqt_cast<TQListBox*>(w))
- static_cast<tdehtml::RenderWidget::ScrollViewEventPropagator*>(sc)->sendEvent(TQT_TQEVENT(&fw));
+ static_cast<tdehtml::RenderWidget::ScrollViewEventPropagator*>(sc)->sendEvent(static_cast<TQEvent*>(&fw));
else if(w)
- static_cast<tdehtml::RenderWidget::EventPropagator*>(w)->sendEvent(TQT_TQEVENT(&fw));
+ static_cast<tdehtml::RenderWidget::EventPropagator*>(w)->sendEvent(static_cast<TQEvent*>(&fw));
}
@@ -1899,7 +1899,7 @@ bool TDEHTMLView::eventFilter(TQObject *o, TQEvent *e)
// we need to install an event filter on all children of the viewport to
// be able to get correct stacking of children within the document.
if(e->type() == TQEvent::ChildInserted) {
- TQObject *c = TQT_TQOBJECT(TQT_TQCHILDEVENT(e)->child());
+ TQObject *c = TQT_TQOBJECT(static_cast<TQChildEvent*>(e)->child());
if (c->isWidgetType()) {
TQWidget *w = TQT_TQWIDGET(c);
// don't install the event filter on toplevels
@@ -1951,7 +1951,7 @@ bool TDEHTMLView::eventFilter(TQObject *o, TQEvent *e)
v = v->parentWidget();
}
viewportToContents( x, y, x, y );
- TQPaintEvent *pe = TQT_TQPAINTEVENT(e);
+ TQPaintEvent *pe = static_cast<TQPaintEvent*>(e);
bool asap = !d->contentsMoving && ::tqt_cast<TQScrollView *>(c);
// TQScrollView needs fast repaints
@@ -1970,7 +1970,7 @@ bool TDEHTMLView::eventFilter(TQObject *o, TQEvent *e)
case TQEvent::MouseButtonRelease:
case TQEvent::MouseButtonDblClick: {
if ( (w->parentWidget() == view || ::tqt_cast<TQScrollView*>(c)) && !::tqt_cast<TQScrollBar *>(w)) {
- TQMouseEvent *me = TQT_TQMOUSEEVENT(e);
+ TQMouseEvent *me = static_cast<TQMouseEvent*>(e);
TQPoint pt = w->mapTo( view, me->pos());
TQMouseEvent me2(me->type(), pt, me->button(), me->state());
@@ -1989,7 +1989,7 @@ bool TDEHTMLView::eventFilter(TQObject *o, TQEvent *e)
case TQEvent::KeyPress:
case TQEvent::KeyRelease:
if (w->parentWidget() == view && !::tqt_cast<TQScrollBar *>(w)) {
- TQKeyEvent *ke = TQT_TQKEYEVENT(e);
+ TQKeyEvent *ke = static_cast<TQKeyEvent*>(e);
if (e->type() == TQEvent::KeyPress)
keyPressEvent(ke);
else
diff --git a/tdemdi/tdemdi/dockcontainer.cpp b/tdemdi/tdemdi/dockcontainer.cpp
index 898f1bd1e..8b2cf86cf 100644
--- a/tdemdi/tdemdi/dockcontainer.cpp
+++ b/tdemdi/tdemdi/dockcontainer.cpp
@@ -279,7 +279,7 @@ bool DockContainer::eventFilter( TQObject *obj, TQEvent *event )
if (m_movingState==WaitingForMoveStart) {
TQPoint p( ((TQMouseEvent*)event)->pos() - m_startEvent->pos() );
if( p.manhattanLength() > TDEGlobalSettings::dndEventDelay()) {
- m_dockManager->eventFilter(m_dragPanel,TQT_TQEVENT(m_startEvent));
+ m_dockManager->eventFilter(m_dragPanel,static_cast<TQEvent*>(m_startEvent));
m_dockManager->eventFilter(m_dragPanel,event);
m_movingState=Moving;
}
diff --git a/tdemdi/tdemdidockcontainer.cpp b/tdemdi/tdemdidockcontainer.cpp
index 6a18ef8e6..1e4c95eaf 100644
--- a/tdemdi/tdemdidockcontainer.cpp
+++ b/tdemdi/tdemdidockcontainer.cpp
@@ -303,7 +303,7 @@ bool KMdiDockContainer::eventFilter( TQObject *obj, TQEvent *event )
TQPoint p( ( ( TQMouseEvent* ) event )->pos() - m_startEvent->pos() );
if ( p.manhattanLength() > TDEGlobalSettings::dndEventDelay() )
{
- m_dockManager->eventFilter( m_dragPanel, TQT_TQEVENT(m_startEvent) );
+ m_dockManager->eventFilter( m_dragPanel, static_cast<TQEvent*>(m_startEvent) );
m_dockManager->eventFilter( m_dragPanel, event );
m_movingState = Moving;
}
diff --git a/tdeparts/partmanager.cpp b/tdeparts/partmanager.cpp
index e380acf5f..140db74e2 100644
--- a/tdeparts/partmanager.cpp
+++ b/tdeparts/partmanager.cpp
@@ -55,7 +55,7 @@ public:
switch( ev->type() ) {
case TQEvent::MouseButtonPress:
case TQEvent::MouseButtonDblClick: {
- TQMouseEvent* mev = TQT_TQMOUSEEVENT( ev );
+ TQMouseEvent* mev = static_cast<TQMouseEvent*>( ev );
m_reason = mev->button() == TQt::LeftButton
? PartManager::ReasonLeftClick
: ( mev->button() == TQt::MidButton
@@ -64,7 +64,7 @@ public:
break;
}
case TQEvent::FocusIn:
- m_reason = TQT_TQFOCUSEVENT( ev )->reason();
+ m_reason = static_cast<TQFocusEvent*>( ev )->reason();
break;
default:
kdWarning(1000) << "PartManagerPrivate::setReason got unexpected ev type " << ev->type() << endl;
@@ -192,7 +192,7 @@ bool PartManager::eventFilter( TQObject *obj, TQEvent *ev )
TQMouseEvent* mev = 0L;
if ( ev->type() == TQEvent::MouseButtonPress || ev->type() == TQEvent::MouseButtonDblClick )
{
- mev = TQT_TQMOUSEEVENT( ev );
+ mev = static_cast<TQMouseEvent*>( ev );
#ifdef DEBUG_PARTMANAGER
kdDebug(1000) << "PartManager::eventFilter button: " << mev->button() << " " << "d->m_activationButtonMask=" << d->m_activationButtonMask << endl;
#endif
diff --git a/tdestyles/keramik/keramik.cpp b/tdestyles/keramik/keramik.cpp
index d09fd6f58..13fef3417 100644
--- a/tdestyles/keramik/keramik.cpp
+++ b/tdestyles/keramik/keramik.cpp
@@ -2808,7 +2808,7 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData,
return false;
recursion = true;
- object->event( TQT_TQPAINTEVENT( event ) );
+ object->event( static_cast<TQPaintEvent*>( event ) );
TQWidget* widget = TQT_TQWIDGET( object );
TQPainter p( widget );
Keramik::RectTilePainter( keramik_frame_shadow, false, false, 2, 2 ).draw( &p, ceData.rect,
@@ -2827,7 +2827,7 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData,
case TQEvent::Resize:
{
TQListBox* listbox = static_cast<TQListBox*>(TQT_TQWIDGET(object));
- TQResizeEvent* resize = TQT_TQRESIZEEVENT(event);
+ TQResizeEvent* resize = static_cast<TQResizeEvent*>(event);
if (resize->size().height() < 6)
return false;
@@ -2891,7 +2891,7 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData,
{
firstComboPopupRelease = false;
- TQMouseEvent* mev = TQT_TQMOUSEEVENT(event);
+ TQMouseEvent* mev = static_cast<TQMouseEvent*>(event);
TQListBox* box = static_cast<TQListBox*>(TQT_TQWIDGET(object));
TQWidget* parent = box->parentWidget();
diff --git a/tdeui/klineedit.cpp b/tdeui/klineedit.cpp
index 617de7675..92cc5d0ca 100644
--- a/tdeui/klineedit.cpp
+++ b/tdeui/klineedit.cpp
@@ -1011,7 +1011,7 @@ bool KLineEdit::eventFilter( TQObject* o, TQEvent* ev )
KCursor::autoHideEventFilter( TQT_TQOBJECT(this), ev );
if ( ev->type() == TQEvent::AccelOverride )
{
- TQKeyEvent *e = TQT_TQKEYEVENT( ev );
+ TQKeyEvent *e = static_cast<TQKeyEvent*>( ev );
if (overrideAccel (e))
{
e->accept();
@@ -1020,7 +1020,7 @@ bool KLineEdit::eventFilter( TQObject* o, TQEvent* ev )
}
else if( ev->type() == TQEvent::KeyPress )
{
- TQKeyEvent *e = TQT_TQKEYEVENT( ev );
+ TQKeyEvent *e = static_cast<TQKeyEvent*>( ev );
if( e->key() == TQt::Key_Return || e->key() == TQt::Key_Enter )
{
diff --git a/tdeui/ksyntaxhighlighter.cpp b/tdeui/ksyntaxhighlighter.cpp
index 25c22222c..80529ed34 100644
--- a/tdeui/ksyntaxhighlighter.cpp
+++ b/tdeui/ksyntaxhighlighter.cpp
@@ -620,7 +620,7 @@ bool KDictSpellingHighlighter::eventFilter( TQObject *o, TQEvent *e)
}
if (o == textEdit() && (e->type() == TQEvent::KeyPress)) {
- TQKeyEvent *k = TQT_TQKEYEVENT(e);
+ TQKeyEvent *k = static_cast<TQKeyEvent*>(e);
d->autoReady = true;
if (d->rehighlightRequest->isActive()) // try to stay out of the users way
d->rehighlightRequest->changeInterval( 500 );
diff --git a/tdeui/kurllabel.cpp b/tdeui/kurllabel.cpp
index db6212a51..60e2faba6 100644
--- a/tdeui/kurllabel.cpp
+++ b/tdeui/kurllabel.cpp
@@ -308,7 +308,7 @@ void KURLLabel::enterEvent (TQEvent* e)
TQLabel::enterEvent (e);
TQRect r( activeRect() );
- if (!r.contains( TQT_TQMOUSEEVENT(e)->pos() ))
+ if (!r.contains( static_cast<TQMouseEvent*>(e)->pos() ))
return;
if (!d->AltPixmap.isNull() && pixmap())
@@ -372,7 +372,7 @@ bool KURLLabel::event (TQEvent *e)
return result;
}
else if (e->type() == TQEvent::KeyPress) {
- TQKeyEvent* ke = TQT_TQKEYEVENT(e);
+ TQKeyEvent* ke = static_cast<TQKeyEvent*>(e);
if (ke->key() == TQt::Key_Enter || ke->key() == TQt::Key_Return) {
setLinkColor (d->HighlightedLinkColor);
d->Timer->start (300);
@@ -384,12 +384,12 @@ bool KURLLabel::event (TQEvent *e)
}
else if (e->type() == TQEvent::MouseButtonPress) {
TQRect r( activeRect() );
- d->MousePressed = r.contains(TQT_TQMOUSEEVENT(e)->pos());
+ d->MousePressed = r.contains(static_cast<TQMouseEvent*>(e)->pos());
}
else if (e->type() == TQEvent::MouseMove) {
if (d->Cursor) {
TQRect r( activeRect() );
- bool inside = r.contains(TQT_TQMOUSEEVENT(e)->pos());
+ bool inside = r.contains(static_cast<TQMouseEvent*>(e)->pos());
if (d->WasInsideRect != inside) {
if (inside)
TQLabel::setCursor(*d->Cursor);
diff --git a/tdeui/tdecompletionbox.cpp b/tdeui/tdecompletionbox.cpp
index ca3017b44..5392e2c41 100644
--- a/tdeui/tdecompletionbox.cpp
+++ b/tdeui/tdecompletionbox.cpp
@@ -112,7 +112,7 @@ bool TDECompletionBox::eventFilter( TQObject *o, TQEvent *e )
if ( o == d->m_parent ) {
if ( isVisible() ) {
if ( type == TQEvent::KeyPress ) {
- TQKeyEvent *ev = TQT_TQKEYEVENT( e );
+ TQKeyEvent *ev = static_cast<TQKeyEvent*>( e );
switch ( ev->key() ) {
case Key_BackTab:
if ( d->tabHandling && (ev->state() == TQt::NoButton ||
@@ -185,7 +185,7 @@ bool TDECompletionBox::eventFilter( TQObject *o, TQEvent *e )
else if ( type == TQEvent::AccelOverride ) {
// Override any acceleartors that match
// the key sequences we use here...
- TQKeyEvent *ev = TQT_TQKEYEVENT( e );
+ TQKeyEvent *ev = static_cast<TQKeyEvent*>( e );
switch ( ev->key() ) {
case Key_Down:
case Key_Up:
@@ -230,7 +230,7 @@ bool TDECompletionBox::eventFilter( TQObject *o, TQEvent *e )
// any mouse-click on something else than "this" makes us hide
else if ( type == TQEvent::MouseButtonPress ) {
- TQMouseEvent *ev = TQT_TQMOUSEEVENT( e );
+ TQMouseEvent *ev = static_cast<TQMouseEvent*>( e );
if ( !rect().contains( ev->pos() )) // this widget
hide();
diff --git a/tdeui/tdetoolbarbutton.cpp b/tdeui/tdetoolbarbutton.cpp
index 854ad2f9b..d957a2edf 100644
--- a/tdeui/tdetoolbarbutton.cpp
+++ b/tdeui/tdetoolbarbutton.cpp
@@ -419,12 +419,12 @@ bool TDEToolBarButton::eventFilter(TQObject *o, TQEvent *ev)
{
if (ev->type() == TQEvent::MouseButtonPress)
{
- TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev);
+ TQMouseEvent* mev = static_cast<TQMouseEvent*>(ev);
d->m_mousePressPos = mev->pos();
}
else if (ev->type() == TQEvent::MouseMove)
{
- TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev);
+ TQMouseEvent* mev = static_cast<TQMouseEvent*>(ev);
if ((mev->pos() - d->m_mousePressPos).manhattanLength()
> TDEGlobalSettings::dndEventDelay())
{