1 files changed, 39 insertions, 39 deletions
diff --git a/tdehtml/rendering/render_replaced.cpp b/tdehtml/rendering/render_replaced.cpp
index 2d991c3a2..0e5666b9d 100644
--- a/tdehtml/rendering/render_replaced.cpp
+++ b/tdehtml/rendering/render_replaced.cpp
@@ -186,7 +186,7 @@ bool RenderWidget::event( TQEvent *e )
         repaint();
     }
     // eat all events - except if this is a frame (in which case TDEHTMLView handles it all)
-    if ( ::tqqt_cast<TDEHTMLView *>( m_widget ) )
+    if ( ::tqt_cast<TDEHTMLView *>( m_widget ) )
         return TQObject::event( e );
     return true;
 }
@@ -202,21 +202,21 @@ void RenderWidget::setQWidget(TQWidget *widget)
     {
         if (m_widget) {
             m_widget->removeEventFilter(this);
-            disconnect( m_widget, TQT_SIGNAL( destroyed()), this, TQT_SLOT( slotWidgetDestructed()));
+            disconnect( m_widget, TQ_SIGNAL( destroyed()), this, TQ_SLOT( slotWidgetDestructed()));
             m_widget->hide();
             m_widget->deleteLater(); //Might happen due to event on the widget, so be careful
             m_widget = 0;
         }
         m_widget = widget;
         if (m_widget) {
-            connect( m_widget, TQT_SIGNAL( destroyed()), this, TQT_SLOT( slotWidgetDestructed()));
+            connect( m_widget, TQ_SIGNAL( destroyed()), this, TQ_SLOT( slotWidgetDestructed()));
             m_widget->installEventFilter(this);
 
-            if ( (m_isTDEHTMLWidget = !strcmp(m_widget->name(), "__tdehtml")) && !::tqqt_cast<TQFrame*>(m_widget))
+            if ( (m_isTDEHTMLWidget = !strcmp(m_widget->name(), "__tdehtml")) && !::tqt_cast<TQFrame*>(m_widget))
                 m_widget->setBackgroundMode( TQWidget::NoBackground );
 
-            if (m_widget->focusPolicy() > TQ_StrongFocus)
-                m_widget->setFocusPolicy(TQ_StrongFocus);
+            if (m_widget->focusPolicy() > TQWidget::StrongFocus)
+                m_widget->setFocusPolicy(TQWidget::StrongFocus);
             // if we've already received a layout, apply the calculated space to the
             // widget immediately, but we have to have really been full constructed (with a non-null
             // style pointer).
@@ -316,12 +316,12 @@ void RenderWidget::updateFromElement()
                 if (v > 128)
                     // dark bg, light fg - need a darker disabled fg
                     disfg = disfg.dark(lowlightVal);
-                else if (disfg != Qt::black)
+                else if (disfg != TQt::black)
                     // light bg, dark fg - need a lighter disabled fg - but only if !black
                     disfg = disfg.light(highlightVal);
                 else
                     // black fg - use darkgray disabled fg
-                    disfg = Qt::darkGray;
+                    disfg = TQt::darkGray;
                 pal.setColor(TQPalette::Disabled,TQColorGroup::Foreground,disfg);
             }
 
@@ -330,7 +330,7 @@ void RenderWidget::updateFromElement()
         else
             m_widget->unsetPalette();
         // Border:
-        TQFrame* frame = ::tqqt_cast<TQFrame*>(m_widget);
+        TQFrame* frame = ::tqt_cast<TQFrame*>(m_widget);
         if (frame) {
             if (shouldPaintBackgroundOrBorder())
             {
@@ -439,7 +439,7 @@ void RenderWidget::paint(PaintInfo& paintInfo, int _tx, int _ty)
         paintWidget(paintInfo, m_widget, xPos, yPos);
 }
 
-#include <tqinternal_p.h>
+#include <private/tqinternal_p.h>
 
 // The PaintBuffer class provides a shared buffer for widget painting.
 //
@@ -532,7 +532,7 @@ static void copyWidget(const TQRect& r, TQPainter *p, TQWidget *widget, int tx,
         TQObjectList childWidgets = widget->childrenListObject();
         TQObjectListIterator it(childWidgets);
         for (; it.current(); ++it) {
-            TQWidget* const w = ::tqqt_cast<TQWidget *>(it.current());
+            TQWidget* const w = ::tqt_cast<TQWidget *>(it.current());
 	    if ( w && !w->isTopLevel() && !w->isHidden()) {
 	        TQRect r2 = w->geometry();
 	        blit -= r2;
@@ -613,7 +613,7 @@ void RenderWidget::paintWidget(PaintInfo& pI, TQWidget *widget, int tx, int ty)
 bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e)
 {
     // no special event processing if this is a frame (in which case TDEHTMLView handles it all)
-    if ( ::tqqt_cast<TDEHTMLView *>( m_widget ) )
+    if ( ::tqt_cast<TDEHTMLView *>( m_widget ) )
         return false;
     if ( !element() ) return true;
 
@@ -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;
 
@@ -673,8 +673,8 @@ bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e)
             // currently focused. this avoids accidentally changing a select box
             // or something while wheeling a webpage.
             if (tqApp->focusWidget() != widget() &&
-                widget()->focusPolicy() <= TQ_StrongFocus)  {
-                TQT_TQWHEELEVENT(e)->ignore();
+                widget()->focusPolicy() <= TQWidget::StrongFocus)  {
+                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;
@@ -784,13 +784,13 @@ bool RenderWidget::handleEvent(const DOM::EventImpl& ev)
             }
             switch (me.button()) {
             case 0:
-                button = Qt::LeftButton;
+                button = TQt::LeftButton;
                 break;
             case 1:
-                button = Qt::MidButton;
+                button = TQt::MidButton;
                 break;
             case 2:
-                button = Qt::RightButton;
+                button = TQt::RightButton;
                 break;
             default:
                 break;
@@ -809,11 +809,11 @@ bool RenderWidget::handleEvent(const DOM::EventImpl& ev)
 //                   << " pos=" << p << " type=" << type
 //                   << " button=" << button << " state=" << state << endl;
         TQMouseEvent e(type, p, button, state);
-        TQScrollView * sc = ::tqqt_cast<TQScrollView*>(m_widget);
-        if (sc && !::tqqt_cast<TQListBox*>(m_widget))
-            static_cast<ScrollViewEventPropagator *>(sc)->sendEvent(TQT_TQEVENT(&e));
+        TQScrollView * sc = ::tqt_cast<TQScrollView*>(m_widget);
+        if (sc && !::tqt_cast<TQListBox*>(m_widget))
+            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;
     }
@@ -847,16 +847,16 @@ bool RenderWidget::handleEvent(const DOM::EventImpl& ev)
         //  DOM:   Down      Press   |       Press                             |     Up
         //  Qt:    (nothing) Press   | Release(autorepeat) + Press(autorepeat) |   Release
         //
-        // Qt::KeyPress is sent for DOM keypress and not DOM keydown to allow
+        // TQt::KeyPress is sent for DOM keypress and not DOM keydown to allow
         // sites to block a key with onkeypress, #99749
 
         TQKeyEvent* const ke = domKeyEv.qKeyEvent();
         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;
     }