diff options
Diffstat (limited to 'tdehtml')
| -rw-r--r-- | tdehtml/html/Platform.h | 2 | ||||
| -rw-r--r-- | tdehtml/html/html_formimpl.cpp | 6 | ||||
| -rw-r--r-- | tdehtml/html/html_miscimpl.cpp | 1 | ||||
| -rw-r--r-- | tdehtml/tdehtmlview.cpp | 4 |
4 files changed, 1 insertions, 12 deletions
diff --git a/tdehtml/html/Platform.h b/tdehtml/html/Platform.h index f47d28bb2..dfbea38cf 100644 --- a/tdehtml/html/Platform.h +++ b/tdehtml/html/Platform.h @@ -193,7 +193,7 @@ /* for Unicode, KDE uses Qt, everything else uses ICU */ #if PLATFORM(KDE) || PLATFORM(QT) -#define WTF_USE_QT4_UNICODE 1 +#define WTF_USE_QT3_UNICODE 1 #elif PLATFORM(SYMBIAN) #define WTF_USE_SYMBIAN_UNICODE 1 #else diff --git a/tdehtml/html/html_formimpl.cpp b/tdehtml/html/html_formimpl.cpp index af9008dd3..b10aaba99 100644 --- a/tdehtml/html/html_formimpl.cpp +++ b/tdehtml/html/html_formimpl.cpp @@ -1020,17 +1020,11 @@ void HTMLGenericFormElementImpl::defaultEventHandler(EventImpl *evt) TQKeyEvent* const k = static_cast<KeyEventBaseImpl *>(evt)->qKeyEvent(); if ( k && (k->key() == Qt::Key_Tab || k->key() == TQt::Key_BackTab) ) { TQWidget* const widget = static_cast<RenderWidget*>(m_render)->widget(); -#ifdef USE_QT4 - 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); TQFocusEvent::resetReason(); -#endif // USE_QT4 evt->setDefaultHandled(); } } diff --git a/tdehtml/html/html_miscimpl.cpp b/tdehtml/html/html_miscimpl.cpp index 58804bff5..5b8d4ef4b 100644 --- a/tdehtml/html/html_miscimpl.cpp +++ b/tdehtml/html/html_miscimpl.cpp @@ -64,7 +64,6 @@ struct CollectionCache: public NodeListImpl::Cache virtual void clear(DocumentImpl* doc) { Cache::clear(doc); - //qDeletaAll here in Qt4 nameCache.clear(); } }; diff --git a/tdehtml/tdehtmlview.cpp b/tdehtml/tdehtmlview.cpp index 088e52174..f68df55c9 100644 --- a/tdehtml/tdehtmlview.cpp +++ b/tdehtml/tdehtmlview.cpp @@ -2409,13 +2409,9 @@ bool TDEHTMLView::focusNodeWithAccessKey( TQChar c, TDEHTMLView* caller ) guard = node; } // Set focus node on the document -#ifdef USE_QT4 - m_part->xmlDocImpl()->setFocusNode(node); -#else // USE_QT4 TQFocusEvent::setReason( TQFocusEvent::Shortcut ); m_part->xmlDocImpl()->setFocusNode(node); TQFocusEvent::resetReason(); -#endif // USE_QT4 if( node != NULL && node->hasOneRef()) // deleted, only held by guard return true; emit m_part->nodeActivated(Node(node)); |