From 9fc074fcb2225e6303bf7cec6dc4cc85d6b5edb7 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 26 Nov 2023 02:32:50 +0900 Subject: Replaced various '#define' with actual strings - part 4 Signed-off-by: Michele Calgaro (cherry picked from commit 138bb80efac020c7e78871d3f05127eb37f18274) --- tdehtml/ecma/kjs_debugwin.cpp | 4 +-- tdehtml/ecma/kjs_dom.cpp | 4 +-- tdehtml/ecma/kjs_events.cpp | 4 +-- tdehtml/ecma/kjs_window.cpp | 54 +++++++++++++++++------------------ tdehtml/ecma/xmlhttprequest.cpp | 2 +- tdehtml/html/html_baseimpl.cpp | 4 +-- tdehtml/html/html_objectimpl.cpp | 2 +- tdehtml/rendering/render_replaced.cpp | 14 ++++----- tdehtml/tdehtml_ext.cpp | 4 +-- tdehtml/tdehtml_part.cpp | 12 ++++---- tdehtml/tdehtmlimage.cpp | 6 ++-- tdehtml/tdehtmlview.cpp | 16 +++++------ 12 files changed, 63 insertions(+), 63 deletions(-) (limited to 'tdehtml') diff --git a/tdehtml/ecma/kjs_debugwin.cpp b/tdehtml/ecma/kjs_debugwin.cpp index 4e2328d52..2b6cef798 100644 --- a/tdehtml/ecma/kjs_debugwin.cpp +++ b/tdehtml/ecma/kjs_debugwin.cpp @@ -249,7 +249,7 @@ KJSDebugWin * KJSDebugWin::kjs_html_debugger = 0; TQString SourceFile::getCode() { if (interpreter) { - TDEHTMLPart *part = ::tqqt_cast(static_cast(interpreter)->part()); + TDEHTMLPart *part = ::tqt_cast(static_cast(interpreter)->part()); if (part && url == part->url().url() && TDEHTMLPageCache::self()->isValid(part->cacheId())) { Decoder *decoder = part->createDecoder(); TQByteArray data; @@ -805,7 +805,7 @@ bool KJSDebugWin::exception(ExecState *exec, const Value &value, bool inTryCatch return true; KParts::ReadOnlyPart *part = static_cast(exec->interpreter())->part(); - TDEHTMLPart *tdehtmlpart = ::tqqt_cast(part); + TDEHTMLPart *tdehtmlpart = ::tqt_cast(part); if (tdehtmlpart && !tdehtmlpart->settings()->isJavaScriptErrorReportingEnabled()) return true; diff --git a/tdehtml/ecma/kjs_dom.cpp b/tdehtml/ecma/kjs_dom.cpp index 1834c5931..1f73dd9fe 100644 --- a/tdehtml/ecma/kjs_dom.cpp +++ b/tdehtml/ecma/kjs_dom.cpp @@ -1093,7 +1093,7 @@ Value DOMDocumentProtoFunc::tryCall(ExecState *exec, Object &thisObj, const List Window* active = Window::retrieveActive(exec); // Complete the URL using the "active part" (running interpreter). We do this for the security // check and to make sure we load exactly the same url as we have verified to be safe - TDEHTMLPart *tdehtmlpart = ::tqqt_cast(active->part()); + TDEHTMLPart *tdehtmlpart = ::tqt_cast(active->part()); if (tdehtmlpart) { // Security: only allow documents to be loaded from the same host TQString dstUrl = tdehtmlpart->htmlDocument().completeURL(s).string(); @@ -1279,7 +1279,7 @@ Value DOMDOMImplementationProtoFunc::tryCall(ExecState *exec, Object &thisObj, c case DOMDOMImplementation::CreateDocument: { // DOM2 // Initially set the URL to document of the creator... this is so that it resides in the same // host/domain for security checks. The URL will be updated if Document.load() is called. - TDEHTMLPart *part = ::tqqt_cast(static_cast(exec->interpreter())->part()); + TDEHTMLPart *part = ::tqt_cast(static_cast(exec->interpreter())->part()); if (part) { Document doc = implementation.createDocument(args[0].toString(exec).string(),args[1].toString(exec).string(),toNode(args[2])); KURL url = static_cast(part->document().handle())->URL(); diff --git a/tdehtml/ecma/kjs_events.cpp b/tdehtml/ecma/kjs_events.cpp index 35016910f..825cd4107 100644 --- a/tdehtml/ecma/kjs_events.cpp +++ b/tdehtml/ecma/kjs_events.cpp @@ -62,7 +62,7 @@ void JSEventListener::handleEvent(DOM::Event &evt) if (KJSDebugWin::debugWindow() && KJSDebugWin::debugWindow()->inSession()) return; #endif - TDEHTMLPart *part = ::tqqt_cast(static_cast(win.imp())->part()); + TDEHTMLPart *part = ::tqt_cast(static_cast(win.imp())->part()); KJSProxy *proxy = 0L; if (part) proxy = part->jScript(); @@ -162,7 +162,7 @@ Object JSLazyEventListener::listenerObj() const void JSLazyEventListener::parseCode() const { if (!parsed) { - TDEHTMLPart *part = ::tqqt_cast(static_cast(win.imp())->part()); + TDEHTMLPart *part = ::tqt_cast(static_cast(win.imp())->part()); KJSProxy *proxy = 0L; if (part) proxy = part->jScript(); diff --git a/tdehtml/ecma/kjs_window.cpp b/tdehtml/ecma/kjs_window.cpp index 0623d6ef9..7acea8dee 100644 --- a/tdehtml/ecma/kjs_window.cpp +++ b/tdehtml/ecma/kjs_window.cpp @@ -420,7 +420,7 @@ Window *Window::retrieveWindow(KParts::ReadOnlyPart *p) Object obj = Object::dynamicCast( retrieve( p ) ); #ifndef NDEBUG // obj should never be null, except when javascript has been disabled in that part. - TDEHTMLPart *part = ::tqqt_cast(p); + TDEHTMLPart *part = ::tqt_cast(p); if ( part && part->jScriptEnabled() ) { assert( obj.isValid() ); @@ -447,10 +447,10 @@ Window *Window::retrieveActive(ExecState *exec) Value Window::retrieve(KParts::ReadOnlyPart *p) { assert(p); - TDEHTMLPart * part = ::tqqt_cast(p); + TDEHTMLPart * part = ::tqt_cast(p); KJSProxy *proxy = 0L; if (!part) { - part = ::tqqt_cast(p->parent()); + part = ::tqt_cast(p->parent()); if (part) proxy = part->framejScript(p); } else @@ -477,7 +477,7 @@ Location *Window::location() const ObjectImp* Window::frames( ExecState* exec ) const { - TDEHTMLPart *part = ::tqqt_cast(m_frame->m_part); + TDEHTMLPart *part = ::tqt_cast(m_frame->m_part); if (part) return m_frames ? m_frames : (const_cast(this)->m_frames = new FrameArray(exec, part)); @@ -515,7 +515,7 @@ bool Window::hasProperty(ExecState *exec, const Identifier &p) const if (Lookup::findEntry(&WindowTable, p)) return true; - TDEHTMLPart *part = ::tqqt_cast(m_frame->m_part); + TDEHTMLPart *part = ::tqt_cast(m_frame->m_part); if (!part) return false; @@ -584,7 +584,7 @@ Value Window::get(ExecState *exec, const Identifier &p) const } const HashEntry* entry = Lookup::findEntry(&WindowTable, p); - TDEHTMLPart *part = ::tqqt_cast(m_frame->m_part); + TDEHTMLPart *part = ::tqt_cast(m_frame->m_part); // properties that work on all windows if (entry) { @@ -1084,7 +1084,7 @@ void Window::put(ExecState* exec, const Identifier &propertyName, const Value &v default: break; } - TDEHTMLPart *part = ::tqqt_cast(m_frame->m_part); + TDEHTMLPart *part = ::tqt_cast(m_frame->m_part); if (part) { switch( entry->value ) { case Status: { @@ -1221,7 +1221,7 @@ bool Window::toBoolean(ExecState *) const DOM::AbstractView Window::toAbstractView() const { - TDEHTMLPart *part = ::tqqt_cast(m_frame->m_part); + TDEHTMLPart *part = ::tqt_cast(m_frame->m_part); if (!part) return DOM::AbstractView(); return part->document().defaultView(); @@ -1239,7 +1239,7 @@ void Window::closeNow() if (m_frame.isNull() || m_frame->m_part.isNull()) { kdDebug(6070) << k_funcinfo << "part is deleted already" << endl; } else { - TDEHTMLPart *part = ::tqqt_cast(m_frame->m_part); + TDEHTMLPart *part = ::tqt_cast(m_frame->m_part); if (!part) { kdDebug(6070) << "closeNow on non TDEHTML part" << endl; } else { @@ -1287,7 +1287,7 @@ bool Window::checkIsSafeScript(KParts::ReadOnlyPart *activePart) const if ( activePart == m_frame->m_part ) // Not calling from another frame, no problem. return true; - TDEHTMLPart *part = ::tqqt_cast(m_frame->m_part); + TDEHTMLPart *part = ::tqt_cast(m_frame->m_part); if (!part) return true; // not a TDEHTMLPart @@ -1300,7 +1300,7 @@ bool Window::checkIsSafeScript(KParts::ReadOnlyPart *activePart) const return false; } - TDEHTMLPart *activeTDEHTMLPart = ::tqqt_cast(activePart); + TDEHTMLPart *activeTDEHTMLPart = ::tqt_cast(activePart); if (!activeTDEHTMLPart) return true; // not a TDEHTMLPart @@ -1326,7 +1326,7 @@ bool Window::checkIsSafeScript(KParts::ReadOnlyPart *activePart) const void Window::setListener(ExecState *exec, int eventId, Value func) { - TDEHTMLPart *part = ::tqqt_cast(m_frame->m_part); + TDEHTMLPart *part = ::tqt_cast(m_frame->m_part); if (!part || !isSafeScript(exec)) return; DOM::DocumentImpl *doc = static_cast(part->htmlDocument().handle()); @@ -1338,7 +1338,7 @@ void Window::setListener(ExecState *exec, int eventId, Value func) Value Window::getListener(ExecState *exec, int eventId) const { - TDEHTMLPart *part = ::tqqt_cast(m_frame->m_part); + TDEHTMLPart *part = ::tqt_cast(m_frame->m_part); if (!part || !isSafeScript(exec)) return Undefined(); DOM::DocumentImpl *doc = static_cast(part->htmlDocument().handle()); @@ -1356,7 +1356,7 @@ Value Window::getListener(ExecState *exec, int eventId) const JSEventListener *Window::getJSEventListener(const Value& val, bool html) { // This function is so hot that it's worth coding it directly with imps. - TDEHTMLPart *part = ::tqqt_cast(m_frame->m_part); + TDEHTMLPart *part = ::tqt_cast(m_frame->m_part); if (!part || val.type() != ObjectType) return 0; @@ -1432,8 +1432,8 @@ void Window::setCurrentEvent( DOM::Event *evt ) void Window::goURL(ExecState* exec, const TQString& url, bool lockHistory) { Window* active = Window::retrieveActive(exec); - TDEHTMLPart *part = ::tqqt_cast(m_frame->m_part); - TDEHTMLPart *active_part = ::tqqt_cast(active->part()); + TDEHTMLPart *part = ::tqt_cast(m_frame->m_part); + TDEHTMLPart *active_part = ::tqt_cast(active->part()); // Complete the URL using the "active part" (running interpreter) if (active_part && part) { if (url[0] == TQChar('#')) { @@ -1469,7 +1469,7 @@ void Window::delayedGoHistory( int steps ) void Window::goHistory( int steps ) { - TDEHTMLPart *part = ::tqqt_cast(m_frame->m_part); + TDEHTMLPart *part = ::tqt_cast(m_frame->m_part); if(!part) // TODO history readonlypart return; @@ -1487,7 +1487,7 @@ void Window::goHistory( int steps ) void KJS::Window::resizeTo(TQWidget* tl, int width, int height) { - TDEHTMLPart *part = ::tqqt_cast(m_frame->m_part); + TDEHTMLPart *part = ::tqt_cast(m_frame->m_part); if(!part) // TODO resizeTo readonlypart return; @@ -1530,7 +1530,7 @@ void KJS::Window::resizeTo(TQWidget* tl, int width, int height) Value Window::openWindow(ExecState *exec, const List& args) { - TDEHTMLPart *part = ::tqqt_cast(m_frame->m_part); + TDEHTMLPart *part = ::tqt_cast(m_frame->m_part); if (!part) return Undefined(); TDEHTMLView *widget = part->view(); @@ -1543,7 +1543,7 @@ Value Window::openWindow(ExecState *exec, const List& args) KURL url; if (!str.isEmpty()) { - TDEHTMLPart* p = ::tqqt_cast(Window::retrieveActive(exec)->m_frame->m_part); + TDEHTMLPart* p = ::tqt_cast(Window::retrieveActive(exec)->m_frame->m_part); if ( p ) url = p->htmlDocument().completeURL(str).string(); if ( !p || @@ -1601,7 +1601,7 @@ Value Window::openWindow(ExecState *exec, const List& args) Value Window::executeOpenWindow(ExecState *exec, const KURL& url, const TQString& frameName, const TQString& features) { - TDEHTMLPart *p = ::tqqt_cast(m_frame->m_part); + TDEHTMLPart *p = ::tqt_cast(m_frame->m_part); TDEHTMLView *widget = p->view(); KParts::WindowArgs winargs; @@ -1702,7 +1702,7 @@ Value Window::executeOpenWindow(ExecState *exec, const KURL& url, const TQString // request window (new or existing if framename is set) KParts::ReadOnlyPart *newPart = 0L; emit p->browserExtension()->createNewWindow(KURL(), uargs,winargs,newPart); - if (newPart && ::tqqt_cast(newPart)) { + if (newPart && ::tqt_cast(newPart)) { TDEHTMLPart *tdehtmlpart = static_cast(newPart); //tqDebug("opener set to %p (this Window's part) in new Window %p (this Window=%p)",part,win,window); tdehtmlpart->setOpener(p); @@ -1734,7 +1734,7 @@ void Window::forgetSuppressedWindows() void Window::showSuppressedWindows() { - TDEHTMLPart *part = ::tqqt_cast( m_frame->m_part ); + TDEHTMLPart *part = ::tqt_cast( m_frame->m_part ); KJS::Interpreter *interpreter = part->jScript()->interpreter(); ExecState *exec = interpreter->globalExec(); @@ -1759,7 +1759,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args) Window *window = static_cast(thisObj.imp()); TQString str, str2; - TDEHTMLPart *part = ::tqqt_cast(window->m_frame->m_part); + TDEHTMLPart *part = ::tqt_cast(window->m_frame->m_part); if (!part) return Undefined(); @@ -2113,7 +2113,7 @@ ScheduledAction::ScheduledAction(TQString _code, DateTimeMS _nextTime, int _inte bool ScheduledAction::execute(Window *window) { - TDEHTMLPart *part = ::tqqt_cast(window->m_frame->m_part); + TDEHTMLPart *part = ::tqt_cast(window->m_frame->m_part); if (!part || !part->jScriptEnabled()) return false; ScriptInterpreter *interpreter = static_cast(part->jScript()->interpreter()); @@ -2589,7 +2589,7 @@ void Location::put(ExecState *exec, const Identifier &p, const Value &v, int att TQString str = v.toString(exec).qstring(); switch (entry->value) { case Href: { - TDEHTMLPart* p =::tqqt_cast(Window::retrieveActive(exec)->part()); + TDEHTMLPart* p =::tqt_cast(Window::retrieveActive(exec)->part()); if ( p ) url = p->htmlDocument().completeURL( str ).string(); else @@ -2680,7 +2680,7 @@ Value LocationFunc::tryCall(ExecState *exec, Object &thisObj, const List &args) id == Location::Replace); break; case Location::Reload: { - TDEHTMLPart *tdehtmlpart = ::tqqt_cast(part); + TDEHTMLPart *tdehtmlpart = ::tqt_cast(part); if (tdehtmlpart) tdehtmlpart->scheduleRedirection(-1, part->url().url(), true/*lock history*/); else diff --git a/tdehtml/ecma/xmlhttprequest.cpp b/tdehtml/ecma/xmlhttprequest.cpp index 410fd1992..a3d0b2b3d 100644 --- a/tdehtml/ecma/xmlhttprequest.cpp +++ b/tdehtml/ecma/xmlhttprequest.cpp @@ -724,7 +724,7 @@ Value XMLHttpRequestProtoFunc::tryCall(ExecState *exec, Object &thisObj, const L } TQString method = args[0].toString(exec).qstring(); - TDEHTMLPart *part = ::tqqt_cast(Window::retrieveActive(exec)->part()); + TDEHTMLPart *part = ::tqt_cast(Window::retrieveActive(exec)->part()); if (!part) return Undefined(); KURL url = KURL(part->document().completeURL(args[1].toString(exec).qstring()).string()); diff --git a/tdehtml/html/html_baseimpl.cpp b/tdehtml/html/html_baseimpl.cpp index 16ca7a23b..e8150a387 100644 --- a/tdehtml/html/html_baseimpl.cpp +++ b/tdehtml/html/html_baseimpl.cpp @@ -414,7 +414,7 @@ DocumentImpl* HTMLFrameElementImpl::contentDocument() const RenderPart* render = static_cast( m_render ); - if(render->widget() && ::tqqt_cast( render->widget()) ) + if(render->widget() && ::tqt_cast( render->widget()) ) return static_cast( render->widget() )->part()->xmlDocImpl(); return 0; @@ -426,7 +426,7 @@ TDEHTMLPart* HTMLFrameElementImpl::contentPart() const RenderPart* render = static_cast( m_render ); - if(render->widget() && ::tqqt_cast( render->widget()) ) + if(render->widget() && ::tqt_cast( render->widget()) ) return static_cast( render->widget() )->part(); return 0; diff --git a/tdehtml/html/html_objectimpl.cpp b/tdehtml/html/html_objectimpl.cpp index f2cf8c1db..864de8ed7 100644 --- a/tdehtml/html/html_objectimpl.cpp +++ b/tdehtml/html/html_objectimpl.cpp @@ -422,7 +422,7 @@ DocumentImpl* HTMLObjectElementImpl::contentDocument() const if ( !m_render ) return 0; if ( !m_render->isWidget() ) return 0; TQWidget* widget = static_cast( m_render )->widget(); - if( widget && ::tqqt_cast( widget ) ) + if( widget && ::tqt_cast( widget ) ) return static_cast( widget )->part()->xmlDocImpl(); return 0; } diff --git a/tdehtml/rendering/render_replaced.cpp b/tdehtml/rendering/render_replaced.cpp index 09931c3de..ddf4dfb4b 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( m_widget ) ) + if ( ::tqt_cast( m_widget ) ) return TQObject::event( e ); return true; } @@ -212,7 +212,7 @@ void RenderWidget::setQWidget(TQWidget *widget) connect( m_widget, TQT_SIGNAL( destroyed()), this, TQT_SLOT( slotWidgetDestructed())); m_widget->installEventFilter(this); - if ( (m_isTDEHTMLWidget = !strcmp(m_widget->name(), "__tdehtml")) && !::tqqt_cast(m_widget)) + if ( (m_isTDEHTMLWidget = !strcmp(m_widget->name(), "__tdehtml")) && !::tqt_cast(m_widget)) m_widget->setBackgroundMode( TQWidget::NoBackground ); if (m_widget->focusPolicy() > TQWidget::StrongFocus) @@ -330,7 +330,7 @@ void RenderWidget::updateFromElement() else m_widget->unsetPalette(); // Border: - TQFrame* frame = ::tqqt_cast(m_widget); + TQFrame* frame = ::tqt_cast(m_widget); if (frame) { if (shouldPaintBackgroundOrBorder()) { @@ -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(it.current()); + TQWidget* const w = ::tqt_cast(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( m_widget ) ) + if ( ::tqt_cast( m_widget ) ) return false; if ( !element() ) return true; @@ -809,8 +809,8 @@ 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(m_widget); - if (sc && !::tqqt_cast(m_widget)) + TQScrollView * sc = ::tqt_cast(m_widget); + if (sc && !::tqt_cast(m_widget)) static_cast(sc)->sendEvent(TQT_TQEVENT(&e)); else static_cast(m_widget)->sendEvent(TQT_TQEVENT(&e)); diff --git a/tdehtml/tdehtml_ext.cpp b/tdehtml/tdehtml_ext.cpp index 24a2636e4..89172f22a 100644 --- a/tdehtml/tdehtml_ext.cpp +++ b/tdehtml/tdehtml_ext.cpp @@ -343,9 +343,9 @@ void TDEHTMLPartBrowserExtension::updateEditActions() bool hasSelection = false; if( m_editableFormWidget) { - if ( ::tqqt_cast(m_editableFormWidget)) + if ( ::tqt_cast(m_editableFormWidget)) hasSelection = static_cast( &(*m_editableFormWidget) )->hasSelectedText(); - else if(::tqqt_cast(m_editableFormWidget)) + else if(::tqt_cast(m_editableFormWidget)) hasSelection = static_cast( &(*m_editableFormWidget) )->hasSelectedText(); } diff --git a/tdehtml/tdehtml_part.cpp b/tdehtml/tdehtml_part.cpp index 3518ea1b5..df8ad1403 100644 --- a/tdehtml/tdehtml_part.cpp +++ b/tdehtml/tdehtml_part.cpp @@ -177,7 +177,7 @@ void tdehtml::ChildFrame::liveConnectEvent(const unsigned long, const TQString & script += ")"; kdDebug(6050) << "tdehtml::ChildFrame::liveConnectEvent " << script << endl; - TDEHTMLPart * part = ::tqqt_cast(m_part->parent()); + TDEHTMLPart * part = ::tqt_cast(m_part->parent()); if (!part) return; if (!m_jscript) @@ -1844,7 +1844,7 @@ void TDEHTMLPart::slotFinished( TDEIO::Job * job ) return; } - TDEIO::TransferJob *tjob = ::tqqt_cast(job); + TDEIO::TransferJob *tjob = ::tqt_cast(job); if (tjob && tjob->isErrorPage()) { tdehtml::RenderPart *renderPart = d->m_frame ? static_cast(d->m_frame->m_frame) : 0; if (renderPart) { @@ -4489,7 +4489,7 @@ bool TDEHTMLPart::processObjectRequest( tdehtml::ChildFrame *child, const KURL & //CRITICAL STUFF if ( child->m_part ) { - if (!::tqqt_cast(child->m_part) && child->m_jscript) + if (!::tqt_cast(child->m_part) && child->m_jscript) child->m_jscript->clear(); partManager()->removePart( (KParts::ReadOnlyPart *)child->m_part ); delete (KParts::ReadOnlyPart *)child->m_part; @@ -4510,7 +4510,7 @@ bool TDEHTMLPart::processObjectRequest( tdehtml::ChildFrame *child, const KURL & child->m_part = part; - if (::tqqt_cast(part)) { + if (::tqt_cast(part)) { static_cast(part)->d->m_frame = child; } else if (child->m_frame) { child->m_liveconnect = KParts::LiveConnectExtension::childObject(part); @@ -5302,7 +5302,7 @@ bool TDEHTMLPart::frameExists( const TQString &frameName ) KJSProxy *TDEHTMLPart::framejScript(KParts::ReadOnlyPart *framePart) { - TDEHTMLPart* const kp = ::tqqt_cast(framePart); + TDEHTMLPart* const kp = ::tqt_cast(framePart); if (kp) return kp->jScript(); @@ -5320,7 +5320,7 @@ KJSProxy *TDEHTMLPart::framejScript(KParts::ReadOnlyPart *framePart) TDEHTMLPart *TDEHTMLPart::parentPart() { - return ::tqqt_cast( parent() ); + return ::tqt_cast( parent() ); } tdehtml::ChildFrame *TDEHTMLPart::recursiveFrameRequest( TDEHTMLPart *callingHtmlPart, const KURL &url, diff --git a/tdehtml/tdehtmlimage.cpp b/tdehtml/tdehtmlimage.cpp index dc2a51c66..fe8e31c8d 100644 --- a/tdehtml/tdehtmlimage.cpp +++ b/tdehtml/tdehtmlimage.cpp @@ -62,7 +62,7 @@ TDEHTMLImage::TDEHTMLImage( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, TDEHTMLPart::GUIProfile prof ) : KParts::ReadOnlyPart( parent, name ), m_image( 0 ) { - TDEHTMLPart* parentPart = ::tqqt_cast( parent ); + TDEHTMLPart* parentPart = ::tqt_cast( parent ); setInstance( TDEHTMLImageFactory::instance(), prof == TDEHTMLPart::BrowserViewGUI && !parentPart ); TQVBox *box = new TQVBox( parentWidget, widgetName ); @@ -103,7 +103,7 @@ TDEHTMLImage::TDEHTMLImage( TQWidget *parentWidget, const char *widgetName, // forward important signals from the tdehtml part // forward opening requests to parent frame (if existing) - TDEHTMLPart *p = ::tqqt_cast(parent); + TDEHTMLPart *p = ::tqt_cast(parent); KParts::BrowserExtension *be = p ? p->browserExtension() : m_ext; connect(m_tdehtml->browserExtension(), TQT_SIGNAL(openURLRequestDelayed(const KURL &, const KParts::URLArgs &)), be, TQT_SIGNAL(openURLRequestDelayed(const KURL &, const KParts::URLArgs &))); @@ -304,7 +304,7 @@ bool TDEHTMLImage::eventFilter(TQObject *, TQEvent *e) { case TQEvent::Drop: { // find out if this part is embedded in a frame, and send the // event to its outside widget - TDEHTMLPart *p = ::tqqt_cast(parent()); + TDEHTMLPart *p = ::tqt_cast(parent()); if (p) return TQApplication::sendEvent(p->widget(), e); // otherwise simply forward all dnd events to the part widget, diff --git a/tdehtml/tdehtmlview.cpp b/tdehtml/tdehtmlview.cpp index c791f054e..ae2be579a 100644 --- a/tdehtml/tdehtmlview.cpp +++ b/tdehtml/tdehtmlview.cpp @@ -1112,8 +1112,8 @@ static inline void forwardPeripheralEvent(tdehtml::RenderWidget* r, TQMouseEvent TQPoint p(x-absx, y-absy); TQMouseEvent fw(me->type(), p, me->button(), me->state()); TQWidget* w = r->widget(); - TQScrollView* sc = ::tqqt_cast(w); - if (sc && !::tqqt_cast(w)) + TQScrollView* sc = ::tqt_cast(w); + if (sc && !::tqt_cast(w)) static_cast(sc)->sendEvent(TQT_TQEVENT(&fw)); else if(w) static_cast(w)->sendEvent(TQT_TQEVENT(&fw)); @@ -1907,15 +1907,15 @@ bool TDEHTMLView::eventFilter(TQObject *o, TQEvent *e) if (!strcmp(w->name(), "__tdehtml")) { w->installEventFilter(this); w->unsetCursor(); - if (!::tqqt_cast(w)) + if (!::tqt_cast(w)) w->setBackgroundMode( TQWidget::NoBackground ); static_cast(w)->setNoErase(); if (!w->childrenListObject().isEmpty()) { TQObjectListIterator it(w->childrenListObject()); for (; it.current(); ++it) { - TQWidget *widget = ::tqqt_cast(it.current()); + TQWidget *widget = ::tqt_cast(it.current()); if (widget && !widget->isTopLevel()) { - if (!::tqqt_cast(w)) + if (!::tqt_cast(w)) widget->setBackgroundMode( TQWidget::NoBackground ); static_cast(widget)->setNoErase(); widget->installEventFilter(this); @@ -1952,7 +1952,7 @@ bool TDEHTMLView::eventFilter(TQObject *o, TQEvent *e) } viewportToContents( x, y, x, y ); TQPaintEvent *pe = TQT_TQPAINTEVENT(e); - bool asap = !d->contentsMoving && ::tqqt_cast(c); + bool asap = !d->contentsMoving && ::tqt_cast(c); // TQScrollView needs fast repaints if ( asap && !d->painting && m_part->xmlDocImpl() && m_part->xmlDocImpl()->renderer() && @@ -1969,7 +1969,7 @@ bool TDEHTMLView::eventFilter(TQObject *o, TQEvent *e) case TQEvent::MouseButtonPress: case TQEvent::MouseButtonRelease: case TQEvent::MouseButtonDblClick: { - if ( (w->parentWidget() == view || ::tqqt_cast(c)) && !::tqqt_cast(w)) { + if ( (w->parentWidget() == view || ::tqt_cast(c)) && !::tqt_cast(w)) { TQMouseEvent *me = TQT_TQMOUSEEVENT(e); TQPoint pt = w->mapTo( view, me->pos()); TQMouseEvent me2(me->type(), pt, me->button(), me->state()); @@ -1988,7 +1988,7 @@ bool TDEHTMLView::eventFilter(TQObject *o, TQEvent *e) } case TQEvent::KeyPress: case TQEvent::KeyRelease: - if (w->parentWidget() == view && !::tqqt_cast(w)) { + if (w->parentWidget() == view && !::tqt_cast(w)) { TQKeyEvent *ke = TQT_TQKEYEVENT(e); if (e->type() == TQEvent::KeyPress) keyPressEvent(ke); -- cgit v1.2.1