1 files changed, 10 insertions, 16 deletions

diff --git a/tdehtml/html/html_formimpl.cpp b/tdehtml/html/html_formimpl.cpp
index 5dc44ad04..f87260ffe 100644
--- a/tdehtml/html/html_formimpl.cpp
+++ b/tdehtml/html/html_formimpl.cpp
@@ -957,14 +957,14 @@ bool HTMLGenericFormElementImpl::isFocusable() const
 	return false;
 
     TQWidget* widget = static_cast<RenderWidget*>(m_render)->widget();
-    return widget && widget->focusPolicy() >= TQ_TabFocus;
+    return widget && widget->focusPolicy() >= TQWidget::TabFocus;
 }
 
 class FocusHandleWidget : public TQWidget
 {
 public:
     void focusNextPrev(bool n) {
-        if (!focusNextPrevChild(n) && inherits(TQTEXTEDIT_OBJECT_NAME_STRING))
+        if (!focusNextPrevChild(n) && inherits("TQTextEdit"))
             TQWidget::focusNextPrevChild(n);
     }
 };
@@ -1018,19 +1018,13 @@ void HTMLGenericFormElementImpl::defaultEventHandler(EventImpl *evt)
 	    // handle tabbing out, either from a single or repeated key event.
 	    if ( evt->id() == EventImpl::KEYPRESS_EVENT && evt->isKeyRelatedEvent() ) {
 	        TQKeyEvent* const k = static_cast<KeyEventBaseImpl *>(evt)->qKeyEvent();
-	        if ( k && (k->key() == Qt::Key_Tab || k->key() == TQt::Key_BackTab) ) {
+	        if ( k && (k->key() == TQt::Key_Tab || k->key() == TQt::Key_BackTab) ) {
 		    TQWidget* const widget = static_cast<RenderWidget*>(m_render)->widget();
-#ifdef USE_QT4
+		    TQFocusEvent::setReason( k->key() == TQt::Key_Tab ? TQFocusEvent::Tab : TQFocusEvent::Backtab );
 		    if (widget)
                         static_cast<FocusHandleWidget *>(widget)
-			    ->focusNextPrev(k->key() == Qt::Key_Tab);
-#else // USE_QT4
-		    TQFocusEvent::setReason( k->key() == Qt::Key_Tab ? TQFocusEvent::Tab : TQFocusEvent::Backtab );
-		    if (widget)
-                        static_cast<FocusHandleWidget *>(widget)
-			    ->focusNextPrev(k->key() == Qt::Key_Tab);
+			    ->focusNextPrev(k->key() == TQt::Key_Tab);
 		    TQFocusEvent::resetReason();
-#endif // USE_QT4
                     evt->setDefaultHandled();
 	        }
             }
@@ -1125,7 +1119,7 @@ void HTMLButtonElementImpl::defaultEventHandler(EventImpl *evt)
 	bool act = (evt->id() == EventImpl::DOMACTIVATE_EVENT);
 	if (!act && evt->id()==EventImpl::KEYUP_EVENT && evt->isKeyRelatedEvent()) {
 	    TQKeyEvent* const ke = static_cast<KeyEventBaseImpl *>(evt)->qKeyEvent();
-	    if (ke && active() && (ke->key() == Qt::Key_Return || ke->key() == Qt::Key_Enter || ke->key() == Qt::Key_Space))
+	    if (ke && active() && (ke->key() == TQt::Key_Return || ke->key() == TQt::Key_Enter || ke->key() == TQt::Key_Space))
 		act = true;
 	}
 	if (act)
@@ -1149,7 +1143,7 @@ void HTMLButtonElementImpl::activate()
 
 void HTMLButtonElementImpl::click()
 {
-    TQMouseEvent me(TQEvent::MouseButtonRelease, TQPoint(0,0),Qt::LeftButton, 0);
+    TQMouseEvent me(TQEvent::MouseButtonRelease, TQPoint(0,0),TQt::LeftButton, 0);
     dispatchMouseEvent(&me,EventImpl::CLICK_EVENT, 1);
 }
 
@@ -1365,7 +1359,7 @@ void HTMLInputElementImpl::select(  )
 
 void HTMLInputElementImpl::click()
 {
-    TQMouseEvent me(TQEvent::MouseButtonRelease, TQPoint(0,0),Qt::LeftButton, 0);
+    TQMouseEvent me(TQEvent::MouseButtonRelease, TQPoint(0,0),TQt::LeftButton, 0);
     dispatchMouseEvent(&me,0, 1);
     dispatchMouseEvent(&me,EventImpl::CLICK_EVENT, 1);
 }
@@ -1807,7 +1801,7 @@ void HTMLInputElementImpl::defaultEventHandler(EventImpl *evt)
 	    bool act = (evt->id() == EventImpl::DOMACTIVATE_EVENT);
 	    if (!act && evt->id() == EventImpl::KEYUP_EVENT && evt->isKeyRelatedEvent()) {
 		TQKeyEvent* const ke = static_cast<KeyEventBaseImpl *>(evt)->qKeyEvent();
-		if (ke && active() && (ke->key() == Qt::Key_Return || ke->key() == Qt::Key_Enter || ke->key() == Qt::Key_Space))
+		if (ke && active() && (ke->key() == TQt::Key_Return || ke->key() == TQt::Key_Enter || ke->key() == TQt::Key_Space))
 		    act = true;
 	    }
 	    if (act)
@@ -1923,7 +1917,7 @@ void HTMLLabelElementImpl::defaultEventHandler(EventImpl *evt)
 	else if ( evt->isKeyRelatedEvent() && ( evt->id() == EventImpl::KEYUP_EVENT ||
 	                                        evt->id() == EventImpl::KEYPRESS_EVENT ) ) {
 	    TQKeyEvent* const ke = static_cast<KeyEventBaseImpl *>(evt)->qKeyEvent();
-	    if (ke && active() && (ke->key() == Qt::Key_Return || ke->key() == Qt::Key_Enter || ke->key() == Qt::Key_Space))
+	    if (ke && active() && (ke->key() == TQt::Key_Return || ke->key() == TQt::Key_Enter || ke->key() == TQt::Key_Space))
 		act = true;
 	}