diff options
186 files changed, 2320 insertions, 2320 deletions
diff --git a/KDE2PORTING.html b/KDE2PORTING.html index 131c74577..8f6070bf7 100644 --- a/KDE2PORTING.html +++ b/KDE2PORTING.html @@ -351,13 +351,13 @@ This makes KRun the recommended way to run another program in KDE 2. tdehtmlw has been replaced with tdehtml.<BR> <UL> - <LI>KHTMLView has vanished. Just use KHTMLWidget, which does scrollbar + <LI>TDEHTMLView has vanished. Just use TDEHTMLWidget, which does scrollbar managing for free. <LI>A lot of the API has changed. If you just want to open a file/URL, you just need to do:<P> <PRE> - KHTMLWidget *w = new KHTMLWidget(); + TDEHTMLWidget *w = new TDEHTMLWidget(); w->openURL(myURL); </PRE> @@ -367,18 +367,18 @@ tdehtmlw has been replaced with tdehtml.<BR> const char * -> QString TQStrList -> QStringList </PRE> - The only exception for the moment is KHTMLWidget::write(), which does + The only exception for the moment is TDEHTMLWidget::write(), which does also exist in a const char * version.<P> -<LI>you won't need the getKHTMLWiget function anymore. Just replace - getKHTMLWidget->xxx() with xxx()<P> +<LI>you won't need the getTDEHTMLWiget function anymore. Just replace + getTDEHTMLWidget->xxx() with xxx()<P> <LI>xxx(TQString) -> xxx(const TQString &)<P> <LI>consistent naming. All getXyz() functions are renamed to xyz()<P> <LI>replaced/changed functions:<P> <TABLE BORDER="1"> <TR> -<TD>KHTMLWidget::setDefaultFontBase()</TD> +<TD>TDEHTMLWidget::setDefaultFontBase()</TD> <TD>-> setFontSizes()</TD> </TR> <TR> diff --git a/KDE3PORTING.html b/KDE3PORTING.html index 7d6130ac4..ca9b67388 100644 --- a/KDE3PORTING.html +++ b/KDE3PORTING.html @@ -22,7 +22,7 @@ or <a href="http://doc.trolltech.com/3.0/porting.html">this page online</a>.<P> <LI><A HREF="#kio">Changes in kio</A></LI> <LI><A HREF="#tdeparts">Changes in tdeparts</A></LI> <LI><A HREF="#tdespell">Changes in tdespell</A></LI> -<LI><A HREF="#tdehtmlpart">API-cleanup in KHTML</A></LI> +<LI><A HREF="#tdehtmlpart">API-cleanup in TDEHTML</A></LI> <LI><A HREF="#tdefile">Changes in tdefile</A></LI> <LI><A HREF="#kcontrol">TDE Control Center</A></LI> <LI><A HREF="#kicker">Panel Applets and Extensions</A></LI> @@ -495,9 +495,9 @@ The API has been cleaned up to be in line with the rest of tdelibs, in particula <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4> -<H3><A NAME="tdehtmlpart">API-cleanups in KHTML</A></H3> +<H3><A NAME="tdehtmlpart">API-cleanups in TDEHTML</A></H3> -There were a few relatively minor API-adjustements in KHTMLPart. In particular: +There were a few relatively minor API-adjustements in TDEHTMLPart. In particular: <ul><li>enableJScript(bool) has been replaced by setJScriptEnabled(bool) <li>enableJava(bool) has been replaced by setJavaEnabled(bool) <li>enablePlugins(bool) has been replaced by setPluginsEnabled(bool) @@ -505,7 +505,7 @@ There were a few relatively minor API-adjustements in KHTMLPart. In particular: <li>enableMetaRefresh(bool) has been replaced by setMetaRefreshEnabled(bool) <li>setBaseURL and setBaseTarget have been removed. baseURL(), baseTarget() and completeURL() are remained for compatibility reasons, but they're deprecated now. use the variants in DOM::HTMLDocument() instead. -<li>the second parameter of KHTMLPart::completeURL is removed. it didn't have +<li>the second parameter of TDEHTMLPart::completeURL is removed. it didn't have any effect before either. </ul> Besides that, all methods previously marked as deprecated or were internal @@ -513,7 +513,7 @@ but accidentally part of the public API are now private or removed. As they were marked as becoming private already you should not experience any problems. Backward compatibility exists for the common methods, to disable this use a #define KDE_NO_COMPAT. -<p>In KHTMLView, the following changes were done: +<p>In TDEHTMLView, the following changes were done: <ul> <li>gotoNextLink has been replaced by gotoLink(true); <li>gotoPrevLink has been replaced by gotoLink(false); @@ -223,7 +223,7 @@ an alternative help->contents action) - Move KRichTextLabel into tdeui if still required with Qt 4. -- Add the concept of a session to KIO, in particular for KHTML so that it can +- Add the concept of a session to KIO, in particular for TDEHTML so that it can have all of its jobs associated in some way (a unique key of sorts). Will make SSL much easier to implement and allow removal of many hacks, mostly involving metadata. diff --git a/configure.in.in b/configure.in.in index 00870d24c..e6969bb1f 100644 --- a/configure.in.in +++ b/configure.in.in @@ -255,7 +255,7 @@ AC_SUBST(LIB_TDEUI, '$(top_builddir)/tdeui/libtdeui.la') AC_SUBST(LIB_KIO, '$(top_builddir)/tdeio/libtdeio.la') AC_SUBST(LIB_KFILE, '$(top_builddir)/tdeio/libtdeio.la') AC_SUBST(LIB_KSYCOCA, '$(top_builddir)/tdeio/libtdeio.la') -AC_SUBST(LIB_KHTML, '$(top_builddir)/tdehtml/libtdehtml.la') +AC_SUBST(LIB_TDEHTML, '$(top_builddir)/tdehtml/libtdehtml.la') AC_SUBST(LIB_TDEPRINT, '$(top_builddir)/tdeprint/libtdeprint.la') AC_SUBST(LIB_KPARTS, '$(top_builddir)/tdeparts/libtdeparts.la') AC_SUBST(LIB_KIMGIO, '$(top_builddir)/kimgio/libkimgio.la') diff --git a/kjs/README b/kjs/README index 7e01b0b41..a0545086e 100644 --- a/kjs/README +++ b/kjs/README @@ -13,7 +13,7 @@ for the standard page. About 95% of the required features should be covered by now. Note that this number covers the core language elements only. Features like the famous roll-over buttons on the www are NOT part of the standard. Those extensions -are added via a module loaded dynamically by the KHTML Widget. +are added via a module loaded dynamically by the TDEHTML Widget. I'll provide some examples of how to extend this library for various needs at a later point in time. Feel free to contact me via mail if you have any diff --git a/kstyles/keramik/keramik.cpp b/kstyles/keramik/keramik.cpp index 7105d81c5..591a5aae3 100644 --- a/kstyles/keramik/keramik.cpp +++ b/kstyles/keramik/keramik.cpp @@ -1357,7 +1357,7 @@ void KeramikStyle::drawKStylePrimitive( KStylePrimitive kpe, bool KeramikStyle::isFormWidget(const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget* widget) const { if (widget) { - //Form widgets are in the KHTMLView, but that has 2 further inner levels + //Form widgets are in the TDEHTMLView, but that has 2 further inner levels //of widgets - QClipperWidget, and outside of that, QViewportWidget TQWidget* potentialClipPort = widget->parentWidget(); if ((ceData.parentWidgetData.widgetObjectTypes.isEmpty()) && (ceData.parentWidgetFlags & CEF_IsTopLevel)) { @@ -1369,9 +1369,9 @@ bool KeramikStyle::isFormWidget(const TQStyleControlElementData &ceData, const C qstrcmp(potentialViewPort->name(), "qt_viewport") ) return false; - TQWidget* potentialKHTML = potentialViewPort->parentWidget(); - if (!potentialKHTML || potentialKHTML->isTopLevel() || - qstrcmp(potentialKHTML->className(), "KHTMLView") ) + TQWidget* potentialTDEHTML = potentialViewPort->parentWidget(); + if (!potentialTDEHTML || potentialTDEHTML->isTopLevel() || + qstrcmp(potentialTDEHTML->className(), "TDEHTMLView") ) return false; diff --git a/tdecore/network/kiobuffer.h b/tdecore/network/tdeiobuffer.h index c79daaa70..c79daaa70 100644 --- a/tdecore/network/kiobuffer.h +++ b/tdecore/network/tdeiobuffer.h diff --git a/tdecore/tdelibs_export.h b/tdecore/tdelibs_export.h index a226eac94..9ba0a994b 100644 --- a/tdecore/tdelibs_export.h +++ b/tdecore/tdelibs_export.h @@ -46,7 +46,7 @@ #define KVCARD_EXPORT KDE_EXPORT #define KRESOURCES_EXPORT KDE_EXPORT #define KSTYLE_EXPORT KDE_EXPORT -#define KHTML_EXPORT KDE_EXPORT +#define TDEHTML_EXPORT KDE_EXPORT #define KMDI_EXPORT KDE_EXPORT #define KUTILS_EXPORT KDE_EXPORT #define KATEPARTINTERFACES_EXPORT KDE_EXPORT diff --git a/tdehtml/ChangeLog b/tdehtml/ChangeLog index ea77bf459..cf19f1b06 100644 --- a/tdehtml/ChangeLog +++ b/tdehtml/ChangeLog @@ -243,7 +243,7 @@ stalled layout flags problems - #121653). (updateWidgetMasks): mask the content box, not the border box. (enclosingStackingContext) new. Returns the layer defining current stacking context. - * rendering/render_replaced.{h,cpp} (isKHTMLWidget): new flag for KHTML-proxied widgets. + * rendering/render_replaced.{h,cpp} (isTDEHTMLWidget): new flag for TDEHTML-proxied widgets. (detach/resizeWidget/setQWidget/layout/updateFromElement/slotWidgetDestructed/setStyle/paint): use the flag insead of strcmp's Only allow !tdehtml widgets to register in the view (only those need masking). @@ -473,7 +473,7 @@ 2005-08-10 Dawit Alemayehu <[email protected]> * ecma/xmlhttprequest.cpp: Convert a 304 (Not Modified) HTTP response in - XMLHttpRequest to a 200 (OK) response to make KHTML conform to IE's and + XMLHttpRequest to a 200 (OK) response to make TDEHTML conform to IE's and Mozilla's behavior. BUG: 110272 * ecma/xmlhttprequest.cpp: Factored out the HTTP status line parsing code @@ -510,7 +510,7 @@ replace them with the "blocked" pixmap.) * tdehtml_part.{cpp,h}: Added runAdFilters() function which is called from reparseConfiguration() - * tdehtml_ext.cpp: Call KHTMLPart::reparseConfiguration() after adding new filters. + * tdehtml_ext.cpp: Call TDEHTMLPart::reparseConfiguration() after adding new filters. * misc/loader.cpp: Create blockedPixmap in Cache::init() instead of the CachedImage constructor. 2005-07-19 Allan Sandfeld Jensen <[email protected]> @@ -528,7 +528,7 @@ * tdehtml_ext.{cpp,h}: Added "blockiframe" to context popup menu * tdehtml_popupmenu.rc: Same - * tdehtml_part.h: added KHTMLPopupGUIClient to friend classes + * tdehtml_part.h: added TDEHTMLPopupGUIClient to friend classes 2005-07-08 Germain Garand <[email protected]> @@ -544,11 +544,11 @@ 2005-07-07 Allan Sandfeld Jensen <[email protected]> - There is nothing KHTML specific about keypress events. They might not be DOM2 or 3, + There is nothing TDEHTML specific about keypress events. They might not be DOM2 or 3, but MSIE, Mozilla and Safari all handles them as a valid event class. * xml/dom2_eventsimpl.{h,cpp}: Allow KEYPRESS as a valid event type - * ./.: Rename KHTML_KEYPRESS_EVENT to KEYPRESS_EVENT + * ./.: Rename TDEHTML_KEYPRESS_EVENT to KEYPRESS_EVENT 2005-07-05 Allan Sandfeld Jensen <[email protected]> @@ -1969,7 +1969,7 @@ 2004-07-28 Leo Savernik <[email protected]> - * tdehtmlview.{cpp,h} (KHTMLToolTip::maybeTip): Query <area> elements + * tdehtmlview.{cpp,h} (TDEHTMLToolTip::maybeTip): Query <area> elements of image maps. (dispatchMouseEvent): Added parameter innerNonSharedNode. * tdehtml_part.{cpp,h}: Added method nonSharedNodeUnderMouse. @@ -1978,7 +1978,7 @@ * xml/dom_nodeimpl.h: Added innerNonSharedNode to NodeImpl::MouseEvent. * html/html_imageimpl.h: Added cachedRegion() for being able to - retrieve the region in KHTMLToolTip. + retrieve the region in TDEHTMLToolTip. 2004-07-20 Stephan Kulow <[email protected]> @@ -2297,7 +2297,7 @@ 2004-05-06 Tobias Anton <[email protected]> - * html/htmlparser.cpp (class KHTMLParser): use setCurrent() after reset() + * html/htmlparser.cpp (class TDEHTMLParser): use setCurrent() after reset() to avoid a memleak whenever the parser is used on a DocumentFragment. 2004-05-04 Leo Savernik <[email protected]> @@ -2370,8 +2370,8 @@ Added classes CaretBox, CaretBoxLine, CaretBoxIterator, EditableCaretBoxIterator. Changed every other class. - * tdehtmlview.[cpp,h}: (class KHTMLView) Adapt to tdehtml_caret* changes. - (KHTMLToolTip::maybeTip) Save tooltip position instead of recalculating it. + * tdehtmlview.[cpp,h}: (class TDEHTMLView) Adapt to tdehtml_caret* changes. + (TDEHTMLToolTip::maybeTip) Save tooltip position instead of recalculating it. * rendering/render_{inline,box}.{cpp,h}: (Render{Box,Inline}::caretPos) Handle outside caret positions. @@ -2508,7 +2508,7 @@ * ecma/xmlhttprequest.h/cpp: Implement asynchronous interface enough to pass the tests on http://www.mozilla.org/xmlextras/tests.html - * xml/dom2_eventsimpl.h (EventImpl): rename KHTML_KEYUP/DOWN_EVENT + * xml/dom2_eventsimpl.h (EventImpl): rename TDEHTML_KEYUP/DOWN_EVENT to KEYUP/DOWN_EVENT. Add events needed for XMLHttpRequest. * rendering/render_object.h (class RenderObject): introduce a PaintInfo @@ -2526,7 +2526,7 @@ * tdehtml_part.cpp/.h (openURL): In case the call is a reload, do a stat on the user-defined stylesheet and reload it in case it changed in the meanwhile (#39962). - * tdehtmlpart_p.h (class KHTMLPartPrivate): Added + * tdehtmlpart_p.h (class TDEHTMLPartPrivate): Added m_userStyleSheetLastModified variable which keeps track of the mtime of the user-defined sheet. @@ -2825,7 +2825,7 @@ 2004-01-18 Dirk Mueller <[email protected]> - * tdehtmlpart_p.h (class KHTMLPartPrivate): experimental: + * tdehtmlpart_p.h (class TDEHTMLPartPrivate): experimental: copy encoding information from parent frame. helps on http://www.pfl.ru/ when manually setting the correct encoding. @@ -3835,7 +3835,7 @@ to make the one call entering a local event loop the last, so that we can cleanly exit when it the view is already deleted. - * tdehtml_ext.cpp (KHTMLPopupGUIClient): pass QObject parent + * tdehtml_ext.cpp (TDEHTMLPopupGUIClient): pass QObject parent 2003-10-05 Dirk Mueller <[email protected]> @@ -3852,7 +3852,7 @@ 2003-10-04 Dirk Mueller <[email protected]> - * html/htmlparser.h (class KHTMLParser): keep "current" NodeImpl referenced + * html/htmlparser.h (class TDEHTMLParser): keep "current" NodeImpl referenced to avoid ugly crashes when DHTML deletes the node while we're still parsing. #57020, testcase alja.html diff --git a/tdehtml/DESIGN.html b/tdehtml/DESIGN.html index 861825141..3907a56d0 100644 --- a/tdehtml/DESIGN.html +++ b/tdehtml/DESIGN.html @@ -15,7 +15,7 @@ document, but it'll hopefully make it easier for you to read the source code. </p> <p> The library is build up out of several different parts. Basically, when you use the lib, you -create an instance of a KHTMLPart, and feed data to it. That's more or less all you need to +create an instance of a TDEHTMLPart, and feed data to it. That's more or less all you need to know if you want to use tdehtml for another application. If you want to start hacking tdehtml, here's a sketch of the objects that will get constructed, when eg. running testtdehtml with a url argument. @@ -52,8 +52,8 @@ compatible to IE. </blockquote> <p> -<a href="tdehtml_part.h">KHTMLPart</a> creates one instance of a -<a href="tdehtmlview.h">KHTMLView</a> (derived from TQScrollView), +<a href="tdehtml_part.h">TDEHTMLPart</a> creates one instance of a +<a href="tdehtmlview.h">TDEHTMLView</a> (derived from TQScrollView), the widget showing the whole thing. At the same time a DOM tree is built up from the HTML or XML found in the specified file. <p> @@ -173,7 +173,7 @@ classes. In the implementation classes we have added a few more intermediate cla not be seen from the outside for various reasons (make implementation of shared features easier or to reduce memory consumption). <p> -In C++, you can access the whole DOM tree from outside KHTML by using the interface classes. +In C++, you can access the whole DOM tree from outside TDEHTML by using the interface classes. For a description see the <a href="http://developer.kde.org/documentation/library/kdeqt/trinityarch/tdehtml/index.html">introduction to tdehtml</a> on <a href="http://developer.kde.org/">developer.kde.org</a>. One thing that has been omitted in the discussion above is the style sheet defined inside the @@ -261,8 +261,8 @@ RenderRoot* A call to of <a href="rendering/render_root.cpp">layout()</a> on the <a href="rendering/render_root.h">RenderRoot </a> (the root of the rendering tree) object causes the rendering tree to layout itself into the available space -(width) given by the the KHTMLView. After that, the drawContents() method of -KHTMLView can call RenderRoot->print() with appropriate parameters to actually +(width) given by the the TDEHTMLView. After that, the drawContents() method of +TDEHTMLView can call RenderRoot->print() with appropriate parameters to actually paint the document. This is not 100% correct, when parsing incrementally, but is exactly what happens when you resize the document. @@ -301,7 +301,7 @@ the definition of the objects used in the rendering tree, the layouting code, an <h2>Exception handling</h2> To save on library size, C++-exceptions are only enabled in the dom/ subdirectory, -since exceptions are mandated by the DOM API. In the rest of KHTML's code, +since exceptions are mandated by the DOM API. In the rest of TDEHTML's code, we pass an error flag (usually called "exceptionCode"), and the class that is part of dom/* checks for this flag and throws the exception. diff --git a/tdehtml/Mainpage.dox b/tdehtml/Mainpage.dox index 84ebfedb1..5de4d53a2 100644 --- a/tdehtml/Mainpage.dox +++ b/tdehtml/Mainpage.dox @@ -1,19 +1,19 @@ /** @mainpage Trinity HTML Parser and Widget If you want a fully-fledged HTML browser widget in your application, -you can use KHTMLPart to do so. +you can use TDEHTMLPart to do so. @code KUrl url = "http://www.trinitydesktop.org"; -KHTMLPart *w = new KHTMLPart(); +TDEHTMLPart *w = new TDEHTMLPart(); w->openUrl(url); w->view()->resize(500, 400); w->show(); @endcode -For more information, see the documentation for KHTMLPart. +For more information, see the documentation for TDEHTMLPart. -Note that using KHTMLPart may introduce security vulnerabilities +Note that using TDEHTMLPart may introduce security vulnerabilities and unnecessary bloat to your application. Qt's text widgets are rich-text capable, and will interpret a limited subset of HTML. @@ -30,7 +30,7 @@ George Staikos \<[email protected]\><br> Allan Sandfeld Jensen \<[email protected]\><br> Germain Garand \<[email protected]\><br> Maksim Orlovich \<[email protected]\><br> -KHTML has also heavily benefited from the work of Apple Computer, Inc. +TDEHTML has also heavily benefited from the work of Apple Computer, Inc. @maintainers Allan Sandfeld Jensen <br> Germain Garand<br> @@ -42,5 +42,5 @@ Maksim Orlovich */ // DOXYGEN_REFERENCES = tdecore tdeui kio tdeparts kjs // DOXYGEN_EXCLUDE = test*.* html rendering xml misc ecma css imload pics test -// DOXYGEN_SET_PROJECT_NAME = KHTML +// DOXYGEN_SET_PROJECT_NAME = TDEHTML // vim:ts=4:sw=4:expandtab:filetype=doxygen diff --git a/tdehtml/README.HTMLWidget b/tdehtml/README.HTMLWidget index 2a8900ee2..cae4a3c58 100644 --- a/tdehtml/README.HTMLWidget +++ b/tdehtml/README.HTMLWidget @@ -43,7 +43,7 @@ You can add the widget to your program by doing something like: . . - KHTMLWidget *view = new KHTMLWidget( parent, "Name" ); + TDEHTMLWidget *view = new TDEHTMLWidget( parent, "Name" ); view->show(); view->begin( "file:/tmp/test.html" ); diff --git a/tdehtml/css/css_renderstyledeclarationimpl.cpp b/tdehtml/css/css_renderstyledeclarationimpl.cpp index 95c1c95d9..00e6f5382 100644 --- a/tdehtml/css/css_renderstyledeclarationimpl.cpp +++ b/tdehtml/css/css_renderstyledeclarationimpl.cpp @@ -41,8 +41,8 @@ static const int computedProperties[] = { CSS_PROP_BACKGROUND_POSITION_Y, CSS_PROP_BORDER_COLLAPSE, CSS_PROP_BORDER_SPACING, - CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING, - CSS_PROP__KHTML_BORDER_VERTICAL_SPACING, + CSS_PROP__TDEHTML_BORDER_HORIZONTAL_SPACING, + CSS_PROP__TDEHTML_BORDER_VERTICAL_SPACING, CSS_PROP_BORDER_TOP_COLOR, CSS_PROP_BORDER_RIGHT_COLOR, CSS_PROP_BORDER_BOTTOM_COLOR, @@ -80,10 +80,10 @@ static const int computedProperties[] = { CSS_PROP_MARGIN_RIGHT, CSS_PROP_MARGIN_BOTTOM, CSS_PROP_MARGIN_LEFT, - CSS_PROP__KHTML_MARQUEE_DIRECTION, - CSS_PROP__KHTML_MARQUEE_INCREMENT, - CSS_PROP__KHTML_MARQUEE_REPETITION, - CSS_PROP__KHTML_MARQUEE_STYLE, + CSS_PROP__TDEHTML_MARQUEE_DIRECTION, + CSS_PROP__TDEHTML_MARQUEE_INCREMENT, + CSS_PROP__TDEHTML_MARQUEE_REPETITION, + CSS_PROP__TDEHTML_MARQUEE_STYLE, CSS_PROP_MAX_HEIGHT, CSS_PROP_MAX_WIDTH, CSS_PROP_MIN_HEIGHT, @@ -137,7 +137,7 @@ static CSSValueImpl *valueForBorderStyle(EBorderStyle style) { switch (style) { case tdehtml::BNATIVE: - return new CSSPrimitiveValueImpl(CSS_VAL__KHTML_NATIVE); + return new CSSPrimitiveValueImpl(CSS_VAL__TDEHTML_NATIVE); case tdehtml::BNONE: return new CSSPrimitiveValueImpl(CSS_VAL_NONE); case tdehtml::BHIDDEN: @@ -176,12 +176,12 @@ static CSSValueImpl *valueForTextAlign(ETextAlign align) return new CSSPrimitiveValueImpl(CSS_VAL_CENTER); case tdehtml::JUSTIFY: return new CSSPrimitiveValueImpl(CSS_VAL_JUSTIFY); - case tdehtml::KHTML_LEFT: - return new CSSPrimitiveValueImpl(CSS_VAL__KHTML_LEFT); - case tdehtml::KHTML_RIGHT: - return new CSSPrimitiveValueImpl(CSS_VAL__KHTML_RIGHT); - case tdehtml::KHTML_CENTER: - return new CSSPrimitiveValueImpl(CSS_VAL__KHTML_CENTER); + case tdehtml::TDEHTML_LEFT: + return new CSSPrimitiveValueImpl(CSS_VAL__TDEHTML_LEFT); + case tdehtml::TDEHTML_RIGHT: + return new CSSPrimitiveValueImpl(CSS_VAL__TDEHTML_RIGHT); + case tdehtml::TDEHTML_CENTER: + return new CSSPrimitiveValueImpl(CSS_VAL__TDEHTML_CENTER); } Q_ASSERT( 0 ); return 0; @@ -440,10 +440,10 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID ) "px"); return new CSSPrimitiveValueImpl(string, CSSPrimitiveValue::CSS_STRING); } - case CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING: + case CSS_PROP__TDEHTML_BORDER_HORIZONTAL_SPACING: return new CSSPrimitiveValueImpl(style->borderHorizontalSpacing(), CSSPrimitiveValue::CSS_PX); - case CSS_PROP__KHTML_BORDER_VERTICAL_SPACING: + case CSS_PROP__TDEHTML_BORDER_VERTICAL_SPACING: return new CSSPrimitiveValueImpl(style->borderVerticalSpacing(), CSSPrimitiveValue::CSS_PX); case CSS_PROP_BORDER_TOP_COLOR: @@ -614,9 +614,9 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID ) case FRIGHT: return new CSSPrimitiveValueImpl(CSS_VAL_RIGHT); case FLEFT_ALIGN: - return new CSSPrimitiveValueImpl(CSS_VAL__KHTML_LEFT); + return new CSSPrimitiveValueImpl(CSS_VAL__TDEHTML_LEFT); case FRIGHT_ALIGN: - return new CSSPrimitiveValueImpl(CSS_VAL__KHTML_RIGHT); + return new CSSPrimitiveValueImpl(CSS_VAL__TDEHTML_RIGHT); } } case CSS_PROP_FONT_FAMILY: @@ -706,10 +706,10 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID ) return valueForLength(style->marginBottom(), renderer->contentHeight()); case CSS_PROP_MARGIN_LEFT: return valueForLength(style->marginLeft(), renderer->contentWidth()); - case CSS_PROP__KHTML_MARQUEE: + case CSS_PROP__TDEHTML_MARQUEE: // FIXME: unimplemented break; - case CSS_PROP__KHTML_MARQUEE_DIRECTION: + case CSS_PROP__TDEHTML_MARQUEE_DIRECTION: switch (style->marqueeDirection()) { case MFORWARD: return new CSSPrimitiveValueImpl(CSS_VAL_FORWARDS); @@ -728,16 +728,16 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID ) } Q_ASSERT(0); return 0; - case CSS_PROP__KHTML_MARQUEE_INCREMENT: + case CSS_PROP__TDEHTML_MARQUEE_INCREMENT: return valueForLength(style->marqueeIncrement(), renderer->contentWidth()); - case CSS_PROP__KHTML_MARQUEE_REPETITION: + case CSS_PROP__TDEHTML_MARQUEE_REPETITION: if (style->marqueeLoopCount() < 0) return new CSSPrimitiveValueImpl(CSS_VAL_INFINITE); return new CSSPrimitiveValueImpl(style->marqueeLoopCount(), CSSPrimitiveValue::CSS_NUMBER); - case CSS_PROP__KHTML_MARQUEE_SPEED: + case CSS_PROP__TDEHTML_MARQUEE_SPEED: // FIXME: unimplemented break; - case CSS_PROP__KHTML_MARQUEE_STYLE: + case CSS_PROP__TDEHTML_MARQUEE_STYLE: switch (style->marqueeBehavior()) { case MNONE: return new CSSPrimitiveValueImpl(CSS_VAL_NONE); @@ -960,7 +960,7 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID ) case BOTTOM: return new CSSPrimitiveValueImpl(CSS_VAL_BOTTOM); case BASELINE_MIDDLE: - return new CSSPrimitiveValueImpl(CSS_VAL__KHTML_BASELINE_MIDDLE); + return new CSSPrimitiveValueImpl(CSS_VAL__TDEHTML_BASELINE_MIDDLE); case LENGTH: return valueForLength(style->verticalAlignLength(), renderer->contentWidth()); } @@ -991,8 +991,8 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID ) return new CSSPrimitiveValueImpl(CSS_VAL_PRE_LINE); case NOWRAP: return new CSSPrimitiveValueImpl(CSS_VAL_NOWRAP); - case KHTML_NOWRAP: - return new CSSPrimitiveValueImpl(CSS_VAL__KHTML_NOWRAP); + case TDEHTML_NOWRAP: + return new CSSPrimitiveValueImpl(CSS_VAL__TDEHTML_NOWRAP); } Q_ASSERT(0); break; @@ -1060,9 +1060,9 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID ) break; case CSS_PROP_SCROLLBAR_ARROW_COLOR: break; - case CSS_PROP__KHTML_FLOW_MODE: + case CSS_PROP__TDEHTML_FLOW_MODE: break; - case CSS_PROP__KHTML_USER_INPUT: + case CSS_PROP__TDEHTML_USER_INPUT: break; default: Q_ASSERT( 0 ); diff --git a/tdehtml/css/css_valueimpl.cpp b/tdehtml/css/css_valueimpl.cpp index 0da65c4b6..94cca8840 100644 --- a/tdehtml/css/css_valueimpl.cpp +++ b/tdehtml/css/css_valueimpl.cpp @@ -891,7 +891,7 @@ FontFamilyValueImpl::FontFamilyValueImpl( const TQString &string) parsedFontName.replace(braceReg, TQString()); #ifndef APPLE_CHANGES - const TQString &available = KHTMLSettings::availableFamilies(); + const TQString &available = TDEHTMLSettings::availableFamilies(); parsedFontName = parsedFontName.lower(); // kdDebug(0) << "searching for face '" << parsedFontName << "'" << endl; diff --git a/tdehtml/css/csshelper.h b/tdehtml/css/csshelper.h index 772a9eba1..5bc5194d0 100644 --- a/tdehtml/css/csshelper.h +++ b/tdehtml/css/csshelper.h @@ -28,7 +28,7 @@ #include "dom/dom_string.h" class TQPaintDeviceMetrics; -class KHTMLSettings; +class TDEHTMLSettings; namespace DOM { diff --git a/tdehtml/css/cssparser.cpp b/tdehtml/css/cssparser.cpp index b994ad773..b33151b59 100644 --- a/tdehtml/css/cssparser.cpp +++ b/tdehtml/css/cssparser.cpp @@ -533,7 +533,7 @@ bool CSSParser::parseValue( int propId, bool important ) * correctly and allows optimization in tdehtml::applyRule(..) */ case CSS_PROP_CAPTION_SIDE: // top | bottom | left | right | inherit - // Left and right were deprecated in CSS 2.1 and never supported by KHTML + // Left and right were deprecated in CSS 2.1 and never supported by TDEHTML if ( /* id == CSS_VAL_LEFT || id == CSS_VAL_RIGHT || */ id == CSS_VAL_TOP || id == CSS_VAL_BOTTOM) valid_primitive = true; @@ -567,7 +567,7 @@ bool CSSParser::parseValue( int propId, bool important ) // upper-roman | lower-greek | lower-alpha | lower-latin | upper-alpha | // upper-latin | hebrew | armenian | georgian | cjk-ideographic | hiragana | // katakana | hiragana-iroha | katakana-iroha | none | inherit - if ((id >= CSS_VAL_DISC && id <= CSS_VAL__KHTML_CLOSE_QUOTE) || id == CSS_VAL_NONE) + if ((id >= CSS_VAL_DISC && id <= CSS_VAL__TDEHTML_CLOSE_QUOTE) || id == CSS_VAL_NONE) valid_primitive = true; break; @@ -590,8 +590,8 @@ bool CSSParser::parseValue( int propId, bool important ) break; case CSS_PROP_FLOAT: // left | right | none | tdehtml_left | tdehtml_right | inherit + center for buggy CSS - if ( id == CSS_VAL_LEFT || id == CSS_VAL_RIGHT || id == CSS_VAL__KHTML_LEFT || - id == CSS_VAL__KHTML_RIGHT ||id == CSS_VAL_NONE || id == CSS_VAL_CENTER) + if ( id == CSS_VAL_LEFT || id == CSS_VAL_RIGHT || id == CSS_VAL__TDEHTML_LEFT || + id == CSS_VAL__TDEHTML_RIGHT ||id == CSS_VAL_NONE || id == CSS_VAL_CENTER) valid_primitive = true; break; @@ -603,7 +603,7 @@ bool CSSParser::parseValue( int propId, bool important ) case CSS_PROP_TEXT_ALIGN: // left | right | center | justify | tdehtml_left | tdehtml_right | tdehtml_center | <string> | inherit - if ( ( id >= CSS_VAL__KHTML_AUTO && id <= CSS_VAL__KHTML_CENTER ) || + if ( ( id >= CSS_VAL__TDEHTML_AUTO && id <= CSS_VAL__TDEHTML_CENTER ) || value->unit == CSSPrimitiveValue::CSS_STRING ) valid_primitive = true; break; @@ -613,7 +613,7 @@ bool CSSParser::parseValue( int propId, bool important ) case CSS_PROP_BORDER_RIGHT_STYLE: // Defined as: none | hidden | dotted | dashed | case CSS_PROP_BORDER_BOTTOM_STYLE: // solid | double | groove | ridge | inset | outset | -tdehtml-native case CSS_PROP_BORDER_LEFT_STYLE: //// - if (id >= CSS_VAL__KHTML_NATIVE && id <= CSS_VAL_DOUBLE) + if (id >= CSS_VAL__TDEHTML_NATIVE && id <= CSS_VAL_DOUBLE) valid_primitive = true; break; @@ -636,8 +636,8 @@ bool CSSParser::parseValue( int propId, bool important ) case CSS_PROP_BORDER_SPACING: { - const int properties[2] = { CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING, - CSS_PROP__KHTML_BORDER_VERTICAL_SPACING }; + const int properties[2] = { CSS_PROP__TDEHTML_BORDER_HORIZONTAL_SPACING, + CSS_PROP__TDEHTML_BORDER_VERTICAL_SPACING }; if (num == 1) { ShorthandScope scope(this, CSS_PROP_BORDER_SPACING); if (!parseValue(properties[0], important)) return false; @@ -653,8 +653,8 @@ bool CSSParser::parseValue( int propId, bool important ) } return false; } - case CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING: - case CSS_PROP__KHTML_BORDER_VERTICAL_SPACING: + case CSS_PROP__TDEHTML_BORDER_HORIZONTAL_SPACING: + case CSS_PROP__TDEHTML_BORDER_VERTICAL_SPACING: valid_primitive = validUnit(value, FLength|FNonNeg, strict&(!nonCSSHint)); break; @@ -682,10 +682,10 @@ bool CSSParser::parseValue( int propId, bool important ) case CSS_PROP_BORDER_BOTTOM_COLOR: // <color> | inherit case CSS_PROP_BORDER_LEFT_COLOR: // <color> | inherit case CSS_PROP_COLOR: // <color> | inherit - if ( id == CSS_VAL__KHTML_TEXT || id == CSS_VAL_MENU || + if ( id == CSS_VAL__TDEHTML_TEXT || id == CSS_VAL_MENU || (id >= CSS_VAL_AQUA && id <= CSS_VAL_WINDOWTEXT ) || id == CSS_VAL_TRANSPARENT || - (id >= CSS_VAL_GREY && id < CSS_VAL__KHTML_TEXT && (nonCSSHint|!strict) ) ) { + (id >= CSS_VAL_GREY && id < CSS_VAL__TDEHTML_TEXT && (nonCSSHint|!strict) ) ) { valid_primitive = true; } else { parsedValue = parseColor(); @@ -707,13 +707,13 @@ bool CSSParser::parseValue( int propId, bool important ) break; case CSS_PROP_BACKGROUND_ATTACHMENT: - case CSS_PROP__KHTML_BACKGROUND_CLIP: + case CSS_PROP__TDEHTML_BACKGROUND_CLIP: case CSS_PROP_BACKGROUND_IMAGE: - case CSS_PROP__KHTML_BACKGROUND_ORIGIN: + case CSS_PROP__TDEHTML_BACKGROUND_ORIGIN: case CSS_PROP_BACKGROUND_POSITION: case CSS_PROP_BACKGROUND_POSITION_X: case CSS_PROP_BACKGROUND_POSITION_Y: - case CSS_PROP__KHTML_BACKGROUND_SIZE: + case CSS_PROP__TDEHTML_BACKGROUND_SIZE: case CSS_PROP_BACKGROUND_REPEAT: { CSSValueImpl *val1 = 0, *val2 = 0; int propId1, propId2; @@ -769,7 +769,7 @@ bool CSSParser::parseValue( int propId, bool important ) case CSS_PROP_PADDING_RIGHT: // <padding-width> | inherit case CSS_PROP_PADDING_BOTTOM: // Which is defined as case CSS_PROP_PADDING_LEFT: // <length> | <percentage> - case CSS_PROP__KHTML_PADDING_START: + case CSS_PROP__TDEHTML_PADDING_START: valid_primitive = ( !id && validUnit( value, FLength|FPercent|FNonNeg, strict&(!nonCSSHint) ) ); break; @@ -807,7 +807,7 @@ bool CSSParser::parseValue( int propId, bool important ) // baseline | sub | super | top | text-top | middle | bottom | text-bottom | // <percentage> | <length> | inherit - if ( id >= CSS_VAL_BASELINE && id <= CSS_VAL__KHTML_BASELINE_MIDDLE ) + if ( id >= CSS_VAL_BASELINE && id <= CSS_VAL__TDEHTML_BASELINE_MIDDLE ) valid_primitive = true; else valid_primitive = ( !id && validUnit( value, FLength|FPercent, strict&(!nonCSSHint) ) ); @@ -830,7 +830,7 @@ bool CSSParser::parseValue( int propId, bool important ) case CSS_PROP_MARGIN_RIGHT: // Which is defined as case CSS_PROP_MARGIN_BOTTOM: // <length> | <percentage> | auto | inherit case CSS_PROP_MARGIN_LEFT: //// - case CSS_PROP__KHTML_MARGIN_START: + case CSS_PROP__TDEHTML_MARGIN_START: if ( id == CSS_VAL_AUTO ) valid_primitive = true; else @@ -912,8 +912,8 @@ bool CSSParser::parseValue( int propId, bool important ) valid_primitive = true; break; - case CSS_PROP__KHTML_FLOW_MODE: - if ( id == CSS_VAL__KHTML_NORMAL || id == CSS_VAL__KHTML_AROUND_FLOATS ) + case CSS_PROP__TDEHTML_FLOW_MODE: + if ( id == CSS_VAL__TDEHTML_NORMAL || id == CSS_VAL__TDEHTML_AROUND_FLOATS ) valid_primitive = true; break; @@ -934,41 +934,41 @@ bool CSSParser::parseValue( int propId, bool important ) case CSS_PROP_OPACITY: valid_primitive = validUnit(value, FNumber, strict); break; - case CSS_PROP__KHTML_USER_INPUT: // none | enabled | disabled | inherit + case CSS_PROP__TDEHTML_USER_INPUT: // none | enabled | disabled | inherit if ( id == CSS_VAL_NONE || id == CSS_VAL_ENABLED || id == CSS_VAL_DISABLED ) valid_primitive = true; -// kdDebug(6080) << "CSS_PROP__KHTML_USER_INPUT: " << valid_primitive << endl; +// kdDebug(6080) << "CSS_PROP__TDEHTML_USER_INPUT: " << valid_primitive << endl; break; - case CSS_PROP__KHTML_MARQUEE: { - const int properties[5] = { CSS_PROP__KHTML_MARQUEE_DIRECTION, CSS_PROP__KHTML_MARQUEE_INCREMENT, - CSS_PROP__KHTML_MARQUEE_REPETITION, - CSS_PROP__KHTML_MARQUEE_STYLE, CSS_PROP__KHTML_MARQUEE_SPEED }; + case CSS_PROP__TDEHTML_MARQUEE: { + const int properties[5] = { CSS_PROP__TDEHTML_MARQUEE_DIRECTION, CSS_PROP__TDEHTML_MARQUEE_INCREMENT, + CSS_PROP__TDEHTML_MARQUEE_REPETITION, + CSS_PROP__TDEHTML_MARQUEE_STYLE, CSS_PROP__TDEHTML_MARQUEE_SPEED }; return parseShortHand(propId, properties, 5, important); } - case CSS_PROP__KHTML_MARQUEE_DIRECTION: + case CSS_PROP__TDEHTML_MARQUEE_DIRECTION: if (id == CSS_VAL_FORWARDS || id == CSS_VAL_BACKWARDS || id == CSS_VAL_AHEAD || id == CSS_VAL_REVERSE || id == CSS_VAL_LEFT || id == CSS_VAL_RIGHT || id == CSS_VAL_DOWN || id == CSS_VAL_UP || id == CSS_VAL_AUTO) valid_primitive = true; break; - case CSS_PROP__KHTML_MARQUEE_INCREMENT: + case CSS_PROP__TDEHTML_MARQUEE_INCREMENT: if (id == CSS_VAL_SMALL || id == CSS_VAL_LARGE || id == CSS_VAL_MEDIUM) valid_primitive = true; else valid_primitive = validUnit(value, FLength|FPercent, strict&(!nonCSSHint)); break; - case CSS_PROP__KHTML_MARQUEE_STYLE: + case CSS_PROP__TDEHTML_MARQUEE_STYLE: if (id == CSS_VAL_NONE || id == CSS_VAL_SLIDE || id == CSS_VAL_SCROLL || id == CSS_VAL_ALTERNATE || id == CSS_VAL_UNFURL) valid_primitive = true; break; - case CSS_PROP__KHTML_MARQUEE_REPETITION: + case CSS_PROP__TDEHTML_MARQUEE_REPETITION: if (id == CSS_VAL_INFINITE) valid_primitive = true; else valid_primitive = validUnit(value, FInteger|FNonNeg, strict&(!nonCSSHint)); break; - case CSS_PROP__KHTML_MARQUEE_SPEED: + case CSS_PROP__TDEHTML_MARQUEE_SPEED: if (id == CSS_VAL_NORMAL || id == CSS_VAL_SLOW || id == CSS_VAL_FAST) valid_primitive = true; else @@ -1137,11 +1137,11 @@ bool CSSParser::parseBackgroundShorthand(bool important) { // Position must come before color in this array because a plain old "0" is a legal color // in quirks mode but it's usually the X coordinate of a position. - // FIXME: Add CSS_PROP__KHTML_BACKGROUND_SIZE to the shorthand. + // FIXME: Add CSS_PROP__TDEHTML_BACKGROUND_SIZE to the shorthand. const int numProperties = 7; const int properties[numProperties] = { CSS_PROP_BACKGROUND_IMAGE, CSS_PROP_BACKGROUND_REPEAT, - CSS_PROP_BACKGROUND_ATTACHMENT, CSS_PROP_BACKGROUND_POSITION, CSS_PROP__KHTML_BACKGROUND_CLIP, - CSS_PROP__KHTML_BACKGROUND_ORIGIN, CSS_PROP_BACKGROUND_COLOR }; + CSS_PROP_BACKGROUND_ATTACHMENT, CSS_PROP_BACKGROUND_POSITION, CSS_PROP__TDEHTML_BACKGROUND_CLIP, + CSS_PROP__TDEHTML_BACKGROUND_ORIGIN, CSS_PROP_BACKGROUND_COLOR }; ShorthandScope scope(this, CSS_PROP_BACKGROUND); @@ -1427,7 +1427,7 @@ CSSValueImpl* CSSParser::parseCounterContent(ValueList *args, bool counters) if (i->unit != Value::Operator || i->iValue != ',') goto invalid; i = args->next(); if (i->unit != CSSPrimitiveValue::CSS_IDENT) goto invalid; - if (i->id < CSS_VAL_DISC || i->id > CSS_VAL__KHTML_CLOSE_QUOTE) goto invalid; + if (i->id < CSS_VAL_DISC || i->id > CSS_VAL__TDEHTML_CLOSE_QUOTE) goto invalid; counter->m_listStyle = i->id - CSS_VAL_DISC; } return new CSSPrimitiveValueImpl(counter); @@ -1439,9 +1439,9 @@ invalid: CSSValueImpl* CSSParser::parseBackgroundColor() { int id = valueList->current()->id; - if (id == CSS_VAL__KHTML_TEXT || id == CSS_VAL_TRANSPARENT || + if (id == CSS_VAL__TDEHTML_TEXT || id == CSS_VAL_TRANSPARENT || (id >= CSS_VAL_AQUA && id <= CSS_VAL_WINDOWTEXT) || id == CSS_VAL_MENU || - (id >= CSS_VAL_GREY && id < CSS_VAL__KHTML_TEXT && !strict)) + (id >= CSS_VAL_GREY && id < CSS_VAL__TDEHTML_TEXT && !strict)) return new CSSPrimitiveValueImpl(id); return parseColor(); } @@ -1615,8 +1615,8 @@ bool CSSParser::parseBackgroundProperty(int propId, int& propId1, int& propId2, if (currValue) valueList->next(); break; - case CSS_PROP__KHTML_BACKGROUND_CLIP: - case CSS_PROP__KHTML_BACKGROUND_ORIGIN: + case CSS_PROP__TDEHTML_BACKGROUND_CLIP: + case CSS_PROP__TDEHTML_BACKGROUND_ORIGIN: if (val->id == CSS_VAL_BORDER || val->id == CSS_VAL_PADDING || val->id == CSS_VAL_CONTENT) { currValue = new CSSPrimitiveValueImpl(val->id); valueList->next(); @@ -1646,7 +1646,7 @@ bool CSSParser::parseBackgroundProperty(int propId, int& propId1, int& propId2, valueList->next(); } break; - case CSS_PROP__KHTML_BACKGROUND_SIZE: + case CSS_PROP__TDEHTML_BACKGROUND_SIZE: currValue = parseBackgroundSize(); if (currValue) valueList->next(); @@ -2268,7 +2268,7 @@ bool CSSParser::parseShadow(int propId, bool important) // The only other type of value that's ok is a color value. CSSPrimitiveValueImpl* parsedColor = 0; bool isColor = (val->id >= CSS_VAL_AQUA && val->id <= CSS_VAL_WINDOWTEXT || val->id == CSS_VAL_MENU || - (val->id >= CSS_VAL_GREY && val->id <= CSS_VAL__KHTML_TEXT && !strict)); + (val->id >= CSS_VAL_GREY && val->id <= CSS_VAL__TDEHTML_TEXT && !strict)); if (!context.allowColor) return context.failed(); diff --git a/tdehtml/css/cssproperties.c b/tdehtml/css/cssproperties.c index da5208412..384982aba 100644 --- a/tdehtml/css/cssproperties.c +++ b/tdehtml/css/cssproperties.c @@ -295,7 +295,7 @@ findProp (register const char *str, register unsigned int len) #line 104 "cssproperties.gperf" {"text-indent", CSS_PROP_TEXT_INDENT}, #line 69 "cssproperties.gperf" - {"-tdehtml-margin-start", CSS_PROP__KHTML_MARGIN_START}, + {"-tdehtml-margin-start", CSS_PROP__TDEHTML_MARGIN_START}, #line 14 "cssproperties.gperf" {"background-color", CSS_PROP_BACKGROUND_COLOR}, #line 100 "cssproperties.gperf" @@ -305,7 +305,7 @@ findProp (register const char *str, register unsigned int len) #line 47 "cssproperties.gperf" {"counter-reset", CSS_PROP_COUNTER_RESET}, #line 93 "cssproperties.gperf" - {"-tdehtml-padding-start", CSS_PROP__KHTML_PADDING_START}, + {"-tdehtml-padding-start", CSS_PROP__TDEHTML_PADDING_START}, #line 15 "cssproperties.gperf" {"background-image", CSS_PROP_BACKGROUND_IMAGE}, #line 96 "cssproperties.gperf" @@ -319,11 +319,11 @@ findProp (register const char *str, register unsigned int len) #line 52 "cssproperties.gperf" {"float", CSS_PROP_FLOAT}, #line 21 "cssproperties.gperf" - {"-tdehtml-background-clip", CSS_PROP__KHTML_BACKGROUND_CLIP}, + {"-tdehtml-background-clip", CSS_PROP__TDEHTML_BACKGROUND_CLIP}, #line 70 "cssproperties.gperf" - {"-tdehtml-marquee", CSS_PROP__KHTML_MARQUEE}, + {"-tdehtml-marquee", CSS_PROP__TDEHTML_MARQUEE}, #line 27 "cssproperties.gperf" - {"-tdehtml-border-vertical-spacing", CSS_PROP__KHTML_BORDER_VERTICAL_SPACING}, + {"-tdehtml-border-vertical-spacing", CSS_PROP__TDEHTML_BORDER_VERTICAL_SPACING}, #line 46 "cssproperties.gperf" {"counter-increment", CSS_PROP_COUNTER_INCREMENT}, #line 128 "cssproperties.gperf" @@ -337,7 +337,7 @@ findProp (register const char *str, register unsigned int len) #line 31 "cssproperties.gperf" {"border-left-color", CSS_PROP_BORDER_LEFT_COLOR}, #line 22 "cssproperties.gperf" - {"-tdehtml-background-origin", CSS_PROP__KHTML_BACKGROUND_ORIGIN}, + {"-tdehtml-background-origin", CSS_PROP__TDEHTML_BACKGROUND_ORIGIN}, #line 17 "cssproperties.gperf" {"background-attachment", CSS_PROP_BACKGROUND_ATTACHMENT}, #line 126 "cssproperties.gperf" @@ -353,7 +353,7 @@ findProp (register const char *str, register unsigned int len) #line 68 "cssproperties.gperf" {"margin-left", CSS_PROP_MARGIN_LEFT}, #line 142 "cssproperties.gperf" - {"-tdehtml-user-input", CSS_PROP__KHTML_USER_INPUT}, + {"-tdehtml-user-input", CSS_PROP__TDEHTML_USER_INPUT}, #line 79 "cssproperties.gperf" {"min-width", CSS_PROP_MIN_WIDTH}, #line 127 "cssproperties.gperf" @@ -361,13 +361,13 @@ findProp (register const char *str, register unsigned int len) #line 92 "cssproperties.gperf" {"padding-left", CSS_PROP_PADDING_LEFT}, #line 71 "cssproperties.gperf" - {"-tdehtml-marquee-direction", CSS_PROP__KHTML_MARQUEE_DIRECTION}, + {"-tdehtml-marquee-direction", CSS_PROP__TDEHTML_MARQUEE_DIRECTION}, #line 73 "cssproperties.gperf" - {"-tdehtml-marquee-repetition", CSS_PROP__KHTML_MARQUEE_REPETITION}, + {"-tdehtml-marquee-repetition", CSS_PROP__TDEHTML_MARQUEE_REPETITION}, #line 95 "cssproperties.gperf" {"page-break-before", CSS_PROP_PAGE_BREAK_BEFORE}, #line 74 "cssproperties.gperf" - {"-tdehtml-marquee-speed", CSS_PROP__KHTML_MARQUEE_SPEED}, + {"-tdehtml-marquee-speed", CSS_PROP__TDEHTML_MARQUEE_SPEED}, #line 94 "cssproperties.gperf" {"page-break-after", CSS_PROP_PAGE_BREAK_AFTER}, #line 81 "cssproperties.gperf" @@ -383,7 +383,7 @@ findProp (register const char *str, register unsigned int len) #line 134 "cssproperties.gperf" {"scrollbar-face-color", CSS_PROP_SCROLLBAR_FACE_COLOR}, #line 72 "cssproperties.gperf" - {"-tdehtml-marquee-increment", CSS_PROP__KHTML_MARQUEE_INCREMENT}, + {"-tdehtml-marquee-increment", CSS_PROP__TDEHTML_MARQUEE_INCREMENT}, #line 116 "cssproperties.gperf" {"word-spacing", CSS_PROP_WORD_SPACING}, #line 111 "cssproperties.gperf" @@ -405,13 +405,13 @@ findProp (register const char *str, register unsigned int len) #line 32 "cssproperties.gperf" {"border-top-style", CSS_PROP_BORDER_TOP_STYLE}, #line 26 "cssproperties.gperf" - {"-tdehtml-border-horizontal-spacing", CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING}, + {"-tdehtml-border-horizontal-spacing", CSS_PROP__TDEHTML_BORDER_HORIZONTAL_SPACING}, #line 33 "cssproperties.gperf" {"border-right-style", CSS_PROP_BORDER_RIGHT_STYLE}, #line 34 "cssproperties.gperf" {"border-bottom-style", CSS_PROP_BORDER_BOTTOM_STYLE}, #line 23 "cssproperties.gperf" - {"-tdehtml-background-size", CSS_PROP__KHTML_BACKGROUND_SIZE}, + {"-tdehtml-background-size", CSS_PROP__TDEHTML_BACKGROUND_SIZE}, #line 135 "cssproperties.gperf" {"scrollbar-shadow-color", CSS_PROP_SCROLLBAR_SHADOW_COLOR}, #line 129 "cssproperties.gperf" @@ -435,7 +435,7 @@ findProp (register const char *str, register unsigned int len) #line 84 "cssproperties.gperf" {"outline-style", CSS_PROP_OUTLINE_STYLE}, #line 141 "cssproperties.gperf" - {"-tdehtml-flow-mode", CSS_PROP__KHTML_FLOW_MODE}, + {"-tdehtml-flow-mode", CSS_PROP__TDEHTML_FLOW_MODE}, #line 87 "cssproperties.gperf" {"overflow-x", CSS_PROP_OVERFLOW_X}, #line 113 "cssproperties.gperf" @@ -449,7 +449,7 @@ findProp (register const char *str, register unsigned int len) #line 83 "cssproperties.gperf" {"outline-offset", CSS_PROP_OUTLINE_OFFSET}, #line 75 "cssproperties.gperf" - {"-tdehtml-marquee-style", CSS_PROP__KHTML_MARQUEE_STYLE}, + {"-tdehtml-marquee-style", CSS_PROP__TDEHTML_MARQUEE_STYLE}, #line 55 "cssproperties.gperf" {"font-style", CSS_PROP_FONT_STYLE}, #line 35 "cssproperties.gperf" diff --git a/tdehtml/css/cssproperties.h b/tdehtml/css/cssproperties.h index be92d93d4..c06431c62 100644 --- a/tdehtml/css/cssproperties.h +++ b/tdehtml/css/cssproperties.h @@ -15,13 +15,13 @@ DOM::DOMString getPropertyName(unsigned short id) KDE_NO_EXPORT; #define CSS_PROP_BACKGROUND_POSITION 5 #define CSS_PROP_BACKGROUND_POSITION_X 6 #define CSS_PROP_BACKGROUND_POSITION_Y 7 -#define CSS_PROP__KHTML_BACKGROUND_CLIP 8 -#define CSS_PROP__KHTML_BACKGROUND_ORIGIN 9 -#define CSS_PROP__KHTML_BACKGROUND_SIZE 10 +#define CSS_PROP__TDEHTML_BACKGROUND_CLIP 8 +#define CSS_PROP__TDEHTML_BACKGROUND_ORIGIN 9 +#define CSS_PROP__TDEHTML_BACKGROUND_SIZE 10 #define CSS_PROP_BORDER_COLLAPSE 11 #define CSS_PROP_BORDER_SPACING 12 -#define CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING 13 -#define CSS_PROP__KHTML_BORDER_VERTICAL_SPACING 14 +#define CSS_PROP__TDEHTML_BORDER_HORIZONTAL_SPACING 13 +#define CSS_PROP__TDEHTML_BORDER_VERTICAL_SPACING 14 #define CSS_PROP_BORDER_TOP_COLOR 15 #define CSS_PROP_BORDER_RIGHT_COLOR 16 #define CSS_PROP_BORDER_BOTTOM_COLOR 17 @@ -63,13 +63,13 @@ DOM::DOMString getPropertyName(unsigned short id) KDE_NO_EXPORT; #define CSS_PROP_MARGIN_RIGHT 53 #define CSS_PROP_MARGIN_BOTTOM 54 #define CSS_PROP_MARGIN_LEFT 55 -#define CSS_PROP__KHTML_MARGIN_START 56 -#define CSS_PROP__KHTML_MARQUEE 57 -#define CSS_PROP__KHTML_MARQUEE_DIRECTION 58 -#define CSS_PROP__KHTML_MARQUEE_INCREMENT 59 -#define CSS_PROP__KHTML_MARQUEE_REPETITION 60 -#define CSS_PROP__KHTML_MARQUEE_SPEED 61 -#define CSS_PROP__KHTML_MARQUEE_STYLE 62 +#define CSS_PROP__TDEHTML_MARGIN_START 56 +#define CSS_PROP__TDEHTML_MARQUEE 57 +#define CSS_PROP__TDEHTML_MARQUEE_DIRECTION 58 +#define CSS_PROP__TDEHTML_MARQUEE_INCREMENT 59 +#define CSS_PROP__TDEHTML_MARQUEE_REPETITION 60 +#define CSS_PROP__TDEHTML_MARQUEE_SPEED 61 +#define CSS_PROP__TDEHTML_MARQUEE_STYLE 62 #define CSS_PROP_MAX_HEIGHT 63 #define CSS_PROP_MAX_WIDTH 64 #define CSS_PROP_MIN_HEIGHT 65 @@ -87,7 +87,7 @@ DOM::DOMString getPropertyName(unsigned short id) KDE_NO_EXPORT; #define CSS_PROP_PADDING_RIGHT 77 #define CSS_PROP_PADDING_BOTTOM 78 #define CSS_PROP_PADDING_LEFT 79 -#define CSS_PROP__KHTML_PADDING_START 80 +#define CSS_PROP__TDEHTML_PADDING_START 80 #define CSS_PROP_PAGE_BREAK_AFTER 81 #define CSS_PROP_PAGE_BREAK_BEFORE 82 #define CSS_PROP_PAGE_BREAK_INSIDE 83 @@ -135,8 +135,8 @@ DOM::DOMString getPropertyName(unsigned short id) KDE_NO_EXPORT; #define CSS_PROP_SCROLLBAR_DARKSHADOW_COLOR 125 #define CSS_PROP_SCROLLBAR_TRACK_COLOR 126 #define CSS_PROP_SCROLLBAR_ARROW_COLOR 127 -#define CSS_PROP__KHTML_FLOW_MODE 128 -#define CSS_PROP__KHTML_USER_INPUT 129 +#define CSS_PROP__TDEHTML_FLOW_MODE 128 +#define CSS_PROP__TDEHTML_USER_INPUT 129 #define CSS_PROP_MAX CSS_PROP_Z_INDEX #define CSS_PROP_TOTAL 130 diff --git a/tdehtml/css/cssstyleselector.cpp b/tdehtml/css/cssstyleselector.cpp index 04b66e40a..2a1fb5477 100644 --- a/tdehtml/css/cssstyleselector.cpp +++ b/tdehtml/css/cssstyleselector.cpp @@ -211,7 +211,7 @@ static PseudoState pseudoState; CSSStyleSelector::CSSStyleSelector( DocumentImpl* doc, TQString userStyleSheet, StyleSheetListImpl *styleSheets, const KURL &url, bool _strictParsing ) { - KHTMLView* view = doc->view(); + TDEHTMLView* view = doc->view(); init(view ? view->part()->settings() : 0, doc); @@ -273,14 +273,14 @@ CSSStyleSelector::CSSStyleSelector( CSSStyleSheetImpl *sheet ) { init(0L, 0L); - KHTMLView *view = sheet->doc()->view(); + TDEHTMLView *view = sheet->doc()->view(); m_medium = view ? view->mediaType() : "screen"; authorStyle = new CSSStyleSelectorList(); authorStyle->append( sheet, m_medium ); } -void CSSStyleSelector::init(const KHTMLSettings* _settings, DocumentImpl* doc) +void CSSStyleSelector::init(const TDEHTMLSettings* _settings, DocumentImpl* doc) { element = 0; settings = _settings; @@ -308,12 +308,12 @@ CSSStyleSelector::~CSSStyleSelector() void CSSStyleSelector::addSheet( CSSStyleSheetImpl *sheet ) { - KHTMLView *view = sheet->doc()->view(); + TDEHTMLView *view = sheet->doc()->view(); m_medium = view ? view->mediaType() : "screen"; authorStyle->append( sheet, m_medium ); } -void CSSStyleSelector::loadDefaultStyle(const KHTMLSettings *s, DocumentImpl *doc) +void CSSStyleSelector::loadDefaultStyle(const TDEHTMLSettings *s, DocumentImpl *doc) { if(s_defaultStyle) return; @@ -883,9 +883,9 @@ static PseudoState checkPseudoState( const CSSStyleSelector::Encodedurl& encoded cleanpath( u ); } //completeURL( attr.string() ); - bool contains = KHTMLFactory::vLinks()->contains( u ); + bool contains = TDEHTMLFactory::vLinks()->contains( u ); if ( !contains && u.contains('/')==2 ) - contains = KHTMLFactory::vLinks()->contains( u+'/' ); + contains = TDEHTMLFactory::vLinks()->contains( u+'/' ); return contains ? PseudoVisited : PseudoLink; } @@ -2136,9 +2136,9 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value ) (!parentNode && value->cssValueType() == CSSValue::CSS_INHERIT); // These properties are used to set the correct margins/padding on RTL lists. - if (id == CSS_PROP__KHTML_MARGIN_START) + if (id == CSS_PROP__TDEHTML_MARGIN_START) id = style->direction() == LTR ? CSS_PROP_MARGIN_LEFT : CSS_PROP_MARGIN_RIGHT; - else if (id == CSS_PROP__KHTML_PADDING_START) + else if (id == CSS_PROP__TDEHTML_PADDING_START) id = style->direction() == LTR ? CSS_PROP_PADDING_LEFT : CSS_PROP_PADDING_RIGHT; // What follows is a list that maps the CSS properties into their corresponding front-end @@ -2150,16 +2150,16 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value ) case CSS_PROP_BACKGROUND_ATTACHMENT: HANDLE_BACKGROUND_VALUE(backgroundAttachment, BackgroundAttachment, value) break; - case CSS_PROP__KHTML_BACKGROUND_CLIP: + case CSS_PROP__TDEHTML_BACKGROUND_CLIP: HANDLE_BACKGROUND_VALUE(backgroundClip, BackgroundClip, value) break; - case CSS_PROP__KHTML_BACKGROUND_ORIGIN: + case CSS_PROP__TDEHTML_BACKGROUND_ORIGIN: HANDLE_BACKGROUND_VALUE(backgroundOrigin, BackgroundOrigin, value) break; case CSS_PROP_BACKGROUND_REPEAT: HANDLE_BACKGROUND_VALUE(backgroundRepeat, BackgroundRepeat, value) break; - case CSS_PROP__KHTML_BACKGROUND_SIZE: + case CSS_PROP__TDEHTML_BACKGROUND_SIZE: HANDLE_BACKGROUND_VALUE(backgroundSize, BackgroundSize, value) break; case CSS_PROP_BORDER_COLLAPSE: @@ -2181,27 +2181,27 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value ) case CSS_PROP_BORDER_TOP_STYLE: HANDLE_INHERIT_AND_INITIAL_WITH_VALUE(borderTopStyle, BorderTopStyle, BorderStyle) if (!primitiveValue) return; - style->setBorderTopStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__KHTML_NATIVE)); + style->setBorderTopStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__TDEHTML_NATIVE)); break; case CSS_PROP_BORDER_RIGHT_STYLE: HANDLE_INHERIT_AND_INITIAL_WITH_VALUE(borderRightStyle, BorderRightStyle, BorderStyle) if (!primitiveValue) return; - style->setBorderRightStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__KHTML_NATIVE)); + style->setBorderRightStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__TDEHTML_NATIVE)); break; case CSS_PROP_BORDER_BOTTOM_STYLE: HANDLE_INHERIT_AND_INITIAL_WITH_VALUE(borderBottomStyle, BorderBottomStyle, BorderStyle) if (!primitiveValue) return; - style->setBorderBottomStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__KHTML_NATIVE)); + style->setBorderBottomStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__TDEHTML_NATIVE)); break; case CSS_PROP_BORDER_LEFT_STYLE: HANDLE_INHERIT_AND_INITIAL_WITH_VALUE(borderLeftStyle, BorderLeftStyle, BorderStyle) if (!primitiveValue) return; - style->setBorderLeftStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__KHTML_NATIVE)); + style->setBorderLeftStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__TDEHTML_NATIVE)); break; case CSS_PROP_OUTLINE_STYLE: HANDLE_INHERIT_AND_INITIAL_WITH_VALUE(outlineStyle, OutlineStyle, BorderStyle) if (!primitiveValue) return; - style->setOutlineStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__KHTML_NATIVE)); + style->setOutlineStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__TDEHTML_NATIVE)); break; case CSS_PROP_CAPTION_SIDE: { @@ -2279,11 +2279,11 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value ) EFloat f; switch(primitiveValue->getIdent()) { - case CSS_VAL__KHTML_LEFT: + case CSS_VAL__TDEHTML_LEFT: f = FLEFT_ALIGN; break; case CSS_VAL_LEFT: f = FLEFT; break; - case CSS_VAL__KHTML_RIGHT: + case CSS_VAL__TDEHTML_RIGHT: f = FRIGHT_ALIGN; break; case CSS_VAL_RIGHT: f = FRIGHT; break; @@ -2659,8 +2659,8 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value ) EWhiteSpace s; switch(primitiveValue->getIdent()) { - case CSS_VAL__KHTML_NOWRAP: - s = KHTML_NOWRAP; + case CSS_VAL__TDEHTML_NOWRAP: + s = TDEHTML_NOWRAP; break; case CSS_VAL_NOWRAP: s = NOWRAP; @@ -2700,14 +2700,14 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value ) style->setBorderVerticalSpacing(parentStyle->borderVerticalSpacing()); break; } - case CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING: { + case CSS_PROP__TDEHTML_BORDER_HORIZONTAL_SPACING: { HANDLE_INHERIT_AND_INITIAL(borderHorizontalSpacing, BorderHorizontalSpacing) if (!primitiveValue) break; short spacing = primitiveValue->computeLength(style, paintDeviceMetrics); style->setBorderHorizontalSpacing(spacing); break; } - case CSS_PROP__KHTML_BORDER_VERTICAL_SPACING: { + case CSS_PROP__TDEHTML_BORDER_VERTICAL_SPACING: { HANDLE_INHERIT_AND_INITIAL(borderVerticalSpacing, BorderVerticalSpacing) if (!primitiveValue) break; short spacing = primitiveValue->computeLength(style, paintDeviceMetrics); @@ -2759,7 +2759,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value ) return; int ident = primitiveValue->getIdent(); if ( ident ) { - if ( ident == CSS_VAL__KHTML_TEXT ) + if ( ident == CSS_VAL__TDEHTML_TEXT ) col = element->getDocument()->textColor(); // ### should be eliminated else if ( ident == CSS_VAL_TRANSPARENT @@ -3152,7 +3152,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value ) align = SUB; break; case CSS_VAL_SUPER: align = SUPER; break; - case CSS_VAL__KHTML_BASELINE_MIDDLE: + case CSS_VAL__TDEHTML_BASELINE_MIDDLE: align = BASELINE_MIDDLE; break; default: return; @@ -3210,7 +3210,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value ) case CSS_VAL_LARGE: size = int( fontSizes[4] ); break; case CSS_VAL_X_LARGE: size = int( fontSizes[5] ); break; case CSS_VAL_XX_LARGE: size = int( fontSizes[6] ); break; - case CSS_VAL__KHTML_XXX_LARGE: size = int( fontSizes[7] ); break; + case CSS_VAL__TDEHTML_XXX_LARGE: size = int( fontSizes[7] ); break; case CSS_VAL_LARGER: size = nextFontSize(fontSizes, oldSize, false); break; @@ -3326,7 +3326,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value ) HANDLE_INHERIT_AND_INITIAL(textAlign, TextAlign) if (!primitiveValue) return; if (primitiveValue->getIdent()) - style->setTextAlign( (ETextAlign) (primitiveValue->getIdent() - CSS_VAL__KHTML_AUTO) ); + style->setTextAlign( (ETextAlign) (primitiveValue->getIdent() - CSS_VAL__TDEHTML_AUTO) ); return; } @@ -3581,15 +3581,15 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value ) style->setTextDecoration(t); break; } - case CSS_PROP__KHTML_FLOW_MODE: + case CSS_PROP__TDEHTML_FLOW_MODE: HANDLE_INHERIT_AND_INITIAL(flowAroundFloats, FlowAroundFloats) if (!primitiveValue) return; if (primitiveValue->getIdent()) { - style->setFlowAroundFloats( primitiveValue->getIdent() == CSS_VAL__KHTML_AROUND_FLOATS ); + style->setFlowAroundFloats( primitiveValue->getIdent() == CSS_VAL__TDEHTML_AROUND_FLOATS ); return; } break; - case CSS_PROP__KHTML_USER_INPUT: { + case CSS_PROP__TDEHTML_USER_INPUT: { if(value->cssValueType() == CSSValue::CSS_INHERIT) { if(!parentNode) return; @@ -3843,7 +3843,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value ) // Clamp opacity to the range 0-1 style->setOpacity(kMin(1.0f, kMax(0.0f, (float)primitiveValue->floatValue(CSSPrimitiveValue::CSS_NUMBER)))); break; - case CSS_PROP__KHTML_MARQUEE: + case CSS_PROP__TDEHTML_MARQUEE: if (value->cssValueType() != CSSValue::CSS_INHERIT || !parentNode) return; style->setMarqueeDirection(parentStyle->marqueeDirection()); style->setMarqueeIncrement(parentStyle->marqueeIncrement()); @@ -3851,7 +3851,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value ) style->setMarqueeLoopCount(parentStyle->marqueeLoopCount()); style->setMarqueeBehavior(parentStyle->marqueeBehavior()); break; - case CSS_PROP__KHTML_MARQUEE_REPETITION: { + case CSS_PROP__TDEHTML_MARQUEE_REPETITION: { HANDLE_INHERIT_AND_INITIAL(marqueeLoopCount, MarqueeLoopCount) if (!primitiveValue) return; if (primitiveValue->getIdent() == CSS_VAL_INFINITE) @@ -3860,7 +3860,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value ) style->setMarqueeLoopCount((int)(primitiveValue->floatValue(CSSPrimitiveValue::CSS_NUMBER))); break; } - case CSS_PROP__KHTML_MARQUEE_SPEED: { + case CSS_PROP__TDEHTML_MARQUEE_SPEED: { HANDLE_INHERIT_AND_INITIAL(marqueeSpeed, MarqueeSpeed) if (!primitiveValue) return; if (primitiveValue->getIdent()) { @@ -3885,7 +3885,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value ) style->setMarqueeSpeed(int(primitiveValue->floatValue(CSSPrimitiveValue::CSS_NUMBER))); break; } - case CSS_PROP__KHTML_MARQUEE_INCREMENT: { + case CSS_PROP__TDEHTML_MARQUEE_INCREMENT: { HANDLE_INHERIT_AND_INITIAL(marqueeIncrement, MarqueeIncrement) if (!primitiveValue) return; if (primitiveValue->getIdent()) { @@ -3910,7 +3910,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value ) } break; } - case CSS_PROP__KHTML_MARQUEE_STYLE: { + case CSS_PROP__TDEHTML_MARQUEE_STYLE: { HANDLE_INHERIT_AND_INITIAL(marqueeBehavior, MarqueeBehavior) if (!primitiveValue || !primitiveValue->getIdent()) return; switch (primitiveValue->getIdent()) @@ -3933,7 +3933,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value ) } break; } - case CSS_PROP__KHTML_MARQUEE_DIRECTION: { + case CSS_PROP__TDEHTML_MARQUEE_DIRECTION: { HANDLE_INHERIT_AND_INITIAL(marqueeDirection, MarqueeDirection) if (!primitiveValue || !primitiveValue->getIdent()) return; switch (primitiveValue->getIdent()) diff --git a/tdehtml/css/cssstyleselector.h b/tdehtml/css/cssstyleselector.h index ad6903de7..f826c0323 100644 --- a/tdehtml/css/cssstyleselector.h +++ b/tdehtml/css/cssstyleselector.h @@ -30,10 +30,10 @@ #include "dom/dom_string.h" #include "xml/dom_restyler.h" -class KHTMLSettings; -class KHTMLView; -class KHTMLPart; -class KHTMLFactory; +class TDEHTMLSettings; +class TDEHTMLView; +class TDEHTMLPart; +class TDEHTMLFactory; class KURL; namespace DOM { @@ -127,7 +127,7 @@ namespace tdehtml KDE_EXPORT static void clear(); static void reparseConfiguration(); - static void loadDefaultStyle(const KHTMLSettings *s, DOM::DocumentImpl *doc); + static void loadDefaultStyle(const TDEHTMLSettings *s, DOM::DocumentImpl *doc); RenderStyle *styleForElement(DOM::ElementImpl *e); @@ -189,7 +189,7 @@ namespace tdehtml public: private: - void init(const KHTMLSettings* settings, DOM::DocumentImpl* doc); + void init(const TDEHTMLSettings* settings, DOM::DocumentImpl* doc); void mapBackgroundAttachment(BackgroundLayer* layer, DOM::CSSValueImpl* value); void mapBackgroundClip(BackgroundLayer* layer, DOM::CSSValueImpl* value); @@ -246,9 +246,9 @@ public: RenderStyle *parentStyle; DOM::ElementImpl *element; DOM::NodeImpl *parentNode; - KHTMLView *view; - KHTMLPart *part; - const KHTMLSettings *settings; + TDEHTMLView *view; + TDEHTMLPart *part; + const TDEHTMLSettings *settings; TQPaintDeviceMetrics *paintDeviceMetrics; TQValueVector<int> m_fontSizes; TQValueVector<int> m_fixedFontSizes; diff --git a/tdehtml/css/cssvalues.c b/tdehtml/css/cssvalues.c index 28ceede3d..1cd8075e8 100644 --- a/tdehtml/css/cssvalues.c +++ b/tdehtml/css/cssvalues.c @@ -597,9 +597,9 @@ findValue (register const char *str, register unsigned int len) #line 35 "cssvalues.gperf" {"small-caps", CSS_VAL_SMALL_CAPS}, #line 122 "cssvalues.gperf" - {"-tdehtml-text", CSS_VAL__KHTML_TEXT}, + {"-tdehtml-text", CSS_VAL__TDEHTML_TEXT}, #line 141 "cssvalues.gperf" - {"-tdehtml-left", CSS_VAL__KHTML_LEFT}, + {"-tdehtml-left", CSS_VAL__TDEHTML_LEFT}, #line 97 "cssvalues.gperf" {"background", CSS_VAL_BACKGROUND}, #line 178 "cssvalues.gperf" @@ -615,9 +615,9 @@ findValue (register const char *str, register unsigned int len) #line 198 "cssvalues.gperf" {"table-caption", CSS_VAL_TABLE_CAPTION}, #line 154 "cssvalues.gperf" - {"-tdehtml-lao", CSS_VAL__KHTML_LAO}, + {"-tdehtml-lao", CSS_VAL__TDEHTML_LAO}, #line 143 "cssvalues.gperf" - {"-tdehtml-center", CSS_VAL__KHTML_CENTER}, + {"-tdehtml-center", CSS_VAL__TDEHTML_CENTER}, #line 54 "cssvalues.gperf" {"x-large", CSS_VAL_X_LARGE}, #line 30 "cssvalues.gperf" @@ -625,29 +625,29 @@ findValue (register const char *str, register unsigned int len) #line 203 "cssvalues.gperf" {"progress", CSS_VAL_PROGRESS}, #line 16 "cssvalues.gperf" - {"-tdehtml-native", CSS_VAL__KHTML_NATIVE}, + {"-tdehtml-native", CSS_VAL__TDEHTML_NATIVE}, #line 177 "cssvalues.gperf" {"hiragana", CSS_VAL_HIRAGANA}, #line 171 "cssvalues.gperf" {"lower-greek", CSS_VAL_LOWER_GREEK}, #line 150 "cssvalues.gperf" - {"-tdehtml-diamond", CSS_VAL__KHTML_DIAMOND}, + {"-tdehtml-diamond", CSS_VAL__TDEHTML_DIAMOND}, #line 224 "cssvalues.gperf" {"no-close-quote", CSS_VAL_NO_CLOSE_QUOTE}, #line 61 "cssvalues.gperf" {"ultra-condensed", CSS_VAL_ULTRA_CONDENSED}, #line 158 "cssvalues.gperf" - {"-tdehtml-tibetan", CSS_VAL__KHTML_TIBETAN}, + {"-tdehtml-tibetan", CSS_VAL__TDEHTML_TIBETAN}, #line 124 "cssvalues.gperf" {"repeat-x", CSS_VAL_REPEAT_X}, #line 266 "cssvalues.gperf" - {"-tdehtml-normal", CSS_VAL__KHTML_NORMAL}, + {"-tdehtml-normal", CSS_VAL__TDEHTML_NORMAL}, #line 113 "cssvalues.gperf" {"threeddarkshadow", CSS_VAL_THREEDDARKSHADOW}, #line 219 "cssvalues.gperf" {"uppercase", CSS_VAL_UPPERCASE}, #line 136 "cssvalues.gperf" - {"-tdehtml-auto", CSS_VAL__KHTML_AUTO}, + {"-tdehtml-auto", CSS_VAL__TDEHTML_AUTO}, #line 163 "cssvalues.gperf" {"georgian", CSS_VAL_GEORGIAN}, #line 229 "cssvalues.gperf" @@ -657,13 +657,13 @@ findValue (register const char *str, register unsigned int len) #line 109 "cssvalues.gperf" {"infobackground", CSS_VAL_INFOBACKGROUND}, #line 157 "cssvalues.gperf" - {"-tdehtml-thai", CSS_VAL__KHTML_THAI}, + {"-tdehtml-thai", CSS_VAL__TDEHTML_THAI}, #line 226 "cssvalues.gperf" {"open-quote", CSS_VAL_OPEN_QUOTE}, #line 173 "cssvalues.gperf" {"lower-alpha", CSS_VAL_LOWER_ALPHA}, #line 156 "cssvalues.gperf" - {"-tdehtml-urdu", CSS_VAL__KHTML_URDU}, + {"-tdehtml-urdu", CSS_VAL__TDEHTML_URDU}, #line 223 "cssvalues.gperf" {"close-quote", CSS_VAL_CLOSE_QUOTE}, #line 104 "cssvalues.gperf" @@ -671,13 +671,13 @@ findValue (register const char *str, register unsigned int len) #line 225 "cssvalues.gperf" {"no-open-quote", CSS_VAL_NO_OPEN_QUOTE}, #line 231 "cssvalues.gperf" - {"-tdehtml-nowrap", CSS_VAL__KHTML_NOWRAP}, + {"-tdehtml-nowrap", CSS_VAL__TDEHTML_NOWRAP}, #line 67 "cssvalues.gperf" {"extra-expanded", CSS_VAL_EXTRA_EXPANDED}, #line 105 "cssvalues.gperf" {"highlighttext", CSS_VAL_HIGHLIGHTTEXT}, #line 155 "cssvalues.gperf" - {"-tdehtml-persian", CSS_VAL__KHTML_PERSIAN}, + {"-tdehtml-persian", CSS_VAL__TDEHTML_PERSIAN}, #line 116 "cssvalues.gperf" {"threedlightshadow", CSS_VAL_THREEDLIGHTSHADOW}, #line 96 "cssvalues.gperf" @@ -691,13 +691,13 @@ findValue (register const char *str, register unsigned int len) #line 251 "cssvalues.gperf" {"line-through", CSS_VAL_LINE_THROUGH}, #line 142 "cssvalues.gperf" - {"-tdehtml-right", CSS_VAL__KHTML_RIGHT}, + {"-tdehtml-right", CSS_VAL__TDEHTML_RIGHT}, #line 160 "cssvalues.gperf" {"upper-roman", CSS_VAL_UPPER_ROMAN}, #line 135 "cssvalues.gperf" - {"-tdehtml-baseline-middle", CSS_VAL__KHTML_BASELINE_MIDDLE}, + {"-tdehtml-baseline-middle", CSS_VAL__TDEHTML_BASELINE_MIDDLE}, #line 153 "cssvalues.gperf" - {"-tdehtml-arabic-indic", CSS_VAL__KHTML_ARABIC_INDIC}, + {"-tdehtml-arabic-indic", CSS_VAL__TDEHTML_ARABIC_INDIC}, #line 152 "cssvalues.gperf" {"decimal-leading-zero", CSS_VAL_DECIMAL_LEADING_ZERO}, #line 115 "cssvalues.gperf" @@ -707,13 +707,13 @@ findValue (register const char *str, register unsigned int len) #line 99 "cssvalues.gperf" {"buttonhighlight", CSS_VAL_BUTTONHIGHLIGHT}, #line 56 "cssvalues.gperf" - {"-tdehtml-xxx-large", CSS_VAL__KHTML_XXX_LARGE}, + {"-tdehtml-xxx-large", CSS_VAL__TDEHTML_XXX_LARGE}, #line 267 "cssvalues.gperf" - {"-tdehtml-around-floats", CSS_VAL__KHTML_AROUND_FLOATS}, + {"-tdehtml-around-floats", CSS_VAL__TDEHTML_AROUND_FLOATS}, #line 191 "cssvalues.gperf" {"table-row-group", CSS_VAL_TABLE_ROW_GROUP}, #line 182 "cssvalues.gperf" - {"-tdehtml-close-quote", CSS_VAL__KHTML_CLOSE_QUOTE}, + {"-tdehtml-close-quote", CSS_VAL__TDEHTML_CLOSE_QUOTE}, #line 179 "cssvalues.gperf" {"hiragana-iroha", CSS_VAL_HIRAGANA_IROHA}, #line 193 "cssvalues.gperf" @@ -723,23 +723,23 @@ findValue (register const char *str, register unsigned int len) #line 175 "cssvalues.gperf" {"upper-alpha", CSS_VAL_UPPER_ALPHA}, #line 181 "cssvalues.gperf" - {"-tdehtml-open-quote", CSS_VAL__KHTML_OPEN_QUOTE}, + {"-tdehtml-open-quote", CSS_VAL__TDEHTML_OPEN_QUOTE}, #line 165 "cssvalues.gperf" - {"-tdehtml-japanese-formal", CSS_VAL__KHTML_JAPANESE_FORMAL}, + {"-tdehtml-japanese-formal", CSS_VAL__TDEHTML_JAPANESE_FORMAL}, #line 166 "cssvalues.gperf" - {"-tdehtml-japanese-informal", CSS_VAL__KHTML_JAPANESE_INFORMAL}, + {"-tdehtml-japanese-informal", CSS_VAL__TDEHTML_JAPANESE_INFORMAL}, #line 192 "cssvalues.gperf" {"table-header-group", CSS_VAL_TABLE_HEADER_GROUP}, #line 169 "cssvalues.gperf" - {"-tdehtml-trad-chinese-formal", CSS_VAL__KHTML_TRAD_CHINESE_FORMAL}, + {"-tdehtml-trad-chinese-formal", CSS_VAL__TDEHTML_TRAD_CHINESE_FORMAL}, #line 170 "cssvalues.gperf" - {"-tdehtml-trad-chinese-informal", CSS_VAL__KHTML_TRAD_CHINESE_INFORMAL}, + {"-tdehtml-trad-chinese-informal", CSS_VAL__TDEHTML_TRAD_CHINESE_INFORMAL}, #line 167 "cssvalues.gperf" - {"-tdehtml-simp-chinese-formal", CSS_VAL__KHTML_SIMP_CHINESE_FORMAL}, + {"-tdehtml-simp-chinese-formal", CSS_VAL__TDEHTML_SIMP_CHINESE_FORMAL}, #line 168 "cssvalues.gperf" - {"-tdehtml-simp-chinese-informal", CSS_VAL__KHTML_SIMP_CHINESE_INFORMAL}, + {"-tdehtml-simp-chinese-informal", CSS_VAL__TDEHTML_SIMP_CHINESE_INFORMAL}, #line 172 "cssvalues.gperf" - {"-tdehtml-upper-greek", CSS_VAL__KHTML_UPPER_GREEK} + {"-tdehtml-upper-greek", CSS_VAL__TDEHTML_UPPER_GREEK} }; static const short lookup[] = diff --git a/tdehtml/css/cssvalues.h b/tdehtml/css/cssvalues.h index 36a365754..12d606acc 100644 --- a/tdehtml/css/cssvalues.h +++ b/tdehtml/css/cssvalues.h @@ -11,7 +11,7 @@ DOM::DOMString getValueName(unsigned short id) KDE_NO_EXPORT; #define CSS_VAL_MIN 1 #define CSS_VAL_INHERIT 1 #define CSS_VAL_INITIAL 2 -#define CSS_VAL__KHTML_NATIVE 3 +#define CSS_VAL__TDEHTML_NATIVE 3 #define CSS_VAL_NONE 4 #define CSS_VAL_HIDDEN 5 #define CSS_VAL_INSET 6 @@ -51,7 +51,7 @@ DOM::DOMString getValueName(unsigned short id) KDE_NO_EXPORT; #define CSS_VAL_LARGE 40 #define CSS_VAL_X_LARGE 41 #define CSS_VAL_XX_LARGE 42 -#define CSS_VAL__KHTML_XXX_LARGE 43 +#define CSS_VAL__TDEHTML_XXX_LARGE 43 #define CSS_VAL_SMALLER 44 #define CSS_VAL_LARGER 45 #define CSS_VAL_WIDER 46 @@ -117,7 +117,7 @@ DOM::DOMString getValueName(unsigned short id) KDE_NO_EXPORT; #define CSS_VAL_WINDOWFRAME 106 #define CSS_VAL_WINDOWTEXT 107 #define CSS_VAL_GREY 108 -#define CSS_VAL__KHTML_TEXT 109 +#define CSS_VAL__TDEHTML_TEXT 109 #define CSS_VAL_REPEAT 110 #define CSS_VAL_REPEAT_X 111 #define CSS_VAL_REPEAT_Y 112 @@ -130,44 +130,44 @@ DOM::DOMString getValueName(unsigned short id) KDE_NO_EXPORT; #define CSS_VAL_TEXT_BOTTOM 119 #define CSS_VAL_TOP 120 #define CSS_VAL_BOTTOM 121 -#define CSS_VAL__KHTML_BASELINE_MIDDLE 122 -#define CSS_VAL__KHTML_AUTO 123 +#define CSS_VAL__TDEHTML_BASELINE_MIDDLE 122 +#define CSS_VAL__TDEHTML_AUTO 123 #define CSS_VAL_LEFT 124 #define CSS_VAL_RIGHT 125 #define CSS_VAL_CENTER 126 #define CSS_VAL_JUSTIFY 127 -#define CSS_VAL__KHTML_LEFT 128 -#define CSS_VAL__KHTML_RIGHT 129 -#define CSS_VAL__KHTML_CENTER 130 +#define CSS_VAL__TDEHTML_LEFT 128 +#define CSS_VAL__TDEHTML_RIGHT 129 +#define CSS_VAL__TDEHTML_CENTER 130 #define CSS_VAL_OUTSIDE 131 #define CSS_VAL_INSIDE 132 #define CSS_VAL_DISC 133 #define CSS_VAL_CIRCLE 134 #define CSS_VAL_SQUARE 135 #define CSS_VAL_BOX 136 -#define CSS_VAL__KHTML_DIAMOND 137 +#define CSS_VAL__TDEHTML_DIAMOND 137 #define CSS_VAL_DECIMAL 138 #define CSS_VAL_DECIMAL_LEADING_ZERO 139 -#define CSS_VAL__KHTML_ARABIC_INDIC 140 -#define CSS_VAL__KHTML_LAO 141 -#define CSS_VAL__KHTML_PERSIAN 142 -#define CSS_VAL__KHTML_URDU 143 -#define CSS_VAL__KHTML_THAI 144 -#define CSS_VAL__KHTML_TIBETAN 145 +#define CSS_VAL__TDEHTML_ARABIC_INDIC 140 +#define CSS_VAL__TDEHTML_LAO 141 +#define CSS_VAL__TDEHTML_PERSIAN 142 +#define CSS_VAL__TDEHTML_URDU 143 +#define CSS_VAL__TDEHTML_THAI 144 +#define CSS_VAL__TDEHTML_TIBETAN 145 #define CSS_VAL_LOWER_ROMAN 146 #define CSS_VAL_UPPER_ROMAN 147 #define CSS_VAL_HEBREW 148 #define CSS_VAL_ARMENIAN 149 #define CSS_VAL_GEORGIAN 150 #define CSS_VAL_CJK_IDEOGRAPHIC 151 -#define CSS_VAL__KHTML_JAPANESE_FORMAL 152 -#define CSS_VAL__KHTML_JAPANESE_INFORMAL 153 -#define CSS_VAL__KHTML_SIMP_CHINESE_FORMAL 154 -#define CSS_VAL__KHTML_SIMP_CHINESE_INFORMAL 155 -#define CSS_VAL__KHTML_TRAD_CHINESE_FORMAL 156 -#define CSS_VAL__KHTML_TRAD_CHINESE_INFORMAL 157 +#define CSS_VAL__TDEHTML_JAPANESE_FORMAL 152 +#define CSS_VAL__TDEHTML_JAPANESE_INFORMAL 153 +#define CSS_VAL__TDEHTML_SIMP_CHINESE_FORMAL 154 +#define CSS_VAL__TDEHTML_SIMP_CHINESE_INFORMAL 155 +#define CSS_VAL__TDEHTML_TRAD_CHINESE_FORMAL 156 +#define CSS_VAL__TDEHTML_TRAD_CHINESE_INFORMAL 157 #define CSS_VAL_LOWER_GREEK 158 -#define CSS_VAL__KHTML_UPPER_GREEK 159 +#define CSS_VAL__TDEHTML_UPPER_GREEK 159 #define CSS_VAL_LOWER_ALPHA 160 #define CSS_VAL_LOWER_LATIN 161 #define CSS_VAL_UPPER_ALPHA 162 @@ -176,8 +176,8 @@ DOM::DOMString getValueName(unsigned short id) KDE_NO_EXPORT; #define CSS_VAL_KATAKANA 165 #define CSS_VAL_HIRAGANA_IROHA 166 #define CSS_VAL_KATAKANA_IROHA 167 -#define CSS_VAL__KHTML_OPEN_QUOTE 168 -#define CSS_VAL__KHTML_CLOSE_QUOTE 169 +#define CSS_VAL__TDEHTML_OPEN_QUOTE 168 +#define CSS_VAL__TDEHTML_CLOSE_QUOTE 169 #define CSS_VAL_INLINE 170 #define CSS_VAL_BLOCK 171 #define CSS_VAL_LIST_ITEM 172 @@ -226,7 +226,7 @@ DOM::DOMString getValueName(unsigned short id) KDE_NO_EXPORT; #define CSS_VAL_PRE 215 #define CSS_VAL_PRE_WRAP 216 #define CSS_VAL_PRE_LINE 217 -#define CSS_VAL__KHTML_NOWRAP 218 +#define CSS_VAL__TDEHTML_NOWRAP 218 #define CSS_VAL_BREAK_WORD 219 #define CSS_VAL_ABOVE 220 #define CSS_VAL_ABSOLUTE 221 @@ -261,8 +261,8 @@ DOM::DOMString getValueName(unsigned short id) KDE_NO_EXPORT; #define CSS_VAL_THICK 250 #define CSS_VAL_THIN 251 #define CSS_VAL_UNDERLINE 252 -#define CSS_VAL__KHTML_NORMAL 253 -#define CSS_VAL__KHTML_AROUND_FLOATS 254 +#define CSS_VAL__TDEHTML_NORMAL 253 +#define CSS_VAL__TDEHTML_AROUND_FLOATS 254 #define CSS_VAL_BORDER_BOX 255 #define CSS_VAL_CONTENT_BOX 256 #define CSS_VAL_ENABLED 257 diff --git a/tdehtml/css/cssvalues.in b/tdehtml/css/cssvalues.in index b85d49f17..30ed44475 100644 --- a/tdehtml/css/cssvalues.in +++ b/tdehtml/css/cssvalues.in @@ -350,16 +350,16 @@ thick thin underline # -# CSS_PROP__KHTML_FLOW_MODE +# CSS_PROP__TDEHTML_FLOW_MODE -tdehtml-normal -tdehtml-around-floats # CSS3 Values -# CSS_PROP__KHTML_BOX_SIZING +# CSS_PROP__TDEHTML_BOX_SIZING border-box content-box -# CSS_PROP__KHTML_USER_INPUT +# CSS_PROP__TDEHTML_USER_INPUT enabled disabled #none diff --git a/tdehtml/css/parser.cpp b/tdehtml/css/parser.cpp index f88b7d002..3e8ee89fd 100644 --- a/tdehtml/css/parser.cpp +++ b/tdehtml/css/parser.cpp @@ -81,9 +81,9 @@ FONT_FACE_SYM = 273, CHARSET_SYM = 274, NAMESPACE_SYM = 275, - KHTML_RULE_SYM = 276, - KHTML_DECLS_SYM = 277, - KHTML_VALUE_SYM = 278, + TDEHTML_RULE_SYM = 276, + TDEHTML_DECLS_SYM = 277, + TDEHTML_VALUE_SYM = 278, IMPORTANT_SYM = 279, QEMS = 280, EMS = 281, @@ -129,9 +129,9 @@ #define FONT_FACE_SYM 273 #define CHARSET_SYM 274 #define NAMESPACE_SYM 275 -#define KHTML_RULE_SYM 276 -#define KHTML_DECLS_SYM 277 -#define KHTML_VALUE_SYM 278 +#define TDEHTML_RULE_SYM 276 +#define TDEHTML_DECLS_SYM 277 +#define TDEHTML_VALUE_SYM 278 #define IMPORTANT_SYM 279 #define QEMS 280 #define EMS 281 @@ -589,7 +589,7 @@ static const char *const yytname[] = "INCLUDES", "DASHMATCH", "BEGINSWITH", "ENDSWITH", "CONTAINS", "STRING", "IDENT", "NTH", "HASH", "':'", "'.'", "'['", "'*'", "'|'", "IMPORT_SYM", "PAGE_SYM", "MEDIA_SYM", "FONT_FACE_SYM", "CHARSET_SYM", "NAMESPACE_SYM", - "KHTML_RULE_SYM", "KHTML_DECLS_SYM", "KHTML_VALUE_SYM", "IMPORTANT_SYM", + "TDEHTML_RULE_SYM", "TDEHTML_DECLS_SYM", "TDEHTML_VALUE_SYM", "IMPORTANT_SYM", "QEMS", "EMS", "EXS", "PXS", "CMS", "MMS", "INS", "PTS", "PCS", "DEGS", "RADS", "GRADS", "MSECS", "SECS", "HERZ", "KHERZ", "DIMEN", "PERCENTAGE", "FLOAT", "INTEGER", "URI", "FUNCTION", "NOTFUNCTION", "UNICODERANGE", diff --git a/tdehtml/css/parser.h b/tdehtml/css/parser.h index e3375db66..2920fd9de 100644 --- a/tdehtml/css/parser.h +++ b/tdehtml/css/parser.h @@ -48,9 +48,9 @@ FONT_FACE_SYM = 273, CHARSET_SYM = 274, NAMESPACE_SYM = 275, - KHTML_RULE_SYM = 276, - KHTML_DECLS_SYM = 277, - KHTML_VALUE_SYM = 278, + TDEHTML_RULE_SYM = 276, + TDEHTML_DECLS_SYM = 277, + TDEHTML_VALUE_SYM = 278, IMPORTANT_SYM = 279, QEMS = 280, EMS = 281, @@ -96,9 +96,9 @@ #define FONT_FACE_SYM 273 #define CHARSET_SYM 274 #define NAMESPACE_SYM 275 -#define KHTML_RULE_SYM 276 -#define KHTML_DECLS_SYM 277 -#define KHTML_VALUE_SYM 278 +#define TDEHTML_RULE_SYM 276 +#define TDEHTML_DECLS_SYM 277 +#define TDEHTML_VALUE_SYM 278 #define IMPORTANT_SYM 279 #define QEMS 280 #define EMS 281 diff --git a/tdehtml/css/parser.y b/tdehtml/css/parser.y index bb6f915f9..6d8b18e9a 100644 --- a/tdehtml/css/parser.y +++ b/tdehtml/css/parser.y @@ -164,9 +164,9 @@ static int cssyylex( YYSTYPE *yylval ) { %token FONT_FACE_SYM %token CHARSET_SYM %token NAMESPACE_SYM -%token KHTML_RULE_SYM -%token KHTML_DECLS_SYM -%token KHTML_VALUE_SYM +%token TDEHTML_RULE_SYM +%token TDEHTML_DECLS_SYM +%token TDEHTML_VALUE_SYM %token IMPORTANT_SYM @@ -261,20 +261,20 @@ stylesheet: ; tdehtml_rule: - KHTML_RULE_SYM '{' maybe_space ruleset maybe_space '}' { + TDEHTML_RULE_SYM '{' maybe_space ruleset maybe_space '}' { CSSParser *p = static_cast<CSSParser *>(parser); p->rule = $4; } ; tdehtml_decls: - KHTML_DECLS_SYM declaration_block { + TDEHTML_DECLS_SYM declaration_block { /* can be empty */ } ; tdehtml_value: - KHTML_VALUE_SYM '{' maybe_space expr '}' { + TDEHTML_VALUE_SYM '{' maybe_space expr '}' { CSSParser *p = static_cast<CSSParser *>(parser); if ( $4 ) { p->valueList = $4; diff --git a/tdehtml/css/tokenizer.cpp b/tdehtml/css/tokenizer.cpp index 493a98032..48fd174d1 100644 --- a/tdehtml/css/tokenizer.cpp +++ b/tdehtml/css/tokenizer.cpp @@ -756,17 +756,17 @@ YY_RULE_SETUP case 20: YY_RULE_SETUP #line 53 "tokenizer.flex" -{yyTok = KHTML_RULE_SYM; return yyTok; } +{yyTok = TDEHTML_RULE_SYM; return yyTok; } YY_BREAK case 21: YY_RULE_SETUP #line 54 "tokenizer.flex" -{yyTok = KHTML_DECLS_SYM; return yyTok; } +{yyTok = TDEHTML_DECLS_SYM; return yyTok; } YY_BREAK case 22: YY_RULE_SETUP #line 55 "tokenizer.flex" -{yyTok = KHTML_VALUE_SYM; return yyTok; } +{yyTok = TDEHTML_VALUE_SYM; return yyTok; } YY_BREAK case 23: YY_RULE_SETUP diff --git a/tdehtml/css/tokenizer.flex b/tdehtml/css/tokenizer.flex index 76fcadb7c..330d13042 100644 --- a/tdehtml/css/tokenizer.flex +++ b/tdehtml/css/tokenizer.flex @@ -50,9 +50,9 @@ nth (-?[0-9]*n[\+-][0-9]+)|(-?[0-9]*n) "@font-face" {yyTok = FONT_FACE_SYM; return yyTok;} "@charset" {yyTok = CHARSET_SYM; return yyTok;} "@namespace" {yyTok = NAMESPACE_SYM; return yyTok; } -"@-tdehtml-rule" {yyTok = KHTML_RULE_SYM; return yyTok; } -"@-tdehtml-decls" {yyTok = KHTML_DECLS_SYM; return yyTok; } -"@-tdehtml-value" {yyTok = KHTML_VALUE_SYM; return yyTok; } +"@-tdehtml-rule" {yyTok = TDEHTML_RULE_SYM; return yyTok; } +"@-tdehtml-decls" {yyTok = TDEHTML_DECLS_SYM; return yyTok; } +"@-tdehtml-value" {yyTok = TDEHTML_VALUE_SYM; return yyTok; } "!"{w}"important" {yyTok = IMPORTANT_SYM; return yyTok;} diff --git a/tdehtml/design.h b/tdehtml/design.h index 86dbec911..f287a5ef9 100644 --- a/tdehtml/design.h +++ b/tdehtml/design.h @@ -36,7 +36,7 @@ * If you want to add to your application a widget that only needs simple text * browsing, you can also use the KTextBrowser widget in tdeui. * - * KHTMLPart : + * TDEHTMLPart : * The main part/widget for using tdehtml. * * DOM : diff --git a/tdehtml/dom/css_rule.h b/tdehtml/dom/css_rule.h index 5f27e8f8a..9059eecd7 100644 --- a/tdehtml/dom/css_rule.h +++ b/tdehtml/dom/css_rule.h @@ -49,7 +49,7 @@ class CSSRuleImpl; * interface. * */ -class KHTML_EXPORT CSSRule +class TDEHTML_EXPORT CSSRule { public: CSSRule(); @@ -72,7 +72,7 @@ public: MEDIA_RULE = 4, FONT_FACE_RULE = 5, PAGE_RULE = 6, - QUIRKS_RULE = 100 // KHTML CSS Extension + QUIRKS_RULE = 100 // TDEHTML CSS Extension }; /** @@ -146,7 +146,7 @@ class CSSCharsetRuleImpl; * be used to define the encoding of the style sheet. * */ -class KHTML_EXPORT CSSCharsetRule : public CSSRule +class TDEHTML_EXPORT CSSCharsetRule : public CSSRule { public: CSSCharsetRule(); @@ -190,7 +190,7 @@ class CSSFontFaceRuleImpl; * rule is used to hold a set of font descriptions. * */ -class KHTML_EXPORT CSSFontFaceRule : public CSSRule +class TDEHTML_EXPORT CSSFontFaceRule : public CSSRule { public: CSSFontFaceRule(); @@ -220,7 +220,7 @@ class CSSImportRuleImpl; * rule is used to import style rules from other style sheets. * */ -class KHTML_EXPORT CSSImportRule : public CSSRule +class TDEHTML_EXPORT CSSImportRule : public CSSRule { public: CSSImportRule(); @@ -267,7 +267,7 @@ class CSSMediaRuleImpl; * can be used to delimit style rules for specific media types. * */ -class KHTML_EXPORT CSSMediaRule : public CSSRule +class TDEHTML_EXPORT CSSMediaRule : public CSSRule { public: CSSMediaRule(); @@ -359,7 +359,7 @@ class CSSPageRuleImpl; * page box for paged media. * */ -class KHTML_EXPORT CSSPageRule : public CSSRule +class TDEHTML_EXPORT CSSPageRule : public CSSRule { public: CSSPageRule(); @@ -408,7 +408,7 @@ class CSSStyleRuleImpl; * in a CSS style sheet. * */ -class KHTML_EXPORT CSSStyleRule : public CSSRule +class TDEHTML_EXPORT CSSStyleRule : public CSSRule { public: CSSStyleRule(); @@ -458,7 +458,7 @@ class CSSUnknownRuleImpl; * not supported by this user agent. * */ -class KHTML_EXPORT CSSUnknownRule : public CSSRule +class TDEHTML_EXPORT CSSUnknownRule : public CSSRule { public: CSSUnknownRule(); @@ -481,7 +481,7 @@ class StyleListImpl; * of an ordered collection of CSS rules. * */ -class KHTML_EXPORT CSSRuleList +class TDEHTML_EXPORT CSSRuleList { public: CSSRuleList(); diff --git a/tdehtml/dom/css_stylesheet.h b/tdehtml/dom/css_stylesheet.h index d220ffa76..884c6bec5 100644 --- a/tdehtml/dom/css_stylesheet.h +++ b/tdehtml/dom/css_stylesheet.h @@ -55,7 +55,7 @@ class DocumentImpl; * instruction </a> . * */ -class KHTML_EXPORT StyleSheet +class TDEHTML_EXPORT StyleSheet { public: StyleSheet(); @@ -170,7 +170,7 @@ protected: * This exception is raised when a specific CSS operation is impossible * to perform. */ -class KHTML_EXPORT CSSException +class TDEHTML_EXPORT CSSException { public: CSSException(unsigned short _code) { code = _code; } @@ -204,7 +204,7 @@ class CSSRuleList; * content type is "text/css". * */ -class KHTML_EXPORT CSSStyleSheet : public StyleSheet +class TDEHTML_EXPORT CSSStyleSheet : public StyleSheet { public: CSSStyleSheet(); @@ -306,7 +306,7 @@ class StyleSheet; * abstraction of an ordered collection of style sheets. * */ -class KHTML_EXPORT StyleSheetList +class TDEHTML_EXPORT StyleSheetList { public: StyleSheetList(); @@ -360,7 +360,7 @@ class CSSStyleSheet; * strings. * */ -class KHTML_EXPORT MediaList +class TDEHTML_EXPORT MediaList { public: MediaList(); @@ -444,7 +444,7 @@ protected: class LinkStyleImpl; -class KHTML_EXPORT LinkStyle +class TDEHTML_EXPORT LinkStyle { public: LinkStyle(); @@ -466,7 +466,7 @@ protected: class DocumentStyleImpl; -class KHTML_EXPORT DocumentStyle +class TDEHTML_EXPORT DocumentStyle { public: DocumentStyle(); diff --git a/tdehtml/dom/css_value.h b/tdehtml/dom/css_value.h index 5d4a043c7..e2028feac 100644 --- a/tdehtml/dom/css_value.h +++ b/tdehtml/dom/css_value.h @@ -57,7 +57,7 @@ class CSSValue; * interface. * */ -class KHTML_EXPORT CSSStyleDeclaration +class TDEHTML_EXPORT CSSStyleDeclaration { public: CSSStyleDeclaration(); @@ -240,7 +240,7 @@ class CSSValueImpl; * complexe value. * */ -class KHTML_EXPORT CSSValue +class TDEHTML_EXPORT CSSValue { public: CSSValue(); @@ -313,7 +313,7 @@ class CSSValue; * of an ordered collection of CSS values. * */ -class KHTML_EXPORT CSSValueList : public CSSValue +class TDEHTML_EXPORT CSSValueList : public CSSValue { public: CSSValueList(); @@ -370,7 +370,7 @@ class Rect; * \c CSSStyleDeclaration interface. * */ -class KHTML_EXPORT CSSPrimitiveValue : public CSSValue +class TDEHTML_EXPORT CSSPrimitiveValue : public CSSValue { public: CSSPrimitiveValue(); @@ -588,7 +588,7 @@ public: * interface modify the style property. * */ -class KHTML_EXPORT RGBColor +class TDEHTML_EXPORT RGBColor { public: RGBColor(); @@ -639,7 +639,7 @@ class RectImpl; * interface modify the style property. * */ -class KHTML_EXPORT Rect +class TDEHTML_EXPORT Rect { friend class CSSPrimitiveValue; public: @@ -696,7 +696,7 @@ class CounterImpl; * made through this interface modify the style property. * */ -class KHTML_EXPORT Counter +class TDEHTML_EXPORT Counter { friend class CSSPrimitiveValue; public: diff --git a/tdehtml/dom/dom2_events.h b/tdehtml/dom/dom2_events.h index 285a0c10e..3b68eafaa 100644 --- a/tdehtml/dom/dom2_events.h +++ b/tdehtml/dom/dom2_events.h @@ -61,7 +61,7 @@ class MutationEventImpl; * add them manually. * */ -class KHTML_EXPORT EventListener : public DomShared { +class TDEHTML_EXPORT EventListener : public DomShared { public: EventListener(); virtual ~EventListener(); @@ -108,7 +108,7 @@ protected: * implemented by the object passed to the event listener. * */ -class KHTML_EXPORT Event { +class TDEHTML_EXPORT Event { friend class Document; friend class NodeImpl; friend class DocumentImpl; @@ -259,7 +259,7 @@ protected: * descriptions. * */ -class KHTML_EXPORT EventException +class TDEHTML_EXPORT EventException { public: EventException(unsigned short _code); @@ -291,7 +291,7 @@ public: * with User Interface events. * */ -class KHTML_EXPORT UIEvent : public Event { +class TDEHTML_EXPORT UIEvent : public Event { public: UIEvent(); UIEvent(const UIEvent &other); @@ -396,7 +396,7 @@ protected: * obtain notification of mouse events which occur within its descendent elements. * */ -class KHTML_EXPORT MouseEvent : public UIEvent { +class TDEHTML_EXPORT MouseEvent : public UIEvent { public: MouseEvent(); MouseEvent(const MouseEvent &other); @@ -552,7 +552,7 @@ protected: * as specified in current DOM3 Events revision. This is doing heavy emulation * at the moment */ -class KHTML_EXPORT TextEvent : public UIEvent { +class TDEHTML_EXPORT TextEvent : public UIEvent { public: TextEvent(); TextEvent(const TextEvent &other); @@ -735,7 +735,7 @@ protected: * associated with Mutation events. * */ -class KHTML_EXPORT MutationEvent : public Event { +class TDEHTML_EXPORT MutationEvent : public Event { public: MutationEvent(); MutationEvent(const MutationEvent &other); diff --git a/tdehtml/dom/dom2_range.h b/tdehtml/dom/dom2_range.h index 290f4f48c..1f69b4a99 100644 --- a/tdehtml/dom/dom2_range.h +++ b/tdehtml/dom/dom2_range.h @@ -44,7 +44,7 @@ class RangeImpl; class DOMException; // Introduced in DOM Level 2: -class KHTML_EXPORT RangeException { +class TDEHTML_EXPORT RangeException { public: RangeException(unsigned short _code) { code = _code; } RangeException(const RangeException &other) { code = other.code; } @@ -67,7 +67,7 @@ public: }; -class KHTML_EXPORT Range +class TDEHTML_EXPORT Range { friend class DocumentImpl; friend class Document; diff --git a/tdehtml/dom/dom2_traversal.h b/tdehtml/dom/dom2_traversal.h index ea3d3521b..a1fc86bb3 100644 --- a/tdehtml/dom/dom2_traversal.h +++ b/tdehtml/dom/dom2_traversal.h @@ -57,7 +57,7 @@ class CustomNodeFilterImpl; * interface. * */ -class KHTML_EXPORT NodeIterator +class TDEHTML_EXPORT NodeIterator { friend class NodeIteratorImpl; friend class Document; @@ -181,7 +181,7 @@ protected: * an instance of it to the NodeFilter. For more details see the * CustomNodeFilter class */ -class KHTML_EXPORT NodeFilter +class TDEHTML_EXPORT NodeFilter { friend class NodeIterator; friend class NodeIteratorImpl; @@ -292,7 +292,7 @@ protected: * */ -class KHTML_EXPORT CustomNodeFilter : public DomShared { +class TDEHTML_EXPORT CustomNodeFilter : public DomShared { public: CustomNodeFilter(); virtual ~CustomNodeFilter(); @@ -336,7 +336,7 @@ protected: * how deeply nested the structure of the original document. * */ -class KHTML_EXPORT TreeWalker +class TDEHTML_EXPORT TreeWalker { friend class Document; friend class TreeWalkerImpl; diff --git a/tdehtml/dom/dom2_views.h b/tdehtml/dom/dom2_views.h index 6f326aaa3..dcba1cb40 100644 --- a/tdehtml/dom/dom2_views.h +++ b/tdehtml/dom/dom2_views.h @@ -38,7 +38,7 @@ class DOMString; * A base interface that all views shall derive from. * */ -class KHTML_EXPORT AbstractView { +class TDEHTML_EXPORT AbstractView { friend class Event; friend class UIEvent; friend class MouseEvent; diff --git a/tdehtml/dom/dom_doc.cpp b/tdehtml/dom/dom_doc.cpp index 0ff123444..b38a01401 100644 --- a/tdehtml/dom/dom_doc.cpp +++ b/tdehtml/dom/dom_doc.cpp @@ -438,7 +438,7 @@ void Document::setSelectedStylesheetSet(const DOMString& s) } -KHTMLView *Document::view() const +TDEHTMLView *Document::view() const { if (!impl) return 0; diff --git a/tdehtml/dom/dom_doc.h b/tdehtml/dom/dom_doc.h index 9a5331295..cef6692c5 100644 --- a/tdehtml/dom/dom_doc.h +++ b/tdehtml/dom/dom_doc.h @@ -32,8 +32,8 @@ #include <dom/dom_node.h> #include <dom/css_stylesheet.h> -class KHTMLView; -class KHTMLPart; +class TDEHTMLView; +class TDEHTMLPart; namespace DOM { @@ -74,7 +74,7 @@ class HTMLDocument; * DOM Level 2 and newer provide means for creating documents directly, * which was not possible with DOM Level 1. */ -class KHTML_EXPORT DOMImplementation +class TDEHTML_EXPORT DOMImplementation { friend class Document; public: @@ -242,10 +242,10 @@ protected: * context they were created. * */ -class KHTML_EXPORT Document : public Node +class TDEHTML_EXPORT Document : public Node { - friend class ::KHTMLView; - friend class ::KHTMLPart; + friend class ::TDEHTMLView; + friend class ::TDEHTMLPart; friend class AbstractView; friend class DOMImplementation; friend class HTMLFrameElement; @@ -786,9 +786,9 @@ public: void removeStyleSheet(const StyleSheet &sheet); /** - * @return The KHTML view widget of this document. + * @return The TDEHTML view widget of this document. */ - KHTMLView *view() const; + TDEHTMLView *view() const; /** * Introduced in DOM Level 2 @@ -988,7 +988,7 @@ class DocumentFragmentImpl; * \c insertBefore() and \c appendChild() . * */ -class KHTML_EXPORT DocumentFragment : public Node +class TDEHTML_EXPORT DocumentFragment : public Node { friend class Document; friend class HTMLElementImpl; @@ -1025,7 +1025,7 @@ class DOMString; * nodes. * */ -class KHTML_EXPORT DocumentType : public Node +class TDEHTML_EXPORT DocumentType : public Node { friend class Document; friend class DOMImplementation; diff --git a/tdehtml/dom/dom_element.h b/tdehtml/dom/dom_element.h index d3313628e..8df181c17 100644 --- a/tdehtml/dom/dom_element.h +++ b/tdehtml/dom/dom_element.h @@ -86,7 +86,7 @@ class DocumentImpl; * unknown, there are no tokenized attribute values. * */ -class KHTML_EXPORT Attr : public Node +class TDEHTML_EXPORT Attr : public Node { friend class Element; friend class Document; @@ -207,7 +207,7 @@ class DOMString; * access an attribute value can safely be used as a convenience. * */ -class KHTML_EXPORT Element : public Node +class TDEHTML_EXPORT Element : public Node { friend class Document; friend class HTMLDocument; @@ -579,7 +579,7 @@ public: bool isHTMLElement() const; /** - * KHTML extension to DOM + * TDEHTML extension to DOM * This method returns the associated form element. * returns null if this element is not a form-like element * or if this elment is not in the scope of a form element. diff --git a/tdehtml/dom/dom_exception.h b/tdehtml/dom/dom_exception.h index cef032206..f4c4b4e75 100644 --- a/tdehtml/dom/dom_exception.h +++ b/tdehtml/dom/dom_exception.h @@ -54,7 +54,7 @@ namespace DOM { * the corresponding method descriptions. * */ -class KHTML_EXPORT DOMException +class TDEHTML_EXPORT DOMException { public: DOMException(unsigned short _code) { code = _code; } diff --git a/tdehtml/dom/dom_misc.h b/tdehtml/dom/dom_misc.h index 4cded0f00..494ab2704 100644 --- a/tdehtml/dom/dom_misc.h +++ b/tdehtml/dom/dom_misc.h @@ -33,7 +33,7 @@ namespace DOM { * Other objects should overload deleteMe() to fit their needs. The default * implementation deletes the object if the ref count drops to 0. */ -class KHTML_EXPORT DomShared +class TDEHTML_EXPORT DomShared { public: DomShared() : _ref( 0 ) {} diff --git a/tdehtml/dom/dom_node.h b/tdehtml/dom/dom_node.h index 594aa5e3e..b87997547 100644 --- a/tdehtml/dom/dom_node.h +++ b/tdehtml/dom/dom_node.h @@ -63,7 +63,7 @@ class Event; * imply that the DOM specifies an order to these Nodes. * */ -class KHTML_EXPORT NamedNodeMap +class TDEHTML_EXPORT NamedNodeMap { public: NamedNodeMap(); @@ -271,7 +271,7 @@ class NodeImpl; * mechanisms to get and set the relevant information. * */ -class KHTML_EXPORT Node +class TDEHTML_EXPORT Node { friend class NamedNodeMap; friend class NodeList; @@ -775,7 +775,7 @@ public: * * @exception DOMException * NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly. - * Note: KHTML will also raise this if setContent is called on things + * Note: TDEHTML will also raise this if setContent is called on things * that do not have child nodes. * * @since 3.5.7 @@ -928,7 +928,7 @@ class NodeListImpl; * integral index, starting from 0. * */ -class KHTML_EXPORT NodeList +class TDEHTML_EXPORT NodeList { friend class Element; friend class Node; diff --git a/tdehtml/dom/dom_string.h b/tdehtml/dom/dom_string.h index 3d4706b5a..a82d1018b 100644 --- a/tdehtml/dom/dom_string.h +++ b/tdehtml/dom/dom_string.h @@ -40,10 +40,10 @@ class DOMStringImpl; * that modifications to one instance will also modify all others. If you * wish to get a DOMString that is independent, use copy(). */ -class KHTML_EXPORT DOMString +class TDEHTML_EXPORT DOMString { friend class CharacterDataImpl; - friend KHTML_EXPORT bool operator==( const DOMString &a, const char *b ); + friend TDEHTML_EXPORT bool operator==( const DOMString &a, const char *b ); public: /** * default constructor. Gives an empty DOMString @@ -128,17 +128,17 @@ inline kndbgstream &operator<<(kndbgstream &stream, const DOMString &) { } #endif -KHTML_EXPORT bool operator==( const DOMString &a, const DOMString &b ); -KHTML_EXPORT bool operator==( const DOMString &a, const TQString &b ); -KHTML_EXPORT bool operator==( const DOMString &a, const char *b ); +TDEHTML_EXPORT bool operator==( const DOMString &a, const DOMString &b ); +TDEHTML_EXPORT bool operator==( const DOMString &a, const TQString &b ); +TDEHTML_EXPORT bool operator==( const DOMString &a, const char *b ); inline bool operator!=( const DOMString &a, const DOMString &b ) { return !(a==b); } inline bool operator!=( const DOMString &a, const TQString &b ) { return !(a==b); } inline bool operator!=( const DOMString &a, const char *b ) { return !(a==b); } inline bool strcmp( const DOMString &a, const DOMString &b ) { return a != b; } // returns false when equal, true otherwise (ignoring case) -KHTML_EXPORT bool strcasecmp( const DOMString &a, const DOMString &b ); -KHTML_EXPORT bool strcasecmp( const DOMString& a, const char* b ); +TDEHTML_EXPORT bool strcasecmp( const DOMString &a, const DOMString &b ); +TDEHTML_EXPORT bool strcasecmp( const DOMString& a, const char* b ); } #endif diff --git a/tdehtml/dom/dom_text.h b/tdehtml/dom/dom_text.h index c6f92fb1d..bc84f5902 100644 --- a/tdehtml/dom/dom_text.h +++ b/tdehtml/dom/dom_text.h @@ -46,7 +46,7 @@ class CharacterDataImpl; * <code>offset</code>s in this interface start from 0. * */ -class KHTML_EXPORT CharacterData : public Node +class TDEHTML_EXPORT CharacterData : public Node { friend class CharacterDataImpl; @@ -220,7 +220,7 @@ class CommentImpl; * the full SGML comment structure. * */ -class KHTML_EXPORT Comment : public CharacterData +class TDEHTML_EXPORT Comment : public CharacterData { friend class Document; friend class TextImpl; @@ -266,7 +266,7 @@ class TextImpl; * \c XPointers. * */ -class KHTML_EXPORT Text : public CharacterData +class TDEHTML_EXPORT Text : public CharacterData { friend class Document; friend class TextImpl; diff --git a/tdehtml/dom/dom_xml.h b/tdehtml/dom/dom_xml.h index 12e70d9e5..b2ef9f8e6 100644 --- a/tdehtml/dom/dom_xml.h +++ b/tdehtml/dom/dom_xml.h @@ -63,7 +63,7 @@ class ProcessingInstructionImpl; * merged by use of the Element.normalize() method. * */ -class KHTML_EXPORT CDATASection : public Text +class TDEHTML_EXPORT CDATASection : public Text { friend class Document; public: @@ -121,7 +121,7 @@ class DOMString; * An \c Entity node does not have any parent. * */ -class KHTML_EXPORT Entity : public Node +class TDEHTML_EXPORT Entity : public Node { public: Entity(); @@ -185,7 +185,7 @@ protected: * evaluation. * */ -class KHTML_EXPORT EntityReference : public Node +class TDEHTML_EXPORT EntityReference : public Node { friend class Document; public: @@ -219,7 +219,7 @@ class DOMString; * A \c Notation node does not have any parent. * */ -class KHTML_EXPORT Notation : public Node +class TDEHTML_EXPORT Notation : public Node { public: Notation(); @@ -256,7 +256,7 @@ protected: * processor-specific information in the text of the document. * */ -class KHTML_EXPORT ProcessingInstruction : public Node +class TDEHTML_EXPORT ProcessingInstruction : public Node { friend class Document; public: diff --git a/tdehtml/dom/html_base.h b/tdehtml/dom/html_base.h index c7ed878ce..1ff3fb825 100644 --- a/tdehtml/dom/html_base.h +++ b/tdehtml/dom/html_base.h @@ -47,7 +47,7 @@ class DOMString; * BODY element definition </a> in HTML 4.0. * */ -class KHTML_EXPORT HTMLBodyElement : public HTMLElement +class TDEHTML_EXPORT HTMLBodyElement : public HTMLElement { public: HTMLBodyElement(); @@ -160,7 +160,7 @@ class DOMString; * FRAME element definition </a> in HTML 4.0. * */ -class KHTML_EXPORT HTMLFrameElement : public HTMLElement +class TDEHTML_EXPORT HTMLFrameElement : public HTMLElement { public: HTMLFrameElement(); @@ -306,7 +306,7 @@ class DOMString; * FRAMESET element definition </a> in HTML 4.0. * */ -class KHTML_EXPORT HTMLFrameSetElement : public HTMLElement +class TDEHTML_EXPORT HTMLFrameSetElement : public HTMLElement { public: HTMLFrameSetElement(); @@ -359,7 +359,7 @@ class HTMLIFrameElementImpl; * IFRAME element definition </a> in HTML 4.0. * */ -class KHTML_EXPORT HTMLIFrameElement : public HTMLElement +class TDEHTML_EXPORT HTMLIFrameElement : public HTMLElement { public: HTMLIFrameElement(); @@ -533,7 +533,7 @@ class DOMString; * HEAD element definition </a> in HTML 4.0. * */ -class KHTML_EXPORT HTMLHeadElement : public HTMLElement +class TDEHTML_EXPORT HTMLHeadElement : public HTMLElement { public: HTMLHeadElement(); @@ -574,7 +574,7 @@ class DOMString; * HTML element definition </a> in HTML 4.0. * */ -class KHTML_EXPORT HTMLHtmlElement : public HTMLElement +class TDEHTML_EXPORT HTMLHtmlElement : public HTMLElement { public: HTMLHtmlElement(); diff --git a/tdehtml/dom/html_block.h b/tdehtml/dom/html_block.h index 4283bafa2..fc3963716 100644 --- a/tdehtml/dom/html_block.h +++ b/tdehtml/dom/html_block.h @@ -47,7 +47,7 @@ class DOMString; * BLOCKQUOTE element definition </a> in HTML 4.0. * */ -class KHTML_EXPORT HTMLBlockquoteElement : public HTMLElement +class TDEHTML_EXPORT HTMLBlockquoteElement : public HTMLElement { public: HTMLBlockquoteElement(); @@ -88,7 +88,7 @@ class DOMString; * DIV element definition </a> in HTML 4.0. * */ -class KHTML_EXPORT HTMLDivElement : public HTMLElement +class TDEHTML_EXPORT HTMLDivElement : public HTMLElement { public: HTMLDivElement(); @@ -130,7 +130,7 @@ class DOMString; * HR element definition </a> in HTML 4.0. * */ -class KHTML_EXPORT HTMLHRElement : public HTMLElement +class TDEHTML_EXPORT HTMLHRElement : public HTMLElement { public: HTMLHRElement(); @@ -214,7 +214,7 @@ class DOMString; * H1 element definition </a> in HTML 4.0. * */ -class KHTML_EXPORT HTMLHeadingElement : public HTMLElement +class TDEHTML_EXPORT HTMLHeadingElement : public HTMLElement { public: HTMLHeadingElement(); @@ -255,7 +255,7 @@ class DOMString; * element definition </a> in HTML 4.0. * */ -class KHTML_EXPORT HTMLParagraphElement : public HTMLElement +class TDEHTML_EXPORT HTMLParagraphElement : public HTMLElement { public: HTMLParagraphElement(); @@ -296,7 +296,7 @@ class HTMLPreElementImpl; * PRE element definition </a> in HTML 4.0. * */ -class KHTML_EXPORT HTMLPreElement : public HTMLElement +class TDEHTML_EXPORT HTMLPreElement : public HTMLElement { public: HTMLPreElement(); @@ -334,7 +334,7 @@ class HTMLLayerElementImpl; * Behaves mostly like absolute positioned DIV-blocks. * */ -class KHTML_EXPORT HTMLLayerElement : public HTMLElement +class TDEHTML_EXPORT HTMLLayerElement : public HTMLElement { public: HTMLLayerElement(); diff --git a/tdehtml/dom/html_document.cpp b/tdehtml/dom/html_document.cpp index c24bf65f7..0d0af0ab9 100644 --- a/tdehtml/dom/html_document.cpp +++ b/tdehtml/dom/html_document.cpp @@ -39,7 +39,7 @@ HTMLDocument::HTMLDocument() : Document(false) // create the impl here } -HTMLDocument::HTMLDocument(KHTMLView *parent) +HTMLDocument::HTMLDocument(TDEHTMLView *parent) : Document(false) // create the impl here { impl = DOMImplementationImpl::instance()->createHTMLDocument(parent); diff --git a/tdehtml/dom/html_document.h b/tdehtml/dom/html_document.h index aa53de96c..98a027297 100644 --- a/tdehtml/dom/html_document.h +++ b/tdehtml/dom/html_document.h @@ -35,8 +35,8 @@ #include <tdelibs_export.h> -class KHTMLView; -class KHTMLPart; +class TDEHTMLView; +class TDEHTMLPart; namespace DOM { @@ -70,10 +70,10 @@ class HTMLElement; * * */ -class KHTML_EXPORT HTMLDocument : public Document +class TDEHTML_EXPORT HTMLDocument : public Document { - friend class ::KHTMLView; - friend class ::KHTMLPart; + friend class ::TDEHTMLView; + friend class ::TDEHTMLPart; friend class DOMImplementation; public: HTMLDocument(); @@ -82,7 +82,7 @@ public: * Rendering information (like sizes, etc...) is only created if * parent != 0 */ - HTMLDocument(KHTMLView *parent); + HTMLDocument(TDEHTMLView *parent); HTMLDocument(const HTMLDocument &other); HTMLDocument(const Node &other) : Document(false) {(*this)=other;} diff --git a/tdehtml/dom/html_element.h b/tdehtml/dom/html_element.h index 1329793b2..719223777 100644 --- a/tdehtml/dom/html_element.h +++ b/tdehtml/dom/html_element.h @@ -32,7 +32,7 @@ #include <dom/dom_element.h> #include <tdelibs_export.h> -class KHTMLView; +class TDEHTMLView; namespace DOM { @@ -66,10 +66,10 @@ class HTMLCollection; * interface is reserved for future usage. * */ -class KHTML_EXPORT HTMLElement : public Element +class TDEHTML_EXPORT HTMLElement : public Element { friend class HTMLDocument; - friend class ::KHTMLView; + friend class ::TDEHTMLView; friend class HTMLTableElement; friend class HTMLTableRowElement; friend class HTMLTableSectionElement; diff --git a/tdehtml/dom/html_form.h b/tdehtml/dom/html_form.h index 0623e421b..d0e20da73 100644 --- a/tdehtml/dom/html_form.h +++ b/tdehtml/dom/html_form.h @@ -47,7 +47,7 @@ class DOMString; * BUTTON element definition </a> in HTML 4.0. * */ -class KHTML_EXPORT HTMLButtonElement : public HTMLElement +class TDEHTML_EXPORT HTMLButtonElement : public HTMLElement { public: HTMLButtonElement(); @@ -169,7 +169,7 @@ class HTMLFieldSetElementImpl; * FIELDSET element definition </a> in HTML 4.0. * */ -class KHTML_EXPORT HTMLFieldSetElement : public HTMLElement +class TDEHTML_EXPORT HTMLFieldSetElement : public HTMLElement { public: HTMLFieldSetElement(); @@ -203,7 +203,7 @@ class HTMLFormElementImpl; * FORM element definition </a> in HTML 4.0. * */ -class KHTML_EXPORT HTMLFormElement : public HTMLElement +class TDEHTML_EXPORT HTMLFormElement : public HTMLElement { friend class HTMLButtonElement; friend class HTMLFieldSetElement; @@ -346,7 +346,7 @@ class HTMLInputElementImpl; * INPUT element definition </a> in HTML 4.0. * */ -class KHTML_EXPORT HTMLInputElement : public HTMLElement +class TDEHTML_EXPORT HTMLInputElement : public HTMLElement { public: HTMLInputElement(); @@ -707,7 +707,7 @@ class HTMLLabelElementImpl; * LABEL element definition </a> in HTML 4.0. * */ -class KHTML_EXPORT HTMLLabelElement : public HTMLElement +class TDEHTML_EXPORT HTMLLabelElement : public HTMLElement { public: HTMLLabelElement(); @@ -762,7 +762,7 @@ class HTMLLegendElementImpl; * LEGEND element definition </a> in HTML 4.0. * */ -class KHTML_EXPORT HTMLLegendElement : public HTMLElement +class TDEHTML_EXPORT HTMLLegendElement : public HTMLElement { public: HTMLLegendElement(); @@ -821,7 +821,7 @@ class HTMLOptGroupElementImpl; * OPTGROUP element definition </a> in HTML 4.0. * */ -class KHTML_EXPORT HTMLOptGroupElement : public HTMLElement +class TDEHTML_EXPORT HTMLOptGroupElement : public HTMLElement { public: HTMLOptGroupElement(); @@ -875,7 +875,7 @@ class HTMLSelectElementImpl; * SELECT element definition </a> in HTML 4.0. * */ -class KHTML_EXPORT HTMLSelectElement : public HTMLElement +class TDEHTML_EXPORT HTMLSelectElement : public HTMLElement { public: HTMLSelectElement(); @@ -1051,7 +1051,7 @@ class HTMLTextAreaElementImpl; * TEXTAREA element definition </a> in HTML 4.0. * */ -class KHTML_EXPORT HTMLTextAreaElement : public HTMLElement +class TDEHTML_EXPORT HTMLTextAreaElement : public HTMLElement { public: HTMLTextAreaElement(); @@ -1266,7 +1266,7 @@ class HTMLOptionElementImpl; * OPTION element definition </a> in HTML 4.0. * */ -class KHTML_EXPORT HTMLOptionElement : public HTMLElement +class TDEHTML_EXPORT HTMLOptionElement : public HTMLElement { public: HTMLOptionElement(); @@ -1386,7 +1386,7 @@ class HTMLFormElement; * deprecated in HTML 4.0. * */ -class KHTML_EXPORT HTMLIsIndexElement : public HTMLElement +class TDEHTML_EXPORT HTMLIsIndexElement : public HTMLElement { public: HTMLIsIndexElement(); diff --git a/tdehtml/dom/html_head.h b/tdehtml/dom/html_head.h index e8dc52d21..08bd1bc1c 100644 --- a/tdehtml/dom/html_head.h +++ b/tdehtml/dom/html_head.h @@ -43,7 +43,7 @@ class DOMString; * BASE element definition </a> in HTML 4.0. * */ -class KHTML_EXPORT HTMLBaseElement : public HTMLElement +class TDEHTML_EXPORT HTMLBaseElement : public HTMLElement { public: HTMLBaseElement(); @@ -98,7 +98,7 @@ class HTMLLinkElementImpl; * LINK element definition </a> in HTML 4.0. * */ -class KHTML_EXPORT HTMLLinkElement : public HTMLElement +class TDEHTML_EXPORT HTMLLinkElement : public HTMLElement { public: HTMLLinkElement(); @@ -253,7 +253,7 @@ class HTMLMetaElementImpl; * META element definition </a> in HTML 4.0. * */ -class KHTML_EXPORT HTMLMetaElement : public HTMLElement +class TDEHTML_EXPORT HTMLMetaElement : public HTMLElement { public: HTMLMetaElement(); @@ -332,7 +332,7 @@ class HTMLScriptElementImpl; * SCRIPT element definition </a> in HTML 4.0. * */ -class KHTML_EXPORT HTMLScriptElement : public HTMLElement +class TDEHTML_EXPORT HTMLScriptElement : public HTMLElement { public: HTMLScriptElement(); @@ -446,7 +446,7 @@ class HTMLStyleElementImpl; * STYLE element definition </a> in HTML 4.0. * */ -class KHTML_EXPORT HTMLStyleElement : public HTMLElement +class TDEHTML_EXPORT HTMLStyleElement : public HTMLElement { public: HTMLStyleElement(); @@ -519,7 +519,7 @@ class HTMLTitleElementImpl; * TITLE element definition </a> in HTML 4.0. * */ -class KHTML_EXPORT HTMLTitleElement : public HTMLElement +class TDEHTML_EXPORT HTMLTitleElement : public HTMLElement { public: HTMLTitleElement(); diff --git a/tdehtml/dom/html_image.h b/tdehtml/dom/html_image.h index 9f30aaa14..8258d7a63 100644 --- a/tdehtml/dom/html_image.h +++ b/tdehtml/dom/html_image.h @@ -44,7 +44,7 @@ class DOMString; * AREA element definition </a> in HTML 4.0. * */ -class KHTML_EXPORT HTMLAreaElement : public HTMLElement +class TDEHTML_EXPORT HTMLAreaElement : public HTMLElement { public: HTMLAreaElement(); @@ -182,7 +182,7 @@ class HTMLImageElementImpl; * IMG element definition </a> in HTML 4.0. * */ -class KHTML_EXPORT HTMLImageElement : public HTMLElement +class TDEHTML_EXPORT HTMLImageElement : public HTMLElement { public: HTMLImageElement(); @@ -390,7 +390,7 @@ class DOMString; * MAP element definition </a> in HTML 4.0. * */ -class KHTML_EXPORT HTMLMapElement : public HTMLElement +class TDEHTML_EXPORT HTMLMapElement : public HTMLElement { public: HTMLMapElement(); diff --git a/tdehtml/dom/html_inline.h b/tdehtml/dom/html_inline.h index f92ed6917..322282d1f 100644 --- a/tdehtml/dom/html_inline.h +++ b/tdehtml/dom/html_inline.h @@ -44,7 +44,7 @@ class DOMString; * element definition </a> in HTML 4.0. * */ -class KHTML_EXPORT HTMLAnchorElement : public HTMLElement +class TDEHTML_EXPORT HTMLAnchorElement : public HTMLElement { public: HTMLAnchorElement(); @@ -256,7 +256,7 @@ class HTMLBRElementImpl; * element definition </a> in HTML 4.0. * */ -class KHTML_EXPORT HTMLBRElement : public HTMLElement +class TDEHTML_EXPORT HTMLBRElement : public HTMLElement { public: HTMLBRElement(); @@ -299,7 +299,7 @@ class DOMString; * deprecated in HTML 4.0. * */ -class KHTML_EXPORT HTMLFontElement : public HTMLElement +class TDEHTML_EXPORT HTMLFontElement : public HTMLElement { public: HTMLFontElement(); @@ -369,7 +369,7 @@ class DOMString; * DEL </a> element definitions in HTML 4.0. * */ -class KHTML_EXPORT HTMLModElement : public HTMLElement +class TDEHTML_EXPORT HTMLModElement : public HTMLElement { public: HTMLModElement(); @@ -427,7 +427,7 @@ class HTMLQuoteElementImpl; * element. To resolve ambiquities, we use this one for the \c Q * element only. */ -class KHTML_EXPORT HTMLQuoteElement : public HTMLElement +class TDEHTML_EXPORT HTMLQuoteElement : public HTMLElement { public: HTMLQuoteElement(); diff --git a/tdehtml/dom/html_list.h b/tdehtml/dom/html_list.h index 34c081cb5..59328ec26 100644 --- a/tdehtml/dom/html_list.h +++ b/tdehtml/dom/html_list.h @@ -49,7 +49,7 @@ class DOMString; * DL element definition </a> in HTML 4.0. * */ -class KHTML_EXPORT HTMLDListElement : public HTMLElement +class TDEHTML_EXPORT HTMLDListElement : public HTMLElement { public: HTMLDListElement(); @@ -89,7 +89,7 @@ public: * in HTML 4.0. * */ -class KHTML_EXPORT HTMLDirectoryElement : public HTMLElement +class TDEHTML_EXPORT HTMLDirectoryElement : public HTMLElement { public: HTMLDirectoryElement(); @@ -128,7 +128,7 @@ public: * LI element definition </a> in HTML 4.0. * */ -class KHTML_EXPORT HTMLLIElement : public HTMLElement +class TDEHTML_EXPORT HTMLLIElement : public HTMLElement { public: HTMLLIElement(); @@ -183,7 +183,7 @@ public: * deprecated in HTML 4.0. * */ -class KHTML_EXPORT HTMLMenuElement : public HTMLElement +class TDEHTML_EXPORT HTMLMenuElement : public HTMLElement { public: HTMLMenuElement(); @@ -223,7 +223,7 @@ public: * OL element definition </a> in HTML 4.0. * */ -class KHTML_EXPORT HTMLOListElement : public HTMLElement +class TDEHTML_EXPORT HTMLOListElement : public HTMLElement { public: HTMLOListElement(); @@ -291,7 +291,7 @@ public: * UL element definition </a> in HTML 4.0. * */ -class KHTML_EXPORT HTMLUListElement : public HTMLElement +class TDEHTML_EXPORT HTMLUListElement : public HTMLElement { public: HTMLUListElement(); diff --git a/tdehtml/dom/html_misc.h b/tdehtml/dom/html_misc.h index 643e5caf6..9cb6dc976 100644 --- a/tdehtml/dom/html_misc.h +++ b/tdehtml/dom/html_misc.h @@ -45,7 +45,7 @@ class HTMLCollectionImpl; * deprecated in HTML 4.0. * */ -class KHTML_EXPORT HTMLBaseFontElement : public HTMLElement +class TDEHTML_EXPORT HTMLBaseFontElement : public HTMLElement { public: HTMLBaseFontElement(); @@ -123,7 +123,7 @@ public: * automatically updated when the underlying document is changed. * */ -class KHTML_EXPORT HTMLCollection +class TDEHTML_EXPORT HTMLCollection { friend class HTMLDocument; friend class HTMLSelectElement; @@ -201,7 +201,7 @@ protected: HTMLCollectionImpl *impl; }; -class KHTML_EXPORT HTMLFormCollection : public HTMLCollection +class TDEHTML_EXPORT HTMLFormCollection : public HTMLCollection { friend class HTMLFormElement; protected: @@ -211,7 +211,7 @@ protected: /** @internal. Not part of the public API */ -class KHTML_EXPORT HTMLMappedNameCollection : public HTMLCollection +class TDEHTML_EXPORT HTMLMappedNameCollection : public HTMLCollection { public: HTMLMappedNameCollection(NodeImpl *base, int type, const DOMString &name ); diff --git a/tdehtml/dom/html_object.h b/tdehtml/dom/html_object.h index 9195a40f7..56c592fa3 100644 --- a/tdehtml/dom/html_object.h +++ b/tdehtml/dom/html_object.h @@ -47,7 +47,7 @@ class HTMLAppletElementImpl; * deprecated in HTML 4.0. * */ -class KHTML_EXPORT HTMLAppletElement : public HTMLElement +class TDEHTML_EXPORT HTMLAppletElement : public HTMLElement { public: HTMLAppletElement(); @@ -255,7 +255,7 @@ class HTMLObjectElementImpl; * OBJECT element definition </a> in HTML 4.0. * */ -class KHTML_EXPORT HTMLObjectElement : public HTMLElement +class TDEHTML_EXPORT HTMLObjectElement : public HTMLElement { public: HTMLObjectElement(); @@ -554,7 +554,7 @@ class HTMLParamElementImpl; * PARAM element definition </a> in HTML 4.0. * */ -class KHTML_EXPORT HTMLParamElement : public HTMLElement +class TDEHTML_EXPORT HTMLParamElement : public HTMLElement { public: HTMLParamElement(); diff --git a/tdehtml/dom/html_table.h b/tdehtml/dom/html_table.h index 6b9a2d99d..fdc1119cb 100644 --- a/tdehtml/dom/html_table.h +++ b/tdehtml/dom/html_table.h @@ -44,7 +44,7 @@ class DOMString; * CAPTION element definition </a> in HTML 4.0. * */ -class KHTML_EXPORT HTMLTableCaptionElement : public HTMLElement +class TDEHTML_EXPORT HTMLTableCaptionElement : public HTMLElement { friend class HTMLTableElement; @@ -88,7 +88,7 @@ class HTMLTableCellElementImpl; * TD element definition </a> in HTML 4.0. * */ -class KHTML_EXPORT HTMLTableCellElement : public HTMLElement +class TDEHTML_EXPORT HTMLTableCellElement : public HTMLElement { friend class HTMLTableElement; @@ -319,7 +319,7 @@ class HTMLTableColElementImpl; * COL element definition </a> in HTML 4.0. * */ -class KHTML_EXPORT HTMLTableColElement : public HTMLElement +class TDEHTML_EXPORT HTMLTableColElement : public HTMLElement { friend class HTMLTableElement; @@ -438,7 +438,7 @@ class DOMString; * TABLE element definition </a> in HTML 4.0. * */ -class KHTML_EXPORT HTMLTableElement : public HTMLElement +class TDEHTML_EXPORT HTMLTableElement : public HTMLElement { public: HTMLTableElement(); @@ -722,7 +722,7 @@ class DOMString; * TR element definition </a> in HTML 4.0. * */ -class KHTML_EXPORT HTMLTableRowElement : public HTMLElement +class TDEHTML_EXPORT HTMLTableRowElement : public HTMLElement { friend class HTMLTableElement; @@ -892,7 +892,7 @@ class DOMString; * elements. * */ -class KHTML_EXPORT HTMLTableSectionElement : public HTMLElement +class TDEHTML_EXPORT HTMLTableSectionElement : public HTMLElement { friend class HTMLTableElement; diff --git a/tdehtml/domtreeview.cpp b/tdehtml/domtreeview.cpp index 7482c7b81..5bff83e72 100644 --- a/tdehtml/domtreeview.cpp +++ b/tdehtml/domtreeview.cpp @@ -19,7 +19,7 @@ #include "domtreeview.moc" #include "xml/dom_nodeimpl.h" -DOMTreeView::DOMTreeView(TQWidget *parent, KHTMLPart *currentpart, const char * name) : KListView(parent, name) +DOMTreeView::DOMTreeView(TQWidget *parent, TDEHTMLPart *currentpart, const char * name) : KListView(parent, name) { setCaption(name); setRootIsDecorated(true); diff --git a/tdehtml/domtreeview.h b/tdehtml/domtreeview.h index ef3d45c44..93baa8f61 100644 --- a/tdehtml/domtreeview.h +++ b/tdehtml/domtreeview.h @@ -28,7 +28,7 @@ class DOMTreeView : public KListView { Q_OBJECT public: - DOMTreeView(TQWidget *parent, KHTMLPart *part, const char * name = 0); + DOMTreeView(TQWidget *parent, TDEHTMLPart *part, const char * name = 0); ~DOMTreeView(); void recursive(const DOM::Node &pNode, const DOM::Node &node); @@ -47,7 +47,7 @@ class DOMTreeView : public KListView TQPtrDict<DOM::Node> m_nodedict; DOM::Node document; - KHTMLPart *part; + TDEHTMLPart *part; }; diff --git a/tdehtml/ecma/README b/tdehtml/ecma/README index 4c341699a..f44d663a0 100644 --- a/tdehtml/ecma/README +++ b/tdehtml/ecma/README @@ -1,7 +1,7 @@ This module contains the ECMAScript a.k.a. JavaScript language bindings for -the KHTML Part. +the TDEHTML Part. -The module is loaded into KHTML's address space on demand. +The module is loaded into TDEHTML's address space on demand. To test the non-HTML DOM functions you may compile a little interactive interpreter called 'testecma' with 'make check' (see testecma.cpp for diff --git a/tdehtml/ecma/kjs_binding.cpp b/tdehtml/ecma/kjs_binding.cpp index 09961fbb5..d9f0b7b25 100644 --- a/tdehtml/ecma/kjs_binding.cpp +++ b/tdehtml/ecma/kjs_binding.cpp @@ -232,7 +232,7 @@ bool ScriptInterpreter::isWindowOpenAllowed() const bool eventOk = ( // mouse events id == DOM::EventImpl::CLICK_EVENT || id == DOM::EventImpl::MOUSEUP_EVENT || id == DOM::EventImpl::MOUSEDOWN_EVENT || - id == DOM::EventImpl::KHTML_ECMA_CLICK_EVENT || id == DOM::EventImpl::KHTML_ECMA_DBLCLICK_EVENT || + id == DOM::EventImpl::TDEHTML_ECMA_CLICK_EVENT || id == DOM::EventImpl::TDEHTML_ECMA_DBLCLICK_EVENT || // keyboard events id == DOM::EventImpl::KEYDOWN_EVENT || id == DOM::EventImpl::KEYPRESS_EVENT || id == DOM::EventImpl::KEYUP_EVENT || diff --git a/tdehtml/ecma/kjs_debugwin.cpp b/tdehtml/ecma/kjs_debugwin.cpp index 47921fb2a..ec794b8d2 100644 --- a/tdehtml/ecma/kjs_debugwin.cpp +++ b/tdehtml/ecma/kjs_debugwin.cpp @@ -249,12 +249,12 @@ KJSDebugWin * KJSDebugWin::kjs_html_debugger = 0; TQString SourceFile::getCode() { if (interpreter) { - KHTMLPart *part = ::tqqt_cast<KHTMLPart*>(static_cast<ScriptInterpreter*>(interpreter)->part()); - if (part && url == part->url().url() && KHTMLPageCache::self()->isValid(part->cacheId())) { + TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart*>(static_cast<ScriptInterpreter*>(interpreter)->part()); + if (part && url == part->url().url() && TDEHTMLPageCache::self()->isValid(part->cacheId())) { Decoder *decoder = part->createDecoder(); TQByteArray data; TQDataStream stream(data,IO_WriteOnly); - KHTMLPageCache::self()->saveData(part->cacheId(),&stream); + TDEHTMLPageCache::self()->saveData(part->cacheId(),&stream); TQString str; if (data.size() == 0) str = ""; @@ -721,7 +721,7 @@ bool KJSDebugWin::sourceParsed(KJS::ExecState *exec, int sourceId, KParts::ReadOnlyPart *part = static_cast<ScriptInterpreter*>(exec->interpreter())->part(); if (m_nextSourceUrl == part->url().url()) { // Only store the code here if it's not from the part's html page... in that - // case we can get it from KHTMLPageCache + // case we can get it from TDEHTMLPageCache code = TQString::null; } @@ -805,7 +805,7 @@ bool KJSDebugWin::exception(ExecState *exec, const Value &value, bool inTryCatch return true; KParts::ReadOnlyPart *part = static_cast<ScriptInterpreter*>(exec->interpreter())->part(); - KHTMLPart *tdehtmlpart = ::tqqt_cast<KHTMLPart*>(part); + TDEHTMLPart *tdehtmlpart = ::tqqt_cast<TDEHTMLPart*>(part); if (tdehtmlpart && !tdehtmlpart->settings()->isJavaScriptErrorReportingEnabled()) return true; diff --git a/tdehtml/ecma/kjs_dom.cpp b/tdehtml/ecma/kjs_dom.cpp index 71e91d7ef..77d4983da 100644 --- a/tdehtml/ecma/kjs_dom.cpp +++ b/tdehtml/ecma/kjs_dom.cpp @@ -265,11 +265,11 @@ Value DOMNode::getValueProperty(ExecState *exec, int token) const case OnChange: return getListener(DOM::EventImpl::CHANGE_EVENT); case OnClick: - return getListener(DOM::EventImpl::KHTML_ECMA_CLICK_EVENT); + return getListener(DOM::EventImpl::TDEHTML_ECMA_CLICK_EVENT); case OnDblClick: - return getListener(DOM::EventImpl::KHTML_ECMA_DBLCLICK_EVENT); + return getListener(DOM::EventImpl::TDEHTML_ECMA_DBLCLICK_EVENT); case OnDragDrop: - return getListener(DOM::EventImpl::KHTML_DRAGDROP_EVENT); + return getListener(DOM::EventImpl::TDEHTML_DRAGDROP_EVENT); case OnError: return getListener(DOM::EventImpl::ERROR_EVENT); case OnFocus: @@ -293,7 +293,7 @@ Value DOMNode::getValueProperty(ExecState *exec, int token) const case OnMouseUp: return getListener(DOM::EventImpl::MOUSEUP_EVENT); case OnMove: - return getListener(DOM::EventImpl::KHTML_MOVE_EVENT); + return getListener(DOM::EventImpl::TDEHTML_MOVE_EVENT); case OnReset: return getListener(DOM::EventImpl::RESET_EVENT); case OnResize: @@ -409,13 +409,13 @@ void DOMNode::putValueProperty(ExecState *exec, int token, const Value& value, i setListener(exec,DOM::EventImpl::CHANGE_EVENT,value); break; case OnClick: - setListener(exec,DOM::EventImpl::KHTML_ECMA_CLICK_EVENT,value); + setListener(exec,DOM::EventImpl::TDEHTML_ECMA_CLICK_EVENT,value); break; case OnDblClick: - setListener(exec,DOM::EventImpl::KHTML_ECMA_DBLCLICK_EVENT,value); + setListener(exec,DOM::EventImpl::TDEHTML_ECMA_DBLCLICK_EVENT,value); break; case OnDragDrop: - setListener(exec,DOM::EventImpl::KHTML_DRAGDROP_EVENT,value); + setListener(exec,DOM::EventImpl::TDEHTML_DRAGDROP_EVENT,value); break; case OnError: setListener(exec,DOM::EventImpl::ERROR_EVENT,value); @@ -451,7 +451,7 @@ void DOMNode::putValueProperty(ExecState *exec, int token, const Value& value, i setListener(exec,DOM::EventImpl::MOUSEUP_EVENT,value); break; case OnMove: - setListener(exec,DOM::EventImpl::KHTML_MOVE_EVENT,value); + setListener(exec,DOM::EventImpl::TDEHTML_MOVE_EVENT,value); break; case OnReset: setListener(exec,DOM::EventImpl::RESET_EVENT,value); @@ -949,7 +949,7 @@ Value DOMDocument::getValueProperty(ExecState *exec, int token) const return getDOMStyleSheetList(exec, doc.styleSheets(), doc); case DOMDocument::DefaultView: // DOM2 { - KHTMLView *view = node.handle()->getDocument()->view(); + TDEHTMLView *view = node.handle()->getDocument()->view(); if (view) return Window::retrieve(view->part()); return getDOMAbstractView(exec, doc.defaultView()); @@ -963,7 +963,7 @@ Value DOMDocument::getValueProperty(ExecState *exec, int token) const DOM::DocumentImpl* docimpl = node.handle()->getDocument(); if ( docimpl && docimpl->view() ) { - KHTMLPart* part = docimpl->view()->part(); + TDEHTMLPart* part = docimpl->view()->part(); if ( part ) { if (part->d->m_bComplete) return String("complete"); if (docimpl->parsing()) return String("loading"); @@ -1088,7 +1088,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 - KHTMLPart *tdehtmlpart = ::tqqt_cast<KHTMLPart *>(active->part()); + TDEHTMLPart *tdehtmlpart = ::tqqt_cast<TDEHTMLPart *>(active->part()); if (tdehtmlpart) { // Security: only allow documents to be loaded from the same host TQString dstUrl = tdehtmlpart->htmlDocument().completeURL(s).string(); @@ -1274,7 +1274,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. - KHTMLPart *part = ::tqqt_cast<KHTMLPart*>(static_cast<KJS::ScriptInterpreter*>(exec->interpreter())->part()); + TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart*>(static_cast<KJS::ScriptInterpreter*>(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<DocumentImpl*>(part->document().handle())->URL(); @@ -1526,7 +1526,7 @@ bool checkNodeSecurity(ExecState *exec, const DOM::Node& n) // Check to see if the currently executing interpreter is allowed to access the specified node if (n.isNull()) return true; - KHTMLView *view = n.handle()->getDocument()->view(); + TDEHTMLView *view = n.handle()->getDocument()->view(); Window* win = view && view->part() ? Window::retrieveWindow(view->part()) : 0L; if ( !win || !win->isSafeScript(exec) ) return false; diff --git a/tdehtml/ecma/kjs_events.cpp b/tdehtml/ecma/kjs_events.cpp index 7b6ff3cc1..acf88f89a 100644 --- a/tdehtml/ecma/kjs_events.cpp +++ b/tdehtml/ecma/kjs_events.cpp @@ -63,7 +63,7 @@ void JSEventListener::handleEvent(DOM::Event &evt) if (KJSDebugWin::debugWindow() && KJSDebugWin::debugWindow()->inSession()) return; #endif - KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(static_cast<Window*>(win.imp())->part()); + TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(static_cast<Window*>(win.imp())->part()); KJSProxy *proxy = 0L; if (part) proxy = part->jScript(); @@ -163,7 +163,7 @@ Object JSLazyEventListener::listenerObj() const void JSLazyEventListener::parseCode() const { if (!parsed) { - KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(static_cast<Window*>(win.imp())->part()); + TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(static_cast<Window*>(win.imp())->part()); KJSProxy *proxy = 0L; if (part) proxy = part->jScript(); diff --git a/tdehtml/ecma/kjs_html.cpp b/tdehtml/ecma/kjs_html.cpp index 37fd70754..8a63ba943 100644 --- a/tdehtml/ecma/kjs_html.cpp +++ b/tdehtml/ecma/kjs_html.cpp @@ -98,7 +98,7 @@ Value KJS::HTMLDocFunction::tryCall(ExecState *exec, Object &thisObj, const List case HTMLDocument::Open: if (args.size() >= 3) // IE extension for document.open: it means window.open if it has 3 args or more { - KHTMLView *view = static_cast<DOM::DocumentImpl*>(doc.handle())->view(); + TDEHTMLView *view = static_cast<DOM::DocumentImpl*>(doc.handle())->view(); if ( view && view->part() ) { Window* win = Window::retrieveWindow(view->part()); if( win ) { @@ -133,7 +133,7 @@ Value KJS::HTMLDocFunction::tryCall(ExecState *exec, Object &thisObj, const List case HTMLDocument::GetSelection: { // NS4 and Mozilla specific. IE uses document.selection.createRange() // http://docs.sun.com/source/816-6408-10/document.htm#1195981 - KHTMLView *view = static_cast<DOM::DocumentImpl*>(doc.handle())->view(); + TDEHTMLView *view = static_cast<DOM::DocumentImpl*>(doc.handle())->view(); if ( view && view->part() ) return String(view->part()->selectedText()); else @@ -199,7 +199,7 @@ bool KJS::HTMLDocument::hasProperty(ExecState *exec, const Identifier &p) const #endif DOM::HTMLDocument doc = static_cast<DOM::HTMLDocument>(node); DOM::DocumentImpl* docImpl = static_cast<DOM::DocumentImpl*>(doc.handle()); - KHTMLView *view = docImpl->view(); + TDEHTMLView *view = docImpl->view(); Window* win = view && view->part() ? Window::retrieveWindow(view->part()) : 0L; if ( !win || !win->isSafeScript(exec) ) return false; @@ -210,7 +210,7 @@ bool KJS::HTMLDocument::hasProperty(ExecState *exec, const Identifier &p) const if ( view && view->part() ) { - KHTMLPart *kp = view->part()->findFrame( p.qstring() ); + TDEHTMLPart *kp = view->part()->findFrame( p.qstring() ); if (kp) return true; } @@ -226,7 +226,7 @@ Value KJS::HTMLDocument::tryGet(ExecState *exec, const Identifier &propertyName) DOM::HTMLDocument doc = static_cast<DOM::HTMLDocument>(node); DOM::DocumentImpl* docImpl = static_cast<DOM::DocumentImpl*>(doc.handle()); - KHTMLView *view = docImpl->view(); + TDEHTMLView *view = docImpl->view(); Window* win = view && view->part() ? Window::retrieveWindow(view->part()) : 0L; if ( !win || !win->isSafeScript(exec) ) @@ -261,7 +261,7 @@ Value KJS::HTMLDocument::tryGet(ExecState *exec, const Identifier &propertyName) { // ###### TODO return a collection in case several frames have the same name // (IE does that). Hard to do with findFrame :} - KHTMLPart *kp = view->part()->findFrame( propertyName.qstring() ); + TDEHTMLPart *kp = view->part()->findFrame( propertyName.qstring() ); if (kp) return Window::retrieve(kp); } @@ -356,7 +356,7 @@ void KJS::HTMLDocument::tryPut(ExecState *exec, const Identifier &propertyName, #ifdef KJS_VERBOSE kdDebug(6070) << "KJS::HTMLDocument::tryPut " << propertyName.qstring() << endl; #endif - KHTMLView *view = static_cast<DOM::DocumentImpl*>(node.handle())->view(); + TDEHTMLView *view = static_cast<DOM::DocumentImpl*>(node.handle())->view(); Window* win = view && view->part() ? Window::retrieveWindow(view->part()) : 0L; if ( !win || !win->isSafeScript(exec) ) @@ -394,7 +394,7 @@ void KJS::HTMLDocument::putValueProperty(ExecState *exec, int token, const Value break; case Location: { - KHTMLView *view = static_cast<DOM::DocumentImpl*>(doc.handle())->view(); + TDEHTMLView *view = static_cast<DOM::DocumentImpl*>(doc.handle())->view(); if ( view ) Window::retrieveWindow(view->part())->goURL(exec, value.toString(exec).qstring(), false /*don't lock history*/); break; @@ -1127,7 +1127,7 @@ const ClassInfo* KJS::HTMLElement::classInfo() const static KParts::LiveConnectExtension *getLiveConnectExtension(const DOM::HTMLElement & element) { DOM::HTMLDocument doc = element.ownerDocument(); - KHTMLView *view = static_cast<DOM::DocumentImpl*>(doc.handle())->view(); + TDEHTMLView *view = static_cast<DOM::DocumentImpl*>(doc.handle())->view(); if (view && element.handle()) return view->part()->liveConnectExtension(static_cast<tdehtml::RenderPart*>(element.handle()->renderer())); return 0L; @@ -1870,7 +1870,7 @@ Value KJS::HTMLElement::getValueProperty(ExecState *exec, int token) const case FrameContentDocument: return checkNodeSecurity(exec,frameElement.contentDocument()) ? getDOMNode(exec, frameElement.contentDocument()) : Undefined(); case FrameContentWindow: { - KHTMLPart* part = static_cast<DOM::HTMLFrameElementImpl*>(frameElement.handle())->contentPart(); + TDEHTMLPart* part = static_cast<DOM::HTMLFrameElementImpl*>(frameElement.handle())->contentPart(); if (part) { Window *w = Window::retrieveWindow(part); if (w) @@ -1905,7 +1905,7 @@ Value KJS::HTMLElement::getValueProperty(ExecState *exec, int token) const case IFrameContentDocument: return checkNodeSecurity(exec,iFrame.contentDocument()) ? getDOMNode(exec, iFrame.contentDocument()) : Undefined(); case IFrameContentWindow: { - KHTMLPart* part = static_cast<DOM::HTMLIFrameElementImpl*>(iFrame.handle())->contentPart(); + TDEHTMLPart* part = static_cast<DOM::HTMLIFrameElementImpl*>(iFrame.handle())->contentPart(); if (part) { Window *w = Window::retrieveWindow(part); if (w) @@ -2123,14 +2123,14 @@ Value KJS::HTMLElementFunction::tryCall(ExecState *exec, Object &thisObj, const DOM::HTMLDocument doc = element.ownerDocument(); - KHTMLView *view = static_cast<DOM::DocumentImpl*>(doc.handle())->view(); - KHTMLSettings::KJSWindowOpenPolicy policy = KHTMLSettings::KJSWindowOpenAllow; + TDEHTMLView *view = static_cast<DOM::DocumentImpl*>(doc.handle())->view(); + TDEHTMLSettings::KJSWindowOpenPolicy policy = TDEHTMLSettings::KJSWindowOpenAllow; if (view) policy = view->part()->settings()->windowOpenPolicy(view->part()->url().host()); bool block = false; - if ( policy != KHTMLSettings::KJSWindowOpenAllow ) { + if ( policy != TDEHTMLSettings::KJSWindowOpenAllow ) { block = true; // if this is a form without a target, or a special target, don't block @@ -2146,7 +2146,7 @@ Value KJS::HTMLElementFunction::tryCall(ExecState *exec, Object &thisObj, const if (!view->part()->url().host().isEmpty()) caption = view->part()->url().host() + " - "; // search all (possibly nested) framesets - KHTMLPart *currentPart = view->part()->parentPart(); + TDEHTMLPart *currentPart = view->part()->parentPart(); while( currentPart != 0L ) { if( currentPart->frameExists( form.target().string() ) ) block = false; @@ -2154,7 +2154,7 @@ Value KJS::HTMLElementFunction::tryCall(ExecState *exec, Object &thisObj, const } } - if ( block && policy == KHTMLSettings::KJSWindowOpenAsk && view ) { + if ( block && policy == TDEHTMLSettings::KJSWindowOpenAsk && view ) { if (view && view->part()) emit view->part()->browserExtension()->requestFocus(view->part()); caption += i18n( "Confirmation: JavaScript Popup" ); @@ -2167,7 +2167,7 @@ Value KJS::HTMLElementFunction::tryCall(ExecState *exec, Object &thisObj, const caption, i18n("Allow"), i18n("Do Not Allow") ) == KMessageBox::Yes ) block = false; - } else if ( block && policy == KHTMLSettings::KJSWindowOpenSmart ) { + } else if ( block && policy == TDEHTMLSettings::KJSWindowOpenSmart ) { if( static_cast<KJS::ScriptInterpreter *>(exec->interpreter())->isWindowOpenAllowed() ) { // This submission has been triggered by the user block = false; diff --git a/tdehtml/ecma/kjs_mozilla.cpp b/tdehtml/ecma/kjs_mozilla.cpp index 216fde26e..6fc7688dd 100644 --- a/tdehtml/ecma/kjs_mozilla.cpp +++ b/tdehtml/ecma/kjs_mozilla.cpp @@ -40,7 +40,7 @@ const ClassInfo MozillaSidebarExtension::info = { "sidebar", 0, &MozillaSidebarE } IMPLEMENT_PROTOFUNC_DOM(MozillaSidebarExtensionFunc) -MozillaSidebarExtension::MozillaSidebarExtension(ExecState *exec, KHTMLPart *p) +MozillaSidebarExtension::MozillaSidebarExtension(ExecState *exec, TDEHTMLPart *p) : ObjectImp(exec->interpreter()->builtinObjectPrototype()), m_part(p) { } Value MozillaSidebarExtension::get(ExecState *exec, const Identifier &propertyName) const @@ -66,7 +66,7 @@ Value MozillaSidebarExtensionFunc::tryCall(ExecState *exec, Object &thisObj, con KJS_CHECK_THIS( KJS::MozillaSidebarExtension, thisObj ); MozillaSidebarExtension *mse = static_cast<MozillaSidebarExtension*>(thisObj.imp()); - KHTMLPart *part = mse->part(); + TDEHTMLPart *part = mse->part(); if (!part) return Undefined(); diff --git a/tdehtml/ecma/kjs_mozilla.h b/tdehtml/ecma/kjs_mozilla.h index 220094f63..112af1315 100644 --- a/tdehtml/ecma/kjs_mozilla.h +++ b/tdehtml/ecma/kjs_mozilla.h @@ -23,21 +23,21 @@ #include <kjs/object.h> -class KHTMLPart; +class TDEHTMLPart; namespace KJS { class MozillaSidebarExtension : public ObjectImp { public: - MozillaSidebarExtension(ExecState *exec, KHTMLPart *p); + MozillaSidebarExtension(ExecState *exec, TDEHTMLPart *p); virtual Value get(ExecState *exec, const Identifier &propertyName) const; Value getValueProperty(ExecState *exec, int token) const; virtual const ClassInfo* classInfo() const { return &info; } static const ClassInfo info; enum { addPanel }; - KHTMLPart *part() const { return m_part; } + TDEHTMLPart *part() const { return m_part; } private: - KHTMLPart *m_part; + TDEHTMLPart *m_part; }; } // namespace diff --git a/tdehtml/ecma/kjs_navigator.cpp b/tdehtml/ecma/kjs_navigator.cpp index 22d5f9cb7..5934afd3e 100644 --- a/tdehtml/ecma/kjs_navigator.cpp +++ b/tdehtml/ecma/kjs_navigator.cpp @@ -165,7 +165,7 @@ const ClassInfo Navigator::info = { "Navigator", 0, &NavigatorTable, 0 }; */ IMPLEMENT_PROTOFUNC_DOM(NavigatorFunc) -Navigator::Navigator(ExecState *exec, KHTMLPart *p) +Navigator::Navigator(ExecState *exec, TDEHTMLPart *p) : ObjectImp(exec->interpreter()->builtinObjectPrototype()), m_part(p) { } Value Navigator::get(ExecState *exec, const Identifier &propertyName) const diff --git a/tdehtml/ecma/kjs_navigator.h b/tdehtml/ecma/kjs_navigator.h index ccd1ba63b..9298b3761 100644 --- a/tdehtml/ecma/kjs_navigator.h +++ b/tdehtml/ecma/kjs_navigator.h @@ -23,13 +23,13 @@ #include <kjs/object.h> -class KHTMLPart; +class TDEHTMLPart; namespace KJS { class Navigator : public ObjectImp { public: - Navigator(ExecState *exec, KHTMLPart *p); + Navigator(ExecState *exec, TDEHTMLPart *p); virtual Value get(ExecState *exec, const Identifier &propertyName) const; Value getValueProperty(ExecState *exec, int token) const; virtual const ClassInfo* classInfo() const { return &info; } @@ -37,9 +37,9 @@ namespace KJS { enum { AppCodeName, AppName, AppVersion, Language, UserAgent, UserLanguage, Platform, _Plugins, _MimeTypes, Product, ProductSub, Vendor, CookieEnabled, JavaEnabled, BrowserLanguage, CpuClass }; - KHTMLPart *part() const { return m_part; } + TDEHTMLPart *part() const { return m_part; } private: - KHTMLPart *m_part; + TDEHTMLPart *m_part; }; // Hashtable enums diff --git a/tdehtml/ecma/kjs_proxy.cpp b/tdehtml/ecma/kjs_proxy.cpp index cc7afa00a..578cd30f0 100644 --- a/tdehtml/ecma/kjs_proxy.cpp +++ b/tdehtml/ecma/kjs_proxy.cpp @@ -355,7 +355,7 @@ void KJSProxyImpl::applyUserAgent() // If we find "Mozilla" but not "(compatible, ...)" we are a real Netscape if (userAgent.find(TQString::fromLatin1("Mozilla")) >= 0 && userAgent.find(TQString::fromLatin1("compatible")) == -1 && - userAgent.find(TQString::fromLatin1("KHTML")) == -1) + userAgent.find(TQString::fromLatin1("TDEHTML")) == -1) { m_script->setCompatMode(Interpreter::NetscapeCompat); #ifdef KJS_VERBOSE @@ -365,8 +365,8 @@ void KJSProxyImpl::applyUserAgent() } // Helper method, so that all classes which need jScript() don't need to be added -// as friend to KHTMLPart -KJSProxy * KJSProxy::proxy( KHTMLPart *part ) +// as friend to TDEHTMLPart +KJSProxy * KJSProxy::proxy( TDEHTMLPart *part ) { return part->jScript(); } @@ -402,7 +402,7 @@ void KJSCPUGuard::stop() bool KJSCPUGuard::confirmTerminate() { kdDebug(6070) << "alarmhandler" << endl; - return KMessageBox::warningYesNo(0L, i18n("A script on this page is causing KHTML to freeze. If it continues to run, other applications may become less responsive.\nDo you want to abort the script?"), i18n("JavaScript"), i18n("&Abort"), KStdGuiItem::cont(), "kjscupguard_alarmhandler") == KMessageBox::Yes; + return KMessageBox::warningYesNo(0L, i18n("A script on this page is causing TDEHTML to freeze. If it continues to run, other applications may become less responsive.\nDo you want to abort the script?"), i18n("JavaScript"), i18n("&Abort"), KStdGuiItem::cont(), "kjscupguard_alarmhandler") == KMessageBox::Yes; } void KJSCPUGuard::alarmHandler(int) { diff --git a/tdehtml/ecma/kjs_proxy.h b/tdehtml/ecma/kjs_proxy.h index 5ea2d5bf6..bac9e9579 100644 --- a/tdehtml/ecma/kjs_proxy.h +++ b/tdehtml/ecma/kjs_proxy.h @@ -26,7 +26,7 @@ #include <tqstring.h> #include <sys/time.h> -class KHTMLPart; +class TDEHTMLPart; namespace DOM { class Node; @@ -72,8 +72,8 @@ public: tdehtml::ChildFrame *m_frame; int m_handlerLineno; - // Helper method, to access the private KHTMLPart::jScript() - static KJSProxy *proxy( KHTMLPart *part ); + // Helper method, to access the private TDEHTMLPart::jScript() + static KJSProxy *proxy( TDEHTMLPart *part ); }; class KJSCPUGuard { diff --git a/tdehtml/ecma/kjs_traversal.cpp b/tdehtml/ecma/kjs_traversal.cpp index b8b9e824a..a01d469de 100644 --- a/tdehtml/ecma/kjs_traversal.cpp +++ b/tdehtml/ecma/kjs_traversal.cpp @@ -302,11 +302,11 @@ JSNodeFilter::~JSNodeFilter() short JSNodeFilter::acceptNode(const DOM::Node &n) { - KHTMLView *view = static_cast<DOM::DocumentImpl *>( n.handle()->docPtr() )->view(); + TDEHTMLView *view = static_cast<DOM::DocumentImpl *>( n.handle()->docPtr() )->view(); if (!view) return DOM::NodeFilter::FILTER_REJECT; - KHTMLPart *part = view->part(); + TDEHTMLPart *part = view->part(); KJSProxy *proxy = part->jScript(); if (proxy) { ExecState *exec = proxy->interpreter()->globalExec(); diff --git a/tdehtml/ecma/kjs_window.cpp b/tdehtml/ecma/kjs_window.cpp index 767c7607f..1d38de27e 100644 --- a/tdehtml/ecma/kjs_window.cpp +++ b/tdehtml/ecma/kjs_window.cpp @@ -77,7 +77,7 @@ namespace KJS { class History : public ObjectImp { friend class HistoryFunc; public: - History(ExecState *exec, KHTMLPart *p) + History(ExecState *exec, TDEHTMLPart *p) : ObjectImp(exec->interpreter()->builtinObjectPrototype()), part(p) { } virtual Value get(ExecState *exec, const Identifier &propertyName) const; Value getValueProperty(ExecState *exec, int token) const; @@ -85,31 +85,31 @@ namespace KJS { static const ClassInfo info; enum { Back, Forward, Go, Length }; private: - TQGuardedPtr<KHTMLPart> part; + TQGuardedPtr<TDEHTMLPart> part; }; class External : public ObjectImp { friend class ExternalFunc; public: - External(ExecState *exec, KHTMLPart *p) + External(ExecState *exec, TDEHTMLPart *p) : ObjectImp(exec->interpreter()->builtinObjectPrototype()), part(p) { } virtual Value get(ExecState *exec, const Identifier &propertyName) const; virtual const ClassInfo* classInfo() const { return &info; } static const ClassInfo info; enum { AddFavorite }; private: - TQGuardedPtr<KHTMLPart> part; + TQGuardedPtr<TDEHTMLPart> part; }; class FrameArray : public ObjectImp { public: - FrameArray(ExecState *exec, KHTMLPart *p) + FrameArray(ExecState *exec, TDEHTMLPart *p) : ObjectImp(exec->interpreter()->builtinObjectPrototype()), part(p) { } virtual Value get(ExecState *exec, const Identifier &propertyName) const; virtual Value call(ExecState *exec, Object &thisObj, const List &args); virtual bool implementsCall() const { return true; } private: - TQGuardedPtr<KHTMLPart> part; + TQGuardedPtr<TDEHTMLPart> part; }; #ifdef Q_WS_QWS @@ -421,7 +421,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. - KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(p); + TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(p); if ( part && part->jScriptEnabled() ) { assert( obj.isValid() ); @@ -448,10 +448,10 @@ Window *Window::retrieveActive(ExecState *exec) Value Window::retrieve(KParts::ReadOnlyPart *p) { assert(p); - KHTMLPart * part = ::tqqt_cast<KHTMLPart *>(p); + TDEHTMLPart * part = ::tqqt_cast<TDEHTMLPart *>(p); KJSProxy *proxy = 0L; if (!part) { - part = ::tqqt_cast<KHTMLPart *>(p->parent()); + part = ::tqqt_cast<TDEHTMLPart *>(p->parent()); if (part) proxy = part->framejScript(p); } else @@ -478,7 +478,7 @@ Location *Window::location() const ObjectImp* Window::frames( ExecState* exec ) const { - KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(m_frame->m_part); + TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part); if (part) return m_frames ? m_frames : (const_cast<Window*>(this)->m_frames = new FrameArray(exec, part)); @@ -516,7 +516,7 @@ bool Window::hasProperty(ExecState *exec, const Identifier &p) const if (Lookup::findEntry(&WindowTable, p)) return true; - KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(m_frame->m_part); + TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part); if (!part) return false; @@ -585,7 +585,7 @@ Value Window::get(ExecState *exec, const Identifier &p) const } const HashEntry* entry = Lookup::findEntry(&WindowTable, p); - KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(m_frame->m_part); + TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part); // properties that work on all windows if (entry) { @@ -604,7 +604,7 @@ Value Window::get(ExecState *exec, const Identifier &p) const } if (!part) return Undefined(); - // KHTMLPart next + // TDEHTMLPart next switch(entry->value) { case Frames: return Value(frames(exec)); @@ -614,9 +614,9 @@ Value Window::get(ExecState *exec, const Identifier &p) const else // doesn't work yet return retrieve(part->opener()); case Parent: - return retrieve(part->parentPart() ? part->parentPart() : (KHTMLPart*)part); + return retrieve(part->parentPart() ? part->parentPart() : (TDEHTMLPart*)part); case Top: { - KHTMLPart *p = part; + TDEHTMLPart *p = part; while (p->parentPart()) p = p->parentPart(); return retrieve(p); @@ -638,7 +638,7 @@ Value Window::get(ExecState *exec, const Identifier &p) const break; } } else if (!part) { - // not a KHTMLPart + // not a TDEHTMLPart TQString rvalue; KParts::LiveConnectExtension::Type rtype; unsigned long robjid; @@ -948,11 +948,11 @@ Value Window::get(ExecState *exec, const Identifier &p) const case Onchange: return getListener(exec,DOM::EventImpl::CHANGE_EVENT); case Onclick: - return getListener(exec,DOM::EventImpl::KHTML_ECMA_CLICK_EVENT); + return getListener(exec,DOM::EventImpl::TDEHTML_ECMA_CLICK_EVENT); case Ondblclick: - return getListener(exec,DOM::EventImpl::KHTML_ECMA_DBLCLICK_EVENT); + return getListener(exec,DOM::EventImpl::TDEHTML_ECMA_DBLCLICK_EVENT); case Ondragdrop: - return getListener(exec,DOM::EventImpl::KHTML_DRAGDROP_EVENT); + return getListener(exec,DOM::EventImpl::TDEHTML_DRAGDROP_EVENT); case Onerror: return getListener(exec,DOM::EventImpl::ERROR_EVENT); case Onfocus: @@ -976,7 +976,7 @@ Value Window::get(ExecState *exec, const Identifier &p) const case Onmouseup: return getListener(exec,DOM::EventImpl::MOUSEUP_EVENT); case Onmove: - return getListener(exec,DOM::EventImpl::KHTML_MOVE_EVENT); + return getListener(exec,DOM::EventImpl::TDEHTML_MOVE_EVENT); case Onreset: return getListener(exec,DOM::EventImpl::RESET_EVENT); case Onresize: @@ -1085,12 +1085,12 @@ void Window::put(ExecState* exec, const Identifier &propertyName, const Value &v default: break; } - KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(m_frame->m_part); + TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part); if (part) { switch( entry->value ) { case Status: { if (isSafeScript(exec) && part->settings()->windowStatusPolicy(part->url().host()) - == KHTMLSettings::KJSWindowStatusAllow) { + == TDEHTMLSettings::KJSWindowStatusAllow) { String s = value.toString(exec); part->setJSStatusBarText(s.value().qstring()); } @@ -1098,7 +1098,7 @@ void Window::put(ExecState* exec, const Identifier &propertyName, const Value &v } case DefaultStatus: { if (isSafeScript(exec) && part->settings()->windowStatusPolicy(part->url().host()) - == KHTMLSettings::KJSWindowStatusAllow) { + == TDEHTMLSettings::KJSWindowStatusAllow) { String s = value.toString(exec); part->setJSDefaultStatusBarText(s.value().qstring()); } @@ -1118,15 +1118,15 @@ void Window::put(ExecState* exec, const Identifier &propertyName, const Value &v return; case Onclick: if (isSafeScript(exec)) - setListener(exec,DOM::EventImpl::KHTML_ECMA_CLICK_EVENT,value); + setListener(exec,DOM::EventImpl::TDEHTML_ECMA_CLICK_EVENT,value); return; case Ondblclick: if (isSafeScript(exec)) - setListener(exec,DOM::EventImpl::KHTML_ECMA_DBLCLICK_EVENT,value); + setListener(exec,DOM::EventImpl::TDEHTML_ECMA_DBLCLICK_EVENT,value); return; case Ondragdrop: if (isSafeScript(exec)) - setListener(exec,DOM::EventImpl::KHTML_DRAGDROP_EVENT,value); + setListener(exec,DOM::EventImpl::TDEHTML_DRAGDROP_EVENT,value); return; case Onerror: if (isSafeScript(exec)) @@ -1174,7 +1174,7 @@ void Window::put(ExecState* exec, const Identifier &propertyName, const Value &v return; case Onmove: if (isSafeScript(exec)) - setListener(exec,DOM::EventImpl::KHTML_MOVE_EVENT,value); + setListener(exec,DOM::EventImpl::TDEHTML_MOVE_EVENT,value); return; case Onreset: if (isSafeScript(exec)) @@ -1222,7 +1222,7 @@ bool Window::toBoolean(ExecState *) const DOM::AbstractView Window::toAbstractView() const { - KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(m_frame->m_part); + TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part); if (!part) return DOM::AbstractView(); return part->document().defaultView(); @@ -1240,9 +1240,9 @@ void Window::closeNow() if (m_frame.isNull() || m_frame->m_part.isNull()) { kdDebug(6070) << k_funcinfo << "part is deleted already" << endl; } else { - KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(m_frame->m_part); + TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part); if (!part) { - kdDebug(6070) << "closeNow on non KHTML part" << endl; + kdDebug(6070) << "closeNow on non TDEHTML part" << endl; } else { //kdDebug(6070) << k_funcinfo << " -> closing window" << endl; // We want to make sure that window.open won't find this part by name. @@ -1288,9 +1288,9 @@ bool Window::checkIsSafeScript(KParts::ReadOnlyPart *activePart) const if ( activePart == m_frame->m_part ) // Not calling from another frame, no problem. return true; - KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(m_frame->m_part); + TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part); if (!part) - return true; // not a KHTMLPart + return true; // not a TDEHTMLPart if ( part->document().isNull() ) return true; // allow to access a window that was just created (e.g. with window.open("about:blank")) @@ -1301,11 +1301,11 @@ bool Window::checkIsSafeScript(KParts::ReadOnlyPart *activePart) const return false; } - KHTMLPart *activeKHTMLPart = ::tqqt_cast<KHTMLPart *>(activePart); - if (!activeKHTMLPart) - return true; // not a KHTMLPart + TDEHTMLPart *activeTDEHTMLPart = ::tqqt_cast<TDEHTMLPart *>(activePart); + if (!activeTDEHTMLPart) + return true; // not a TDEHTMLPart - DOM::HTMLDocument actDocument = activeKHTMLPart->htmlDocument(); + DOM::HTMLDocument actDocument = activeTDEHTMLPart->htmlDocument(); if ( actDocument.isNull() ) { kdDebug(6070) << "Window::isSafeScript: active part has no document!" << endl; return false; @@ -1327,7 +1327,7 @@ bool Window::checkIsSafeScript(KParts::ReadOnlyPart *activePart) const void Window::setListener(ExecState *exec, int eventId, Value func) { - KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(m_frame->m_part); + TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part); if (!part || !isSafeScript(exec)) return; DOM::DocumentImpl *doc = static_cast<DOM::DocumentImpl*>(part->htmlDocument().handle()); @@ -1339,7 +1339,7 @@ void Window::setListener(ExecState *exec, int eventId, Value func) Value Window::getListener(ExecState *exec, int eventId) const { - KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(m_frame->m_part); + TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part); if (!part || !isSafeScript(exec)) return Undefined(); DOM::DocumentImpl *doc = static_cast<DOM::DocumentImpl*>(part->htmlDocument().handle()); @@ -1357,7 +1357,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. - KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(m_frame->m_part); + TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part); if (!part || val.type() != ObjectType) return 0; @@ -1433,8 +1433,8 @@ void Window::setCurrentEvent( DOM::Event *evt ) void Window::goURL(ExecState* exec, const TQString& url, bool lockHistory) { Window* active = Window::retrieveActive(exec); - KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(m_frame->m_part); - KHTMLPart *active_part = ::tqqt_cast<KHTMLPart *>(active->part()); + TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part); + TDEHTMLPart *active_part = ::tqqt_cast<TDEHTMLPart *>(active->part()); // Complete the URL using the "active part" (running interpreter) if (active_part && part) { if (url[0] == TQChar('#')) { @@ -1470,7 +1470,7 @@ void Window::delayedGoHistory( int steps ) void Window::goHistory( int steps ) { - KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(m_frame->m_part); + TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part); if(!part) // TODO history readonlypart return; @@ -1488,7 +1488,7 @@ void Window::goHistory( int steps ) void KJS::Window::resizeTo(TQWidget* tl, int width, int height) { - KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(m_frame->m_part); + TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part); if(!part) // TODO resizeTo readonlypart return; @@ -1531,10 +1531,10 @@ void KJS::Window::resizeTo(TQWidget* tl, int width, int height) Value Window::openWindow(ExecState *exec, const List& args) { - KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(m_frame->m_part); + TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part); if (!part) return Undefined(); - KHTMLView *widget = part->view(); + TDEHTMLView *widget = part->view(); Value v = args[0]; TQString str; if (v.isValid() && !v.isA(UndefinedType)) @@ -1544,7 +1544,7 @@ Value Window::openWindow(ExecState *exec, const List& args) KURL url; if (!str.isEmpty()) { - KHTMLPart* p = ::tqqt_cast<KHTMLPart *>(Window::retrieveActive(exec)->m_frame->m_part); + TDEHTMLPart* p = ::tqqt_cast<TDEHTMLPart *>(Window::retrieveActive(exec)->m_frame->m_part); if ( p ) url = p->htmlDocument().completeURL(str).string(); if ( !p || @@ -1552,9 +1552,9 @@ Value Window::openWindow(ExecState *exec, const List& args) return Undefined(); } - KHTMLSettings::KJSWindowOpenPolicy policy = + TDEHTMLSettings::KJSWindowOpenPolicy policy = part->settings()->windowOpenPolicy(part->url().host()); - if ( policy == KHTMLSettings::KJSWindowOpenAsk ) { + if ( policy == TDEHTMLSettings::KJSWindowOpenAsk ) { emit part->browserExtension()->requestFocus(part); TQString caption; if (!part->url().host().isEmpty()) @@ -1568,12 +1568,12 @@ Value Window::openWindow(ExecState *exec, const List& args) i18n( "<qt>This site is requesting to open<p>%1</p>in a new browser window via JavaScript.<br />" "Do you want to allow this?</qt>").arg(KStringHandler::csqueeze(url.htmlURL(), 100)), caption, i18n("Allow"), i18n("Do Not Allow") ) == KMessageBox::Yes ) - policy = KHTMLSettings::KJSWindowOpenAllow; - } else if ( policy == KHTMLSettings::KJSWindowOpenSmart ) + policy = TDEHTMLSettings::KJSWindowOpenAllow; + } else if ( policy == TDEHTMLSettings::KJSWindowOpenSmart ) { // window.open disabled unless from a key/mouse event if (static_cast<ScriptInterpreter *>(exec->interpreter())->isWindowOpenAllowed()) - policy = KHTMLSettings::KJSWindowOpenAllow; + policy = TDEHTMLSettings::KJSWindowOpenAllow; } TQString frameName = args.size() > 1 ? args[1].toString(exec).qstring() : TQString("_blank"); @@ -1587,7 +1587,7 @@ Value Window::openWindow(ExecState *exec, const List& args) features = features.mid(1, features.length()-2); } - if ( policy != KHTMLSettings::KJSWindowOpenAllow ) { + if ( policy != TDEHTMLSettings::KJSWindowOpenAllow ) { if ( url.isEmpty() ) part->setSuppressedPopupIndicator(true, 0); else { @@ -1602,8 +1602,8 @@ Value Window::openWindow(ExecState *exec, const List& args) Value Window::executeOpenWindow(ExecState *exec, const KURL& url, const TQString& frameName, const TQString& features) { - KHTMLPart *p = ::tqqt_cast<KHTMLPart *>(m_frame->m_part); - KHTMLView *widget = p->view(); + TDEHTMLPart *p = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part); + TDEHTMLView *widget = p->view(); KParts::WindowArgs winargs; // scan feature argument @@ -1703,8 +1703,8 @@ 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<KHTMLPart*>(newPart)) { - KHTMLPart *tdehtmlpart = static_cast<KHTMLPart*>(newPart); + if (newPart && ::tqqt_cast<TDEHTMLPart*>(newPart)) { + TDEHTMLPart *tdehtmlpart = static_cast<TDEHTMLPart*>(newPart); //tqDebug("opener set to %p (this Window's part) in new Window %p (this Window=%p)",part,win,window); tdehtmlpart->setOpener(p); tdehtmlpart->setOpenedByJS(true); @@ -1735,7 +1735,7 @@ void Window::forgetSuppressedWindows() void Window::showSuppressedWindows() { - KHTMLPart *part = ::tqqt_cast<KHTMLPart *>( m_frame->m_part ); + TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>( m_frame->m_part ); KJS::Interpreter *interpreter = part->jScript()->interpreter(); ExecState *exec = interpreter->globalExec(); @@ -1760,11 +1760,11 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args) Window *window = static_cast<Window *>(thisObj.imp()); TQString str, str2; - KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(window->m_frame->m_part); + TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(window->m_frame->m_part); if (!part) return Undefined(); - KHTMLView *widget = part->view(); + TDEHTMLView *widget = part->view(); Value v = args[0]; UString s; if (v.isValid() && !v.isA(UndefinedType)) { @@ -1894,9 +1894,9 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args) window->goURL(exec, args[0].toString(exec).qstring(), false /*don't lock history*/); return Undefined(); case Window::Focus: { - KHTMLSettings::KJSWindowFocusPolicy policy = + TDEHTMLSettings::KJSWindowFocusPolicy policy = part->settings()->windowFocusPolicy(part->url().host()); - if(policy == KHTMLSettings::KJSWindowFocusAllow && widget) { + if(policy == TDEHTMLSettings::KJSWindowFocusAllow && widget) { widget->topLevelWidget()->raise(); KWin::deIconifyWindow( widget->topLevelWidget()->winId() ); widget->setActiveWindow(); @@ -1944,9 +1944,9 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args) widget->setContentsPos(args[0].toInt32(exec), args[1].toInt32(exec)); return Undefined(); case Window::MoveBy: { - KHTMLSettings::KJSWindowMovePolicy policy = + TDEHTMLSettings::KJSWindowMovePolicy policy = part->settings()->windowMovePolicy(part->url().host()); - if(policy == KHTMLSettings::KJSWindowMoveAllow && args.size() == 2 && widget) + if(policy == TDEHTMLSettings::KJSWindowMoveAllow && args.size() == 2 && widget) { KParts::BrowserExtension *ext = part->browserExtension(); if (ext) { @@ -1964,9 +1964,9 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args) return Undefined(); } case Window::MoveTo: { - KHTMLSettings::KJSWindowMovePolicy policy = + TDEHTMLSettings::KJSWindowMovePolicy policy = part->settings()->windowMovePolicy(part->url().host()); - if(policy == KHTMLSettings::KJSWindowMoveAllow && args.size() == 2 && widget) + if(policy == TDEHTMLSettings::KJSWindowMoveAllow && args.size() == 2 && widget) { KParts::BrowserExtension *ext = part->browserExtension(); if (ext) { @@ -1984,9 +1984,9 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args) return Undefined(); } case Window::ResizeBy: { - KHTMLSettings::KJSWindowResizePolicy policy = + TDEHTMLSettings::KJSWindowResizePolicy policy = part->settings()->windowResizePolicy(part->url().host()); - if(policy == KHTMLSettings::KJSWindowResizeAllow + if(policy == TDEHTMLSettings::KJSWindowResizeAllow && args.size() == 2 && widget) { TQWidget * tl = widget->topLevelWidget(); @@ -1998,9 +1998,9 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args) return Undefined(); } case Window::ResizeTo: { - KHTMLSettings::KJSWindowResizePolicy policy = + TDEHTMLSettings::KJSWindowResizePolicy policy = part->settings()->windowResizePolicy(part->url().host()); - if(policy == KHTMLSettings::KJSWindowResizeAllow + if(policy == TDEHTMLSettings::KJSWindowResizeAllow && args.size() == 2 && widget) { TQWidget * tl = widget->topLevelWidget(); @@ -2114,7 +2114,7 @@ ScheduledAction::ScheduledAction(TQString _code, DateTimeMS _nextTime, int _inte bool ScheduledAction::execute(Window *window) { - KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(window->m_frame->m_part); + TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(window->m_frame->m_part); if (!part || !part->jScriptEnabled()) return false; ScriptInterpreter *interpreter = static_cast<ScriptInterpreter *>(part->jScript()->interpreter()); @@ -2432,7 +2432,7 @@ Value FrameArray::get(ExecState *exec, const Identifier &p) const if (node) { if (node->id() == ID_FRAME || node->id() == ID_IFRAME) { //Return the Window object. - KHTMLPart* part = static_cast<DOM::HTMLFrameElementImpl*>(node)->contentPart(); + TDEHTMLPart* part = static_cast<DOM::HTMLFrameElementImpl*>(node)->contentPart(); if (part) return Value(Window::retrieveWindow(part)); else @@ -2590,7 +2590,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: { - KHTMLPart* p =::tqqt_cast<KHTMLPart*>(Window::retrieveActive(exec)->part()); + TDEHTMLPart* p =::tqqt_cast<TDEHTMLPart*>(Window::retrieveActive(exec)->part()); if ( p ) url = p->htmlDocument().completeURL( str ).string(); else @@ -2681,7 +2681,7 @@ Value LocationFunc::tryCall(ExecState *exec, Object &thisObj, const List &args) id == Location::Replace); break; case Location::Reload: { - KHTMLPart *tdehtmlpart = ::tqqt_cast<KHTMLPart *>(part); + TDEHTMLPart *tdehtmlpart = ::tqqt_cast<TDEHTMLPart *>(part); if (tdehtmlpart) tdehtmlpart->scheduleRedirection(-1, part->url().url(), true/*lock history*/); else @@ -2714,11 +2714,11 @@ Value ExternalFunc::tryCall(ExecState *exec, Object &thisObj, const List &args) KJS_CHECK_THIS( External, thisObj ); External *external = static_cast<External *>(thisObj.imp()); - KHTMLPart *part = external->part; + TDEHTMLPart *part = external->part; if (!part) return Undefined(); - KHTMLView *widget = part->view(); + TDEHTMLView *widget = part->view(); switch (id) { case External::AddFavorite: diff --git a/tdehtml/ecma/kjs_window.h b/tdehtml/ecma/kjs_window.h index b9142f983..c30871692 100644 --- a/tdehtml/ecma/kjs_window.h +++ b/tdehtml/ecma/kjs_window.h @@ -32,8 +32,8 @@ #include "kjs_views.h" class TQTimer; -class KHTMLView; -class KHTMLPart; +class TDEHTMLView; +class TDEHTMLPart; namespace KParts { class ReadOnlyPart; @@ -64,13 +64,13 @@ namespace KJS { virtual Value get(ExecState *exec, const Identifier &propertyName) const; Value getValueProperty(ExecState *exec, int token) const; private: - KHTMLView *view; + TDEHTMLView *view; virtual const ClassInfo* classInfo() const { return &info; } static const ClassInfo info; }; class KDE_EXPORT Window : public ObjectImp { - friend TQGuardedPtr<KHTMLPart> getInstance(); + friend TQGuardedPtr<TDEHTMLPart> getInstance(); friend class Location; friend class WindowFunc; friend class WindowQObject; @@ -293,14 +293,14 @@ namespace KJS { class Konqueror : public ObjectImp { friend class KonquerorFunc; public: - Konqueror(KHTMLPart *p) : part(p) { } + Konqueror(TDEHTMLPart *p) : part(p) { } virtual Value get(ExecState *exec, const Identifier &propertyName) const; virtual bool hasProperty(ExecState *exec, const Identifier &p) const; virtual UString toString(ExecState *exec) const; virtual const ClassInfo* classInfo() const { return &info; } static const ClassInfo info; private: - KHTMLPart *part; + TDEHTMLPart *part; }; #endif diff --git a/tdehtml/ecma/testecma.cpp b/tdehtml/ecma/testecma.cpp index 44cd7ecb0..3bd4bb88d 100644 --- a/tdehtml/ecma/testecma.cpp +++ b/tdehtml/ecma/testecma.cpp @@ -19,7 +19,7 @@ /** * An interactive interpreter to test the ECMA Script language bindings - * for the DOM of KHTML. + * for the DOM of TDEHTML. * The 'document' property is preset to an instance of Document and serves * as an entrypoint. * diff --git a/tdehtml/ecma/xmlhttprequest.cpp b/tdehtml/ecma/xmlhttprequest.cpp index bfaa91231..d95fe5e58 100644 --- a/tdehtml/ecma/xmlhttprequest.cpp +++ b/tdehtml/ecma/xmlhttprequest.cpp @@ -725,7 +725,7 @@ Value XMLHttpRequestProtoFunc::tryCall(ExecState *exec, Object &thisObj, const L } TQString method = args[0].toString(exec).qstring(); - KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(Window::retrieveActive(exec)->part()); + TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(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 7ac3d93c9..16ca7a23b 100644 --- a/tdehtml/html/html_baseimpl.cpp +++ b/tdehtml/html/html_baseimpl.cpp @@ -85,7 +85,7 @@ void HTMLBodyElementImpl::parseAttribute(AttributeImpl *attr) break; } case ATTR_MARGINWIDTH: { - KHTMLView* w = getDocument()->view(); + TDEHTMLView* w = getDocument()->view(); if (w) w->setMarginWidth( -1 ); // unset this, so it doesn't override the setting here addCSSLength(CSS_PROP_MARGIN_RIGHT, attr->value() ); @@ -95,7 +95,7 @@ void HTMLBodyElementImpl::parseAttribute(AttributeImpl *attr) addCSSLength(CSS_PROP_MARGIN_LEFT, attr->value() ); break; case ATTR_MARGINHEIGHT: { - KHTMLView* w = getDocument()->view(); + TDEHTMLView* w = getDocument()->view(); if (w) w->setMarginHeight( -1 ); // unset this, so it doesn't override the setting here addCSSLength(CSS_PROP_MARGIN_BOTTOM, attr->value()); @@ -185,7 +185,7 @@ void HTMLBodyElementImpl::insertedIntoDocument() { HTMLElementImpl::insertedIntoDocument(); - KHTMLView* w = getDocument()->view(); + TDEHTMLView* w = getDocument()->view(); if(w && w->marginWidth() != -1) { TQString s; s.sprintf( "%d", w->marginWidth() ); @@ -351,7 +351,7 @@ void HTMLFrameElementImpl::attach() if (!m_render) return; - KHTMLView* w = getDocument()->view(); + TDEHTMLView* w = getDocument()->view(); if (w) { // we need a unique name for every frame in the frameset. Hope that's unique enough. if(name.isEmpty() || w->part()->frameExists( name.string() ) ) @@ -380,9 +380,9 @@ void HTMLFrameElementImpl::setLocation( const DOMString& str ) return; // load the frame contents - KHTMLView *w = getDocument()->view(); + TDEHTMLView *w = getDocument()->view(); if (w) { - KHTMLPart *part = w->part()->findFrame( name.string() ); + TDEHTMLPart *part = w->part()->findFrame( name.string() ); if ( part ) { part->openURL( KURL( getDocument()->completeURL( url.string() ) ) ); } else { @@ -414,20 +414,20 @@ DocumentImpl* HTMLFrameElementImpl::contentDocument() const RenderPart* render = static_cast<RenderPart*>( m_render ); - if(render->widget() && ::tqqt_cast<KHTMLView*>( render->widget()) ) - return static_cast<KHTMLView*>( render->widget() )->part()->xmlDocImpl(); + if(render->widget() && ::tqqt_cast<TDEHTMLView*>( render->widget()) ) + return static_cast<TDEHTMLView*>( render->widget() )->part()->xmlDocImpl(); return 0; } -KHTMLPart* HTMLFrameElementImpl::contentPart() const +TDEHTMLPart* HTMLFrameElementImpl::contentPart() const { if ( !m_render ) return 0; RenderPart* render = static_cast<RenderPart*>( m_render ); - if(render->widget() && ::tqqt_cast<KHTMLView*>( render->widget()) ) - return static_cast<KHTMLView*>( render->widget() )->part(); + if(render->widget() && ::tqqt_cast<TDEHTMLView*>( render->widget()) ) + return static_cast<TDEHTMLView*>( render->widget() )->part(); return 0; } @@ -688,7 +688,7 @@ void HTMLIFrameElementImpl::attach() if (m_render) { // we need a unique name for every frame in the frameset. Hope that's unique enough. - KHTMLView* w = getDocument()->view(); + TDEHTMLView* w = getDocument()->view(); if(w && (name.isEmpty() || w->part()->frameExists( name.string() ))) name = DOMString(w->part()->requestFrameName()); diff --git a/tdehtml/html/html_baseimpl.h b/tdehtml/html/html_baseimpl.h index 0aff3e8e1..8d7205732 100644 --- a/tdehtml/html/html_baseimpl.h +++ b/tdehtml/html/html_baseimpl.h @@ -33,8 +33,8 @@ #include <tqscrollview.h> -class KHTMLView; -class KHTMLPart; +class TDEHTMLView; +class TDEHTMLPart; namespace tdehtml { class RenderFrameSet; @@ -96,7 +96,7 @@ public: virtual void setFocus(bool); DocumentImpl* contentDocument() const; - KHTMLPart* contentPart() const; + TDEHTMLPart* contentPart() const; DOMString url; DOMString name; diff --git a/tdehtml/html/html_blockimpl.cpp b/tdehtml/html/html_blockimpl.cpp index 3e4585c41..47ceaa9fa 100644 --- a/tdehtml/html/html_blockimpl.cpp +++ b/tdehtml/html/html_blockimpl.cpp @@ -45,11 +45,11 @@ void HTMLDivElementImpl::parseAttribute(AttributeImpl *attr) { DOMString v = attr->value().lower(); if ( strcmp( v, "middle" ) == 0 || strcmp( v, "center" ) == 0 ) - addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__KHTML_CENTER); + addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__TDEHTML_CENTER); else if (strcmp(v, "left") == 0) - addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__KHTML_LEFT); + addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__TDEHTML_LEFT); else if (strcmp(v, "right") == 0) - addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__KHTML_RIGHT); + addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__TDEHTML_RIGHT); else addCSSProperty(CSS_PROP_TEXT_ALIGN, v); break; @@ -214,37 +214,37 @@ void HTMLMarqueeElementImpl::parseAttribute(AttributeImpl *attr) break; case ATTR_SCROLLAMOUNT: if (!attr->value().isEmpty()) - addCSSLength(CSS_PROP__KHTML_MARQUEE_INCREMENT, attr->value()); + addCSSLength(CSS_PROP__TDEHTML_MARQUEE_INCREMENT, attr->value()); else - removeCSSProperty(CSS_PROP__KHTML_MARQUEE_INCREMENT); + removeCSSProperty(CSS_PROP__TDEHTML_MARQUEE_INCREMENT); break; case ATTR_SCROLLDELAY: if (!attr->value().isEmpty()) - addCSSLength(CSS_PROP__KHTML_MARQUEE_SPEED, attr->value(), true); + addCSSLength(CSS_PROP__TDEHTML_MARQUEE_SPEED, attr->value(), true); else - removeCSSProperty(CSS_PROP__KHTML_MARQUEE_SPEED); + removeCSSProperty(CSS_PROP__TDEHTML_MARQUEE_SPEED); break; case ATTR_LOOP: if (!attr->value().isEmpty()) { if (attr->value() == "-1" || strcasecmp(attr->value(), "infinite") == 0) - addCSSProperty(CSS_PROP__KHTML_MARQUEE_REPETITION, CSS_VAL_INFINITE); + addCSSProperty(CSS_PROP__TDEHTML_MARQUEE_REPETITION, CSS_VAL_INFINITE); else - addCSSLength(CSS_PROP__KHTML_MARQUEE_REPETITION, attr->value().lower(), true); + addCSSLength(CSS_PROP__TDEHTML_MARQUEE_REPETITION, attr->value().lower(), true); } else - removeCSSProperty(CSS_PROP__KHTML_MARQUEE_REPETITION); + removeCSSProperty(CSS_PROP__TDEHTML_MARQUEE_REPETITION); break; case ATTR_BEHAVIOR: if (!attr->value().isEmpty()) - addCSSProperty(CSS_PROP__KHTML_MARQUEE_STYLE, attr->value().lower()); + addCSSProperty(CSS_PROP__TDEHTML_MARQUEE_STYLE, attr->value().lower()); else - removeCSSProperty(CSS_PROP__KHTML_MARQUEE_STYLE); + removeCSSProperty(CSS_PROP__TDEHTML_MARQUEE_STYLE); break; case ATTR_DIRECTION: if (!attr->value().isEmpty()) - addCSSProperty(CSS_PROP__KHTML_MARQUEE_DIRECTION, attr->value().lower()); + addCSSProperty(CSS_PROP__TDEHTML_MARQUEE_DIRECTION, attr->value().lower()); else - removeCSSProperty(CSS_PROP__KHTML_MARQUEE_DIRECTION); + removeCSSProperty(CSS_PROP__TDEHTML_MARQUEE_DIRECTION); break; case ATTR_TRUESPEED: m_minimumDelay = attr->val() ? 0 : defaultMinimumDelay; diff --git a/tdehtml/html/html_documentimpl.cpp b/tdehtml/html/html_documentimpl.cpp index 3aa70c196..21c3e12c5 100644 --- a/tdehtml/html/html_documentimpl.cpp +++ b/tdehtml/html/html_documentimpl.cpp @@ -69,7 +69,7 @@ using namespace DOM; using namespace tdehtml; -HTMLDocumentImpl::HTMLDocumentImpl(DOMImplementationImpl *_implementation, KHTMLView *v) +HTMLDocumentImpl::HTMLDocumentImpl(DOMImplementationImpl *_implementation, TDEHTMLView *v) : DocumentImpl(_implementation, v) { // kdDebug( 6090 ) << "HTMLDocumentImpl constructor this = " << this << endl; @@ -78,12 +78,12 @@ HTMLDocumentImpl::HTMLDocumentImpl(DOMImplementationImpl *_implementation, KHTML m_doAutoFill = false; /* dynamic history stuff to be fixed later (pfeiffer) - connect( KHTMLFactory::vLinks(), TQT_SIGNAL( removed( const TQString& )), + connect( TDEHTMLFactory::vLinks(), TQT_SIGNAL( removed( const TQString& )), TQT_SLOT( slotHistoryChanged() )); */ - connect( KHTMLFactory::vLinks(), TQT_SIGNAL( inserted( const TQString& ) ), + connect( TDEHTMLFactory::vLinks(), TQT_SIGNAL( inserted( const TQString& ) ), TQT_SLOT( slotHistoryChanged() )); - connect( KHTMLFactory::vLinks(), TQT_SIGNAL( cleared()), + connect( TDEHTMLFactory::vLinks(), TQT_SIGNAL( cleared()), TQT_SLOT( slotHistoryChanged() )); } @@ -108,7 +108,7 @@ DOMString HTMLDocumentImpl::lastModified() const DOMString HTMLDocumentImpl::cookie() const { long windowId = 0; - KHTMLView *v = view (); + TDEHTMLView *v = view (); if ( v && v->topLevelWidget() ) windowId = v->topLevelWidget()->winId(); @@ -140,7 +140,7 @@ DOMString HTMLDocumentImpl::cookie() const void HTMLDocumentImpl::setCookie( const DOMString & value ) { long windowId = 0; - KHTMLView *v = view (); + TDEHTMLView *v = view (); if ( v && v->topLevelWidget() ) windowId = v->topLevelWidget()->winId(); diff --git a/tdehtml/html/html_documentimpl.h b/tdehtml/html/html_documentimpl.h index 0aea47b8b..92f163076 100644 --- a/tdehtml/html/html_documentimpl.h +++ b/tdehtml/html/html_documentimpl.h @@ -29,7 +29,7 @@ #include <tqmap.h> -class KHTMLView; +class TDEHTMLView; class TQString; namespace DOM { @@ -45,7 +45,7 @@ class HTMLDocumentImpl : public DOM::DocumentImpl { Q_OBJECT public: - HTMLDocumentImpl(DOMImplementationImpl *_implementation, KHTMLView *v = 0); + HTMLDocumentImpl(DOMImplementationImpl *_implementation, TDEHTMLView *v = 0); ~HTMLDocumentImpl(); virtual bool isHTMLDocument() const { return true; } diff --git a/tdehtml/html/html_elementimpl.cpp b/tdehtml/html/html_elementimpl.cpp index c18f19ea0..1d7995501 100644 --- a/tdehtml/html/html_elementimpl.cpp +++ b/tdehtml/html/html_elementimpl.cpp @@ -212,11 +212,11 @@ void HTMLElementImpl::parseAttribute(AttributeImpl *attr) break; // standard events case ATTR_ONCLICK: - setHTMLEventListener(EventImpl::KHTML_ECMA_CLICK_EVENT, + setHTMLEventListener(EventImpl::TDEHTML_ECMA_CLICK_EVENT, getDocument()->createHTMLEventListener(attr->value().string(), "onclick", this)); break; case ATTR_ONDBLCLICK: - setHTMLEventListener(EventImpl::KHTML_ECMA_DBLCLICK_EVENT, + setHTMLEventListener(EventImpl::TDEHTML_ECMA_DBLCLICK_EVENT, getDocument()->createHTMLEventListener(attr->value().string(), "ondblclick", this)); break; case ATTR_ONMOUSEDOWN: @@ -640,7 +640,7 @@ void HTMLElementImpl::addHTMLAlignment( DOMString alignment ) } else if ( strcasecmp( alignment, "top" ) == 0 ) { propvalign = CSS_VAL_TOP; } else if ( strcasecmp( alignment, "middle" ) == 0 ) { - propvalign = CSS_VAL__KHTML_BASELINE_MIDDLE; + propvalign = CSS_VAL__TDEHTML_BASELINE_MIDDLE; } else if ( strcasecmp( alignment, "center" ) == 0 ) { propvalign = CSS_VAL_MIDDLE; } else if ( strcasecmp( alignment, "bottom" ) == 0 ) { diff --git a/tdehtml/html/html_formimpl.cpp b/tdehtml/html/html_formimpl.cpp index 7e2776ad5..3f8384a97 100644 --- a/tdehtml/html/html_formimpl.cpp +++ b/tdehtml/html/html_formimpl.cpp @@ -53,7 +53,7 @@ #include <kmessagebox.h> #include <kapplication.h> #include <klocale.h> -#ifndef KHTML_NO_WALLET +#ifndef TDEHTML_NO_WALLET #include <tdewallet.h> #endif #include <netaccess.h> @@ -223,7 +223,7 @@ TQByteArray HTMLFormElementImpl::formData(bool& ok) for(unsigned int i=0; i < strLength; ++i) if(str[i].latin1() == ',') str[i] = space; const TQStringList charsets = TQStringList::split(' ', str); TQTextCodec* codec = 0; - KHTMLView *view = getDocument()->view(); + TDEHTMLView *view = getDocument()->view(); { TQStringList::ConstIterator it = charsets.begin(); const TQStringList::ConstIterator itEnd = charsets.end(); @@ -425,7 +425,7 @@ static TQString calculateAutoFillKey(const HTMLFormElementImpl& e) void HTMLFormElementImpl::doAutoFill() { -#ifndef KHTML_NO_WALLET +#ifndef TDEHTML_NO_WALLET const TQString key = calculateAutoFillKey(*this); if (KWallet::Wallet::keyDoesNotExist(KWallet::Wallet::NetworkWallet(), @@ -435,12 +435,12 @@ void HTMLFormElementImpl::doAutoFill() // assert(view()) getDocument()->view()->part()->openWallet(this); -#endif // KHTML_NO_WALLET +#endif // TDEHTML_NO_WALLET } void HTMLFormElementImpl::walletOpened(KWallet::Wallet *w) { -#ifndef KHTML_NO_WALLET +#ifndef TDEHTML_NO_WALLET assert(w); const TQString key = calculateAutoFillKey(*this); if (!w->hasFolder(KWallet::Wallet::FormDataFolder())) { @@ -463,7 +463,7 @@ void HTMLFormElementImpl::walletOpened(KWallet::Wallet *w) { } } } -#endif // KHTML_NO_WALLET +#endif // TDEHTML_NO_WALLET } void HTMLFormElementImpl::submitFromKeyboard() @@ -505,8 +505,8 @@ void HTMLFormElementImpl::submitFromKeyboard() void HTMLFormElementImpl::gatherWalletData() { -#ifndef KHTML_NO_WALLET - KHTMLView* const view = getDocument()->view(); +#ifndef TDEHTML_NO_WALLET + TDEHTMLView* const view = getDocument()->view(); // check if we have any password input's m_walletMap.clear(); m_havePassword = false; @@ -529,13 +529,13 @@ void HTMLFormElementImpl::gatherWalletData() m_haveTextarea = true; } } -#endif // KHTML_NO_WALLET +#endif // TDEHTML_NO_WALLET } bool HTMLFormElementImpl::prepareSubmit() { - KHTMLView* const view = getDocument()->view(); + TDEHTMLView* const view = getDocument()->view(); if(m_insubmit || !view || !view->part() || view->part()->onlyLocalReferences()) return m_insubmit; @@ -569,7 +569,7 @@ void HTMLFormElementImpl::submit( ) #endif bool ok; - KHTMLView* const view = getDocument()->view(); + TDEHTMLView* const view = getDocument()->view(); const TQByteArray form_data = formData(ok); const KURL formUrl(getDocument()->URL()); @@ -577,7 +577,7 @@ void HTMLFormElementImpl::submit( ) if (m_walletMap.isEmpty()) { gatherWalletData(); } -#ifndef KHTML_NO_WALLET +#ifndef TDEHTML_NO_WALLET if (m_havePassword && !m_haveTextarea && KWallet::Wallet::isEnabled()) { const TQString key = calculateAutoFillKey(*this); const bool doesnotexist = KWallet::Wallet::keyDoesNotExist(KWallet::Wallet::NetworkWallet(), KWallet::Wallet::FormDataFolder(), key); @@ -630,7 +630,7 @@ void HTMLFormElementImpl::submit( ) } } } -#endif // KHTML_NO_WALLET +#endif // TDEHTML_NO_WALLET const DOMString url(tdehtml::parseURL(getAttribute(ATTR_ACTION))); if(m_post) { @@ -652,7 +652,7 @@ void HTMLFormElementImpl::submit( ) void HTMLFormElementImpl::reset( ) { - KHTMLView* const view = getDocument()->view(); + TDEHTMLView* const view = getDocument()->view(); if(m_inreset || !view || !view->part()) return; m_inreset = true; @@ -991,9 +991,9 @@ void HTMLGenericFormElementImpl::defaultEventHandler(EventImpl *evt) if (evt->target()==this && !m_disabled) { // Report focus in/out changes to the browser extension (editable widgets only) - KHTMLView* const view = getDocument()->view(); + TDEHTMLView* const view = getDocument()->view(); if (view && evt->id() == EventImpl::DOMFOCUSIN_EVENT && isEditable() && m_render && m_render->isWidget()) { - KHTMLPartBrowserExtension *ext = static_cast<KHTMLPartBrowserExtension *>(view->part()->browserExtension()); + TDEHTMLPartBrowserExtension *ext = static_cast<TDEHTMLPartBrowserExtension *>(view->part()->browserExtension()); TQWidget* const widget = static_cast<RenderWidget*>(m_render)->widget(); if (ext) ext->editableWidgetFocused(widget); @@ -1038,7 +1038,7 @@ void HTMLGenericFormElementImpl::defaultEventHandler(EventImpl *evt) if (view && evt->id() == EventImpl::DOMFOCUSOUT_EVENT && isEditable() && m_render && m_render->isWidget()) { - KHTMLPartBrowserExtension* const ext = static_cast<KHTMLPartBrowserExtension *>(view->part()->browserExtension()); + TDEHTMLPartBrowserExtension* const ext = static_cast<TDEHTMLPartBrowserExtension *>(view->part()->browserExtension()); TQWidget* const widget = static_cast<RenderWidget*>(m_render)->widget(); if (ext) ext->editableWidgetBlurred(widget); @@ -1772,7 +1772,7 @@ void HTMLInputElementImpl::defaultEventHandler(EventImpl *evt) m_render->absolutePosition(offsetX,offsetY); xPos = me->clientX()-offsetX; yPos = me->clientY()-offsetY; - KHTMLView* v = getDocument()->view(); + TDEHTMLView* v = getDocument()->view(); if ( v ) { xPos += v->contentsX(); yPos += v->contentsY(); diff --git a/tdehtml/html/html_formimpl.h b/tdehtml/html/html_formimpl.h index 6a909368a..8fe0ef1dd 100644 --- a/tdehtml/html/html_formimpl.h +++ b/tdehtml/html/html_formimpl.h @@ -34,7 +34,7 @@ #include <tqcstring.h> #include <tqmemarray.h> -class KHTMLView; +class TDEHTMLView; class TQTextCodec; namespace tdehtml diff --git a/tdehtml/html/html_headimpl.cpp b/tdehtml/html/html_headimpl.cpp index 2bc0ae99f..347f8c262 100644 --- a/tdehtml/html/html_headimpl.cpp +++ b/tdehtml/html/html_headimpl.cpp @@ -175,7 +175,7 @@ void HTMLLinkElementImpl::process() TQString type = getAttribute(ATTR_TYPE).string().lower(); TQString rel = getAttribute(ATTR_REL).string().lower(); - KHTMLPart* part = getDocument()->view() ? getDocument()->view()->part() : 0; + TDEHTMLPart* part = getDocument()->view() ? getDocument()->view()->part() : 0; // IE extension: location of small icon for locationbar / bookmarks // Uses both "shortcut icon" and "icon" @@ -408,7 +408,7 @@ void HTMLScriptElementImpl::evaluateScript(const TQString &URL, const DOMString if (m_evaluated) return; - KHTMLPart *part = getDocument()->part(); + TDEHTMLPart *part = getDocument()->part(); if (part) { KJSProxy *proxy = KJSProxy::proxy(part); if (proxy) { diff --git a/tdehtml/html/html_headimpl.h b/tdehtml/html/html_headimpl.h index ee9c2ad8b..8563de6a8 100644 --- a/tdehtml/html/html_headimpl.h +++ b/tdehtml/html/html_headimpl.h @@ -28,7 +28,7 @@ #include "misc/loader_client.h" #include "css/css_stylesheetimpl.h" -class KHTMLView; +class TDEHTMLView; namespace tdehtml { class CachedCSSStyleSheet; diff --git a/tdehtml/html/html_inlineimpl.cpp b/tdehtml/html/html_inlineimpl.cpp index 829b10f7b..f403a2385 100644 --- a/tdehtml/html/html_inlineimpl.cpp +++ b/tdehtml/html/html_inlineimpl.cpp @@ -98,7 +98,7 @@ void HTMLAnchorElementImpl::defaultEventHandler(EventImpl *evt) tdehtml::RenderImage *r = static_cast<tdehtml::RenderImage *>(img->renderer()); if(r && e) { - KHTMLView* v = getDocument()->view(); + TDEHTMLView* v = getDocument()->view(); int x = e->clientX(); int y = e->clientY(); int absx = 0; @@ -276,7 +276,7 @@ void HTMLFontElementImpl::parseAttribute(AttributeImpl *attr) case 6: size = CSS_VAL_XX_LARGE; break; default: if (num > 6) - size = CSS_VAL__KHTML_XXX_LARGE; + size = CSS_VAL__TDEHTML_XXX_LARGE; else size = CSS_VAL_XX_SMALL; } diff --git a/tdehtml/html/html_objectimpl.cpp b/tdehtml/html/html_objectimpl.cpp index b224ad687..f2cf8c1db 100644 --- a/tdehtml/html/html_objectimpl.cpp +++ b/tdehtml/html/html_objectimpl.cpp @@ -265,7 +265,7 @@ void HTMLAppletElementImpl::parseAttribute(AttributeImpl *attr) void HTMLAppletElementImpl::attach() { - KHTMLView* w = getDocument()->view(); + TDEHTMLView* w = getDocument()->view(); #ifndef Q_WS_QWS // FIXME? DOMString codeBase = getAttribute( ATTR_CODEBASE ); @@ -346,7 +346,7 @@ void HTMLEmbedElementImpl::parseAttribute(AttributeImpl *attr) void HTMLEmbedElementImpl::attach() { - KHTMLView* w = getDocument()->view(); + TDEHTMLView* w = getDocument()->view(); if (!w || !w->part()->pluginsEnabled()) m_renderAlternative = true; @@ -422,14 +422,14 @@ DocumentImpl* HTMLObjectElementImpl::contentDocument() const if ( !m_render ) return 0; if ( !m_render->isWidget() ) return 0; TQWidget* widget = static_cast<RenderWidget*>( m_render )->widget(); - if( widget && ::tqqt_cast<KHTMLView*>( widget ) ) - return static_cast<KHTMLView*>( widget )->part()->xmlDocImpl(); + if( widget && ::tqqt_cast<TDEHTMLView*>( widget ) ) + return static_cast<TDEHTMLView*>( widget )->part()->xmlDocImpl(); return 0; } void HTMLObjectElementImpl::attach() { - KHTMLView* w = getDocument()->view(); + TDEHTMLView* w = getDocument()->view(); if (!w || !w->part()->pluginsEnabled()) m_renderAlternative = true; diff --git a/tdehtml/html/html_objectimpl.h b/tdehtml/html/html_objectimpl.h index cc91935ca..d10e66356 100644 --- a/tdehtml/html/html_objectimpl.h +++ b/tdehtml/html/html_objectimpl.h @@ -28,7 +28,7 @@ #include <tqobject.h> #include <tqstringlist.h> -class KHTMLView; +class TDEHTMLView; // ------------------------------------------------------------------------- namespace DOM { diff --git a/tdehtml/html/html_tableimpl.cpp b/tdehtml/html/html_tableimpl.cpp index 3fc4ba757..71fe14773 100644 --- a/tdehtml/html/html_tableimpl.cpp +++ b/tdehtml/html/html_tableimpl.cpp @@ -63,7 +63,7 @@ HTMLTableElementImpl::HTMLTableElementImpl(DocumentImpl *doc) // only difference to 100% correct is that in strict mode <font> elements are propagated into tables. if ( getDocument()->parseMode() < DocumentImpl::Transitional ) { addCSSProperty( CSS_PROP_FONT_SIZE, CSS_VAL_MEDIUM ); - addCSSProperty( CSS_PROP_COLOR, CSS_VAL__KHTML_TEXT ); + addCSSProperty( CSS_PROP_COLOR, CSS_VAL__TDEHTML_TEXT ); } } @@ -627,13 +627,13 @@ void HTMLTablePartElementImpl::parseAttribute(AttributeImpl *attr) { DOMString v = attr->value(); if ( strcasecmp( attr->value(), "middle" ) == 0 || strcasecmp( attr->value(), "center" ) == 0 ) - addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__KHTML_CENTER); + addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__TDEHTML_CENTER); else if (strcasecmp(attr->value(), "absmiddle") == 0) addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL_CENTER); else if (strcasecmp(attr->value(), "left") == 0) - addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__KHTML_LEFT); + addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__TDEHTML_LEFT); else if (strcasecmp(attr->value(), "right") == 0) - addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__KHTML_RIGHT); + addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL__TDEHTML_RIGHT); else addCSSProperty(CSS_PROP_TEXT_ALIGN, v); break; @@ -881,7 +881,7 @@ void HTMLTableCellElementImpl::parseAttribute(AttributeImpl *attr) break; case ATTR_NOWRAP: if (attr->val() != 0) - addCSSProperty(CSS_PROP_WHITE_SPACE, CSS_VAL__KHTML_NOWRAP); + addCSSProperty(CSS_PROP_WHITE_SPACE, CSS_VAL__TDEHTML_NOWRAP); else removeCSSProperty(CSS_PROP_WHITE_SPACE); break; diff --git a/tdehtml/html/htmlparser.cpp b/tdehtml/html/htmlparser.cpp index 144a9addd..f7cc1daaf 100644 --- a/tdehtml/html/htmlparser.cpp +++ b/tdehtml/html/htmlparser.cpp @@ -125,7 +125,7 @@ public: * */ -KHTMLParser::KHTMLParser( KHTMLView *_parent, DocumentImpl *doc) +TDEHTMLParser::TDEHTMLParser( TDEHTMLView *_parent, DocumentImpl *doc) { //kdDebug( 6035 ) << "parser constructor" << endl; #if SPEED_DEBUG > 0 @@ -144,7 +144,7 @@ KHTMLParser::KHTMLParser( KHTMLView *_parent, DocumentImpl *doc) reset(); } -KHTMLParser::KHTMLParser( DOM::DocumentFragmentImpl *i, DocumentImpl *doc ) +TDEHTMLParser::TDEHTMLParser( DOM::DocumentFragmentImpl *i, DocumentImpl *doc ) { HTMLWidget = 0; document = doc; @@ -161,7 +161,7 @@ KHTMLParser::KHTMLParser( DOM::DocumentFragmentImpl *i, DocumentImpl *doc ) inBody = true; } -KHTMLParser::~KHTMLParser() +TDEHTMLParser::~TDEHTMLParser() { #if SPEED_DEBUG > 0 kdDebug( ) << "TIME: parsing time was = " << qt.elapsed() << endl; @@ -175,7 +175,7 @@ KHTMLParser::~KHTMLParser() delete isindex; } -void KHTMLParser::reset() +void TDEHTMLParser::reset() { setCurrent ( document ); @@ -201,7 +201,7 @@ void KHTMLParser::reset() discard_until = 0; } -void KHTMLParser::parseToken(Token *t) +void TDEHTMLParser::parseToken(Token *t) { if (t->tid > 2*ID_CLOSE_TAG) { @@ -310,7 +310,7 @@ static bool isTableRelatedTag(int id) id == ID_TH); } -bool KHTMLParser::insertNode(NodeImpl *n, bool flat) +bool TDEHTMLParser::insertNode(NodeImpl *n, bool flat) { int id = n->id(); @@ -821,7 +821,7 @@ bool KHTMLParser::insertNode(NodeImpl *n, bool flat) } -NodeImpl *KHTMLParser::getElement(Token* t) +NodeImpl *TDEHTMLParser::getElement(Token* t) { NodeImpl *n = 0; @@ -911,11 +911,11 @@ NodeImpl *KHTMLParser::getElement(Token* t) break; case ID_INPUT: if ( t->attrs && - KHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled() && - KHTMLFactory::defaultHTMLSettings()->isHideAdsEnabled() && + TDEHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled() && + TDEHTMLFactory::defaultHTMLSettings()->isHideAdsEnabled() && !strcasecmp( t->attrs->getValue( ATTR_TYPE ), "image" ) ) { - if (KHTMLFactory::defaultHTMLSettings()->isAdFiltered( doc()->completeURL( tdehtml::parseURL(t->attrs->getValue(ATTR_SRC)).string() ) )) + if (TDEHTMLFactory::defaultHTMLSettings()->isAdFiltered( doc()->completeURL( tdehtml::parseURL(t->attrs->getValue(ATTR_SRC)).string() ) )) return 0; } n = new HTMLInputElementImpl(document, form); @@ -1038,11 +1038,11 @@ NodeImpl *KHTMLParser::getElement(Token* t) // images case ID_IMG: if (t->attrs&& - KHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled()&& - KHTMLFactory::defaultHTMLSettings()->isHideAdsEnabled()) + TDEHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled()&& + TDEHTMLFactory::defaultHTMLSettings()->isHideAdsEnabled()) { TQString url = doc()->completeURL( tdehtml::parseURL(t->attrs->getValue(ATTR_SRC)).string() ); - if (KHTMLFactory::defaultHTMLSettings()->isAdFiltered(url)) + if (TDEHTMLFactory::defaultHTMLSettings()->isAdFiltered(url)) return 0; } n = new HTMLImageElementImpl(document, form); @@ -1200,7 +1200,7 @@ NodeImpl *KHTMLParser::getElement(Token* t) return n; } -void KHTMLParser::processCloseTag(Token *t) +void TDEHTMLParser::processCloseTag(Token *t) { // support for really broken html. Can't believe I'm supporting such crap (lars) switch(t->tid) @@ -1244,7 +1244,7 @@ void KHTMLParser::processCloseTag(Token *t) #endif } -bool KHTMLParser::isResidualStyleTag(int _id) +bool TDEHTMLParser::isResidualStyleTag(int _id) { switch (_id) { case ID_A: @@ -1274,7 +1274,7 @@ bool KHTMLParser::isResidualStyleTag(int _id) } } -bool KHTMLParser::isAffectedByResidualStyle(int _id) +bool TDEHTMLParser::isAffectedByResidualStyle(int _id) { if (isResidualStyleTag(_id)) return true; @@ -1304,7 +1304,7 @@ bool KHTMLParser::isAffectedByResidualStyle(int _id) } } -void KHTMLParser::handleResidualStyleCloseTagAcrossBlocks(HTMLStackElem* elem) +void TDEHTMLParser::handleResidualStyleCloseTagAcrossBlocks(HTMLStackElem* elem) { // Find the element that crosses over to a higher level. // ### For now, if there is more than one, we will only make sure we close the residual style. @@ -1487,7 +1487,7 @@ void KHTMLParser::handleResidualStyleCloseTagAcrossBlocks(HTMLStackElem* elem) // if it becomes necessary to do so. } -void KHTMLParser::reopenResidualStyleTags(HTMLStackElem* elem, DOM::NodeImpl* malformedTableParent) +void TDEHTMLParser::reopenResidualStyleTags(HTMLStackElem* elem, DOM::NodeImpl* malformedTableParent) { // Loop for each tag that needs to be reopened. while (elem) { @@ -1525,7 +1525,7 @@ void KHTMLParser::reopenResidualStyleTags(HTMLStackElem* elem, DOM::NodeImpl* ma } } -void KHTMLParser::pushBlock(int _id, int _level) +void TDEHTMLParser::pushBlock(int _id, int _level) { HTMLStackElem *Elem = new HTMLStackElem(_id, _level, current, m_inline, blockStack); @@ -1533,7 +1533,7 @@ void KHTMLParser::pushBlock(int _id, int _level) addForbidden(_id, forbiddenTag); } -void KHTMLParser::popBlock( int _id ) +void TDEHTMLParser::popBlock( int _id ) { HTMLStackElem *Elem = blockStack; int maxLevel = 0; @@ -1619,7 +1619,7 @@ void KHTMLParser::popBlock( int _id ) reopenResidualStyleTags(residualStyleStack, malformedTableParent); } -void KHTMLParser::popOneBlock(bool delBlock) +void TDEHTMLParser::popOneBlock(bool delBlock) { HTMLStackElem *Elem = blockStack; @@ -1661,20 +1661,20 @@ void KHTMLParser::popOneBlock(bool delBlock) delete Elem; } -void KHTMLParser::popInlineBlocks() +void TDEHTMLParser::popInlineBlocks() { while(blockStack && current->isInline() && current->id() != ID_FONT) popOneBlock(); } -void KHTMLParser::freeBlock() +void TDEHTMLParser::freeBlock() { while (blockStack) popOneBlock(); blockStack = 0; } -void KHTMLParser::createHead() +void TDEHTMLParser::createHead() { if(head || !doc()->firstChild()) return; @@ -1692,7 +1692,7 @@ void KHTMLParser::createHead() } } -NodeImpl *KHTMLParser::handleIsindex( Token *t ) +NodeImpl *TDEHTMLParser::handleIsindex( Token *t ) { NodeImpl *n; HTMLFormElementImpl *myform = form; @@ -1718,7 +1718,7 @@ NodeImpl *KHTMLParser::handleIsindex( Token *t ) return n; } -void KHTMLParser::startBody() +void TDEHTMLParser::startBody() { if(inBody) return; diff --git a/tdehtml/html/htmlparser.h b/tdehtml/html/htmlparser.h index 660ced9e9..79f2b14c7 100644 --- a/tdehtml/html/htmlparser.h +++ b/tdehtml/html/htmlparser.h @@ -44,7 +44,7 @@ #include "html/html_documentimpl.h" #include "html/RefPtr.h" -class KHTMLView; +class TDEHTMLView; class HTMLStackElem; namespace DOM { @@ -66,12 +66,12 @@ class Token; * The parser for html. It receives a stream of tokens from the HTMLTokenizer, and * builds up the Document structure form it. */ -class KHTMLParser +class TDEHTMLParser { public: - KHTMLParser( KHTMLView *w, DOM::DocumentImpl *i ); - KHTMLParser( DOM::DocumentFragmentImpl *frag, DOM::DocumentImpl *doc ); - virtual ~KHTMLParser(); + TDEHTMLParser( TDEHTMLView *w, DOM::DocumentImpl *i ); + TDEHTMLParser( DOM::DocumentFragmentImpl *frag, DOM::DocumentImpl *doc ); + virtual ~TDEHTMLParser(); /** * parses one token delivered by the tokenizer @@ -92,7 +92,7 @@ public: protected: - KHTMLView *HTMLWidget; + TDEHTMLView *HTMLWidget; DOM::DocumentImpl *document; /* diff --git a/tdehtml/html/htmltokenizer.cpp b/tdehtml/html/htmltokenizer.cpp index 83bfd4bd5..62d3ffab6 100644 --- a/tdehtml/html/htmltokenizer.cpp +++ b/tdehtml/html/htmltokenizer.cpp @@ -69,9 +69,9 @@ static const char styleEnd [] = "</style"; static const char textareaEnd [] = "</textarea"; static const char titleEnd [] = "</title"; -#define KHTML_ALLOC_QCHAR_VEC( N ) (TQChar*) malloc( sizeof(TQChar)*( N ) ) -#define KHTML_REALLOC_QCHAR_VEC(P, N ) (TQChar*) realloc(P, sizeof(TQChar)*( N )) -#define KHTML_DELETE_QCHAR_VEC( P ) free((char*)( P )) +#define TDEHTML_ALLOC_QCHAR_VEC( N ) (TQChar*) malloc( sizeof(TQChar)*( N ) ) +#define TDEHTML_REALLOC_QCHAR_VEC(P, N ) (TQChar*) realloc(P, sizeof(TQChar)*( N )) +#define TDEHTML_DELETE_QCHAR_VEC( P ) free((char*)( P )) // Full support for MS Windows extensions to Latin-1. // Technically these extensions should only be activated for pages @@ -123,14 +123,14 @@ static const char titleEnd [] = "</title"; #endif // ---------------------------------------------------------------------------- -HTMLTokenizer::HTMLTokenizer(DOM::DocumentImpl *_doc, KHTMLView *_view) +HTMLTokenizer::HTMLTokenizer(DOM::DocumentImpl *_doc, TDEHTMLView *_view) { view = _view; buffer = 0; scriptCode = 0; scriptCodeSize = scriptCodeMaxSize = scriptCodeResync = 0; charsets = TDEGlobal::charsets(); - parser = new KHTMLParser(_view, _doc); + parser = new TDEHTMLParser(_view, _doc); m_executingScript = 0; m_autoCloseTimer = 0; onHold = false; @@ -145,7 +145,7 @@ HTMLTokenizer::HTMLTokenizer(DOM::DocumentImpl *_doc, DOM::DocumentFragmentImpl scriptCode = 0; scriptCodeSize = scriptCodeMaxSize = scriptCodeResync = 0; charsets = TDEGlobal::charsets(); - parser = new KHTMLParser( i, _doc ); + parser = new TDEHTMLParser( i, _doc ); m_executingScript = 0; m_autoCloseTimer = 0; onHold = false; @@ -163,12 +163,12 @@ void HTMLTokenizer::reset() cachedScript.dequeue()->deref(this); if ( buffer ) - KHTML_DELETE_QCHAR_VEC(buffer); + TDEHTML_DELETE_QCHAR_VEC(buffer); buffer = dest = 0; size = 0; if ( scriptCode ) - KHTML_DELETE_QCHAR_VEC(scriptCode); + TDEHTML_DELETE_QCHAR_VEC(scriptCode); scriptCode = 0; scriptCodeSize = scriptCodeMaxSize = scriptCodeResync = 0; @@ -186,7 +186,7 @@ void HTMLTokenizer::begin() onHold = false; reset(); size = 254; - buffer = KHTML_ALLOC_QCHAR_VEC( 255 ); + buffer = TDEHTML_ALLOC_QCHAR_VEC( 255 ); dest = buffer; tag = NoTag; pending = NonePending; @@ -1578,10 +1578,10 @@ void HTMLTokenizer::end() processToken(); if(buffer) - KHTML_DELETE_QCHAR_VEC(buffer); + TDEHTML_DELETE_QCHAR_VEC(buffer); if(scriptCode) - KHTML_DELETE_QCHAR_VEC(scriptCode); + TDEHTML_DELETE_QCHAR_VEC(scriptCode); scriptCode = 0; scriptCodeSize = scriptCodeMaxSize = scriptCodeResync = 0; @@ -1621,7 +1621,7 @@ void HTMLTokenizer::finish() pos = TQConstString(scriptCode, scriptCodeSize).string().find('>'); food.setUnicode(scriptCode+pos+1, scriptCodeSize-pos-1); // deep copy } - KHTML_DELETE_QCHAR_VEC(scriptCode); + TDEHTML_DELETE_QCHAR_VEC(scriptCode); scriptCode = 0; scriptCodeSize = scriptCodeMaxSize = scriptCodeResync = 0; if (script) @@ -1720,7 +1720,7 @@ void HTMLTokenizer::enlargeBuffer(int len) int newsize = kMax(size*2, size+len); int oldoffs = (dest - buffer); - buffer = KHTML_REALLOC_QCHAR_VEC(buffer, newsize); + buffer = TDEHTML_REALLOC_QCHAR_VEC(buffer, newsize); dest = buffer + oldoffs; size = newsize; } @@ -1728,7 +1728,7 @@ void HTMLTokenizer::enlargeBuffer(int len) void HTMLTokenizer::enlargeScriptBuffer(int len) { int newsize = kMax(scriptCodeMaxSize*2, scriptCodeMaxSize+len); - scriptCode = KHTML_REALLOC_QCHAR_VEC(scriptCode, newsize); + scriptCode = TDEHTML_REALLOC_QCHAR_VEC(scriptCode, newsize); scriptCodeMaxSize = newsize; } diff --git a/tdehtml/html/htmltokenizer.h b/tdehtml/html/htmltokenizer.h index 5222647d4..a79f65edf 100644 --- a/tdehtml/html/htmltokenizer.h +++ b/tdehtml/html/htmltokenizer.h @@ -41,7 +41,7 @@ #include "xml/dom_docimpl.h" class KCharsets; -class KHTMLView; +class TDEHTMLView; namespace DOM { class DocumentImpl; @@ -50,7 +50,7 @@ namespace DOM { namespace tdehtml { class CachedScript; - class KHTMLParser; + class TDEHTMLParser; /** * @internal @@ -120,9 +120,9 @@ namespace tdehtml { class HTMLTokenizer : public Tokenizer, public CachedObjectClient { - friend class KHTMLParser; + friend class TDEHTMLParser; public: - HTMLTokenizer(DOM::DocumentImpl *, KHTMLView * = 0); + HTMLTokenizer(DOM::DocumentImpl *, TDEHTMLView * = 0); HTMLTokenizer(DOM::DocumentImpl *, DOM::DocumentFragmentImpl *frag); virtual ~HTMLTokenizer(); @@ -347,9 +347,9 @@ protected: tdehtml::TokenizerString src; KCharsets *charsets; - KHTMLParser *parser; + TDEHTMLParser *parser; - KHTMLView *view; + TDEHTMLView *view; }; } // namespace diff --git a/tdehtml/htmlpageinfo.ui b/tdehtml/htmlpageinfo.ui index 5dd21cd6f..2315771ae 100644 --- a/tdehtml/htmlpageinfo.ui +++ b/tdehtml/htmlpageinfo.ui @@ -1,5 +1,5 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> -<class>KHTMLInfoDlg</class> +<class>TDEHTMLInfoDlg</class> <comment>A dialog to display the HTTP headers for a given page.</comment> <author>George Staikos <[email protected]></author> <widget class="TQDialog"> diff --git a/tdehtml/java/kjavaappletcontext.h b/tdehtml/java/kjavaappletcontext.h index 119699f23..8ccedfe38 100644 --- a/tdehtml/java/kjavaappletcontext.h +++ b/tdehtml/java/kjavaappletcontext.h @@ -30,7 +30,7 @@ * @short Provides a context for KJavaAppletWidgets * * Applets run in a context- (see the Java documentation for more information - * on contexts). Currently, each document in KHTML creates one context, in + * on contexts). Currently, each document in TDEHTML creates one context, in * which multiple applets can run. * * @author Richard J. Moore, [email protected] @@ -112,12 +112,12 @@ signals: void showStatus ( const TQString& txt ); /** - * Signals the KHTML Part to show a url in a given target + * Signals the TDEHTML Part to show a url in a given target */ void showDocument( const TQString& url, const TQString& target ); /** - * Signals the KHTML Part an applet is loaded + * Signals the TDEHTML Part an applet is loaded **/ void appletLoaded(); diff --git a/tdehtml/java/kjavaappletviewer.cpp b/tdehtml/java/kjavaappletviewer.cpp index 194a6324a..913678092 100644 --- a/tdehtml/java/kjavaappletviewer.cpp +++ b/tdehtml/java/kjavaappletviewer.cpp @@ -241,15 +241,15 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *, kdDebug(6100) << "name=" << name << " value=" << value << endl; if (!name.isEmpty()) { const TQString name_lower = name.lower (); - if (name == "__KHTML__PLUGINBASEURL") { + if (name == "__TDEHTML__PLUGINBASEURL") { baseurl = KURL (KURL (value), TQString (".")).url (); - } else if (name == "__KHTML__CODEBASE") + } else if (name == "__TDEHTML__CODEBASE") tdehtml_codebase = value; else if (name_lower == TQString::fromLatin1("codebase") || name_lower == TQString::fromLatin1("java_codebase")) { if (!value.isEmpty ()) codebase = value; - } else if (name == "__KHTML__CLASSID") + } else if (name == "__TDEHTML__CLASSID") //else if (name.lower()==TQString::fromLatin1("classid")) classid = value; else if (name_lower == TQString::fromLatin1("code") || @@ -267,7 +267,7 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *, width = value.toInt(); else if (name_lower == TQString::fromLatin1("height")) height = value.toInt(); - if (!name.startsWith ("__KHTML__")) { + if (!name.startsWith ("__TDEHTML__")) { applet->setParameter (name, value); } } diff --git a/tdehtml/misc/decoder.h b/tdehtml/misc/decoder.h index 2fcda7904..163e44ca7 100644 --- a/tdehtml/misc/decoder.h +++ b/tdehtml/misc/decoder.h @@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef KHTMLDECODER_H -#define KHTMLDECODER_H +#ifndef TDEHTMLDECODER_H +#define TDEHTMLDECODER_H #include <tqstring.h> class TQTextCodec; diff --git a/tdehtml/misc/htmltags.h b/tdehtml/misc/htmltags.h index a2fb0fe55..d8fbb3236 100644 --- a/tdehtml/misc/htmltags.h +++ b/tdehtml/misc/htmltags.h @@ -1,8 +1,8 @@ /* This file is automatically generated from htmltags.in by maketags, do not edit */ /* Copyright 1999 Lars Knoll */ -#ifndef KHTML_TAGS_H -#define KHTML_TAGS_H +#ifndef TDEHTML_TAGS_H +#define TDEHTML_TAGS_H #include "dom/dom_string.h" #include <kglobal.h> diff --git a/tdehtml/misc/loader.cpp b/tdehtml/misc/loader.cpp index 5cd18f29b..6f19d01aa 100644 --- a/tdehtml/misc/loader.cpp +++ b/tdehtml/misc/loader.cpp @@ -486,7 +486,7 @@ CachedImage::CachedImage(DocLoader* dl, const DOMString &url, TDEIO::CacheContro setAccept( acceptHeader ); m_showAnimations = dl->showAnimations(); - if ( KHTMLFactory::defaultHTMLSettings()->isAdFiltered( url.string() ) ) { + if ( TDEHTMLFactory::defaultHTMLSettings()->isAdFiltered( url.string() ) ) { m_wasBlocked = true; CachedObject::finish(); } @@ -735,13 +735,13 @@ void CachedImage::movieStatus(int status) } if((status == TQMovie::EndOfMovie && (!m || m->frameNumber() <= 1)) || - ((status == TQMovie::EndOfLoop) && (m_showAnimations == KHTMLSettings::KAnimationLoopOnce)) || - ((status == TQMovie::EndOfFrame) && (m_showAnimations == KHTMLSettings::KAnimationDisabled)) + ((status == TQMovie::EndOfLoop) && (m_showAnimations == TDEHTMLSettings::KAnimationLoopOnce)) || + ((status == TQMovie::EndOfFrame) && (m_showAnimations == TDEHTMLSettings::KAnimationDisabled)) ) { if(imgSource) { - setShowAnimations( KHTMLSettings::KAnimationDisabled ); + setShowAnimations( TDEHTMLSettings::KAnimationDisabled ); // monochrome alphamasked images are usually about 10000 times // faster to draw, so this is worth the hack @@ -779,10 +779,10 @@ void CachedImage::movieResize(const TQSize& /*s*/) do_notify(m->framePixmap(), TQRect()); } -void CachedImage::setShowAnimations( KHTMLSettings::KAnimationAdvice showAnimations ) +void CachedImage::setShowAnimations( TDEHTMLSettings::KAnimationAdvice showAnimations ) { m_showAnimations = showAnimations; - if ( (m_showAnimations == KHTMLSettings::KAnimationDisabled) && imgSource ) { + if ( (m_showAnimations == TDEHTMLSettings::KAnimationDisabled) && imgSource ) { imgSource->cleanBuffer(); delete p; p = new TQPixmap(m->framePixmap()); @@ -941,13 +941,13 @@ Request::~Request() // ------------------------------------------------------------------------------------------ -DocLoader::DocLoader(KHTMLPart* part, DocumentImpl* doc) +DocLoader::DocLoader(TDEHTMLPart* part, DocumentImpl* doc) { m_cachePolicy = TDEIO::CC_Verify; m_expireDate = 0; m_creationDate = time(0); m_bautoloadImages = true; - m_showAnimations = KHTMLSettings::KAnimationEnabled; + m_showAnimations = TDEHTMLSettings::KAnimationEnabled; m_part = part; m_doc = doc; @@ -1052,8 +1052,8 @@ CachedCSSStyleSheet *DocLoader::requestStyleSheet( const DOM::DOMString &url, co CachedScript *DocLoader::requestScript( const DOM::DOMString &url, const TQString& charset) { DOCLOADER_SECCHECK(true); - if ( ! KHTMLFactory::defaultHTMLSettings()->isJavaScriptEnabled(fullURL.host()) || - KHTMLFactory::defaultHTMLSettings()->isAdFiltered(fullURL.url())) + if ( ! TDEHTMLFactory::defaultHTMLSettings()->isJavaScriptEnabled(fullURL.host()) || + TDEHTMLFactory::defaultHTMLSettings()->isAdFiltered(fullURL.url())) return 0L; CachedScript* s = Cache::requestObject<CachedScript, CachedObject::Script>( this, fullURL, 0 ); @@ -1086,7 +1086,7 @@ void DocLoader::setAutoloadImages( bool enable ) } } -void DocLoader::setShowAnimations( KHTMLSettings::KAnimationAdvice showAnimations ) +void DocLoader::setShowAnimations( TDEHTMLSettings::KAnimationAdvice showAnimations ) { if ( showAnimations == m_showAnimations ) return; m_showAnimations = showAnimations; @@ -1162,7 +1162,7 @@ void Loader::servePendingRequests() { job->addMetaData( "referrer", req->m_docLoader->doc()->URL().url() ); - KHTMLPart *part = req->m_docLoader->part(); + TDEHTMLPart *part = req->m_docLoader->part(); if (part ) { job->addMetaData( "cross-domain", part->toplevelURL().url() ); @@ -1356,7 +1356,7 @@ void Cache::init() nullPixmap = new TQPixmap; if ( !brokenPixmap ) - brokenPixmap = new TQPixmap(KHTMLFactory::instance()->iconLoader()->loadIcon("file_broken", KIcon::Desktop, 16, KIcon::DisabledState)); + brokenPixmap = new TQPixmap(TDEHTMLFactory::instance()->iconLoader()->loadIcon("file_broken", KIcon::Desktop, 16, KIcon::DisabledState)); if ( !blockedPixmap ) { blockedPixmap = new TQPixmap(); diff --git a/tdehtml/misc/loader.h b/tdehtml/misc/loader.h index fa00b4ffb..f885ec33e 100644 --- a/tdehtml/misc/loader.h +++ b/tdehtml/misc/loader.h @@ -55,7 +55,7 @@ #include <dom/dom_string.h> class TQMovie; -class KHTMLPart; +class TDEHTMLPart; namespace TDEIO { class Job; @@ -183,7 +183,7 @@ namespace tdehtml CachedObject* m_next; CachedObject* m_prev; friend class Cache; - friend class ::KHTMLPart; + friend class ::TDEHTMLPart; }; @@ -286,7 +286,7 @@ namespace tdehtml const TQString& suggestedTitle() const { return m_suggestedFilename; } #endif - void setShowAnimations( KHTMLSettings::KAnimationAdvice ); + void setShowAnimations( TDEHTMLSettings::KAnimationAdvice ); void pauseAnimations(); void resumeAnimations(); @@ -331,10 +331,10 @@ namespace tdehtml bool typeChecked : 1; bool isFullyTransparent : 1; bool monochrome : 1; - KHTMLSettings::KAnimationAdvice m_showAnimations : 2; + TDEHTMLSettings::KAnimationAdvice m_showAnimations : 2; friend class Cache; - friend class ::KHTMLPart; + friend class ::TDEHTMLPart; }; /** @@ -345,7 +345,7 @@ namespace tdehtml class DocLoader { public: - DocLoader(KHTMLPart*, DOM::DocumentImpl*); + DocLoader(TDEHTMLPart*, DOM::DocumentImpl*); ~DocLoader(); CachedImage *requestImage( const DOM::DOMString &url); @@ -355,16 +355,16 @@ namespace tdehtml bool autoloadImages() const { return m_bautoloadImages; } TDEIO::CacheControl cachePolicy() const { return m_cachePolicy; } - KHTMLSettings::KAnimationAdvice showAnimations() const { return m_showAnimations; } + TDEHTMLSettings::KAnimationAdvice showAnimations() const { return m_showAnimations; } time_t expireDate() const { return m_expireDate; } - KHTMLPart* part() const { return m_part; } + TDEHTMLPart* part() const { return m_part; } DOM::DocumentImpl* doc() const { return m_doc; } void setCacheCreationDate( time_t ); void setExpireDate( time_t, bool relative ); void setAutoloadImages( bool ); void setCachePolicy( TDEIO::CacheControl cachePolicy ) { m_cachePolicy = cachePolicy; } - void setShowAnimations( KHTMLSettings::KAnimationAdvice ); + void setShowAnimations( TDEHTMLSettings::KAnimationAdvice ); void pauseAnimations(); void resumeAnimations(); void insertCachedObject( CachedObject* o ) const; @@ -375,7 +375,7 @@ namespace tdehtml friend class Cache; friend class DOM::DocumentImpl; - friend class ::KHTMLPart; + friend class ::TDEHTMLPart; TQStringList m_reloadedURLs; mutable TQPtrDict<CachedObject> m_docObjects; @@ -383,8 +383,8 @@ namespace tdehtml time_t m_creationDate; TDEIO::CacheControl m_cachePolicy; bool m_bautoloadImages : 1; - KHTMLSettings::KAnimationAdvice m_showAnimations : 2; - KHTMLPart* m_part; + TDEHTMLSettings::KAnimationAdvice m_showAnimations : 2; + TDEHTMLPart* m_part; DOM::DocumentImpl* m_doc; }; diff --git a/tdehtml/misc/maketags b/tdehtml/misc/maketags index a460cf8e4..b2b472892 100644 --- a/tdehtml/misc/maketags +++ b/tdehtml/misc/maketags @@ -37,8 +37,8 @@ print header <<EOF; /* This file is automatically generated from htmltags.in by maketags, do not edit */ /* Copyright 1999 Lars Knoll */ -#ifndef KHTML_TAGS_H -#define KHTML_TAGS_H +#ifndef TDEHTML_TAGS_H +#define TDEHTML_TAGS_H #include "dom/dom_string.h" #include <kglobal.h> diff --git a/tdehtml/misc/stringit.h b/tdehtml/misc/stringit.h index a93a59e4d..74cdd471e 100644 --- a/tdehtml/misc/stringit.h +++ b/tdehtml/misc/stringit.h @@ -23,8 +23,8 @@ // // KDE HTML Widget -- String class -#ifndef KHTMLSTRING_H -#define KHTMLSTRING_H +#ifndef TDEHTMLSTRING_H +#define TDEHTMLSTRING_H #include "dom/dom_string.h" diff --git a/tdehtml/rendering/bidi.cpp b/tdehtml/rendering/bidi.cpp index a79ac9854..7916a9c4f 100644 --- a/tdehtml/rendering/bidi.cpp +++ b/tdehtml/rendering/bidi.cpp @@ -618,7 +618,7 @@ InlineFlowBox* RenderBlock::createLineBoxes(RenderObject* obj) { // See if we have an unconstructed line box for this object that is also // the last item on the line. - KHTMLAssert(obj->isInlineFlow() || obj == this); + TDEHTMLAssert(obj->isInlineFlow() || obj == this); RenderFlow* flow = static_cast<RenderFlow*>(obj); // Get the last box we made for this render object. @@ -633,7 +633,7 @@ InlineFlowBox* RenderBlock::createLineBoxes(RenderObject* obj) // We need to make a new box for this render object. Once // made, we need to place it at the end of the current line. InlineBox* newBox = obj->createInlineBox(false, obj == this); - KHTMLAssert(newBox->isInlineFlowBox()); + TDEHTMLAssert(newBox->isInlineFlowBox()); box = static_cast<InlineFlowBox*>(newBox); box->setFirstLineStyleBit(m_firstLine); @@ -673,7 +673,7 @@ InlineFlowBox* RenderBlock::constructLine(const BidiIterator &/*start*/, const B // We should have a root inline box. It should be unconstructed and // be the last continuation of our line list. - KHTMLAssert(lastLineBox() && !lastLineBox()->isConstructed()); + TDEHTMLAssert(lastLineBox() && !lastLineBox()->isConstructed()); // Set bits on our inline flow boxes that indicate which sides should // paint borders/margins/padding. This knowledge will ultimately be used when @@ -719,7 +719,7 @@ void RenderBlock::computeHorizontalPositionsForLine(InlineFlowBox* lineBox, Bidi int availableWidth = lineWidth(m_height); switch(style()->textAlign()) { case LEFT: - case KHTML_LEFT: + case TDEHTML_LEFT: numSpaces = 0; break; case JUSTIFY: @@ -732,12 +732,12 @@ void RenderBlock::computeHorizontalPositionsForLine(InlineFlowBox* lineBox, Bidi if (bidi.context->basicDir == TQChar::DirL) break; case RIGHT: - case KHTML_RIGHT: + case TDEHTML_RIGHT: x += availableWidth - totWidth; numSpaces = 0; break; case CENTER: - case KHTML_CENTER: + case TDEHTML_CENTER: int xd = (availableWidth - totWidth)/2; x += xd >0 ? xd : 0; numSpaces = 0; @@ -756,7 +756,7 @@ void RenderBlock::computeHorizontalPositionsForLine(InlineFlowBox* lineBox, Bidi spaces++; } - KHTMLAssert(spaces <= numSpaces); + TDEHTMLAssert(spaces <= numSpaces); // Only justify text with white-space: normal. if (r->obj->style()->whiteSpace() == NORMAL) { @@ -1986,7 +1986,7 @@ BidiIterator RenderBlock::findNextLineBreak(BidiIterator &start, BidiState &bidi } } } else - KHTMLAssert( false ); + TDEHTMLAssert( false ); InlineMinMaxIterator savedIt = lastIt; lastIt = it; diff --git a/tdehtml/rendering/font.cpp b/tdehtml/rendering/font.cpp index 3ace5ddd1..b7632fc8d 100644 --- a/tdehtml/rendering/font.cpp +++ b/tdehtml/rendering/font.cpp @@ -417,7 +417,7 @@ bool Font::isFontScalable(TQFontDatabase& db, const TQFont& font) void Font::update( TQPaintDeviceMetrics* devMetrics ) const { - f.setFamily( fontDef.family.isEmpty() ? KHTMLFactory::defaultHTMLSettings()->stdFontName() : fontDef.family ); + f.setFamily( fontDef.family.isEmpty() ? TDEHTMLFactory::defaultHTMLSettings()->stdFontName() : fontDef.family ); f.setItalic( fontDef.italic ); f.setWeight( fontDef.weight ); diff --git a/tdehtml/rendering/font.h b/tdehtml/rendering/font.h index 81110e0d0..e34f54207 100644 --- a/tdehtml/rendering/font.h +++ b/tdehtml/rendering/font.h @@ -22,8 +22,8 @@ * */ -#ifndef KHTMLFONT_H -#define KHTMLFONT_H +#ifndef TDEHTMLFONT_H +#define TDEHTMLFONT_H #include <tqfont.h> #include <tqfontmetrics.h> diff --git a/tdehtml/rendering/render_applet.cpp b/tdehtml/rendering/render_applet.cpp index 1b65ca8de..d14a93553 100644 --- a/tdehtml/rendering/render_applet.cpp +++ b/tdehtml/rendering/render_applet.cpp @@ -48,9 +48,9 @@ RenderApplet::RenderApplet(HTMLElementImpl *applet, const TQMap<TQString, TQStri setInline(true); KJavaAppletContext *context = 0; - KHTMLView *_view = applet->getDocument()->view(); + TDEHTMLView *_view = applet->getDocument()->view(); if ( _view ) { - KHTMLPart *part = _view->part(); + TDEHTMLPart *part = _view->part(); context = part->createJavaContext(); } @@ -89,8 +89,8 @@ void RenderApplet::layout() { //kdDebug(6100) << "RenderApplet::layout" << endl; - KHTMLAssert( needsLayout() ); - KHTMLAssert( minMaxKnown() ); + TDEHTMLAssert( needsLayout() ); + TDEHTMLAssert( minMaxKnown() ); calcWidth(); calcHeight(); diff --git a/tdehtml/rendering/render_applet.h b/tdehtml/rendering/render_applet.h index 24907edaa..62d023728 100644 --- a/tdehtml/rendering/render_applet.h +++ b/tdehtml/rendering/render_applet.h @@ -28,7 +28,7 @@ #include <tqwidget.h> #include <tqmap.h> -class KHTMLView; +class TDEHTMLView; namespace DOM { class HTMLElementImpl; diff --git a/tdehtml/rendering/render_arena.cpp b/tdehtml/rendering/render_arena.cpp index 14c55ef89..d3fe1676e 100644 --- a/tdehtml/rendering/render_arena.cpp +++ b/tdehtml/rendering/render_arena.cpp @@ -43,7 +43,7 @@ using namespace tdehtml; namespace tdehtml { //#ifdef NDEBUG -#define KHTML_USE_ARENA_ALLOCATOR +#define TDEHTML_USE_ARENA_ALLOCATOR //#endif typedef struct { @@ -78,7 +78,7 @@ RenderArena::~RenderArena() void* RenderArena::allocate(size_t size) { -#ifndef KHTML_USE_ARENA_ALLOCATOR +#ifndef TDEHTML_USE_ARENA_ALLOCATOR // Use standard malloc so that memory debugging tools work. void *block = ::malloc(sizeof(RenderArenaDebugHeader) + size); RenderArenaDebugHeader *header = (RenderArenaDebugHeader *)block; @@ -89,10 +89,10 @@ void* RenderArena::allocate(size_t size) void* result = 0; // Ensure we have correct alignment for pointers. Important for Tru64 - size = KHTML_ROUNDUP(size, sizeof(void*)); + size = TDEHTML_ROUNDUP(size, sizeof(void*)); // Check recyclers first - if (size < KHTML_MAX_RECYCLED_SIZE) { + if (size < TDEHTML_MAX_RECYCLED_SIZE) { const int index = size >> 2; result = m_recyclers[index]; @@ -117,7 +117,7 @@ void* RenderArena::allocate(size_t size) void RenderArena::free(size_t size, void* ptr) { -#ifndef KHTML_USE_ARENA_ALLOCATOR +#ifndef TDEHTML_USE_ARENA_ALLOCATOR // Use standard free so that memory debugging tools work. assert(this); RenderArenaDebugHeader *header = (RenderArenaDebugHeader *)ptr - 1; @@ -131,10 +131,10 @@ void RenderArena::free(size_t size, void* ptr) #endif // Ensure we have correct alignment for pointers. Important for Tru64 - size = KHTML_ROUNDUP(size, sizeof(void*)); + size = TDEHTML_ROUNDUP(size, sizeof(void*)); // See if it's a size that we recycle - if (size < KHTML_MAX_RECYCLED_SIZE) { + if (size < TDEHTML_MAX_RECYCLED_SIZE) { const int index = size >> 2; void* currentTop = m_recyclers[index]; m_recyclers[index] = ptr; diff --git a/tdehtml/rendering/render_arena.h b/tdehtml/rendering/render_arena.h index 1beab6fed..a0b00ab81 100644 --- a/tdehtml/rendering/render_arena.h +++ b/tdehtml/rendering/render_arena.h @@ -43,8 +43,8 @@ namespace tdehtml { -#define KHTML_MAX_RECYCLED_SIZE 400 -#define KHTML_ROUNDUP(x,y) ((((x)+((y)-1))/(y))*(y)) +#define TDEHTML_MAX_RECYCLED_SIZE 400 +#define TDEHTML_ROUNDUP(x,y) ((((x)+((y)-1))/(y))*(y)) class RenderArena: public Shared<RenderArena> { public: @@ -61,7 +61,7 @@ private: // The recycler array is sparse with the indices being multiples of 4, // i.e., 0, 4, 8, 12, 16, 20, ... - void* m_recyclers[KHTML_MAX_RECYCLED_SIZE >> 2]; + void* m_recyclers[TDEHTML_MAX_RECYCLED_SIZE >> 2]; }; diff --git a/tdehtml/rendering/render_block.cpp b/tdehtml/rendering/render_block.cpp index 3c6c79543..82d99cf41 100644 --- a/tdehtml/rendering/render_block.cpp +++ b/tdehtml/rendering/render_block.cpp @@ -1,5 +1,5 @@ /* - * This file is part of the render object implementation for KHTML. + * This file is part of the render object implementation for TDEHTML. * * Copyright (C) 1999-2003 Lars Knoll ([email protected]) * (C) 1999-2003 Antti Koivisto ([email protected]) @@ -279,7 +279,7 @@ void RenderBlock::addChildToFlow(RenderObject* newChild, RenderObject* beforeChi // needed in cases of things like anonymous tables. if (beforeChild && beforeChild->parent() != this) { - KHTMLAssert(beforeChild->parent()); + TDEHTMLAssert(beforeChild->parent()); // In the special case where we are prepending a block-level element before // something contained inside an anonymous block, we can just prepend it before @@ -317,8 +317,8 @@ void RenderBlock::addChildToFlow(RenderObject* newChild, RenderObject* beforeChi if (beforeChild && beforeChild->parent() != this) { beforeChild = beforeChild->parent(); - KHTMLAssert(beforeChild->isAnonymousBlock()); - KHTMLAssert(beforeChild->parent() == this); + TDEHTMLAssert(beforeChild->isAnonymousBlock()); + TDEHTMLAssert(beforeChild->parent() == this); } } else if (!m_childrenInline && !newChild->isFloatingOrPositioned()) @@ -421,8 +421,8 @@ void RenderBlock::makeChildrenNonInline(RenderObject *insertionPoint) // means that we cannot coalesce inlines before |insertionPoint| with inlines following // |insertionPoint|, because the new child is going to be inserted in between the inlines, // splitting them. - KHTMLAssert(isReplacedBlock() || !isInline()); - KHTMLAssert(!insertionPoint || insertionPoint->parent() == this); + TDEHTMLAssert(isReplacedBlock() || !isInline()); + TDEHTMLAssert(!insertionPoint || insertionPoint->parent() == this); m_childrenInline = false; @@ -454,8 +454,8 @@ void RenderBlock::makeChildrenNonInline(RenderObject *insertionPoint) void RenderBlock::makePageBreakAvoidBlocks() { - KHTMLAssert(!childrenInline()); - KHTMLAssert(canvas()->pagedMode()); + TDEHTMLAssert(!childrenInline()); + TDEHTMLAssert(canvas()->pagedMode()); RenderObject *breakAfter = firstChild(); RenderObject *breakBefore = breakAfter ? breakAfter->nextSibling() : 0; @@ -620,8 +620,8 @@ void RenderBlock::layoutBlock(bool relayoutChildren) // kdDebug( 6040 ) << renderName() << " " << this << "::layoutBlock() start" << endl; // TQTime t; // t.start(); - KHTMLAssert( needsLayout() ); - KHTMLAssert( minMaxKnown() ); + TDEHTMLAssert( needsLayout() ); + TDEHTMLAssert( minMaxKnown() ); if (canvas()->pagedMode()) relayoutChildren = true; @@ -737,7 +737,7 @@ void RenderBlock::layoutBlock(bool relayoutChildren) // Check for an overhanging float first. // FIXME: This needs to look at the last flow, not the last child. if (lastChild() && lastChild()->hasOverhangingFloats() && !lastChild()->hasOverflowClip()) { - KHTMLAssert(lastChild()->isRenderBlock()); + TDEHTMLAssert(lastChild()->isRenderBlock()); m_height = lastChild()->yPos() + static_cast<RenderBlock*>(lastChild())->floatBottom(); m_height += borderBottom() + paddingBottom(); } @@ -950,7 +950,7 @@ void RenderBlock::insertCompactIfNeeded(RenderObject* child, CompactInfo& compac int compactYPos = child->yPos() + child->borderTop() + child->paddingTop() - compactChild->paddingTop() - compactChild->borderTop(); int adj = 0; - KHTMLAssert(child->isRenderBlock()); + TDEHTMLAssert(child->isRenderBlock()); InlineRunBox *b = static_cast<RenderBlock*>(child)->firstLineBox(); InlineRunBox *c = static_cast<RenderBlock*>(compactChild)->firstLineBox(); if (b && c) { @@ -1162,8 +1162,8 @@ void RenderBlock::clearFloatsIfNeeded(RenderObject* child, MarginInfo& marginInf bool RenderBlock::canClear(RenderObject *child, PageBreakLevel level) { - KHTMLAssert(child->parent() && child->parent() == this); - KHTMLAssert(canvas()->pagedMode()); + TDEHTMLAssert(child->parent() && child->parent() == this); + TDEHTMLAssert(canvas()->pagedMode()); // Positioned elements cannot be moved. Only normal flow and floating. if (child->isPositioned() || child->isRelPositioned()) return false; @@ -1190,8 +1190,8 @@ bool RenderBlock::canClear(RenderObject *child, PageBreakLevel level) void RenderBlock::clearPageBreak(RenderObject* child, int pageBottom) { - KHTMLAssert(child->parent() && child->parent() == this); - KHTMLAssert(canvas()->pagedMode()); + TDEHTMLAssert(child->parent() && child->parent() == this); + TDEHTMLAssert(canvas()->pagedMode()); if (child->yPos() >= pageBottom) return; @@ -1257,7 +1257,7 @@ void RenderBlock::determineHorizontalPosition(RenderObject* child) // to shift over as necessary to dodge any floats that might get in the way. if (child->flowAroundFloats()) { int leftOff = leftOffset(m_height); - if (style()->textAlign() != KHTML_CENTER && !child->style()->marginLeft().isVariable()) { + if (style()->textAlign() != TDEHTML_CENTER && !child->style()->marginLeft().isVariable()) { if (child->marginLeft() < 0) leftOff += child->marginLeft(); chPos = kMax(chPos, leftOff); // Let the float sit in the child's margin if it can fit. @@ -1281,7 +1281,7 @@ void RenderBlock::determineHorizontalPosition(RenderObject* child) int chPos = xPos - (child->width() + child->marginRight()); if (child->flowAroundFloats()) { int rightOff = rightOffset(m_height); - if (style()->textAlign() != KHTML_CENTER && !child->style()->marginRight().isVariable()) { + if (style()->textAlign() != TDEHTML_CENTER && !child->style()->marginRight().isVariable()) { if (child->marginRight() < 0) rightOff -= child->marginRight(); chPos = kMin(chPos, rightOff - child->width()); // Let the float sit in the child's margin if it can fit. @@ -1789,7 +1789,7 @@ void RenderBlock::insertFloatingObject(RenderObject *o) else { // We should never get here, as insertFloatingObject() should only ever be called with floating // objects. - KHTMLAssert(false); + TDEHTMLAssert(false); newObj = 0; // keep gcc's uninitialized variable warnings happy } @@ -2568,7 +2568,7 @@ bool RenderBlock::nodeAtPoint(NodeInfo& info, int _x, int _y, int _tx, int _ty, void RenderBlock::calcMinMaxWidth() { - KHTMLAssert( !minMaxKnown() ); + TDEHTMLAssert( !minMaxKnown() ); #ifdef DEBUG_LAYOUT kdDebug( 6040 ) << renderName() << "(RenderBlock)::calcMinMaxWidth() this=" << this << endl; diff --git a/tdehtml/rendering/render_block.h b/tdehtml/rendering/render_block.h index 84fd15a0b..36d3f6cc4 100644 --- a/tdehtml/rendering/render_block.h +++ b/tdehtml/rendering/render_block.h @@ -1,5 +1,5 @@ /* - * This file is part of the render object implementation for KHTML. + * This file is part of the render object implementation for TDEHTML. * * Copyright (C) 1999-2003 Lars Knoll ([email protected]) * (C) 1999-2003 Antti Koivisto ([email protected]) diff --git a/tdehtml/rendering/render_box.cpp b/tdehtml/rendering/render_box.cpp index 4cf7080c7..d138d3ee2 100644 --- a/tdehtml/rendering/render_box.cpp +++ b/tdehtml/rendering/render_box.cpp @@ -119,7 +119,7 @@ static inline bool overflowAppliesTo(RenderObject* o) // css 2.1-11.1.1 // 1) overflow only applies to non-replaced block-level elements, table cells, and inline-block elements if (o->isRenderBlock() || o->isTableRow() || o->isTableSection()) - // 2) overflow on root applies to the viewport (cf. KHTMLView::layout) + // 2) overflow on root applies to the viewport (cf. TDEHTMLView::layout) if (!o->isRoot()) // 3) overflow on body may apply to the viewport... if (!o->isBody() @@ -995,7 +995,7 @@ void RenderBox::calcHorizontalMargins(const Length& ml, const Length& mr, int cw { if ( (ml.isVariable() && mr.isVariable() && m_width<cw) || (!ml.isVariable() && !mr.isVariable() && - containingBlock()->style()->textAlign() == KHTML_CENTER) ) + containingBlock()->style()->textAlign() == TDEHTML_CENTER) ) { m_marginLeft = (cw - m_width)/2; if (m_marginLeft<0) m_marginLeft=0; @@ -1003,14 +1003,14 @@ void RenderBox::calcHorizontalMargins(const Length& ml, const Length& mr, int cw } else if ( (mr.isVariable() && m_width<cw) || (!ml.isVariable() && containingBlock()->style()->direction() == RTL && - containingBlock()->style()->textAlign() == KHTML_LEFT)) + containingBlock()->style()->textAlign() == TDEHTML_LEFT)) { m_marginLeft = ml.width(cw); m_marginRight = cw - m_width - m_marginLeft; } else if ( (ml.isVariable() && m_width<cw) || (!mr.isVariable() && containingBlock()->style()->direction() == LTR && - containingBlock()->style()->textAlign() == KHTML_RIGHT)) + containingBlock()->style()->textAlign() == TDEHTML_RIGHT)) { m_marginRight = mr.width(cw); m_marginLeft = cw - m_width - m_marginRight; @@ -2295,15 +2295,15 @@ void RenderBox::caretPos(int /*offset*/, int flags, int &_x, int &_y, int &width // ### regard direction switch (s->textAlign()) { case LEFT: - case KHTML_LEFT: + case TDEHTML_LEFT: case TAAUTO: // ### find out what this does case JUSTIFY: break; case CENTER: - case KHTML_CENTER: + case TDEHTML_CENTER: _x += contentWidth() / 2; break; - case KHTML_RIGHT: + case TDEHTML_RIGHT: case RIGHT: _x += contentWidth(); break; diff --git a/tdehtml/rendering/render_canvas.cpp b/tdehtml/rendering/render_canvas.cpp index 53dc32162..a3dc548b2 100644 --- a/tdehtml/rendering/render_canvas.cpp +++ b/tdehtml/rendering/render_canvas.cpp @@ -36,7 +36,7 @@ using namespace tdehtml; //#define BOX_DEBUG //#define SPEED_DEBUG -RenderCanvas::RenderCanvas(DOM::NodeImpl* node, KHTMLView *view) +RenderCanvas::RenderCanvas(DOM::NodeImpl* node, TDEHTMLView *view) : RenderBlock(node) { // init RenderObject attributes @@ -103,7 +103,7 @@ void RenderCanvas::calcHeight() void RenderCanvas::calcWidth() { - // the width gets set by KHTMLView::print when printing to a printer. + // the width gets set by TDEHTMLView::print when printing to a printer. if(m_pagedMode || !m_view) { m_width = m_rootWidth; @@ -125,7 +125,7 @@ void RenderCanvas::calcWidth() void RenderCanvas::calcMinMaxWidth() { - KHTMLAssert( !minMaxKnown() ); + TDEHTMLAssert( !minMaxKnown() ); RenderBlock::calcMinMaxWidth(); @@ -271,7 +271,7 @@ bool RenderCanvas::needsFullRepaint() const void RenderCanvas::repaintViewRectangle(int x, int y, int w, int h, bool asap) { - KHTMLAssert( view() ); + TDEHTMLAssert( view() ); view()->scheduleRepaint( x, y, w, h, asap ); } diff --git a/tdehtml/rendering/render_canvas.h b/tdehtml/rendering/render_canvas.h index 8495b87bc..6c05a4945 100644 --- a/tdehtml/rendering/render_canvas.h +++ b/tdehtml/rendering/render_canvas.h @@ -25,7 +25,7 @@ #include "render_block.h" -class KHTMLView; +class TDEHTMLView; class TQScrollView; namespace tdehtml { @@ -42,7 +42,7 @@ enum CanvasMode { class RenderCanvas : public RenderBlock { public: - RenderCanvas(DOM::NodeImpl* node, KHTMLView *view); + RenderCanvas(DOM::NodeImpl* node, TDEHTMLView *view); ~RenderCanvas(); virtual const char *renderName() const { return "RenderCanvas"; } @@ -59,7 +59,7 @@ public: int docHeight() const; int docWidth() const; - KHTMLView *view() const { return m_view; } + TDEHTMLView *view() const { return m_view; } virtual void repaint(Priority p=NormalPriority); virtual void repaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false); @@ -145,7 +145,7 @@ protected: virtual TQRect viewRect() const; - KHTMLView *m_view; + TDEHTMLView *m_view; RenderObject* m_selectionStart; RenderObject* m_selectionEnd; diff --git a/tdehtml/rendering/render_container.cpp b/tdehtml/rendering/render_container.cpp index b91bc91df..bf0cd37ec 100644 --- a/tdehtml/rendering/render_container.cpp +++ b/tdehtml/rendering/render_container.cpp @@ -127,7 +127,7 @@ void RenderContainer::addChild(RenderObject *newChild, RenderObject *beforeChild break; case NONE: // RenderHtml and some others can have display:none - // KHTMLAssert(false); + // TDEHTMLAssert(false); break; } } @@ -167,7 +167,7 @@ void RenderContainer::addChild(RenderObject *newChild, RenderObject *beforeChild RenderObject* RenderContainer::removeChildNode(RenderObject* oldChild) { - KHTMLAssert(oldChild->parent() == this); + TDEHTMLAssert(oldChild->parent() == this); // So that we'll get the appropriate dirty bit set (either that a normal flow child got yanked or // that a positioned child got yanked). We also repaint, so that the area exposed when the child @@ -465,7 +465,7 @@ void RenderContainer::updateReplacedContent() void RenderContainer::appendChildNode(RenderObject* newChild) { - KHTMLAssert(newChild->parent() == 0); + TDEHTMLAssert(newChild->parent() == 0); newChild->setParent(this); RenderObject* lChild = lastChild(); @@ -499,10 +499,10 @@ void RenderContainer::insertChildNode(RenderObject* child, RenderObject* beforeC return; } - KHTMLAssert(!child->parent()); + TDEHTMLAssert(!child->parent()); while ( beforeChild->parent() != this && beforeChild->parent()->isAnonymousBlock() ) beforeChild = beforeChild->parent(); - KHTMLAssert(beforeChild->parent() == this); + TDEHTMLAssert(beforeChild->parent() == this); if(beforeChild == firstChild()) setFirstChild(child); @@ -526,8 +526,8 @@ void RenderContainer::insertChildNode(RenderObject* child, RenderObject* beforeC void RenderContainer::layout() { - KHTMLAssert( needsLayout() ); - KHTMLAssert( minMaxKnown() ); + TDEHTMLAssert( needsLayout() ); + TDEHTMLAssert( minMaxKnown() ); const bool pagedMode = canvas()->pagedMode(); RenderObject *child = firstChild(); while( child ) { diff --git a/tdehtml/rendering/render_flow.cpp b/tdehtml/rendering/render_flow.cpp index 71456d0a8..272ceb2db 100644 --- a/tdehtml/rendering/render_flow.cpp +++ b/tdehtml/rendering/render_flow.cpp @@ -289,7 +289,7 @@ void RenderFlow::repaint(Priority prior) for (RenderObject* inlineFlow = this; inlineFlow && inlineFlow->isInlineFlow() && inlineFlow != cb; inlineFlow = inlineFlow->parent()) { if (inlineFlow->style() && inlineFlow->style()->position() == RELATIVE && inlineFlow->layer()) { - KHTMLAssert(inlineFlow->isBox()); + TDEHTMLAssert(inlineFlow->isBox()); static_cast<RenderBox*>(inlineFlow)->relativePositionOffset(left, top); } } diff --git a/tdehtml/rendering/render_form.cpp b/tdehtml/rendering/render_form.cpp index 2872a0e6c..5c8249b6b 100644 --- a/tdehtml/rendering/render_form.cpp +++ b/tdehtml/rendering/render_form.cpp @@ -83,8 +83,8 @@ void RenderFormElement::updateFromElement() void RenderFormElement::layout() { - KHTMLAssert( needsLayout() ); - KHTMLAssert( minMaxKnown() ); + TDEHTMLAssert( needsLayout() ); + TDEHTMLAssert( minMaxKnown() ); // minimum height m_height = 0; @@ -103,13 +103,13 @@ TQ_Alignment RenderFormElement::textAlignment() const { switch (style()->textAlign()) { case LEFT: - case KHTML_LEFT: + case TDEHTML_LEFT: return Qt::AlignLeft; case RIGHT: - case KHTML_RIGHT: + case TDEHTML_RIGHT: return Qt::AlignRight; case CENTER: - case KHTML_CENTER: + case TDEHTML_CENTER: return Qt::AlignHCenter; case JUSTIFY: // Just fall into the auto code for justify. @@ -152,7 +152,7 @@ RenderCheckBox::RenderCheckBox(HTMLInputElementImpl *element) void RenderCheckBox::calcMinMaxWidth() { - KHTMLAssert( !minMaxKnown() ); + TDEHTMLAssert( !minMaxKnown() ); TQCheckBox *cb = static_cast<TQCheckBox *>( m_widget ); TQSize s( cb->style().pixelMetric( TQStyle::PM_IndicatorWidth ), @@ -204,7 +204,7 @@ void RenderRadioButton::updateFromElement() void RenderRadioButton::calcMinMaxWidth() { - KHTMLAssert( !minMaxKnown() ); + TDEHTMLAssert( !minMaxKnown() ); TQRadioButton *rb = static_cast<TQRadioButton *>( m_widget ); TQSize s( rb->style().pixelMetric( TQStyle::PM_ExclusiveIndicatorWidth ), @@ -251,7 +251,7 @@ TQString RenderSubmitButton::rawText() void RenderSubmitButton::calcMinMaxWidth() { - KHTMLAssert( !minMaxKnown() ); + TDEHTMLAssert( !minMaxKnown() ); TQString raw = rawText(); TQPushButton* pb = static_cast<TQPushButton*>(m_widget); @@ -307,7 +307,7 @@ RenderResetButton::RenderResetButton(HTMLInputElementImpl *element) // ------------------------------------------------------------------------------- -LineEditWidget::LineEditWidget(DOM::HTMLInputElementImpl* input, KHTMLView* view, TQWidget* parent) +LineEditWidget::LineEditWidget(DOM::HTMLInputElementImpl* input, TDEHTMLView* view, TQWidget* parent) : KLineEdit(parent, "__tdehtml"), m_input(input), m_view(view), m_spell(0) { setMouseTracking(true); @@ -532,7 +532,7 @@ void RenderLineEdit::handleFocusOut() void RenderLineEdit::calcMinMaxWidth() { - KHTMLAssert( !minMaxKnown() ); + TDEHTMLAssert( !minMaxKnown() ); const TQFontMetrics &fm = style()->fontMetrics(); TQSize s; @@ -797,7 +797,7 @@ RenderFileButton::RenderFileButton(HTMLInputElementImpl *element) void RenderFileButton::calcMinMaxWidth() { - KHTMLAssert( !minMaxKnown() ); + TDEHTMLAssert( !minMaxKnown() ); const TQFontMetrics &fm = style()->fontMetrics(); int size = element()->size(); @@ -1032,7 +1032,7 @@ void RenderSelect::updateFromElement() static_cast<KComboBox*>(m_widget)->insertItem(text, listIndex); } else - KHTMLAssert(false); + TDEHTMLAssert(false); m_selectionChanged = true; } @@ -1058,7 +1058,7 @@ void RenderSelect::updateFromElement() void RenderSelect::calcMinMaxWidth() { - KHTMLAssert( !minMaxKnown() ); + TDEHTMLAssert( !minMaxKnown() ); if (m_optionsChanged) updateFromElement(); @@ -1074,8 +1074,8 @@ void RenderSelect::calcMinMaxWidth() void RenderSelect::layout( ) { - KHTMLAssert(needsLayout()); - KHTMLAssert(minMaxKnown()); + TDEHTMLAssert(needsLayout()); + TDEHTMLAssert(minMaxKnown()); // ### maintain selection properly between type/size changes, and work // out how to handle multiselect->singleselect (probably just select @@ -1137,7 +1137,7 @@ void RenderSelect::slotSelected(int index) // emitted by the combobox only { if ( m_ignoreSelectEvents ) return; - KHTMLAssert( !m_useListBox ); + TDEHTMLAssert( !m_useListBox ); TQMemArray<HTMLGenericFormElementImpl*> listItems = element()->listItems(); if(index >= 0 && index < int(listItems.size())) @@ -1561,7 +1561,7 @@ void TextAreaWidget::slotFind() if ( m_findDlg ) { KWin::activateWindow( m_findDlg->winId() ); } else { - m_findDlg = new KFindDialog(false, this, "KHTML Text Area Find Dialog"); + m_findDlg = new KFindDialog(false, this, "TDEHTML Text Area Find Dialog"); connect( m_findDlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotDoFind()) ); } m_findDlg->show(); @@ -1576,7 +1576,7 @@ void TextAreaWidget::slotReplace() if ( m_repDlg ) { KWin::activateWindow( m_repDlg->winId() ); } else { - m_repDlg = new KReplaceDialog(this, "KHTMLText Area Replace Dialog", 0, + m_repDlg = new KReplaceDialog(this, "TDEHTMLText Area Replace Dialog", 0, TQStringList(), TQStringList(), false); connect( m_repDlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotDoReplace()) ); } @@ -1614,7 +1614,7 @@ RenderTextArea::RenderTextArea(HTMLTextAreaElementImpl *element) TextAreaWidget *edit = new TextAreaWidget(element->wrap(), view()); setQWidget(edit); - const KHTMLSettings *settings = view()->part()->settings(); + const TDEHTMLSettings *settings = view()->part()->settings(); edit->setCheckSpellingEnabled( settings->autoSpellCheck() ); edit->setTabChangesFocus( ! settings->allowTabulation() ); @@ -1645,7 +1645,7 @@ void RenderTextArea::handleFocusOut() void RenderTextArea::calcMinMaxWidth() { - KHTMLAssert( !minMaxKnown() ); + TDEHTMLAssert( !minMaxKnown() ); TextAreaWidget* w = static_cast<TextAreaWidget*>(m_widget); const TQFontMetrics &m = style()->fontMetrics(); @@ -1680,7 +1680,7 @@ void RenderTextArea::setStyle(RenderStyle* _style) void RenderTextArea::layout() { - KHTMLAssert( needsLayout() ); + TDEHTMLAssert( needsLayout() ); RenderFormElement::layout(); diff --git a/tdehtml/rendering/render_form.h b/tdehtml/rendering/render_form.h index d1611c1e0..d4508e6bc 100644 --- a/tdehtml/rendering/render_form.h +++ b/tdehtml/rendering/render_form.h @@ -45,7 +45,7 @@ class QListboxItem; #include <kcombobox.h> #include "dom/dom_misc.h" -class KHTMLPartBrowserExtension; +class TDEHTMLPartBrowserExtension; class KSpell; class KFindDialog; class KReplaceDialog; @@ -256,7 +256,7 @@ class LineEditWidget : public KLineEdit Q_OBJECT public: LineEditWidget(DOM::HTMLInputElementImpl* input, - KHTMLView* view, TQWidget* parent); + TDEHTMLView* view, TQWidget* parent); ~LineEditWidget(); void highLightWord( unsigned int length, unsigned int pos ); @@ -280,7 +280,7 @@ private: EditHistory }; DOM::HTMLInputElementImpl* m_input; - KHTMLView* m_view; + TDEHTMLView* m_view; KSpell *m_spell; KAction *m_spellAction; }; diff --git a/tdehtml/rendering/render_frames.cpp b/tdehtml/rendering/render_frames.cpp index 03d55fbfd..66e2fda75 100644 --- a/tdehtml/rendering/render_frames.cpp +++ b/tdehtml/rendering/render_frames.cpp @@ -101,11 +101,11 @@ bool RenderFrameSet::nodeAtPoint(NodeInfo& info, int _x, int _y, int _tx, int _t void RenderFrameSet::layout( ) { - KHTMLAssert( needsLayout() ); - KHTMLAssert( minMaxKnown() ); + TDEHTMLAssert( needsLayout() ); + TDEHTMLAssert( minMaxKnown() ); if ( !parent()->isFrameSet() ) { - KHTMLView* view = canvas()->view(); + TDEHTMLView* view = canvas()->view(); m_width = view ? view->visibleWidth() : 0; m_height = view ? view->visibleHeight() : 0; } @@ -545,7 +545,7 @@ bool RenderFrameSet::userResize( MouseEventImpl *evt ) setNeedsLayout(true); } - KHTMLView *view = canvas()->view(); + TDEHTMLView *view = canvas()->view(); if ((m_resizing || evt->id() == EventImpl::MOUSEUP_EVENT) && view) { TQPainter paint( view ); paint.setPen( Qt::gray ); @@ -635,7 +635,7 @@ void RenderPart::setWidget( TQWidget *widget ) setQWidget( widget ); widget->setFocusPolicy(TQ_WheelFocus); - if(widget->inherits("KHTMLView")) + if(widget->inherits("TDEHTMLView")) connect( widget, TQT_SIGNAL( cleared() ), this, TQT_SLOT( slotViewCleared() ) ); setNeedsLayoutAndMinMaxRecalc(); @@ -683,11 +683,11 @@ void RenderFrame::slotViewCleared() view->setFrameStyle(TQFrame::NoFrame); view->setVScrollBarMode(element()->scrolling ); view->setHScrollBarMode(element()->scrolling ); - if(view->inherits("KHTMLView")) { + if(view->inherits("TDEHTMLView")) { #ifdef DEBUG_LAYOUT - kdDebug(6031) << "frame is a KHTMLview!" << endl; + kdDebug(6031) << "frame is a TDEHTMLview!" << endl; #endif - KHTMLView *htmlView = static_cast<KHTMLView *>(view); + TDEHTMLView *htmlView = static_cast<TDEHTMLView *>(view); if(element()->marginWidth != -1) htmlView->setMarginWidth(element()->marginWidth); if(element()->marginHeight != -1) htmlView->setMarginHeight(element()->marginHeight); } @@ -706,7 +706,7 @@ RenderPartObject::RenderPartObject( DOM::HTMLElementImpl* element ) void RenderPartObject::updateWidget() { TQString url; - KHTMLPart *part = m_view->part(); + TDEHTMLPart *part = m_view->part(); setNeedsLayoutAndMinMaxRecalc(); @@ -754,8 +754,8 @@ void RenderPartObject::updateWidget() } } } - params.append( TQString::fromLatin1("__KHTML__PLUGINEMBED=\"YES\"") ); - params.append( TQString::fromLatin1("__KHTML__PLUGINBASEURL=\"%1\"").arg(element()->getDocument()->baseURL().url())); + params.append( TQString::fromLatin1("__TDEHTML__PLUGINEMBED=\"YES\"") ); + params.append( TQString::fromLatin1("__TDEHTML__PLUGINBASEURL=\"%1\"").arg(element()->getDocument()->baseURL().url())); HTMLEmbedElementImpl *embed = 0; TQString classId; @@ -775,8 +775,8 @@ void RenderPartObject::updateWidget() } classId = objbase->classId; - params.append( TQString::fromLatin1("__KHTML__CLASSID=\"%1\"").arg( classId ) ); - params.append( TQString::fromLatin1("__KHTML__CODEBASE=\"%1\"").arg( objbase->getAttribute(ATTR_CODEBASE).string() ) ); + params.append( TQString::fromLatin1("__TDEHTML__CLASSID=\"%1\"").arg( classId ) ); + params.append( TQString::fromLatin1("__TDEHTML__CODEBASE=\"%1\"").arg( objbase->getAttribute(ATTR_CODEBASE).string() ) ); if (!objbase->getAttribute(ATTR_WIDTH).isEmpty()) params.append( TQString::fromLatin1("WIDTH=\"%1\"").arg( objbase->getAttribute(ATTR_WIDTH).string() ) ); else if (embed && !embed->getAttribute(ATTR_WIDTH).isEmpty()) { @@ -857,7 +857,7 @@ void RenderPartObject::close() bool RenderPartObject::partLoadingErrorNotify( tdehtml::ChildFrame *childFrame, const KURL& url, const TQString& serviceType ) { - KHTMLPart *part = static_cast<KHTMLView *>(m_view)->part(); + TDEHTMLPart *part = static_cast<TDEHTMLView *>(m_view)->part(); kdDebug(6031) << "RenderPartObject::partLoadingErrorNotify serviceType=" << serviceType << endl; // Check if we just tried with e.g. nsplugin // and fallback to the activexhandler if there is a classid @@ -925,7 +925,7 @@ void RenderPartObject::slotPartLoadingErrorNotify() // prepare for the local eventloop in KMessageBox ref(); - KHTMLPart *part = static_cast<KHTMLView *>(m_view)->part(); + TDEHTMLPart *part = static_cast<TDEHTMLView *>(m_view)->part(); KParts::BrowserExtension *ext = part->browserExtension(); if( embed && !embed->pluginPage.isEmpty() && ext ) { // Prepare the mimetype to show in the question (comment if available, name as fallback) @@ -976,8 +976,8 @@ void RenderPartObject::slotPartLoadingErrorNotify() void RenderPartObject::layout( ) { - KHTMLAssert( needsLayout() ); - KHTMLAssert( minMaxKnown() ); + TDEHTMLAssert( needsLayout() ); + TDEHTMLAssert( minMaxKnown() ); calcWidth(); calcHeight(); @@ -1009,11 +1009,11 @@ void RenderPartObject::slotViewCleared() view->setFrameStyle(frameStyle); view->setVScrollBarMode(scroll ); view->setHScrollBarMode(scroll ); - if(view->inherits("KHTMLView")) { + if(view->inherits("TDEHTMLView")) { #ifdef DEBUG_LAYOUT - kdDebug(6031) << "frame is a KHTMLview!" << endl; + kdDebug(6031) << "frame is a TDEHTMLview!" << endl; #endif - KHTMLView *htmlView = static_cast<KHTMLView *>(view); + TDEHTMLView *htmlView = static_cast<TDEHTMLView *>(view); htmlView->setIgnoreWheelEvents( element()->id() == ID_IFRAME ); if(marginw != -1) htmlView->setMarginWidth(marginw); if(marginh != -1) htmlView->setMarginHeight(marginh); diff --git a/tdehtml/rendering/render_frames.h b/tdehtml/rendering/render_frames.h index 79171c747..49d1e8dc1 100644 --- a/tdehtml/rendering/render_frames.h +++ b/tdehtml/rendering/render_frames.h @@ -26,7 +26,7 @@ #include "rendering/render_replaced.h" #include "xml/dom_nodeimpl.h" #include "html/html_baseimpl.h" -class KHTMLView; +class TDEHTMLView; namespace DOM { @@ -102,7 +102,7 @@ public: virtual void setWidget( TQWidget *widget ); /** - * Called by KHTMLPart to notify the frame object that loading the + * Called by TDEHTMLPart to notify the frame object that loading the * part was not successfuly. (called either asyncroniously after a * after the servicetype of the given url (the one passed with requestObject) * has been determined or syncroniously from within requestObject) diff --git a/tdehtml/rendering/render_generated.cpp b/tdehtml/rendering/render_generated.cpp index 2b793e504..d8e7a1be1 100644 --- a/tdehtml/rendering/render_generated.cpp +++ b/tdehtml/rendering/render_generated.cpp @@ -38,7 +38,7 @@ RenderCounterBase::RenderCounterBase(DOM::NodeImpl* node) void RenderCounterBase::layout() { - KHTMLAssert( needsLayout() ); + TDEHTMLAssert( needsLayout() ); if ( !minMaxKnown() ) calcMinMaxWidth(); @@ -48,7 +48,7 @@ void RenderCounterBase::layout() void RenderCounterBase::calcMinMaxWidth() { - KHTMLAssert( !minMaxKnown() ); + TDEHTMLAssert( !minMaxKnown() ); generateContent(); diff --git a/tdehtml/rendering/render_image.cpp b/tdehtml/rendering/render_image.cpp index d382c9bd1..97c2641ba 100644 --- a/tdehtml/rendering/render_image.cpp +++ b/tdehtml/rendering/render_image.cpp @@ -64,7 +64,7 @@ RenderImage::RenderImage(NodeImpl *_element) m_selectionState = SelectionNone; berrorPic = false; - const KHTMLSettings *settings = _element->getDocument()->view()->part()->settings(); + const TDEHTMLSettings *settings = _element->getDocument()->view()->part()->settings(); bUnfinishedImageFrame = settings->unfinishedImageFrame(); setIntrinsicWidth( 0 ); @@ -378,8 +378,8 @@ void RenderImage::paint(PaintInfo& paintInfo, int _tx, int _ty) void RenderImage::layout() { - KHTMLAssert( needsLayout()); - KHTMLAssert( minMaxKnown() ); + TDEHTMLAssert( needsLayout()); + TDEHTMLAssert( minMaxKnown() ); short oldwidth = m_width; int oldheight = m_height; diff --git a/tdehtml/rendering/render_inline.cpp b/tdehtml/rendering/render_inline.cpp index 96841eb43..aee43a817 100644 --- a/tdehtml/rendering/render_inline.cpp +++ b/tdehtml/rendering/render_inline.cpp @@ -1,5 +1,5 @@ /* - * This file is part of the render object implementation for KHTML. + * This file is part of the render object implementation for TDEHTML. * * Copyright (C) 1999-2003 Lars Knoll ([email protected]) * (C) 1999-2003 Antti Koivisto ([email protected]) @@ -760,7 +760,7 @@ void RenderInline::paintOutlinePath(TQPainter *p, int tx, int ty, const TQPoint void RenderInline::calcMinMaxWidth() { - KHTMLAssert( !minMaxKnown() ); + TDEHTMLAssert( !minMaxKnown() ); #ifdef DEBUG_LAYOUT kdDebug( 6040 ) << renderName() << "(RenderInline)::calcMinMaxWidth() this=" << this << endl; diff --git a/tdehtml/rendering/render_inline.h b/tdehtml/rendering/render_inline.h index 97392999e..ab854543d 100644 --- a/tdehtml/rendering/render_inline.h +++ b/tdehtml/rendering/render_inline.h @@ -1,5 +1,5 @@ /* - * This file is part of the render object implementation for KHTML. + * This file is part of the render object implementation for TDEHTML. * * Copyright (C) 1999-2003 Lars Knoll ([email protected]) * (C) 1999-2003 Antti Koivisto ([email protected]) diff --git a/tdehtml/rendering/render_list.cpp b/tdehtml/rendering/render_list.cpp index 08ee1a88b..5af983a72 100644 --- a/tdehtml/rendering/render_list.cpp +++ b/tdehtml/rendering/render_list.cpp @@ -180,8 +180,8 @@ short RenderListItem::marginRight() const void RenderListItem::layout( ) { - KHTMLAssert( needsLayout() ); - KHTMLAssert( minMaxKnown() ); + TDEHTMLAssert( needsLayout() ); + TDEHTMLAssert( minMaxKnown() ); updateMarkerLocation(); RenderBlock::layout(); @@ -369,7 +369,7 @@ void RenderListMarker::paint(PaintInfo& paintInfo, int _tx, int _ty) void RenderListMarker::layout() { - KHTMLAssert( needsLayout() ); + TDEHTMLAssert( needsLayout() ); if ( !minMaxKnown() ) calcMinMaxWidth(); @@ -392,7 +392,7 @@ void RenderListMarker::setPixmap( const TQPixmap &p, const TQRect& r, CachedImag void RenderListMarker::calcMinMaxWidth() { - KHTMLAssert( !minMaxKnown() ); + TDEHTMLAssert( !minMaxKnown() ); m_markerWidth = m_width = 0; @@ -541,7 +541,7 @@ void RenderListMarker::calcMinMaxWidth() case LNONE: break; default: - KHTMLAssert(false); + TDEHTMLAssert(false); } m_markerWidth = fm.width(m_item) + fm.width(TQString::fromLatin1(". ")); } diff --git a/tdehtml/rendering/render_object.cpp b/tdehtml/rendering/render_object.cpp index a3eb1565e..1d16057a2 100644 --- a/tdehtml/rendering/render_object.cpp +++ b/tdehtml/rendering/render_object.cpp @@ -256,12 +256,12 @@ bool RenderObject::isHTMLMarquee() const void RenderObject::addChild(RenderObject* , RenderObject *) { - KHTMLAssert(0); + TDEHTMLAssert(0); } RenderObject* RenderObject::removeChildNode(RenderObject* ) { - KHTMLAssert(0); + TDEHTMLAssert(0); return 0; } @@ -273,12 +273,12 @@ void RenderObject::removeChild(RenderObject *o ) void RenderObject::appendChildNode(RenderObject*) { - KHTMLAssert(0); + TDEHTMLAssert(0); } void RenderObject::insertChildNode(RenderObject*, RenderObject*) { - KHTMLAssert(0); + TDEHTMLAssert(0); } RenderObject *RenderObject::nextRenderer() const @@ -1369,7 +1369,7 @@ bool RenderObject::attemptDirectLayerTranslation() // When the difference between two successive styles is only 'Position' // we may attempt to save a layout by directly updating the object position. - KHTMLAssert( m_style->position() != STATIC ); + TDEHTMLAssert( m_style->position() != STATIC ); if (!layer()) return false; setInline(m_style->isDisplayInlineType()); @@ -1444,7 +1444,7 @@ void RenderObject::setOverhangingContents(bool p) if (p) { m_overhangingContents = true; - KHTMLAssert( cb != this || isCanvas()); + TDEHTMLAssert( cb != this || isCanvas()); if (cb && cb != this) cb->setOverhangingContents(); } @@ -1464,7 +1464,7 @@ void RenderObject::setOverhangingContents(bool p) else { m_overhangingContents = false; - KHTMLAssert( cb != this ); + TDEHTMLAssert( cb != this ); if (cb && cb != this) cb->setOverhangingContents(false); } @@ -1935,7 +1935,7 @@ void RenderObject::invalidateVerticalPositions() void RenderObject::recalcMinMaxWidths() { - KHTMLAssert( m_recalcMinMax ); + TDEHTMLAssert( m_recalcMinMax ); #ifdef DEBUG_LAYOUT kdDebug( 6040 ) << renderName() << " recalcMinMaxWidths() this=" << this <<endl; @@ -1974,7 +1974,7 @@ void RenderObject::recalcMinMaxWidths() void RenderObject::scheduleRelayout(RenderObject *clippedObj) { if (!isCanvas()) return; - KHTMLView *view = static_cast<RenderCanvas *>(this)->view(); + TDEHTMLView *view = static_cast<RenderCanvas *>(this)->view(); if ( view ) view->scheduleRelayout(clippedObj); } @@ -1986,7 +1986,7 @@ void RenderObject::removeLeftoverAnonymousBoxes() InlineBox* RenderObject::createInlineBox(bool /*makePlaceHolderBox*/, bool /*isRootLineBox*/) { - KHTMLAssert(false); + TDEHTMLAssert(false); return 0; } diff --git a/tdehtml/rendering/render_object.h b/tdehtml/rendering/render_object.h index 9dd064932..8d066201c 100644 --- a/tdehtml/rendering/render_object.h +++ b/tdehtml/rendering/render_object.h @@ -43,17 +43,17 @@ class TQPainter; class TQTextStream; class CSSStyle; -class KHTMLView; +class TDEHTMLView; #ifndef NDEBUG -#define KHTMLAssert( x ) if( !(x) ) { \ +#define TDEHTMLAssert( x ) if( !(x) ) { \ const RenderObject *o = this; while( o->parent() ) o = o->parent(); \ o->printTree(); \ tqDebug(" this object = %p, %s", (void*) this, kdBacktrace().latin1() ); \ assert( x ); \ } #else -#define KHTMLAssert( x ) +#define TDEHTMLAssert( x ) #endif /* diff --git a/tdehtml/rendering/render_replaced.cpp b/tdehtml/rendering/render_replaced.cpp index 42fce027e..5a96d06f0 100644 --- a/tdehtml/rendering/render_replaced.cpp +++ b/tdehtml/rendering/render_replaced.cpp @@ -64,7 +64,7 @@ RenderReplaced::RenderReplaced(DOM::NodeImpl* node) void RenderReplaced::calcMinMaxWidth() { - KHTMLAssert( !minMaxKnown()); + TDEHTMLAssert( !minMaxKnown()); #ifdef DEBUG_LAYOUT kdDebug( 6040 ) << "RenderReplaced::calcMinMaxWidth() known=" << minMaxKnown() << endl; @@ -102,7 +102,7 @@ RenderWidget::RenderWidget(DOM::NodeImpl* node) m_arena.reset(renderArena()); m_resizePending = false; m_discardResizes = false; - m_isKHTMLWidget = false; + m_isTDEHTMLWidget = false; m_needsMask = false; // this is no real reference counting, its just there @@ -131,7 +131,7 @@ void RenderWidget::detach() RenderWidget::~RenderWidget() { - KHTMLAssert( refCount() <= 0 ); + TDEHTMLAssert( refCount() <= 0 ); if(m_widget) { m_widget->hide(); @@ -157,7 +157,7 @@ void RenderWidget::resizeWidget( int w, int h ) w = kMin( w, 2000 ); if (m_widget->width() != w || m_widget->height() != h) { - m_resizePending = isKHTMLWidget(); + m_resizePending = isTDEHTMLWidget(); ref(); element()->ref(); TQApplication::postEvent( this, new TQWidgetResizeEvent( w, h ) ); @@ -185,8 +185,8 @@ bool RenderWidget::event( TQEvent *e ) m_widget->resize( re->w, re->h ); repaint(); } - // eat all events - except if this is a frame (in which case KHTMLView handles it all) - if ( ::tqqt_cast<KHTMLView *>( m_widget ) ) + // eat all events - except if this is a frame (in which case TDEHTMLView handles it all) + if ( ::tqqt_cast<TDEHTMLView *>( 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_isKHTMLWidget = !strcmp(m_widget->name(), "__tdehtml")) && !::tqqt_cast<TQFrame*>(m_widget)) + if ( (m_isTDEHTMLWidget = !strcmp(m_widget->name(), "__tdehtml")) && !::tqqt_cast<TQFrame*>(m_widget)) m_widget->setBackgroundMode( TQWidget::NoBackground ); if (m_widget->focusPolicy() > TQ_StrongFocus) @@ -236,12 +236,12 @@ void RenderWidget::setQWidget(TQWidget *widget) void RenderWidget::layout( ) { - KHTMLAssert( needsLayout() ); - KHTMLAssert( minMaxKnown() ); + TDEHTMLAssert( needsLayout() ); + TDEHTMLAssert( minMaxKnown() ); if ( m_widget ) { resizeWidget( m_width-borderLeft()-borderRight()-paddingLeft()-paddingRight(), m_height-borderTop()-borderBottom()-paddingTop()-paddingBottom() ); - if (!isKHTMLWidget() && !isFrame() && !m_needsMask) { + if (!isTDEHTMLWidget() && !isFrame() && !m_needsMask) { m_needsMask = true; RenderLayer* rl = enclosingStackingContext(); RenderLayer* el = enclosingLayer(); @@ -277,7 +277,7 @@ void RenderWidget::updateFromElement() int lowlightVal = 100 + (2*contrast_+4)*10; if (backgroundColor.isValid()) { - if (!isKHTMLWidget()) + if (!isTDEHTMLWidget()) widget()->setEraseColor(backgroundColor ); for ( int i = 0; i < TQPalette::NColorGroups; ++i ) { pal.setColor( (TQPalette::ColorGroup)i, TQColorGroup::Background, backgroundColor ); @@ -398,11 +398,11 @@ void RenderWidget::paint(PaintInfo& paintInfo, int _tx, int _ty) int xPos = _tx+borderLeft()+paddingLeft(); int yPos = _ty+borderTop()+paddingTop(); - bool tdehtmlw = isKHTMLWidget(); + bool tdehtmlw = isTDEHTMLWidget(); int childw = m_widget->width(); int childh = m_widget->height(); - if ( (childw == 2000 || childh == 3072) && m_widget->inherits( "KHTMLView" ) ) { - KHTMLView *vw = static_cast<KHTMLView *>(m_widget); + if ( (childw == 2000 || childh == 3072) && m_widget->inherits( "TDEHTMLView" ) ) { + TDEHTMLView *vw = static_cast<TDEHTMLView *>(m_widget); int cy = m_view->contentsY(); int ch = m_view->visibleHeight(); @@ -612,8 +612,8 @@ 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 KHTMLView handles it all) - if ( ::tqqt_cast<KHTMLView *>( m_widget ) ) + // no special event processing if this is a frame (in which case TDEHTMLView handles it all) + if ( ::tqqt_cast<TDEHTMLView *>( m_widget ) ) return false; if ( !element() ) return true; @@ -655,14 +655,14 @@ bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e) //kdDebug(6000) << "RenderWidget::eventFilter captures FocusIn" << endl; element()->getDocument()->setFocusNode(element()); // if ( isEditable() ) { -// KHTMLPartBrowserExtension *ext = static_cast<KHTMLPartBrowserExtension *>( element()->view->part()->browserExtension() ); +// TDEHTMLPartBrowserExtension *ext = static_cast<TDEHTMLPartBrowserExtension *>( element()->view->part()->browserExtension() ); // if ( ext ) ext->editableWidgetFocused( m_widget ); // } break; case TQEvent::KeyPress: case TQEvent::KeyRelease: // TODO this seems wrong - Qt events are not correctly translated to DOM ones, - // like in KHTMLView::dispatchKeyEvent() + // like in TDEHTMLView::dispatchKeyEvent() if (element()->dispatchKeyEvent(TQT_TQKEYEVENT(e),false)) filtered = true; break; @@ -837,13 +837,13 @@ bool RenderWidget::handleEvent(const DOM::EventImpl& ev) const KeyEventBaseImpl& domKeyEv = static_cast<const KeyEventBaseImpl &>(ev); if (domKeyEv.isSynthetic() && !acceptsSyntheticEvents()) break; - // See KHTMLView::dispatchKeyEvent: autorepeat is just keypress in the DOM + // See TDEHTMLView::dispatchKeyEvent: autorepeat is just keypress in the DOM // but it's keyrelease+keypress in Qt. So here we do the inverse mapping as - // the one done in KHTMLView: generate two events for one DOM auto-repeat keypress. + // the one done in TDEHTMLView: generate two events for one DOM auto-repeat keypress. // Similarly, DOM keypress events with non-autorepeat Qt event do nothing here, // because the matching Qt keypress event was already sent from DOM keydown event. - // Reverse drawing as the one in KHTMLView: + // Reverse drawing as the one in TDEHTMLView: // DOM: Down Press | Press | Up // Qt: (nothing) Press | Release(autorepeat) + Press(autorepeat) | Release // diff --git a/tdehtml/rendering/render_replaced.h b/tdehtml/rendering/render_replaced.h index c1369bfc0..3d8a68f9c 100644 --- a/tdehtml/rendering/render_replaced.h +++ b/tdehtml/rendering/render_replaced.h @@ -26,7 +26,7 @@ #include <tqobject.h> #include <tqscrollview.h> -class KHTMLView; +class TDEHTMLView; class TQWidget; namespace DOM @@ -100,7 +100,7 @@ public: virtual void updateFromElement(); TQWidget *widget() const { return m_widget; } - KHTMLView* view() const { return m_view; } + TDEHTMLView* view() const { return m_view; } void deref(); @@ -119,7 +119,7 @@ public: public slots: void slotWidgetDestructed(); - bool isKHTMLWidget() const { return m_isKHTMLWidget; } + bool isTDEHTMLWidget() const { return m_isTDEHTMLWidget; } protected: virtual bool canHaveBorder() const { return false; } @@ -134,7 +134,7 @@ protected: void resizeWidget( int w, int h ); TQWidget *m_widget; - KHTMLView* m_view; + TDEHTMLView* m_view; //Because we mess with normal detach due to ref/deref, //we need to keep track of the arena ourselves @@ -143,7 +143,7 @@ protected: bool m_resizePending; bool m_discardResizes; - bool m_isKHTMLWidget; + bool m_isTDEHTMLWidget; bool m_needsMask; public: diff --git a/tdehtml/rendering/render_style.h b/tdehtml/rendering/render_style.h index 6e1b9cbc8..28b6b999d 100644 --- a/tdehtml/rendering/render_style.h +++ b/tdehtml/rendering/render_style.h @@ -719,11 +719,11 @@ class StyleCSS3InheritedData : public Shared<StyleCSS3InheritedData> // enum EWhiteSpace { - NORMAL, PRE, NOWRAP, PRE_WRAP, PRE_LINE, KHTML_NOWRAP + NORMAL, PRE, NOWRAP, PRE_WRAP, PRE_LINE, TDEHTML_NOWRAP }; enum ETextAlign { - TAAUTO, LEFT, RIGHT, CENTER, JUSTIFY, KHTML_LEFT, KHTML_RIGHT, KHTML_CENTER + TAAUTO, LEFT, RIGHT, CENTER, JUSTIFY, TDEHTML_LEFT, TDEHTML_RIGHT, TDEHTML_CENTER }; enum ETextTransform { diff --git a/tdehtml/rendering/render_table.cpp b/tdehtml/rendering/render_table.cpp index ef7fe1031..8a75c73f2 100644 --- a/tdehtml/rendering/render_table.cpp +++ b/tdehtml/rendering/render_table.cpp @@ -265,9 +265,9 @@ void RenderTable::calcWidth() void RenderTable::layout() { - KHTMLAssert( needsLayout() ); - KHTMLAssert( minMaxKnown() ); - KHTMLAssert( !needSectionRecalc ); + TDEHTMLAssert( needsLayout() ); + TDEHTMLAssert( minMaxKnown() ); + TDEHTMLAssert( !needSectionRecalc ); if (posChildNeedsLayout() && !normalChildNeedsLayout() && !selfNeedsLayout()) { // All we have to is lay out our positioned objects. @@ -531,7 +531,7 @@ void RenderTable::paintBoxDecorations(PaintInfo &pI, int _tx, int _ty) void RenderTable::calcMinMaxWidth() { - KHTMLAssert( !minMaxKnown() ); + TDEHTMLAssert( !minMaxKnown() ); if ( needSectionRecalc ) recalcSections(); @@ -567,7 +567,7 @@ void RenderTable::splitColumn( int pos, int firstSpan ) columns.resize( oldSize + 1 ); int oldSpan = columns[pos].span; // tqDebug("splitColumn( %d,%d ), oldSize=%d, oldSpan=%d", pos, firstSpan, oldSize, oldSpan ); - KHTMLAssert( oldSpan > firstSpan ); + TDEHTMLAssert( oldSpan > firstSpan ); columns[pos].span = firstSpan; memmove( columns.data()+pos+1, columns.data()+pos, (oldSize-pos)*sizeof(ColumnStruct) ); columns[pos+1].span = oldSpan - firstSpan; @@ -1040,7 +1040,7 @@ void RenderTableSection::addChild(RenderObject *child, RenderObject *beforeChild cCol = 0; ensureRows( cRow+1 ); - KHTMLAssert( child->isTableRow() ); + TDEHTMLAssert( child->isTableRow() ); grid[cRow].rowRenderer = static_cast<RenderTableRow*>(child); if (!beforeChild) { @@ -2084,8 +2084,8 @@ void RenderTableRow::addChild(RenderObject *child, RenderObject *beforeChild) void RenderTableRow::layout() { - KHTMLAssert( needsLayout() ); - KHTMLAssert( minMaxKnown() ); + TDEHTMLAssert( needsLayout() ); + TDEHTMLAssert( minMaxKnown() ); RenderObject *child = firstChild(); const bool pagedMode = canvas()->pagedMode(); @@ -2176,7 +2176,7 @@ void RenderTableRow::paintRow( PaintInfo& pI, int tx, int ty, int w, int h ) void RenderTableRow::paint(PaintInfo& i, int tx, int ty) { - KHTMLAssert(layer()); + TDEHTMLAssert(layer()); if (!layer()) return; @@ -2260,7 +2260,7 @@ Length RenderTableCell::styleOrColWidth() void RenderTableCell::calcMinMaxWidth() { - KHTMLAssert( !minMaxKnown() ); + TDEHTMLAssert( !minMaxKnown() ); #ifdef DEBUG_LAYOUT kdDebug( 6040 ) << renderName() << "(TableCell)::calcMinMaxWidth() known=" << minMaxKnown() << endl; #endif @@ -2365,7 +2365,7 @@ void RenderTableCell::setStyle( RenderStyle *newStyle ) RenderBlock::setStyle( newStyle ); setShouldPaintBackgroundOrBorder(true); - if (newStyle->whiteSpace() == KHTML_NOWRAP) { + if (newStyle->whiteSpace() == TDEHTML_NOWRAP) { // Figure out if we are really nowrapping or if we should just // use normal instead. If the width of the cell is fixed, then // we don't actually use NOWRAP. diff --git a/tdehtml/rendering/render_text.cpp b/tdehtml/rendering/render_text.cpp index 9090e1631..d125b04c6 100644 --- a/tdehtml/rendering/render_text.cpp +++ b/tdehtml/rendering/render_text.cpp @@ -691,7 +691,7 @@ RenderText::RenderText(DOM::NodeImpl* node, DOMStringImpl *_str) m_maxWidth = -1; str = _str; if(str) str->ref(); - KHTMLAssert(!str || !str->l || str->s); + TDEHTMLAssert(!str || !str->l || str->s); m_selectionState = SelectionNone; m_hasReturn = true; @@ -723,7 +723,7 @@ void RenderText::setStyle(RenderStyle *_style) RenderText::~RenderText() { - KHTMLAssert(m_lines.count() == 0); + TDEHTMLAssert(m_lines.count() == 0); if(str) str->deref(); } @@ -745,7 +745,7 @@ void RenderText::deleteInlineBoxes(RenderArena* arena) } } - KHTMLAssert(m_lines.count() == 0); + TDEHTMLAssert(m_lines.count() == 0); } bool RenderText::isTextFragment() const @@ -1009,12 +1009,12 @@ bool RenderText::posOfChar(int chr, int &x, int &y) void RenderText::paint( PaintInfo& /*pI*/, int /*tx*/, int /*ty*/) { - KHTMLAssert( false ); + TDEHTMLAssert( false ); } void RenderText::calcMinMaxWidth() { - KHTMLAssert( !minMaxKnown() ); + TDEHTMLAssert( !minMaxKnown() ); // ### calc Min and Max width... m_minWidth = m_beginMinWidth = m_endMinWidth = 0; @@ -1213,8 +1213,8 @@ void RenderText::setText(DOMStringImpl *text, bool force) // ### what should happen if we change the text of a // RenderBR object ? - KHTMLAssert(!isBR() || (str->l == 1 && (*str->s) == '\n')); - KHTMLAssert(!str->l || str->s); + TDEHTMLAssert(!isBR() || (str->l == 1 && (*str->s) == '\n')); + TDEHTMLAssert(!str->l || str->s); setNeedsLayoutAndMinMaxRecalc(); #ifdef BIDI_DEBUG @@ -1251,7 +1251,7 @@ short RenderText::baselinePosition( bool firstLine ) const InlineBox* RenderText::createInlineBox(bool, bool isRootLineBox) { - KHTMLAssert( !isRootLineBox ); + TDEHTMLAssert( !isRootLineBox ); return new (renderArena()) InlineTextBox(this); } @@ -1260,7 +1260,7 @@ void RenderText::position(InlineBox* box, int from, int len, bool reverse) //kdDebug(6040) << "position: from="<<from<<" len="<<len<<endl; // ### should not be needed!!! // asserts sometimes with pre (that unibw-hamburg testcase). ### find out why - //KHTMLAssert(!(len == 0 || (str->l && len == 1 && *(str->s+from) == '\n') )); + //TDEHTMLAssert(!(len == 0 || (str->l && len == 1 && *(str->s+from) == '\n') )); // It is now needed. BRs need text boxes too otherwise caret navigation // gets stuck (LS) // if (len == 0 || (str->l && len == 1 && *(str->s+from) == '\n') ) return; @@ -1272,7 +1272,7 @@ void RenderText::position(InlineBox* box, int from, int len, bool reverse) TQConstString cstr(ch, len); #endif - KHTMLAssert(box->isInlineTextBox()); + TDEHTMLAssert(box->isInlineTextBox()); InlineTextBox *s = static_cast<InlineTextBox *>(box); s->m_start = from; s->m_len = len; diff --git a/tdehtml/tdehtml-devel-gdb b/tdehtml/tdehtml-devel-gdb index 02030b2d6..f8a9542e8 100644 --- a/tdehtml/tdehtml-devel-gdb +++ b/tdehtml/tdehtml-devel-gdb @@ -1,4 +1,4 @@ -# This file defines handy gdb macros for KHTML +# This file defines handy gdb macros for TDEHTML # To use it, add this line to your ~/.gdbinit : # source /path/to/kde/sources/tdelibs/tdehtml/tdehtml-devel-gdb @@ -6,7 +6,7 @@ define printdomstring printdomstringimpl $arg0.impl end document printdomstring - Prints the contents of a KHTML DOMString. + Prints the contents of a TDEHTML DOMString. end define printdomstringimpl set $i=0 @@ -17,6 +17,6 @@ define printdomstringimpl printf "\n" end document printdomstringimpl - Prints the contents of a KHTML DOMStringImpl. + Prints the contents of a TDEHTML DOMStringImpl. end diff --git a/tdehtml/tdehtml.desktop b/tdehtml/tdehtml.desktop index 959691671..9bc4ef9ac 100644 --- a/tdehtml/tdehtml.desktop +++ b/tdehtml/tdehtml.desktop @@ -85,8 +85,8 @@ Comment[zh_TW]=可嵌入的 HTML 檢視元件 Comment[zu]= Ilunga lokubuka le-HTML Eshuthekiwe MimeType=text/html;text/xml;application/xhtml+xml; Icon=konqueror -Name=KHTML -Name[hi]=केएचटीएमएल (KHTML) +Name=TDEHTML +Name[hi]=केएचटीएमएल (TDEHTML) Name[te]=కెహెచ్ టి ఎమ్ ఎల్ ServiceTypes=KParts/ReadOnlyPart,Browser/View X-TDE-Library=libtdehtmlpart diff --git a/tdehtml/tdehtml_caret.cpp b/tdehtml/tdehtml_caret.cpp index b5d5185f0..808c52982 100644 --- a/tdehtml/tdehtml_caret.cpp +++ b/tdehtml/tdehtml_caret.cpp @@ -884,15 +884,15 @@ CaretBoxLine *CaretBoxLine::constructCaretBoxLine(CaretBoxLineDeleter *deleter, // ### regard direction switch (s->textAlign()) { case LEFT: - case KHTML_LEFT: + case TDEHTML_LEFT: case TAAUTO: // ### find out what this does case JUSTIFY: break; case CENTER: - case KHTML_CENTER: + case TDEHTML_CENTER: _x += cb->contentWidth() / 2; break; - case KHTML_RIGHT: + case TDEHTML_RIGHT: case RIGHT: _x += cb->contentWidth(); break; @@ -1128,7 +1128,7 @@ static inline bool isDescendant(RenderObject *r, RenderObject *cb) * or at the end. * @param fromEnd begin search from end (default: begin from beginning) */ -static bool containsEditableElement(KHTMLPart *part, RenderBlock *cb, +static bool containsEditableElement(TDEHTMLPart *part, RenderBlock *cb, RenderTable *&table, bool fromEnd = false) { RenderObject *r = cb; @@ -1185,7 +1185,7 @@ static bool containsEditableElement(KHTMLPart *part, RenderBlock *cb, * @param fromEnd begin search from end (default: begin from beginning) * @param start object after which to begin search. */ -static bool containsEditableChildElement(KHTMLPart *part, RenderBlock *cb, +static bool containsEditableChildElement(TDEHTMLPart *part, RenderBlock *cb, RenderTable *&table, bool fromEnd, RenderObject *start) { int state = 0; @@ -1242,7 +1242,7 @@ static bool containsEditableChildElement(KHTMLPart *part, RenderBlock *cb, // == class LinearDocument implementation -LinearDocument::LinearDocument(KHTMLPart *part, NodeImpl *node, long offset, +LinearDocument::LinearDocument(TDEHTMLPart *part, NodeImpl *node, long offset, CaretAdvancePolicy advancePolicy, ElementImpl *baseElem) : node(node), offset(offset), m_part(part), advPol(advancePolicy), base(0) @@ -2052,7 +2052,7 @@ TableRowIterator &TableRowIterator::operator --() // == class ErgonomicEditableLineIterator implementation // some decls -static RenderTableCell *findNearestTableCellInRow(KHTMLPart *part, int x, +static RenderTableCell *findNearestTableCellInRow(TDEHTMLPart *part, int x, RenderTableSection::RowStruct *row, bool fromEnd); /** finds the cell corresponding to absolute x-coordinate @p x in the given @@ -2068,7 +2068,7 @@ static RenderTableCell *findNearestTableCellInRow(KHTMLPart *part, int x, * beginning * @return the cell, or 0 if no editable cell was found. */ -static inline RenderTableCell *findNearestTableCell(KHTMLPart *part, int x, +static inline RenderTableCell *findNearestTableCell(TDEHTMLPart *part, int x, TableRowIterator &it, bool fromEnd) { RenderTableCell *result = 0; @@ -2096,7 +2096,7 @@ static inline RenderTableCell *findNearestTableCell(KHTMLPart *part, int x, * @param fromEnd @p true, begin from end (applies only to nested tables) * @return the found cell or 0 if no editable cell was found */ -static RenderTableCell *findNearestTableCellInRow(KHTMLPart *part, int x, +static RenderTableCell *findNearestTableCellInRow(TDEHTMLPart *part, int x, RenderTableSection::RowStruct *row, bool fromEnd) { // First pass. Find spatially nearest cell. diff --git a/tdehtml/tdehtml_caret_p.h b/tdehtml/tdehtml_caret_p.h index 729f4d8ba..6d85a76b2 100644 --- a/tdehtml/tdehtml_caret_p.h +++ b/tdehtml/tdehtml_caret_p.h @@ -18,8 +18,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef KHTML_CARET_P_H -#define KHTML_CARET_P_H +#ifndef TDEHTML_CARET_P_H +#define TDEHTML_CARET_P_H #include "rendering/render_table.h" @@ -68,7 +68,7 @@ struct CaretViewContext { bool displayed; // true if caret is to be displayed at all. bool caretMoved; // set to true once caret has been moved in page // how to display the caret when view is not focused - KHTMLPart::CaretDisplayPolicy displayNonFocused; + TDEHTMLPart::CaretDisplayPolicy displayNonFocused; /** For natural traversal of lines, the original x position is saved, and * the actual x is set to the first character whose x position is @@ -83,7 +83,7 @@ struct CaretViewContext { // corresponding release event CaretViewContext() : freqTimerId(-1), x(0), y(0), width(1), height(16), visible(true), displayed(false), caretMoved(false), - displayNonFocused(KHTMLPart::CaretInvisible), origX(0), + displayNonFocused(TDEHTMLPart::CaretInvisible), origX(0), keyReleasePending(false) {} }; @@ -650,7 +650,7 @@ public: * cannot serve as a base (to see if this is the case, check whether * LinearDocument::baseFlow()->element() != base) */ - LinearDocument(KHTMLPart *part, DOM::NodeImpl *node, long offset, + LinearDocument(TDEHTMLPart *part, DOM::NodeImpl *node, long offset, CaretAdvancePolicy advancePolicy, DOM::ElementImpl *baseElem); virtual ~LinearDocument(); @@ -730,7 +730,7 @@ protected: Iterator _preBegin; Iterator _end; - KHTMLPart *m_part; + TDEHTMLPart *m_part; CaretAdvancePolicy advPol; RenderObject *base; @@ -754,7 +754,7 @@ protected: * @since 3.3 */ class EditableCaretBoxIterator : public CaretBoxIterator { - KHTMLPart *m_part; + TDEHTMLPart *m_part; bool adjacent; CaretAdvancePolicy advpol; // caret advance policy diff --git a/tdehtml/tdehtml_ext.cpp b/tdehtml/tdehtml_ext.cpp index 4127e7762..5803b1ca3 100644 --- a/tdehtml/tdehtml_ext.cpp +++ b/tdehtml/tdehtml_ext.cpp @@ -70,7 +70,7 @@ #include "tdehtmlpart_p.h" -KHTMLPartBrowserExtension::KHTMLPartBrowserExtension( KHTMLPart *parent, const char *name ) +TDEHTMLPartBrowserExtension::TDEHTMLPartBrowserExtension( TDEHTMLPart *parent, const char *name ) : KParts::BrowserExtension( parent, name ) { m_part = parent; @@ -83,29 +83,29 @@ KHTMLPartBrowserExtension::KHTMLPartBrowserExtension( KHTMLPart *parent, const c m_connectedToClipboard = false; } -int KHTMLPartBrowserExtension::xOffset() +int TDEHTMLPartBrowserExtension::xOffset() { return m_part->view()->contentsX(); } -int KHTMLPartBrowserExtension::yOffset() +int TDEHTMLPartBrowserExtension::yOffset() { return m_part->view()->contentsY(); } -void KHTMLPartBrowserExtension::saveState( TQDataStream &stream ) +void TDEHTMLPartBrowserExtension::saveState( TQDataStream &stream ) { //kdDebug( 6050 ) << "saveState!" << endl; m_part->saveState( stream ); } -void KHTMLPartBrowserExtension::restoreState( TQDataStream &stream ) +void TDEHTMLPartBrowserExtension::restoreState( TQDataStream &stream ) { //kdDebug( 6050 ) << "restoreState!" << endl; m_part->restoreState( stream ); } -void KHTMLPartBrowserExtension::editableWidgetFocused( TQWidget *widget ) +void TDEHTMLPartBrowserExtension::editableWidgetFocused( TQWidget *widget ) { m_editableFormWidget = widget; updateEditActions(); @@ -124,7 +124,7 @@ void KHTMLPartBrowserExtension::editableWidgetFocused( TQWidget *widget ) editableWidgetFocused(); } -void KHTMLPartBrowserExtension::editableWidgetBlurred( TQWidget * /*widget*/ ) +void TDEHTMLPartBrowserExtension::editableWidgetBlurred( TQWidget * /*widget*/ ) { TQWidget *oldWidget = m_editableFormWidget; @@ -150,13 +150,13 @@ void KHTMLPartBrowserExtension::editableWidgetBlurred( TQWidget * /*widget*/ ) editableWidgetBlurred(); } -void KHTMLPartBrowserExtension::setExtensionProxy( KParts::BrowserExtension *proxy ) +void TDEHTMLPartBrowserExtension::setExtensionProxy( KParts::BrowserExtension *proxy ) { if ( m_extensionProxy ) { disconnect( m_extensionProxy, TQT_SIGNAL( enableAction( const char *, bool ) ), this, TQT_SLOT( extensionProxyActionEnabled( const char *, bool ) ) ); - if ( m_extensionProxy->inherits( "KHTMLPartBrowserExtension" ) ) + if ( m_extensionProxy->inherits( "TDEHTMLPartBrowserExtension" ) ) { disconnect( m_extensionProxy, TQT_SIGNAL( editableWidgetFocused() ), this, TQT_SLOT( extensionProxyEditableWidgetFocused() ) ); @@ -171,7 +171,7 @@ void KHTMLPartBrowserExtension::setExtensionProxy( KParts::BrowserExtension *pro { connect( m_extensionProxy, TQT_SIGNAL( enableAction( const char *, bool ) ), this, TQT_SLOT( extensionProxyActionEnabled( const char *, bool ) ) ); - if ( m_extensionProxy->inherits( "KHTMLPartBrowserExtension" ) ) + if ( m_extensionProxy->inherits( "TDEHTMLPartBrowserExtension" ) ) { connect( m_extensionProxy, TQT_SIGNAL( editableWidgetFocused() ), this, TQT_SLOT( extensionProxyEditableWidgetFocused() ) ); @@ -190,7 +190,7 @@ void KHTMLPartBrowserExtension::setExtensionProxy( KParts::BrowserExtension *pro } } -void KHTMLPartBrowserExtension::cut() +void TDEHTMLPartBrowserExtension::cut() { if ( m_extensionProxy ) { @@ -207,7 +207,7 @@ void KHTMLPartBrowserExtension::cut() static_cast<TQTextEdit *>( &(*m_editableFormWidget) )->cut(); } -void KHTMLPartBrowserExtension::copy() +void TDEHTMLPartBrowserExtension::copy() { if ( m_extensionProxy ) { @@ -215,7 +215,7 @@ void KHTMLPartBrowserExtension::copy() return; } - kdDebug( 6050 ) << "************! KHTMLPartBrowserExtension::copy()" << endl; + kdDebug( 6050 ) << "************! TDEHTMLPartBrowserExtension::copy()" << endl; if ( !m_editableFormWidget ) { // get selected text and paste to the clipboard @@ -261,7 +261,7 @@ void KHTMLPartBrowserExtension::copy() } } -void KHTMLPartBrowserExtension::searchProvider() +void TDEHTMLPartBrowserExtension::searchProvider() { // action name is of form "previewProvider[<searchproviderprefix>:]" const TQString searchProviderPrefix = TQString( TQT_TQOBJECT_CONST(sender())->name() ).mid( 14 ); @@ -285,7 +285,7 @@ void KHTMLPartBrowserExtension::searchProvider() emit m_part->browserExtension()->openURLRequest( data.uri(), args ); } -void KHTMLPartBrowserExtension::openSelection() +void TDEHTMLPartBrowserExtension::openSelection() { KParts::URLArgs args; args.frameName = "_blank"; @@ -293,7 +293,7 @@ void KHTMLPartBrowserExtension::openSelection() emit m_part->browserExtension()->openURLRequest( m_part->selectedText(), args ); } -void KHTMLPartBrowserExtension::paste() +void TDEHTMLPartBrowserExtension::paste() { if ( m_extensionProxy ) { @@ -310,7 +310,7 @@ void KHTMLPartBrowserExtension::paste() static_cast<TQTextEdit *>( &(*m_editableFormWidget) )->paste(); } -void KHTMLPartBrowserExtension::callExtensionProxyMethod( const char *method ) +void TDEHTMLPartBrowserExtension::callExtensionProxyMethod( const char *method ) { if ( !m_extensionProxy ) return; @@ -323,7 +323,7 @@ void KHTMLPartBrowserExtension::callExtensionProxyMethod( const char *method ) m_extensionProxy->tqt_invoke( slot, o ); } -void KHTMLPartBrowserExtension::updateEditActions() +void TDEHTMLPartBrowserExtension::updateEditActions() { if ( !m_editableFormWidget ) { @@ -354,15 +354,15 @@ void KHTMLPartBrowserExtension::updateEditActions() enableAction( "cut", hasSelection ); } -void KHTMLPartBrowserExtension::extensionProxyEditableWidgetFocused() { +void TDEHTMLPartBrowserExtension::extensionProxyEditableWidgetFocused() { editableWidgetFocused(); } -void KHTMLPartBrowserExtension::extensionProxyEditableWidgetBlurred() { +void TDEHTMLPartBrowserExtension::extensionProxyEditableWidgetBlurred() { editableWidgetBlurred(); } -void KHTMLPartBrowserExtension::extensionProxyActionEnabled( const char *action, bool enable ) +void TDEHTMLPartBrowserExtension::extensionProxyActionEnabled( const char *action, bool enable ) { // only forward enableAction calls for actions we actually do forward if ( strcmp( action, "cut" ) == 0 || @@ -372,17 +372,17 @@ void KHTMLPartBrowserExtension::extensionProxyActionEnabled( const char *action, } } -void KHTMLPartBrowserExtension::reparseConfiguration() +void TDEHTMLPartBrowserExtension::reparseConfiguration() { m_part->reparseConfiguration(); } -void KHTMLPartBrowserExtension::print() +void TDEHTMLPartBrowserExtension::print() { m_part->view()->print(); } -void KHTMLPartBrowserExtension::disableScrolling() +void TDEHTMLPartBrowserExtension::disableScrolling() { TQScrollView *scrollView = m_part->view(); if (scrollView) { @@ -391,10 +391,10 @@ void KHTMLPartBrowserExtension::disableScrolling() } } -class KHTMLPopupGUIClient::KHTMLPopupGUIClientPrivate +class TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClientPrivate { public: - KHTMLPart *m_tdehtml; + TDEHTMLPart *m_tdehtml; KURL m_url; KURL m_imageURL; TQPixmap m_pixmap; @@ -402,10 +402,10 @@ public: }; -KHTMLPopupGUIClient::KHTMLPopupGUIClient( KHTMLPart *tdehtml, const TQString &doc, const KURL &url ) +TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQString &doc, const KURL &url ) : TQObject( tdehtml ) { - d = new KHTMLPopupGUIClientPrivate; + d = new TDEHTMLPopupGUIClientPrivate; d->m_tdehtml = tdehtml; d->m_url = url; bool isImage = false; @@ -556,7 +556,7 @@ KHTMLPopupGUIClient::KHTMLPopupGUIClient( KHTMLPart *tdehtml, const TQString &do new KAction( i18n( "Reload Frame" ), 0, this, TQT_SLOT( slotReloadFrame() ), actionCollection(), "reloadframe" ); - if ( KHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled() ) { + if ( TDEHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled() ) { if ( tdehtml->d->m_frame->m_type == tdehtml::ChildFrame::IFrame ) new KAction( i18n( "Block IFrame..." ), 0, this, TQT_SLOT( slotBlockIFrame() ), actionCollection(), "blockiframe" ); } @@ -618,7 +618,7 @@ KHTMLPopupGUIClient::KHTMLPopupGUIClient( KHTMLPart *tdehtml, const TQString &do new KAction( i18n( "View Image (%1)" ).arg(d->m_suggestedFilename.isEmpty() ? name.replace("&", "&&") : d->m_suggestedFilename.replace("&", "&&")), 0, this, TQT_SLOT( slotViewImage() ), actionCollection(), "viewimage" ); - if (KHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled()) + if (TDEHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled()) { new KAction( i18n( "Block Image..." ), 0, this, TQT_SLOT( slotBlockImage() ), actionCollection(), "blockimage" ); @@ -641,19 +641,19 @@ KHTMLPopupGUIClient::KHTMLPopupGUIClient( KHTMLPart *tdehtml, const TQString &do menu.insertBefore( domDocument().createElement( "separator" ), menu.firstChild() ); } -KHTMLPopupGUIClient::~KHTMLPopupGUIClient() +TDEHTMLPopupGUIClient::~TDEHTMLPopupGUIClient() { delete d; } -void KHTMLPopupGUIClient::slotSaveLinkAs() +void TDEHTMLPopupGUIClient::slotSaveLinkAs() { TDEIO::MetaData metaData; metaData["referrer"] = d->m_tdehtml->referrer(); saveURL( d->m_tdehtml->widget(), i18n( "Save Link As" ), d->m_url, metaData ); } -void KHTMLPopupGUIClient::slotSendImage() +void TDEHTMLPopupGUIClient::slotSendImage() { TQStringList urls; urls.append( d->m_imageURL.url()); @@ -666,21 +666,21 @@ void KHTMLPopupGUIClient::slotSendImage() } -void KHTMLPopupGUIClient::slotSaveImageAs() +void TDEHTMLPopupGUIClient::slotSaveImageAs() { TDEIO::MetaData metaData; metaData["referrer"] = d->m_tdehtml->referrer(); saveURL( d->m_tdehtml->widget(), i18n( "Save Image As" ), d->m_imageURL, metaData, TQString::null, 0, d->m_suggestedFilename ); } -void KHTMLPopupGUIClient::slotBlockHost() +void TDEHTMLPopupGUIClient::slotBlockHost() { TQString name=d->m_imageURL.protocol()+"://"+d->m_imageURL.host()+"/*"; - KHTMLFactory::defaultHTMLSettings()->addAdFilter( name ); + TDEHTMLFactory::defaultHTMLSettings()->addAdFilter( name ); d->m_tdehtml->reparseConfiguration(); } -void KHTMLPopupGUIClient::slotBlockImage() +void TDEHTMLPopupGUIClient::slotBlockImage() { bool ok = false; @@ -689,12 +689,12 @@ void KHTMLPopupGUIClient::slotBlockImage() d->m_imageURL.url(), &ok); if ( ok ) { - KHTMLFactory::defaultHTMLSettings()->addAdFilter( url ); + TDEHTMLFactory::defaultHTMLSettings()->addAdFilter( url ); d->m_tdehtml->reparseConfiguration(); } } -void KHTMLPopupGUIClient::slotBlockIFrame() +void TDEHTMLPopupGUIClient::slotBlockIFrame() { bool ok = false; TQString url = KInputDialog::getText( i18n( "Add URL to Filter"), @@ -702,12 +702,12 @@ void KHTMLPopupGUIClient::slotBlockIFrame() d->m_tdehtml->url().url(), &ok ); if ( ok ) { - KHTMLFactory::defaultHTMLSettings()->addAdFilter( url ); + TDEHTMLFactory::defaultHTMLSettings()->addAdFilter( url ); d->m_tdehtml->reparseConfiguration(); } } -void KHTMLPopupGUIClient::slotCopyLinkLocation() +void TDEHTMLPopupGUIClient::slotCopyLinkLocation() { KURL safeURL(d->m_url); safeURL.setPass(TQString::null); @@ -722,12 +722,12 @@ void KHTMLPopupGUIClient::slotCopyLinkLocation() #endif } -void KHTMLPopupGUIClient::slotStopAnimations() +void TDEHTMLPopupGUIClient::slotStopAnimations() { d->m_tdehtml->stopAnimations(); } -void KHTMLPopupGUIClient::slotCopyImage() +void TDEHTMLPopupGUIClient::slotCopyImage() { #ifndef QT_NO_MIMECLIPBOARD KURL safeURL(d->m_imageURL); @@ -748,7 +748,7 @@ void KHTMLPopupGUIClient::slotCopyImage() #endif } -void KHTMLPopupGUIClient::slotCopyImageLocation() +void TDEHTMLPopupGUIClient::slotCopyImageLocation() { KURL safeURL(d->m_imageURL); safeURL.setPass(TQString::null); @@ -763,12 +763,12 @@ void KHTMLPopupGUIClient::slotCopyImageLocation() #endif } -void KHTMLPopupGUIClient::slotViewImage() +void TDEHTMLPopupGUIClient::slotViewImage() { d->m_tdehtml->browserExtension()->createNewWindow(d->m_imageURL); } -void KHTMLPopupGUIClient::slotReloadFrame() +void TDEHTMLPopupGUIClient::slotReloadFrame() { KParts::URLArgs args( d->m_tdehtml->browserExtension()->urlArgs() ); args.reload = true; @@ -779,7 +779,7 @@ void KHTMLPopupGUIClient::slotReloadFrame() d->m_tdehtml->openURL( d->m_tdehtml->url() ); } -void KHTMLPopupGUIClient::slotFrameInWindow() +void TDEHTMLPopupGUIClient::slotFrameInWindow() { KParts::URLArgs args( d->m_tdehtml->browserExtension()->urlArgs() ); args.metaData()["referrer"] = d->m_tdehtml->pageReferrer(); @@ -787,7 +787,7 @@ void KHTMLPopupGUIClient::slotFrameInWindow() emit d->m_tdehtml->browserExtension()->createNewWindow( d->m_tdehtml->url(), args ); } -void KHTMLPopupGUIClient::slotFrameInTop() +void TDEHTMLPopupGUIClient::slotFrameInTop() { KParts::URLArgs args( d->m_tdehtml->browserExtension()->urlArgs() ); args.metaData()["referrer"] = d->m_tdehtml->pageReferrer(); @@ -795,7 +795,7 @@ void KHTMLPopupGUIClient::slotFrameInTop() emit d->m_tdehtml->browserExtension()->openURLRequest( d->m_tdehtml->url(), args ); } -void KHTMLPopupGUIClient::slotFrameInTab() +void TDEHTMLPopupGUIClient::slotFrameInTab() { KParts::URLArgs args( d->m_tdehtml->browserExtension()->urlArgs() ); args.metaData()["referrer"] = d->m_tdehtml->pageReferrer(); @@ -803,7 +803,7 @@ void KHTMLPopupGUIClient::slotFrameInTab() emit d->m_tdehtml->browserExtension()->createNewWindow( d->m_tdehtml->url(), args ); } -void KHTMLPopupGUIClient::saveURL( TQWidget *parent, const TQString &caption, +void TDEHTMLPopupGUIClient::saveURL( TQWidget *parent, const TQString &caption, const KURL &url, const TQMap<TQString, TQString> &metadata, const TQString &filter, long cacheId, @@ -834,21 +834,21 @@ void KHTMLPopupGUIClient::saveURL( TQWidget *parent, const TQString &caption, saveURL(url, destURL, metadata, cacheId); } -void KHTMLPopupGUIClient::saveURL( const KURL &url, const KURL &destURL, +void TDEHTMLPopupGUIClient::saveURL( const KURL &url, const KURL &destURL, const TQMap<TQString, TQString> &metadata, long cacheId ) { if ( destURL.isValid() ) { bool saved = false; - if (KHTMLPageCache::self()->isComplete(cacheId)) + if (TDEHTMLPageCache::self()->isComplete(cacheId)) { if (destURL.isLocalFile()) { KSaveFile destFile(destURL.path()); if (destFile.status() == 0) { - KHTMLPageCache::self()->saveData(cacheId, destFile.dataStream()); + TDEHTMLPageCache::self()->saveData(cacheId, destFile.dataStream()); saved = true; } } @@ -858,7 +858,7 @@ void KHTMLPopupGUIClient::saveURL( const KURL &url, const KURL &destURL, KTempFile destFile; if (destFile.status() == 0) { - KHTMLPageCache::self()->saveData(cacheId, destFile.dataStream()); + TDEHTMLPageCache::self()->saveData(cacheId, destFile.dataStream()); destFile.close(); KURL url2 = KURL(); url2.setPath(destFile.name()); @@ -917,37 +917,37 @@ void KHTMLPopupGUIClient::saveURL( const KURL &url, const KURL &destURL, } } -KHTMLPartBrowserHostExtension::KHTMLPartBrowserHostExtension( KHTMLPart *part ) +TDEHTMLPartBrowserHostExtension::TDEHTMLPartBrowserHostExtension( TDEHTMLPart *part ) : KParts::BrowserHostExtension( part ) { m_part = part; } -KHTMLPartBrowserHostExtension::~KHTMLPartBrowserHostExtension() +TDEHTMLPartBrowserHostExtension::~TDEHTMLPartBrowserHostExtension() { } -TQStringList KHTMLPartBrowserHostExtension::frameNames() const +TQStringList TDEHTMLPartBrowserHostExtension::frameNames() const { return m_part->frameNames(); } -const TQPtrList<KParts::ReadOnlyPart> KHTMLPartBrowserHostExtension::frames() const +const TQPtrList<KParts::ReadOnlyPart> TDEHTMLPartBrowserHostExtension::frames() const { return m_part->frames(); } -bool KHTMLPartBrowserHostExtension::openURLInFrame( const KURL &url, const KParts::URLArgs &urlArgs ) +bool TDEHTMLPartBrowserHostExtension::openURLInFrame( const KURL &url, const KParts::URLArgs &urlArgs ) { return m_part->openURLInFrame( url, urlArgs ); } -void KHTMLPartBrowserHostExtension::virtual_hook( int id, void *data ) +void TDEHTMLPartBrowserHostExtension::virtual_hook( int id, void *data ) { if (id == VIRTUAL_FIND_FRAME_PARENT) { FindFrameParentParams *param = static_cast<FindFrameParentParams*>(data); - KHTMLPart *parentPart = m_part->findFrameParent(param->callingPart, param->frame); + TDEHTMLPart *parentPart = m_part->findFrameParent(param->callingPart, param->frame); if (parentPart) param->parent = parentPart->browserHostExtension(); return; @@ -961,19 +961,19 @@ extern const int KDE_NO_EXPORT fastZoomSizes[]; extern const int KDE_NO_EXPORT fastZoomSizeCount; // BCI: remove in KDE 4 -KHTMLZoomFactorAction::KHTMLZoomFactorAction( KHTMLPart *part, bool direction, const TQString &text, const TQString &icon, const TQObject *receiver, const char *slot, TQObject *parent, const char *name ) +TDEHTMLZoomFactorAction::TDEHTMLZoomFactorAction( TDEHTMLPart *part, bool direction, const TQString &text, const TQString &icon, const TQObject *receiver, const char *slot, TQObject *parent, const char *name ) : KAction( text, icon, 0, receiver, slot, parent, name ) { init(part, direction); } -KHTMLZoomFactorAction::KHTMLZoomFactorAction( KHTMLPart *part, bool direction, const TQString &text, const TQString &icon, const KShortcut &cut, const TQObject *receiver, const char *slot, TQObject *parent, const char *name ) +TDEHTMLZoomFactorAction::TDEHTMLZoomFactorAction( TDEHTMLPart *part, bool direction, const TQString &text, const TQString &icon, const KShortcut &cut, const TQObject *receiver, const char *slot, TQObject *parent, const char *name ) : KAction( text, icon, cut, receiver, slot, parent, name ) { init(part, direction); } -void KHTMLZoomFactorAction::init(KHTMLPart *part, bool direction) +void TDEHTMLZoomFactorAction::init(TDEHTMLPart *part, bool direction) { m_direction = direction; m_part = part; @@ -999,12 +999,12 @@ void KHTMLZoomFactorAction::init(KHTMLPart *part, bool direction) connect( m_popup, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotActivated( int ) ) ); } -KHTMLZoomFactorAction::~KHTMLZoomFactorAction() +TDEHTMLZoomFactorAction::~TDEHTMLZoomFactorAction() { delete m_popup; } -int KHTMLZoomFactorAction::plug( TQWidget *w, int index ) +int TDEHTMLZoomFactorAction::plug( TQWidget *w, int index ) { int containerId = KAction::plug( w, index ); if ( containerId == -1 || !w->inherits( "KToolBar" ) ) @@ -1018,7 +1018,7 @@ int KHTMLZoomFactorAction::plug( TQWidget *w, int index ) return containerId; } -void KHTMLZoomFactorAction::slotActivated( int id ) +void TDEHTMLZoomFactorAction::slotActivated( int id ) { int idx = m_popup->indexOf( id ); diff --git a/tdehtml/tdehtml_ext.h b/tdehtml/tdehtml_ext.h index 5a8f00e70..c6db763b9 100644 --- a/tdehtml/tdehtml_ext.h +++ b/tdehtml/tdehtml_ext.h @@ -35,16 +35,16 @@ #include <tdeio/global.h> /** - * This is the BrowserExtension for a KHTMLPart document. Please see the KParts documentation for + * This is the BrowserExtension for a TDEHTMLPart document. Please see the KParts documentation for * more information about the BrowserExtension. */ -class KHTMLPartBrowserExtension : public KParts::BrowserExtension +class TDEHTMLPartBrowserExtension : public KParts::BrowserExtension { Q_OBJECT - friend class KHTMLPart; - friend class KHTMLView; + friend class TDEHTMLPart; + friend class TDEHTMLView; public: - KHTMLPartBrowserExtension( KHTMLPart *parent, const char *name = 0L ); + TDEHTMLPartBrowserExtension( TDEHTMLPart *parent, const char *name = 0L ); virtual int xOffset(); virtual int yOffset(); @@ -84,17 +84,17 @@ signals: private: void callExtensionProxyMethod( const char *method ); - KHTMLPart *m_part; + TDEHTMLPart *m_part; TQGuardedPtr<TQWidget> m_editableFormWidget; TQGuardedPtr<KParts::BrowserExtension> m_extensionProxy; bool m_connectedToClipboard; }; -class KHTMLPartBrowserHostExtension : public KParts::BrowserHostExtension +class TDEHTMLPartBrowserHostExtension : public KParts::BrowserHostExtension { public: - KHTMLPartBrowserHostExtension( KHTMLPart *part ); - virtual ~KHTMLPartBrowserHostExtension(); + TDEHTMLPartBrowserHostExtension( TDEHTMLPart *part ); + virtual ~TDEHTMLPartBrowserHostExtension(); virtual TQStringList frameNames() const; @@ -105,19 +105,19 @@ public: protected: virtual void virtual_hook( int id, void* data ); private: - KHTMLPart *m_part; + TDEHTMLPart *m_part; }; /** * @internal * INTERNAL class. *NOT* part of the public API. */ -class KHTMLPopupGUIClient : public TQObject, public KXMLGUIClient +class TDEHTMLPopupGUIClient : public TQObject, public KXMLGUIClient { Q_OBJECT public: - KHTMLPopupGUIClient( KHTMLPart *tdehtml, const TQString &doc, const KURL &url ); - virtual ~KHTMLPopupGUIClient(); + TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQString &doc, const KURL &url ); + virtual ~TDEHTMLPopupGUIClient(); static void saveURL( TQWidget *parent, const TQString &caption, const KURL &url, const TQMap<TQString, TQString> &metaData = TDEIO::MetaData(), @@ -145,20 +145,20 @@ private slots: void slotBlockIFrame(); private: - class KHTMLPopupGUIClientPrivate; - KHTMLPopupGUIClientPrivate *d; + class TDEHTMLPopupGUIClientPrivate; + TDEHTMLPopupGUIClientPrivate *d; }; -class KHTMLZoomFactorAction : public KAction +class TDEHTMLZoomFactorAction : public KAction { Q_OBJECT public: //BCI: remove in KDE 4 - KHTMLZoomFactorAction( KHTMLPart *part, bool direction, const TQString &text, const TQString &icon, const TQObject *receiver, const char *slot, TQObject *parent, const char *name ); - KHTMLZoomFactorAction( KHTMLPart *part, bool direction, const TQString &text, + TDEHTMLZoomFactorAction( TDEHTMLPart *part, bool direction, const TQString &text, const TQString &icon, const TQObject *receiver, const char *slot, TQObject *parent, const char *name ); + TDEHTMLZoomFactorAction( TDEHTMLPart *part, bool direction, const TQString &text, const TQString &icon, const KShortcut& cut, const TQObject *receiver, const char *slot, TQObject *parent, const char *name ); - virtual ~KHTMLZoomFactorAction(); + virtual ~TDEHTMLZoomFactorAction(); virtual int plug( TQWidget *widget, int index ); @@ -167,11 +167,11 @@ private slots: protected slots: void slotActivated() { KAction::slotActivated(); } private: - void init(KHTMLPart *part, bool direction); + void init(TDEHTMLPart *part, bool direction); private: TQPopupMenu *m_popup; bool m_direction; - KHTMLPart *m_part; + TDEHTMLPart *m_part; }; #endif diff --git a/tdehtml/tdehtml_factory.cpp b/tdehtml/tdehtml_factory.cpp index 9d0ec6d36..103945736 100644 --- a/tdehtml/tdehtml_factory.cpp +++ b/tdehtml/tdehtml_factory.cpp @@ -37,40 +37,40 @@ #include <kdebug.h> -template class TQPtrList<KHTMLPart>; +template class TQPtrList<TDEHTMLPart>; extern "C" KDE_EXPORT void *init_libtdehtml() { // We can't use a plain self() here, because that would // return the global factory, which might already exist // at the time init_libtdehtml is called! As soon as someone - // does new KHTMLPart() in his application and loads up + // does new TDEHTMLPart() in his application and loads up // an html document into that part which either embeds - // embeds another KHTMLPart instance via <object> or + // embeds another TDEHTMLPart instance via <object> or // as html frame, then we cannot return self(), as // what we return here is what the KLibLoader deletes // in the end, and we don't want the libloader to // delete our global instance. Anyway, the new - // KHTMLFactory we create here is very cheap :) + // TDEHTMLFactory we create here is very cheap :) // (Simon) - return new KHTMLFactory( true ); + return new TDEHTMLFactory( true ); } -KHTMLFactory *KHTMLFactory::s_self = 0; -unsigned long int KHTMLFactory::s_refcnt = 0; -TDEInstance *KHTMLFactory::s_instance = 0; -TDEAboutData *KHTMLFactory::s_about = 0; -KHTMLSettings *KHTMLFactory::s_settings = 0; -TQPtrList<KHTMLPart> *KHTMLFactory::s_parts = 0; -TQString *KHTMLSettings::avFamilies = 0; +TDEHTMLFactory *TDEHTMLFactory::s_self = 0; +unsigned long int TDEHTMLFactory::s_refcnt = 0; +TDEInstance *TDEHTMLFactory::s_instance = 0; +TDEAboutData *TDEHTMLFactory::s_about = 0; +TDEHTMLSettings *TDEHTMLFactory::s_settings = 0; +TQPtrList<TDEHTMLPart> *TDEHTMLFactory::s_parts = 0; +TQString *TDEHTMLSettings::avFamilies = 0; -KHTMLFactory::KHTMLFactory( bool clone ) +TDEHTMLFactory::TDEHTMLFactory( bool clone ) { if ( clone ) ref(); } -KHTMLFactory::~KHTMLFactory() +TDEHTMLFactory::~TDEHTMLFactory() { if ( s_self == this ) { @@ -79,7 +79,7 @@ KHTMLFactory::~KHTMLFactory() delete s_instance; delete s_about; delete s_settings; - delete KHTMLSettings::avFamilies; + delete TDEHTMLSettings::avFamilies; if ( s_parts ) { assert( s_parts->isEmpty() ); @@ -90,7 +90,7 @@ KHTMLFactory::~KHTMLFactory() s_about = 0; s_settings = 0; s_parts = 0; - KHTMLSettings::avFamilies = 0; + TDEHTMLSettings::avFamilies = 0; // clean up static data tdehtml::CSSStyleSelector::clear(); @@ -103,16 +103,16 @@ KHTMLFactory::~KHTMLFactory() deref(); } -KParts::Part *KHTMLFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList & ) +KParts::Part *TDEHTMLFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList & ) { - KHTMLPart::GUIProfile prof = KHTMLPart::DefaultGUI; + TDEHTMLPart::GUIProfile prof = TDEHTMLPart::DefaultGUI; if ( strcmp( className, "Browser/View" ) == 0 ) - prof = KHTMLPart::BrowserViewGUI; + prof = TDEHTMLPart::BrowserViewGUI; - return new KHTMLPart( parentWidget, widgetName, parent, name, prof ); + return new TDEHTMLPart( parentWidget, widgetName, parent, name, prof ); } -void KHTMLFactory::ref() +void TDEHTMLFactory::ref() { if ( !s_refcnt && !s_self ) { @@ -125,14 +125,14 @@ void KHTMLFactory::ref() // well, perhaps I'm wrong here, but as I'm unsure I try to stay on the // safe side ;-) -> let's use a simple reference counting scheme // (Simon) - s_self = new KHTMLFactory; + s_self = new TDEHTMLFactory; tdehtml::Cache::init(); } s_refcnt++; } -void KHTMLFactory::deref() +void TDEHTMLFactory::deref() { if ( !--s_refcnt && s_self ) { @@ -141,10 +141,10 @@ void KHTMLFactory::deref() } } -void KHTMLFactory::registerPart( KHTMLPart *part ) +void TDEHTMLFactory::registerPart( TDEHTMLPart *part ) { if ( !s_parts ) - s_parts = new TQPtrList<KHTMLPart>; + s_parts = new TQPtrList<TDEHTMLPart>; if ( !s_parts->containsRef( part ) ) { @@ -153,7 +153,7 @@ void KHTMLFactory::registerPart( KHTMLPart *part ) } } -void KHTMLFactory::deregisterPart( KHTMLPart *part ) +void TDEHTMLFactory::deregisterPart( TDEHTMLPart *part ) { assert( s_parts ); @@ -168,13 +168,13 @@ void KHTMLFactory::deregisterPart( KHTMLPart *part ) } } -TDEInstance *KHTMLFactory::instance() +TDEInstance *TDEHTMLFactory::instance() { assert( s_self ); if ( !s_instance ) { - s_about = new TDEAboutData( "tdehtml", I18N_NOOP( "KHTML" ), "4.0", + s_about = new TDEAboutData( "tdehtml", I18N_NOOP( "TDEHTML" ), "4.0", I18N_NOOP( "Embeddable HTML component" ), TDEAboutData::License_LGPL ); s_about->addAuthor( "Lars Knoll", 0, "[email protected]" ); @@ -193,11 +193,11 @@ TDEInstance *KHTMLFactory::instance() return s_instance; } -KHTMLSettings *KHTMLFactory::defaultHTMLSettings() +TDEHTMLSettings *TDEHTMLFactory::defaultHTMLSettings() { assert( s_self ); if ( !s_settings ) - s_settings = new KHTMLSettings(); + s_settings = new TDEHTMLSettings(); return s_settings; } diff --git a/tdehtml/tdehtml_factory.h b/tdehtml/tdehtml_factory.h index 2177a2602..3ad2aff8c 100644 --- a/tdehtml/tdehtml_factory.h +++ b/tdehtml/tdehtml_factory.h @@ -28,33 +28,33 @@ class TDEInstance; class TDEAboutData; class HistoryProvider; -class KHTMLSettings; -class KHTMLPart; +class TDEHTMLSettings; +class TDEHTMLPart; namespace DOM { class DocumentImpl; } -class KDE_EXPORT KHTMLFactory : public KParts::Factory +class KDE_EXPORT TDEHTMLFactory : public KParts::Factory { Q_OBJECT friend class DOM::DocumentImpl; - friend class KHTMLViewPrivate; + friend class TDEHTMLViewPrivate; public: - KHTMLFactory( bool clone = false ); - virtual ~KHTMLFactory(); + TDEHTMLFactory( bool clone = false ); + virtual ~TDEHTMLFactory(); virtual KParts::Part *createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList &args ); - static void registerPart( KHTMLPart *part ); - static void deregisterPart( KHTMLPart *part ); + static void registerPart( TDEHTMLPart *part ); + static void deregisterPart( TDEHTMLPart *part ); - static TQPtrList<KHTMLPart> *partList() { return s_parts; } + static TQPtrList<TDEHTMLPart> *partList() { return s_parts; } static TDEInstance *instance(); - static KHTMLSettings *defaultHTMLSettings(); + static TDEHTMLSettings *defaultHTMLSettings(); // list of visited URLs static KParts::HistoryProvider *vLinks() { @@ -66,11 +66,11 @@ protected: static void deref(); private: static unsigned long s_refcnt; - static KHTMLFactory *s_self; + static TDEHTMLFactory *s_self; static TDEInstance *s_instance; static TDEAboutData *s_about; - static KHTMLSettings *s_settings; - static TQPtrList<KHTMLPart> *s_parts; + static TDEHTMLSettings *s_settings; + static TQPtrList<TDEHTMLPart> *s_parts; }; #endif diff --git a/tdehtml/tdehtml_iface.cc b/tdehtml/tdehtml_iface.cc index 1ceb6b5d4..4bb4afd89 100644 --- a/tdehtml/tdehtml_iface.cc +++ b/tdehtml/tdehtml_iface.cc @@ -26,127 +26,127 @@ #include <tqapplication.h> #include <tqvariant.h> -KHTMLPartIface::KHTMLPartIface( KHTMLPart *_part ) +TDEHTMLPartIface::TDEHTMLPartIface( TDEHTMLPart *_part ) : DCOPObject( _part->dcopObjectId() ), part(_part) { } -KHTMLPartIface::~KHTMLPartIface() +TDEHTMLPartIface::~TDEHTMLPartIface() { } -KURL KHTMLPartIface::url() const +KURL TDEHTMLPartIface::url() const { return part->url(); } -void KHTMLPartIface::setJScriptEnabled( bool enable ) +void TDEHTMLPartIface::setJScriptEnabled( bool enable ) { part->setJScriptEnabled(enable); } -bool KHTMLPartIface::jScriptEnabled() const +bool TDEHTMLPartIface::jScriptEnabled() const { return part->jScriptEnabled(); } -bool KHTMLPartIface::closeURL() +bool TDEHTMLPartIface::closeURL() { return part->closeURL(); } -bool KHTMLPartIface::metaRefreshEnabled() const +bool TDEHTMLPartIface::metaRefreshEnabled() const { return part->metaRefreshEnabled(); } -void KHTMLPartIface::setDNDEnabled( bool b ) +void TDEHTMLPartIface::setDNDEnabled( bool b ) { part->setDNDEnabled(b); } -bool KHTMLPartIface::dndEnabled() const +bool TDEHTMLPartIface::dndEnabled() const { return part->dndEnabled(); } -void KHTMLPartIface::setJavaEnabled( bool enable ) +void TDEHTMLPartIface::setJavaEnabled( bool enable ) { part->setJavaEnabled( enable ); } -bool KHTMLPartIface::javaEnabled() const +bool TDEHTMLPartIface::javaEnabled() const { return part->javaEnabled(); } -void KHTMLPartIface::setPluginsEnabled( bool enable ) +void TDEHTMLPartIface::setPluginsEnabled( bool enable ) { part->setPluginsEnabled( enable ); } -bool KHTMLPartIface::pluginsEnabled() const +bool TDEHTMLPartIface::pluginsEnabled() const { return part->pluginsEnabled(); } -void KHTMLPartIface::setAutoloadImages( bool enable ) +void TDEHTMLPartIface::setAutoloadImages( bool enable ) { part->setAutoloadImages( enable ); } -bool KHTMLPartIface::autoloadImages() const +bool TDEHTMLPartIface::autoloadImages() const { return part->autoloadImages(); } -void KHTMLPartIface::setOnlyLocalReferences(bool enable) +void TDEHTMLPartIface::setOnlyLocalReferences(bool enable) { part->setOnlyLocalReferences(enable); } -void KHTMLPartIface::setMetaRefreshEnabled( bool enable ) +void TDEHTMLPartIface::setMetaRefreshEnabled( bool enable ) { part->setMetaRefreshEnabled(enable); } -bool KHTMLPartIface::onlyLocalReferences() const +bool TDEHTMLPartIface::onlyLocalReferences() const { return part->onlyLocalReferences(); } -bool KHTMLPartIface::setEncoding( const TQString &name ) +bool TDEHTMLPartIface::setEncoding( const TQString &name ) { return part->setEncoding(name); } -TQString KHTMLPartIface::encoding() const +TQString TDEHTMLPartIface::encoding() const { return part->encoding(); } -void KHTMLPartIface::setFixedFont( const TQString &name ) +void TDEHTMLPartIface::setFixedFont( const TQString &name ) { part->setFixedFont(name); } -bool KHTMLPartIface::gotoAnchor( const TQString &name ) +bool TDEHTMLPartIface::gotoAnchor( const TQString &name ) { return part->gotoAnchor(name); } -bool KHTMLPartIface::nextAnchor() +bool TDEHTMLPartIface::nextAnchor() { return part->nextAnchor(); } -bool KHTMLPartIface::prevAnchor() +bool TDEHTMLPartIface::prevAnchor() { return part->prevAnchor(); } -void KHTMLPartIface::activateNode() +void TDEHTMLPartIface::activateNode() { KParts::ReadOnlyPart* p = part->currentFrame(); if ( p && p->widget() ) { @@ -155,37 +155,37 @@ void KHTMLPartIface::activateNode() } } -void KHTMLPartIface::selectAll() +void TDEHTMLPartIface::selectAll() { part->selectAll(); } -TQString KHTMLPartIface::lastModified() const +TQString TDEHTMLPartIface::lastModified() const { return part->lastModified(); } -void KHTMLPartIface::debugRenderTree() +void TDEHTMLPartIface::debugRenderTree() { part->slotDebugRenderTree(); } -void KHTMLPartIface::debugDOMTree() +void TDEHTMLPartIface::debugDOMTree() { part->slotDebugDOMTree(); } -void KHTMLPartIface::stopAnimations() +void TDEHTMLPartIface::stopAnimations() { part->slotStopAnimations(); } -void KHTMLPartIface::viewDocumentSource() +void TDEHTMLPartIface::viewDocumentSource() { part->slotViewDocumentSource(); } -void KHTMLPartIface::saveBackground(const TQString &destination) +void TDEHTMLPartIface::saveBackground(const TQString &destination) { KURL back = part->backgroundURL(); if (back.isEmpty()) @@ -193,10 +193,10 @@ void KHTMLPartIface::saveBackground(const TQString &destination) TDEIO::MetaData metaData; metaData["referrer"] = part->referrer(); - KHTMLPopupGUIClient::saveURL( back, KURL( destination ), metaData ); + TDEHTMLPopupGUIClient::saveURL( back, KURL( destination ), metaData ); } -void KHTMLPartIface::saveDocument(const TQString &destination) +void TDEHTMLPartIface::saveDocument(const TQString &destination) { KURL srcURL( part->url() ); @@ -205,29 +205,29 @@ void KHTMLPartIface::saveDocument(const TQString &destination) TDEIO::MetaData metaData; // Referrer unknown? - KHTMLPopupGUIClient::saveURL( srcURL, KURL( destination ), metaData, part->cacheId() ); + TDEHTMLPopupGUIClient::saveURL( srcURL, KURL( destination ), metaData, part->cacheId() ); } -void KHTMLPartIface::setUserStyleSheet(const TQString &styleSheet) +void TDEHTMLPartIface::setUserStyleSheet(const TQString &styleSheet) { part->setUserStyleSheet(styleSheet); } -TQString KHTMLPartIface::selectedText() const +TQString TDEHTMLPartIface::selectedText() const { return part->selectedText(); } -void KHTMLPartIface::viewFrameSource() +void TDEHTMLPartIface::viewFrameSource() { part->slotViewFrameSource(); } -TQString KHTMLPartIface::evalJS(const TQString &script) +TQString TDEHTMLPartIface::evalJS(const TQString &script) { return part->executeScript(DOM::Node(), script).toString(); } -void KHTMLPartIface::print( bool quick ) { +void TDEHTMLPartIface::print( bool quick ) { part->view()->print( quick ); } diff --git a/tdehtml/tdehtml_iface.h b/tdehtml/tdehtml_iface.h index d4c34940b..4ca0a3e06 100644 --- a/tdehtml/tdehtml_iface.h +++ b/tdehtml/tdehtml_iface.h @@ -24,19 +24,19 @@ #include <dcopref.h> #include <kurl.h> -class KHTMLPart; +class TDEHTMLPart; /** - * DCOP interface for KHTML + * DCOP interface for TDEHTML */ -class KHTMLPartIface : public DCOPObject +class TDEHTMLPartIface : public DCOPObject { K_DCOP public: - KHTMLPartIface( KHTMLPart * ); - virtual ~KHTMLPartIface(); + TDEHTMLPartIface( TDEHTMLPart * ); + virtual ~TDEHTMLPartIface(); k_dcop: /** @@ -235,7 +235,7 @@ k_dcop: void stopAnimations(); private: - KHTMLPart *part; + TDEHTMLPart *part; }; #endif diff --git a/tdehtml/tdehtml_pagecache.cpp b/tdehtml/tdehtml_pagecache.cpp index bde26c9de..c2e0a89e1 100644 --- a/tdehtml/tdehtml_pagecache.cpp +++ b/tdehtml/tdehtml_pagecache.cpp @@ -32,18 +32,18 @@ #include <assert.h> // We keep 12 pages in memory. -#ifndef KHTML_PAGE_CACHE_SIZE -#define KHTML_PAGE_CACHE_SIZE 12 +#ifndef TDEHTML_PAGE_CACHE_SIZE +#define TDEHTML_PAGE_CACHE_SIZE 12 #endif -template class TQPtrList<KHTMLPageCacheDelivery>; -class KHTMLPageCacheEntry +template class TQPtrList<TDEHTMLPageCacheDelivery>; +class TDEHTMLPageCacheEntry { - friend class KHTMLPageCache; + friend class TDEHTMLPageCache; public: - KHTMLPageCacheEntry(long id); + TDEHTMLPageCacheEntry(long id); - ~KHTMLPageCacheEntry(); + ~TDEHTMLPageCacheEntry(); void addData(const TQByteArray &data); @@ -52,7 +52,7 @@ public: bool isComplete() { return m_complete; } - KHTMLPageCacheDelivery *fetchData(TQObject *recvObj, const char *recvSlot); + TDEHTMLPageCacheDelivery *fetchData(TQObject *recvObj, const char *recvSlot); private: long m_id; bool m_complete; @@ -60,38 +60,38 @@ private: KTempFile *m_file; }; -class KHTMLPageCachePrivate +class TDEHTMLPageCachePrivate { public: long newId; - TQIntDict<KHTMLPageCacheEntry> dict; - TQPtrList<KHTMLPageCacheDelivery> delivery; - TQPtrList<KHTMLPageCacheEntry> expireQueue; + TQIntDict<TDEHTMLPageCacheEntry> dict; + TQPtrList<TDEHTMLPageCacheDelivery> delivery; + TQPtrList<TDEHTMLPageCacheEntry> expireQueue; bool deliveryActive; }; -KHTMLPageCacheEntry::KHTMLPageCacheEntry(long id) : m_id(id), m_complete(false) +TDEHTMLPageCacheEntry::TDEHTMLPageCacheEntry(long id) : m_id(id), m_complete(false) { TQString path = locateLocal("tmp", "tdehtmlcache"); m_file = new KTempFile(path); m_file->unlink(); } -KHTMLPageCacheEntry::~KHTMLPageCacheEntry() +TDEHTMLPageCacheEntry::~TDEHTMLPageCacheEntry() { delete m_file; } void -KHTMLPageCacheEntry::addData(const TQByteArray &data) +TDEHTMLPageCacheEntry::addData(const TQByteArray &data) { if (m_file->status() == 0) m_file->dataStream()->writeRawBytes(data.data(), data.size()); } void -KHTMLPageCacheEntry::endData() +TDEHTMLPageCacheEntry::endData() { m_complete = true; if ( m_file->status() == 0) { @@ -101,38 +101,38 @@ KHTMLPageCacheEntry::endData() } -KHTMLPageCacheDelivery * -KHTMLPageCacheEntry::fetchData(TQObject *recvObj, const char *recvSlot) +TDEHTMLPageCacheDelivery * +TDEHTMLPageCacheEntry::fetchData(TQObject *recvObj, const char *recvSlot) { // Duplicate fd so that entry can be safely deleted while delivering the data. int fd = dup(m_file->handle()); lseek(fd, 0, SEEK_SET); - KHTMLPageCacheDelivery *delivery = new KHTMLPageCacheDelivery(fd); + TDEHTMLPageCacheDelivery *delivery = new TDEHTMLPageCacheDelivery(fd); recvObj->connect(delivery, TQT_SIGNAL(emitData(const TQByteArray&)), recvSlot); delivery->recvObj = recvObj; return delivery; } -static KStaticDeleter<KHTMLPageCache> pageCacheDeleter; +static KStaticDeleter<TDEHTMLPageCache> pageCacheDeleter; -KHTMLPageCache *KHTMLPageCache::_self = 0; +TDEHTMLPageCache *TDEHTMLPageCache::_self = 0; -KHTMLPageCache * -KHTMLPageCache::self() +TDEHTMLPageCache * +TDEHTMLPageCache::self() { if (!_self) - _self = pageCacheDeleter.setObject(_self, new KHTMLPageCache); + _self = pageCacheDeleter.setObject(_self, new TDEHTMLPageCache); return _self; } -KHTMLPageCache::KHTMLPageCache() +TDEHTMLPageCache::TDEHTMLPageCache() { - d = new KHTMLPageCachePrivate; + d = new TDEHTMLPageCachePrivate; d->newId = 1; d->deliveryActive = false; } -KHTMLPageCache::~KHTMLPageCache() +TDEHTMLPageCache::~TDEHTMLPageCache() { d->delivery.setAutoDelete(true); d->dict.setAutoDelete(true); @@ -140,14 +140,14 @@ KHTMLPageCache::~KHTMLPageCache() } long -KHTMLPageCache::createCacheEntry() +TDEHTMLPageCache::createCacheEntry() { - KHTMLPageCacheEntry *entry = new KHTMLPageCacheEntry(d->newId); + TDEHTMLPageCacheEntry *entry = new TDEHTMLPageCacheEntry(d->newId); d->dict.insert(d->newId, entry); d->expireQueue.append(entry); - if (d->expireQueue.count() > KHTML_PAGE_CACHE_SIZE) + if (d->expireQueue.count() > TDEHTML_PAGE_CACHE_SIZE) { - KHTMLPageCacheEntry *entry = d->expireQueue.take(0); + TDEHTMLPageCacheEntry *entry = d->expireQueue.take(0); d->dict.remove(entry->m_id); delete entry; } @@ -155,25 +155,25 @@ KHTMLPageCache::createCacheEntry() } void -KHTMLPageCache::addData(long id, const TQByteArray &data) +TDEHTMLPageCache::addData(long id, const TQByteArray &data) { - KHTMLPageCacheEntry *entry = d->dict.find(id); + TDEHTMLPageCacheEntry *entry = d->dict.find(id); if (entry) entry->addData(data); } void -KHTMLPageCache::endData(long id) +TDEHTMLPageCache::endData(long id) { - KHTMLPageCacheEntry *entry = d->dict.find(id); + TDEHTMLPageCacheEntry *entry = d->dict.find(id); if (entry) entry->endData(); } void -KHTMLPageCache::cancelEntry(long id) +TDEHTMLPageCache::cancelEntry(long id) { - KHTMLPageCacheEntry *entry = d->dict.take(id); + TDEHTMLPageCacheEntry *entry = d->dict.take(id); if (entry) { d->expireQueue.removeRef(entry); @@ -182,24 +182,24 @@ KHTMLPageCache::cancelEntry(long id) } bool -KHTMLPageCache::isValid(long id) +TDEHTMLPageCache::isValid(long id) { return (d->dict.find(id) != 0); } bool -KHTMLPageCache::isComplete(long id) +TDEHTMLPageCache::isComplete(long id) { - KHTMLPageCacheEntry *entry = d->dict.find(id); + TDEHTMLPageCacheEntry *entry = d->dict.find(id); if (entry) return entry->isComplete(); return false; } void -KHTMLPageCache::fetchData(long id, TQObject *recvObj, const char *recvSlot) +TDEHTMLPageCache::fetchData(long id, TQObject *recvObj, const char *recvSlot) { - KHTMLPageCacheEntry *entry = d->dict.find(id); + TDEHTMLPageCacheEntry *entry = d->dict.find(id); if (!entry || !entry->isComplete()) return; // Make this entry the most recent entry. @@ -215,10 +215,10 @@ KHTMLPageCache::fetchData(long id, TQObject *recvObj, const char *recvSlot) } void -KHTMLPageCache::cancelFetch(TQObject *recvObj) +TDEHTMLPageCache::cancelFetch(TQObject *recvObj) { - KHTMLPageCacheDelivery *next; - for(KHTMLPageCacheDelivery* delivery = d->delivery.first(); + TDEHTMLPageCacheDelivery *next; + for(TDEHTMLPageCacheDelivery* delivery = d->delivery.first(); delivery; delivery = next) { @@ -232,14 +232,14 @@ KHTMLPageCache::cancelFetch(TQObject *recvObj) } void -KHTMLPageCache::sendData() +TDEHTMLPageCache::sendData() { if (d->delivery.isEmpty()) { d->deliveryActive = false; return; } - KHTMLPageCacheDelivery *delivery = d->delivery.take(0); + TDEHTMLPageCacheDelivery *delivery = d->delivery.take(0); assert(delivery); char buf[8192]; @@ -269,9 +269,9 @@ KHTMLPageCache::sendData() } void -KHTMLPageCache::saveData(long id, TQDataStream *str) +TDEHTMLPageCache::saveData(long id, TQDataStream *str) { - KHTMLPageCacheEntry *entry = d->dict.find(id); + TDEHTMLPageCacheEntry *entry = d->dict.find(id); assert(entry); int fd = entry->m_file->handle(); @@ -305,7 +305,7 @@ KHTMLPageCache::saveData(long id, TQDataStream *str) lseek(fd, pos, SEEK_SET); } -KHTMLPageCacheDelivery::~KHTMLPageCacheDelivery() +TDEHTMLPageCacheDelivery::~TDEHTMLPageCacheDelivery() { close(fd); } diff --git a/tdehtml/tdehtml_pagecache.h b/tdehtml/tdehtml_pagecache.h index e2992faa4..fbafa171d 100644 --- a/tdehtml/tdehtml_pagecache.h +++ b/tdehtml/tdehtml_pagecache.h @@ -25,7 +25,7 @@ #include <tqvaluelist.h> #include <tqptrlist.h> -class KHTMLPageCachePrivate; +class TDEHTMLPageCachePrivate; /** * Singleton Object that handles a binary cache on top of @@ -38,7 +38,7 @@ class KHTMLPageCachePrivate; * * It operates completely independent from the kio_http cache. */ -class KHTMLPageCache : public TQObject +class TDEHTMLPageCache : public TQObject { Q_OBJECT public: @@ -47,8 +47,8 @@ public: * @return returns a pointer to the cache, if it exists. * creates a new cache otherwise. */ - static KHTMLPageCache *self(); - ~KHTMLPageCache(); + static TDEHTMLPageCache *self(); + ~TDEHTMLPageCache(); /** * Create a new cache entry. @@ -106,21 +106,21 @@ private slots: void sendData(); private: - KHTMLPageCache(); + TDEHTMLPageCache(); - static KHTMLPageCache *_self; + static TDEHTMLPageCache *_self; - KHTMLPageCachePrivate *d; + TDEHTMLPageCachePrivate *d; }; -class KHTMLPageCacheDelivery : public TQObject +class TDEHTMLPageCacheDelivery : public TQObject { - friend class KHTMLPageCache; + friend class TDEHTMLPageCache; Q_OBJECT public: - KHTMLPageCacheDelivery(int _fd) + TDEHTMLPageCacheDelivery(int _fd) : fd(_fd) { } - ~KHTMLPageCacheDelivery(); + ~TDEHTMLPageCacheDelivery(); signals: void emitData(const TQByteArray &data); diff --git a/tdehtml/tdehtml_part.cpp b/tdehtml/tdehtml_part.cpp index 2ebd55df8..47d9de509 100644 --- a/tdehtml/tdehtml_part.cpp +++ b/tdehtml/tdehtml_part.cpp @@ -125,7 +125,7 @@ namespace tdehtml { class PartStyleSheetLoader : public CachedObjectClient { public: - PartStyleSheetLoader(KHTMLPart *part, DOM::DOMString url, DocLoader* dl) + PartStyleSheetLoader(TDEHTMLPart *part, DOM::DOMString url, DocLoader* dl) { m_part = part; m_cachedSheet = dl->requestStyleSheet(url, TQString(), "text/css", @@ -147,7 +147,7 @@ namespace tdehtml { virtual void error( int, const TQString& ) { delete this; } - TQGuardedPtr<KHTMLPart> m_part; + TQGuardedPtr<TDEHTMLPart> m_part; tdehtml::CachedCSSStyleSheet *m_cachedSheet; }; } @@ -178,7 +178,7 @@ void tdehtml::ChildFrame::liveConnectEvent(const unsigned long, const TQString & script += ")"; kdDebug(6050) << "tdehtml::ChildFrame::liveConnectEvent " << script << endl; - KHTMLPart * part = ::tqqt_cast<KHTMLPart *>(m_part->parent()); + TDEHTMLPart * part = ::tqqt_cast<TDEHTMLPart *>(m_part->parent()); if (!part) return; if (!m_jscript) @@ -191,7 +191,7 @@ void tdehtml::ChildFrame::liveConnectEvent(const unsigned long, const TQString & part->executeScript(m_frame->element(), script); } -KHTMLFrameList::Iterator KHTMLFrameList::find( const TQString &name ) +TDEHTMLFrameList::Iterator TDEHTMLFrameList::find( const TQString &name ) { Iterator it = begin(); const Iterator e = end(); @@ -203,44 +203,44 @@ KHTMLFrameList::Iterator KHTMLFrameList::find( const TQString &name ) return it; } -KHTMLPart::KHTMLPart( TQWidget *parentWidget, const char *widgetname, TQObject *parent, const char *name, GUIProfile prof ) +TDEHTMLPart::TDEHTMLPart( TQWidget *parentWidget, const char *widgetname, TQObject *parent, const char *name, GUIProfile prof ) : KParts::ReadOnlyPart( parent, name ) { d = 0; - KHTMLFactory::registerPart( this ); - setInstance( KHTMLFactory::instance(), prof == BrowserViewGUI && !parentPart() ); + TDEHTMLFactory::registerPart( this ); + setInstance( TDEHTMLFactory::instance(), prof == BrowserViewGUI && !parentPart() ); // TODO KDE4 - don't load plugins yet - //setInstance( KHTMLFactory::instance(), false ); - init( new KHTMLView( this, parentWidget, widgetname ), prof ); + //setInstance( TDEHTMLFactory::instance(), false ); + init( new TDEHTMLView( this, parentWidget, widgetname ), prof ); } -KHTMLPart::KHTMLPart( KHTMLView *view, TQObject *parent, const char *name, GUIProfile prof ) +TDEHTMLPart::TDEHTMLPart( TDEHTMLView *view, TQObject *parent, const char *name, GUIProfile prof ) : KParts::ReadOnlyPart( parent, name ) { d = 0; - KHTMLFactory::registerPart( this ); - setInstance( KHTMLFactory::instance(), prof == BrowserViewGUI && !parentPart() ); + TDEHTMLFactory::registerPart( this ); + setInstance( TDEHTMLFactory::instance(), prof == BrowserViewGUI && !parentPart() ); // TODO KDE4 - don't load plugins yet - //setInstance( KHTMLFactory::instance(), false ); + //setInstance( TDEHTMLFactory::instance(), false ); assert( view ); init( view, prof ); } -void KHTMLPart::init( KHTMLView *view, GUIProfile prof ) +void TDEHTMLPart::init( TDEHTMLView *view, GUIProfile prof ) { if ( prof == DefaultGUI ) setXMLFile( "tdehtml.rc" ); else if ( prof == BrowserViewGUI ) setXMLFile( "tdehtml_browser.rc" ); - d = new KHTMLPartPrivate(parent()); + d = new TDEHTMLPartPrivate(parent()); d->m_view = view; setWidget( d->m_view ); d->m_guiProfile = prof; - d->m_extension = new KHTMLPartBrowserExtension( this, "KHTMLBrowserExtension" ); - d->m_hostExtension = new KHTMLPartBrowserHostExtension( this ); + d->m_extension = new TDEHTMLPartBrowserExtension( this, "TDEHTMLBrowserExtension" ); + d->m_hostExtension = new TDEHTMLPartBrowserHostExtension( this ); d->m_statusBarExtension = new KParts::StatusBarExtension( this ); d->m_statusBarIconLabel = 0L; d->m_statusBarPopupLabel = 0L; @@ -357,13 +357,13 @@ void KHTMLPart::init( KHTMLView *view, GUIProfile prof ) d->m_paUseStylesheet = new KSelectAction( i18n( "Use S&tylesheet"), 0, this, TQT_SLOT( slotUseStylesheet() ), actionCollection(), "useStylesheet" ); if ( prof == BrowserViewGUI ) { - d->m_paIncZoomFactor = new KHTMLZoomFactorAction( this, true, i18n( + d->m_paIncZoomFactor = new TDEHTMLZoomFactorAction( this, true, i18n( "Enlarge Font" ), "viewmag+", "CTRL++;CTRL+=", this, TQT_SLOT( slotIncZoomFast() ), actionCollection(), "incFontSizes" ); d->m_paIncZoomFactor->setWhatsThis( i18n( "Enlarge Font<p>" "Make the font in this window bigger. " "Click and hold down the mouse button for a menu with all available font sizes." ) ); - d->m_paDecZoomFactor = new KHTMLZoomFactorAction( this, false, i18n( + d->m_paDecZoomFactor = new TDEHTMLZoomFactorAction( this, false, i18n( "Shrink Font" ), "viewmag-", CTRL + Key_Minus, this, TQT_SLOT( slotDecZoomFast() ), actionCollection(), "decFontSizes" ); d->m_paDecZoomFactor->setWhatsThis( i18n( "Shrink Font<p>" @@ -437,7 +437,7 @@ void KHTMLPart::init( KHTMLView *view, GUIProfile prof ) connect( this, TQT_SIGNAL( started( TDEIO::Job * ) ), this, TQT_SLOT( updateActions() ) ); - d->m_popupMenuXML = KXMLGUIFactory::readConfigFile( locate( "data", "tdehtml/tdehtml_popupmenu.rc", KHTMLFactory::instance() ) ); + d->m_popupMenuXML = KXMLGUIFactory::readConfigFile( locate( "data", "tdehtml/tdehtml_popupmenu.rc", TDEHTMLFactory::instance() ) ); connect( tdehtml::Cache::loader(), TQT_SIGNAL( requestStarted( tdehtml::DocLoader*, tdehtml::CachedObject* ) ), this, TQT_SLOT( slotLoaderRequestStarted( tdehtml::DocLoader*, tdehtml::CachedObject* ) ) ); @@ -453,7 +453,7 @@ void KHTMLPart::init( KHTMLView *view, GUIProfile prof ) connect( &d->m_redirectionTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotRedirect() ) ); - d->m_dcopobject = new KHTMLPartIface(this); + d->m_dcopobject = new TDEHTMLPartIface(this); // TODO KDE4 - load plugins now (see also the constructors) //if ( prof == BrowserViewGUI && !parentPart() ) @@ -465,9 +465,9 @@ void KHTMLPart::init( KHTMLView *view, GUIProfile prof ) TDEGlobal::locale()->removeCatalogue("tdehtml"); } -KHTMLPart::~KHTMLPart() +TDEHTMLPart::~TDEHTMLPart() { - //kdDebug(6050) << "KHTMLPart::~KHTMLPart " << this << endl; + //kdDebug(6050) << "TDEHTMLPart::~TDEHTMLPart " << this << endl; TDEConfig *config = TDEGlobal::config(); config->setGroup( "HTML Settings" ); @@ -520,12 +520,12 @@ KHTMLPart::~KHTMLPart() if (!parentPart()) // only delete d->m_frame if the top tdehtml_part closes delete d->m_frame; delete d; d = 0; - KHTMLFactory::deregisterPart( this ); + TDEHTMLFactory::deregisterPart( this ); } -bool KHTMLPart::restoreURL( const KURL &url ) +bool TDEHTMLPart::restoreURL( const KURL &url ) { - kdDebug( 6050 ) << "KHTMLPart::restoreURL " << url.url() << endl; + kdDebug( 6050 ) << "TDEHTMLPart::restoreURL " << url.url() << endl; d->m_redirectionTimer.stop(); @@ -544,10 +544,10 @@ bool KHTMLPart::restoreURL( const KURL &url ) d->m_workingURL = url; // set the java(script) flags according to the current host. - d->m_bJScriptEnabled = KHTMLFactory::defaultHTMLSettings()->isJavaScriptEnabled(url.host()); - setDebugScript( KHTMLFactory::defaultHTMLSettings()->isJavaScriptDebugEnabled() ); - d->m_bJavaEnabled = KHTMLFactory::defaultHTMLSettings()->isJavaEnabled(url.host()); - d->m_bPluginsEnabled = KHTMLFactory::defaultHTMLSettings()->isPluginsEnabled(url.host()); + d->m_bJScriptEnabled = TDEHTMLFactory::defaultHTMLSettings()->isJavaScriptEnabled(url.host()); + setDebugScript( TDEHTMLFactory::defaultHTMLSettings()->isJavaScriptDebugEnabled() ); + d->m_bJavaEnabled = TDEHTMLFactory::defaultHTMLSettings()->isJavaEnabled(url.host()); + d->m_bPluginsEnabled = TDEHTMLFactory::defaultHTMLSettings()->isPluginsEnabled(url.host()); m_url = url; @@ -555,7 +555,7 @@ bool KHTMLPart::restoreURL( const KURL &url ) disconnect(d->m_view, TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(restoreScrollPosition())); connect(d->m_view, TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(restoreScrollPosition())); - KHTMLPageCache::self()->fetchData( d->m_cacheId, this, TQT_SLOT(slotRestoreData(const TQByteArray &))); + TDEHTMLPageCache::self()->fetchData( d->m_cacheId, this, TQT_SLOT(slotRestoreData(const TQByteArray &))); emit started( 0L ); @@ -563,9 +563,9 @@ bool KHTMLPart::restoreURL( const KURL &url ) } -bool KHTMLPart::openURL( const KURL &url ) +bool TDEHTMLPart::openURL( const KURL &url ) { - kdDebug( 6050 ) << "KHTMLPart(" << this << ")::openURL " << url.url() << endl; + kdDebug( 6050 ) << "TDEHTMLPart(" << this << ")::openURL " << url.url() << endl; d->m_redirectionTimer.stop(); @@ -644,7 +644,7 @@ bool KHTMLPart::openURL( const KURL &url ) bool noReloadForced = !args.reload && !args.redirectedRequest() && !args.doPost(); if (noReloadForced && urlcmp( url.url(), m_url.url(), true, true )) { - kdDebug( 6050 ) << "KHTMLPart::openURL, jumping to anchor. m_url = " << url.url() << endl; + kdDebug( 6050 ) << "TDEHTMLPart::openURL, jumping to anchor. m_url = " << url.url() << endl; m_url = url; emit started( 0L ); @@ -737,10 +737,10 @@ bool KHTMLPart::openURL( const KURL &url ) d->m_statusBarText[BarOverrideText] = d->m_statusBarText[BarDefaultText] = TQString(); // set the javascript flags according to the current url - d->m_bJScriptEnabled = KHTMLFactory::defaultHTMLSettings()->isJavaScriptEnabled(url.host()); - setDebugScript( KHTMLFactory::defaultHTMLSettings()->isJavaScriptDebugEnabled() ); - d->m_bJavaEnabled = KHTMLFactory::defaultHTMLSettings()->isJavaEnabled(url.host()); - d->m_bPluginsEnabled = KHTMLFactory::defaultHTMLSettings()->isPluginsEnabled(url.host()); + d->m_bJScriptEnabled = TDEHTMLFactory::defaultHTMLSettings()->isJavaScriptEnabled(url.host()); + setDebugScript( TDEHTMLFactory::defaultHTMLSettings()->isJavaScriptDebugEnabled() ); + d->m_bJavaEnabled = TDEHTMLFactory::defaultHTMLSettings()->isJavaEnabled(url.host()); + d->m_bPluginsEnabled = TDEHTMLFactory::defaultHTMLSettings()->isPluginsEnabled(url.host()); connect( d->m_job, TQT_SIGNAL( speed( TDEIO::Job*, unsigned long ) ), @@ -767,11 +767,11 @@ bool KHTMLPart::openURL( const KURL &url ) return true; } -bool KHTMLPart::closeURL() +bool TDEHTMLPart::closeURL() { if ( d->m_job ) { - KHTMLPageCache::self()->cancelEntry(d->m_cacheId); + TDEHTMLPageCache::self()->cancelEntry(d->m_cacheId); d->m_job->kill(); d->m_job = 0; } @@ -793,7 +793,7 @@ bool KHTMLPart::closeURL() disconnect(d->m_view, TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(restoreScrollPosition())); - KHTMLPageCache::self()->cancelFetch(this); + TDEHTMLPageCache::self()->cancelFetch(this); if ( d->m_doc && d->m_doc->parsing() ) { kdDebug( 6050 ) << " was still parsing... calling end " << endl; @@ -849,7 +849,7 @@ bool KHTMLPart::closeURL() return true; } -DOM::HTMLDocument KHTMLPart::htmlDocument() const +DOM::HTMLDocument TDEHTMLPart::htmlDocument() const { if (d->m_doc && d->m_doc->isHTMLDocument()) return static_cast<HTMLDocumentImpl*>(d->m_doc); @@ -857,19 +857,19 @@ DOM::HTMLDocument KHTMLPart::htmlDocument() const return static_cast<HTMLDocumentImpl*>(0); } -DOM::Document KHTMLPart::document() const +DOM::Document TDEHTMLPart::document() const { return d->m_doc; } -TQString KHTMLPart::documentSource() const +TQString TDEHTMLPart::documentSource() const { TQString sourceStr; - if ( !( m_url.isLocalFile() ) && KHTMLPageCache::self()->isComplete( d->m_cacheId ) ) + if ( !( m_url.isLocalFile() ) && TDEHTMLPageCache::self()->isComplete( d->m_cacheId ) ) { TQByteArray sourceArray; TQDataStream dataStream( sourceArray, IO_WriteOnly ); - KHTMLPageCache::self()->saveData( d->m_cacheId, &dataStream ); + TDEHTMLPageCache::self()->saveData( d->m_cacheId, &dataStream ); TQTextStream stream( sourceArray, IO_ReadOnly ); stream.setCodec( TQTextCodec::codecForName( encoding().latin1() ) ); sourceStr = stream.read(); @@ -894,27 +894,27 @@ TQString KHTMLPart::documentSource() const } -KParts::BrowserExtension *KHTMLPart::browserExtension() const +KParts::BrowserExtension *TDEHTMLPart::browserExtension() const { return d->m_extension; } -KParts::BrowserHostExtension *KHTMLPart::browserHostExtension() const +KParts::BrowserHostExtension *TDEHTMLPart::browserHostExtension() const { return d->m_hostExtension; } -KHTMLView *KHTMLPart::view() const +TDEHTMLView *TDEHTMLPart::view() const { return d->m_view; } -void KHTMLPart::setStatusMessagesEnabled( bool enable ) +void TDEHTMLPart::setStatusMessagesEnabled( bool enable ) { d->m_statusMessagesEnabled = enable; } -KJS::Interpreter *KHTMLPart::jScriptInterpreter() +KJS::Interpreter *TDEHTMLPart::jScriptInterpreter() { KJSProxy *proxy = jScript(); if (!proxy || proxy->paused()) @@ -923,12 +923,12 @@ KJS::Interpreter *KHTMLPart::jScriptInterpreter() return proxy->interpreter(); } -bool KHTMLPart::statusMessagesEnabled() const +bool TDEHTMLPart::statusMessagesEnabled() const { return d->m_statusMessagesEnabled; } -void KHTMLPart::setJScriptEnabled( bool enable ) +void TDEHTMLPart::setJScriptEnabled( bool enable ) { if ( !enable && jScriptEnabled() && d->m_frame && d->m_frame->m_jscript ) { d->m_frame->m_jscript->clear(); @@ -937,7 +937,7 @@ void KHTMLPart::setJScriptEnabled( bool enable ) d->m_bJScriptOverride = true; } -bool KHTMLPart::jScriptEnabled() const +bool TDEHTMLPart::jScriptEnabled() const { if(onlyLocalReferences()) return false; @@ -946,12 +946,12 @@ bool KHTMLPart::jScriptEnabled() const return d->m_bJScriptEnabled; } -void KHTMLPart::setMetaRefreshEnabled( bool enable ) +void TDEHTMLPart::setMetaRefreshEnabled( bool enable ) { d->m_metaRefreshEnabled = enable; } -bool KHTMLPart::metaRefreshEnabled() const +bool TDEHTMLPart::metaRefreshEnabled() const { return d->m_metaRefreshEnabled; } @@ -995,12 +995,12 @@ static bool createJScript(tdehtml::ChildFrame *frame) return true; } -KJSProxy *KHTMLPart::jScript() +KJSProxy *TDEHTMLPart::jScript() { if (!jScriptEnabled()) return 0; if ( !d->m_frame ) { - KHTMLPart * p = parentPart(); + TDEHTMLPart * p = parentPart(); if (!p) { d->m_frame = new tdehtml::ChildFrame; d->m_frame->m_part = this; @@ -1025,9 +1025,9 @@ KJSProxy *KHTMLPart::jScript() return d->m_frame->m_jscript; } -TQVariant KHTMLPart::crossFrameExecuteScript(const TQString& target, const TQString& script) +TQVariant TDEHTMLPart::crossFrameExecuteScript(const TQString& target, const TQString& script) { - KHTMLPart* destpart = this; + TDEHTMLPart* destpart = this; TQString trg = target.lower(); @@ -1063,7 +1063,7 @@ TQVariant KHTMLPart::crossFrameExecuteScript(const TQString& target, const TQSt //Enable this to see all JS scripts being executed //#define KJS_VERBOSE -KJSErrorDlg *KHTMLPart::jsErrorExtension() { +KJSErrorDlg *TDEHTMLPart::jsErrorExtension() { if (!d->m_settings->jsErrorsEnabled()) { return 0L; } @@ -1094,7 +1094,7 @@ KJSErrorDlg *KHTMLPart::jsErrorExtension() { return d->m_jsedlg; } -void KHTMLPart::removeJSErrorExtension() { +void TDEHTMLPart::removeJSErrorExtension() { if (parentPart()) { parentPart()->removeJSErrorExtension(); return; @@ -1108,24 +1108,24 @@ void KHTMLPart::removeJSErrorExtension() { d->m_jsedlg = 0; } -void KHTMLPart::disableJSErrorExtension() { +void TDEHTMLPart::disableJSErrorExtension() { removeJSErrorExtension(); // These two lines are really kind of hacky, and it sucks to do this inside - // KHTML but I don't know of anything that's reasonably easy as an alternative + // TDEHTML but I don't know of anything that's reasonably easy as an alternative // right now. It makes me wonder if there should be a more clean way to - // contact all running "KHTML" instance as opposed to Konqueror instances too. + // contact all running "TDEHTML" instance as opposed to Konqueror instances too. d->m_settings->setJSErrorsEnabled(false); DCOPClient::mainClient()->send("konqueror*", "KonquerorIface", "reparseConfiguration()", TQByteArray()); } -void KHTMLPart::jsErrorDialogContextMenu() { +void TDEHTMLPart::jsErrorDialogContextMenu() { KPopupMenu *m = new KPopupMenu(0L); m->insertItem(i18n("&Hide Errors"), this, TQT_SLOT(removeJSErrorExtension())); m->insertItem(i18n("&Disable Error Reporting"), this, TQT_SLOT(disableJSErrorExtension())); m->popup(TQCursor::pos()); } -void KHTMLPart::launchJSErrorDialog() { +void TDEHTMLPart::launchJSErrorDialog() { KJSErrorDlg *dlg = jsErrorExtension(); if (dlg) { dlg->show(); @@ -1133,13 +1133,13 @@ void KHTMLPart::launchJSErrorDialog() { } } -void KHTMLPart::launchJSConfigDialog() { +void TDEHTMLPart::launchJSConfigDialog() { TQStringList args; args << "tdehtml_java_js"; TDEApplication::tdeinitExec( "tdecmshell", args ); } -TQVariant KHTMLPart::executeScript(const TQString& filename, int baseLine, const DOM::Node& n, const TQString& script) +TQVariant TDEHTMLPart::executeScript(const TQString& filename, int baseLine, const DOM::Node& n, const TQString& script) { #ifdef KJS_VERBOSE // The script is now printed by KJS's Parser::parse @@ -1179,15 +1179,15 @@ TQVariant KHTMLPart::executeScript(const TQString& filename, int baseLine, const return ret; } -TQVariant KHTMLPart::executeScript( const TQString &script ) +TQVariant TDEHTMLPart::executeScript( const TQString &script ) { return executeScript( DOM::Node(), script ); } -TQVariant KHTMLPart::executeScript( const DOM::Node &n, const TQString &script ) +TQVariant TDEHTMLPart::executeScript( const DOM::Node &n, const TQString &script ) { #ifdef KJS_VERBOSE - kdDebug(6070) << "KHTMLPart::executeScript caller='" << name() << "' node=" << n.nodeName().string().latin1() << "(" << (n.isNull() ? 0 : n.nodeType()) << ") " /* << script */ << endl; + kdDebug(6070) << "TDEHTMLPart::executeScript caller='" << name() << "' node=" << n.nodeName().string().latin1() << "(" << (n.isNull() ? 0 : n.nodeType()) << ") " /* << script */ << endl; #endif KJSProxy *proxy = jScript(); @@ -1213,14 +1213,14 @@ TQVariant KHTMLPart::executeScript( const DOM::Node &n, const TQString &script ) submitFormAgain(); #ifdef KJS_VERBOSE - kdDebug(6070) << "KHTMLPart::executeScript - done" << endl; + kdDebug(6070) << "TDEHTMLPart::executeScript - done" << endl; #endif return ret; } -bool KHTMLPart::scheduleScript(const DOM::Node &n, const TQString& script) +bool TDEHTMLPart::scheduleScript(const DOM::Node &n, const TQString& script) { - //kdDebug(6050) << "KHTMLPart::scheduleScript "<< script << endl; + //kdDebug(6050) << "TDEHTMLPart::scheduleScript "<< script << endl; d->scheduledScript = script; d->scheduledScriptNode = n; @@ -1228,7 +1228,7 @@ bool KHTMLPart::scheduleScript(const DOM::Node &n, const TQString& script) return true; } -TQVariant KHTMLPart::executeScheduledScript() +TQVariant TDEHTMLPart::executeScheduledScript() { if( d->scheduledScript.isEmpty() ) return TQVariant(); @@ -1242,13 +1242,13 @@ TQVariant KHTMLPart::executeScheduledScript() return ret; } -void KHTMLPart::setJavaEnabled( bool enable ) +void TDEHTMLPart::setJavaEnabled( bool enable ) { d->m_bJavaForce = enable; d->m_bJavaOverride = true; } -bool KHTMLPart::javaEnabled() const +bool TDEHTMLPart::javaEnabled() const { if (onlyLocalReferences()) return false; @@ -1261,23 +1261,23 @@ bool KHTMLPart::javaEnabled() const #endif } -KJavaAppletContext *KHTMLPart::javaContext() +KJavaAppletContext *TDEHTMLPart::javaContext() { return 0; } -KJavaAppletContext *KHTMLPart::createJavaContext() +KJavaAppletContext *TDEHTMLPart::createJavaContext() { return 0; } -void KHTMLPart::setPluginsEnabled( bool enable ) +void TDEHTMLPart::setPluginsEnabled( bool enable ) { d->m_bPluginsForce = enable; d->m_bPluginsOverride = true; } -bool KHTMLPart::pluginsEnabled() const +bool TDEHTMLPart::pluginsEnabled() const { if (onlyLocalReferences()) return false; @@ -1288,7 +1288,7 @@ bool KHTMLPart::pluginsEnabled() const static int s_DOMTreeIndentLevel = 0; -void KHTMLPart::slotDebugDOMTree() +void TDEHTMLPart::slotDebugDOMTree() { if ( d->m_doc && d->m_doc->firstChild() ) tqDebug("%s", d->m_doc->firstChild()->toString().string().latin1()); @@ -1300,21 +1300,21 @@ void KHTMLPart::slotDebugDOMTree() ConstFrameIt it = d->m_frames.begin(); const ConstFrameIt end = d->m_frames.end(); for (; it != end; ++it ) - if ( !( *it )->m_part.isNull() && (*it)->m_part->inherits( "KHTMLPart" ) ) { + if ( !( *it )->m_part.isNull() && (*it)->m_part->inherits( "TDEHTMLPart" ) ) { KParts::ReadOnlyPart* const p = ( *it )->m_part; kdDebug(6050) << TQString().leftJustify(s_DOMTreeIndentLevel*4,' ') << "FRAME " << p->name() << " " << endl; - static_cast<KHTMLPart*>( p )->slotDebugDOMTree(); + static_cast<TDEHTMLPart*>( p )->slotDebugDOMTree(); } s_DOMTreeIndentLevel = indentLevel; } -void KHTMLPart::slotDebugScript() +void TDEHTMLPart::slotDebugScript() { if (jScript()) jScript()->showDebugWindow(); } -void KHTMLPart::slotDebugRenderTree() +void TDEHTMLPart::slotDebugRenderTree() { #ifndef NDEBUG if ( d->m_doc ) { @@ -1328,12 +1328,12 @@ void KHTMLPart::slotDebugRenderTree() #endif } -void KHTMLPart::slotStopAnimations() +void TDEHTMLPart::slotStopAnimations() { stopAnimations(); } -void KHTMLPart::setAutoloadImages( bool enable ) +void TDEHTMLPart::setAutoloadImages( bool enable ) { if ( d->m_doc && d->m_doc->docLoader()->autoloadImages() == enable ) return; @@ -1357,7 +1357,7 @@ void KHTMLPart::setAutoloadImages( bool enable ) } } -bool KHTMLPart::autoloadImages() const +bool TDEHTMLPart::autoloadImages() const { if ( d->m_doc ) return d->m_doc->docLoader()->autoloadImages(); @@ -1365,7 +1365,7 @@ bool KHTMLPart::autoloadImages() const return true; } -void KHTMLPart::clear() +void TDEHTMLPart::clear() { if ( d->m_bCleared ) return; @@ -1434,7 +1434,7 @@ void KHTMLPart::clear() if (d->m_frames.count()) { - KHTMLFrameList frames = d->m_frames; + TDEHTMLFrameList frames = d->m_frames; d->m_frames.clear(); ConstFrameIt it = frames.begin(); const ConstFrameIt end = frames.end(); @@ -1452,7 +1452,7 @@ void KHTMLPart::clear() if (d->m_objects.count()) { - KHTMLFrameList objects = d->m_objects; + TDEHTMLFrameList objects = d->m_objects; d->m_objects.clear(); ConstFrameIt oi = objects.begin(); const ConstFrameIt oiEnd = objects.end(); @@ -1492,26 +1492,26 @@ void KHTMLPart::clear() #endif } -bool KHTMLPart::openFile() +bool TDEHTMLPart::openFile() { return true; } -DOM::HTMLDocumentImpl *KHTMLPart::docImpl() const +DOM::HTMLDocumentImpl *TDEHTMLPart::docImpl() const { if ( d && d->m_doc && d->m_doc->isHTMLDocument() ) return static_cast<HTMLDocumentImpl*>(d->m_doc); return 0; } -DOM::DocumentImpl *KHTMLPart::xmlDocImpl() const +DOM::DocumentImpl *TDEHTMLPart::xmlDocImpl() const { if ( d ) return d->m_doc; return 0; } -void KHTMLPart::slotInfoMessage(TDEIO::Job* kio_job, const TQString& msg) +void TDEHTMLPart::slotInfoMessage(TDEIO::Job* kio_job, const TQString& msg) { assert(d->m_job == kio_job); @@ -1519,7 +1519,7 @@ void KHTMLPart::slotInfoMessage(TDEIO::Job* kio_job, const TQString& msg) setStatusBarText(msg, BarDefaultText); } -void KHTMLPart::setPageSecurity( PageSecurity sec ) +void TDEHTMLPart::setPageSecurity( PageSecurity sec ) { emit d->m_extension->setPageSecurity( sec ); if ( sec != NotCrypted && !d->m_statusBarIconLabel && !parentPart() ) { @@ -1562,7 +1562,7 @@ void KHTMLPart::setPageSecurity( PageSecurity sec ) d->m_statusBarIconLabel->setPixmap( SmallIcon( iconName, instance() ) ); } -void KHTMLPart::slotData( TDEIO::Job* kio_job, const TQByteArray &data ) +void TDEHTMLPart::slotData( TDEIO::Job* kio_job, const TQByteArray &data ) { assert ( d->m_job == kio_job ); @@ -1586,7 +1586,7 @@ void KHTMLPart::slotData( TDEIO::Job* kio_job, const TQByteArray &data ) d->m_workingURL = KURL(); - d->m_cacheId = KHTMLPageCache::self()->createCacheEntry(); + d->m_cacheId = TDEHTMLPageCache::self()->createCacheEntry(); // When the first data arrives, the metadata has just been made available d->m_httpHeaders = d->m_job->queryMetaData("HTTP-Headers"); @@ -1599,7 +1599,7 @@ void KHTMLPart::slotData( TDEIO::Job* kio_job, const TQByteArray &data ) d->m_ssl_in_use = (d->m_job->queryMetaData("ssl_in_use") == "TRUE"); { - KHTMLPart *p = parentPart(); + TDEHTMLPart *p = parentPart(); if (p && p->d->m_ssl_in_use != d->m_ssl_in_use) { while (p->parentPart()) p = p->parentPart(); @@ -1663,13 +1663,13 @@ void KHTMLPart::slotData( TDEIO::Job* kio_job, const TQByteArray &data ) d->m_lastModified = TQString(); // done on-demand by lastModified() } - KHTMLPageCache::self()->addData(d->m_cacheId, data); + TDEHTMLPageCache::self()->addData(d->m_cacheId, data); write( data.data(), data.size() ); if (d->m_frame && d->m_frame->m_jscript) d->m_frame->m_jscript->dataReceived(); } -void KHTMLPart::slotRestoreData(const TQByteArray &data ) +void TDEHTMLPart::slotRestoreData(const TQByteArray &data ) { // The first data ? if ( !d->m_workingURL.isEmpty() ) @@ -1696,9 +1696,9 @@ void KHTMLPart::slotRestoreData(const TQByteArray &data ) } } -void KHTMLPart::showError( TDEIO::Job* job ) +void TDEHTMLPart::showError( TDEIO::Job* job ) { - kdDebug(6050) << "KHTMLPart::showError d->m_bParsing=" << (d->m_doc && d->m_doc->parsing()) << " d->m_bComplete=" << d->m_bComplete + kdDebug(6050) << "TDEHTMLPart::showError d->m_bParsing=" << (d->m_doc && d->m_doc->parsing()) << " d->m_bComplete=" << d->m_bComplete << " d->m_bCleared=" << d->m_bCleared << endl; if (job->error() == TDEIO::ERR_NO_CONTENT) @@ -1713,9 +1713,9 @@ void KHTMLPart::showError( TDEIO::Job* job ) } // This is a protected method, placed here because of it's relevance to showError -void KHTMLPart::htmlError( int errorCode, const TQString& text, const KURL& reqUrl ) +void TDEHTMLPart::htmlError( int errorCode, const TQString& text, const KURL& reqUrl ) { - kdDebug(6050) << "KHTMLPart::htmlError errorCode=" << errorCode << " text=" << text << endl; + kdDebug(6050) << "TDEHTMLPart::htmlError errorCode=" << errorCode << " text=" << text << endl; // make sure we're not executing any embedded JS bool bJSFO = d->m_bJScriptForce; bool bJSOO = d->m_bJScriptOverride; @@ -1812,14 +1812,14 @@ void KHTMLPart::htmlError( int errorCode, const TQString& text, const KURL& reqU end(); } -void KHTMLPart::slotFinished( TDEIO::Job * job ) +void TDEHTMLPart::slotFinished( TDEIO::Job * job ) { d->m_job = 0L; d->m_jobspeed = 0L; if (job->error()) { - KHTMLPageCache::self()->cancelEntry(d->m_cacheId); + TDEHTMLPageCache::self()->cancelEntry(d->m_cacheId); // The following catches errors that occur as a result of HTTP // to FTP redirections where the FTP URL is a directory. Since @@ -1856,7 +1856,7 @@ void KHTMLPart::slotFinished( TDEIO::Job * job ) //kdDebug( 6050 ) << "slotFinished" << endl; - KHTMLPageCache::self()->endData(d->m_cacheId); + TDEHTMLPageCache::self()->endData(d->m_cacheId); if (d->m_frame && d->m_frame->m_jscript) d->m_frame->m_jscript->dataReceived(); @@ -1869,17 +1869,17 @@ void KHTMLPart::slotFinished( TDEIO::Job * job ) end(); //will emit completed() } -void KHTMLPart::begin( const KURL &url, int xOffset, int yOffset ) +void TDEHTMLPart::begin( const KURL &url, int xOffset, int yOffset ) { // No need to show this for a new page until an error is triggered if (!parentPart()) { removeJSErrorExtension(); setSuppressedPopupIndicator( false ); d->m_openableSuppressedPopups = 0; - for ( TQValueListIterator<TQGuardedPtr<KHTMLPart> > i = d->m_suppressedPopupOriginParts.begin(); + for ( TQValueListIterator<TQGuardedPtr<TDEHTMLPart> > i = d->m_suppressedPopupOriginParts.begin(); i != d->m_suppressedPopupOriginParts.end(); ++i ) { - if (KHTMLPart* part = *i) { + if (TDEHTMLPart* part = *i) { KJS::Window *w = KJS::Window::retrieveWindow( part ); if (w) w->forgetSuppressedWindows(); @@ -1895,10 +1895,10 @@ void KHTMLPart::begin( const KURL &url, int xOffset, int yOffset ) if(url.isValid()) { TQString urlString = url.url(); - KHTMLFactory::vLinks()->insert( urlString ); + TDEHTMLFactory::vLinks()->insert( urlString ); TQString urlString2 = url.prettyURL(); if ( urlString != urlString2 ) { - KHTMLFactory::vLinks()->insert( urlString2 ); + TDEHTMLFactory::vLinks()->insert( urlString2 ); } } @@ -1928,7 +1928,7 @@ void KHTMLPart::begin( const KURL &url, int xOffset, int yOffset ) // HTML or XHTML? (#86446) static_cast<HTMLDocumentImpl *>(d->m_doc)->setHTMLRequested( !servedAsXHTML ); } -#ifndef KHTML_NO_CARET +#ifndef TDEHTML_NO_CARET // d->m_view->initCaret(); #endif @@ -1937,14 +1937,14 @@ void KHTMLPart::begin( const KURL &url, int xOffset, int yOffset ) if (!d->m_doc->attached()) d->m_doc->attach( ); d->m_doc->setBaseURL( KURL() ); - d->m_doc->docLoader()->setShowAnimations( KHTMLFactory::defaultHTMLSettings()->showAnimations() ); + d->m_doc->docLoader()->setShowAnimations( TDEHTMLFactory::defaultHTMLSettings()->showAnimations() ); emit docCreated(); d->m_paUseStylesheet->setItems(TQStringList()); d->m_paUseStylesheet->setEnabled( false ); - setAutoloadImages( KHTMLFactory::defaultHTMLSettings()->autoLoadImages() ); - TQString userStyleSheet = KHTMLFactory::defaultHTMLSettings()->userStyleSheet(); + setAutoloadImages( TDEHTMLFactory::defaultHTMLSettings()->autoLoadImages() ); + TQString userStyleSheet = TDEHTMLFactory::defaultHTMLSettings()->userStyleSheet(); if ( !userStyleSheet.isEmpty() ) setUserStyleSheet( KURL( userStyleSheet ) ); @@ -1957,7 +1957,7 @@ void KHTMLPart::begin( const KURL &url, int xOffset, int yOffset ) d->m_doc->setParsing(true); } -void KHTMLPart::write( const char *str, int len ) +void TDEHTMLPart::write( const char *str, int len ) { if ( !d->m_decoder ) d->m_decoder = createDecoder(); @@ -1977,7 +1977,7 @@ void KHTMLPart::write( const char *str, int len ) d->m_doc->determineParseMode( decoded ); d->m_bFirstData = false; - //kdDebug(6050) << "KHTMLPart::write haveEnc = " << d->m_haveEncoding << endl; + //kdDebug(6050) << "TDEHTMLPart::write haveEnc = " << d->m_haveEncoding << endl; // ### this is still quite hacky, but should work a lot better than the old solution if(d->m_decoder->visuallyOrdered()) d->m_doc->setVisuallyOrdered(); d->m_doc->setDecoderCodec(d->m_decoder->codec()); @@ -1989,7 +1989,7 @@ void KHTMLPart::write( const char *str, int len ) t->write( decoded, true ); } -void KHTMLPart::write( const TQString &str ) +void TDEHTMLPart::write( const TQString &str ) { if ( str.isNull() ) return; @@ -2004,7 +2004,7 @@ void KHTMLPart::write( const TQString &str ) t->write( str, true ); } -void KHTMLPart::end() +void TDEHTMLPart::end() { if (d->m_doc) { if (d->m_decoder) { @@ -2019,7 +2019,7 @@ void KHTMLPart::end() } } -bool KHTMLPart::doOpenStream( const TQString& mimeType ) +bool TDEHTMLPart::doOpenStream( const TQString& mimeType ) { KMimeType::Ptr mime = KMimeType::mimeType(mimeType); if ( mime->is( "text/html" ) || mime->is( "text/xml" ) ) @@ -2030,40 +2030,40 @@ bool KHTMLPart::doOpenStream( const TQString& mimeType ) return false; } -bool KHTMLPart::doWriteStream( const TQByteArray& data ) +bool TDEHTMLPart::doWriteStream( const TQByteArray& data ) { write( data.data(), data.size() ); return true; } -bool KHTMLPart::doCloseStream() +bool TDEHTMLPart::doCloseStream() { end(); return true; } -void KHTMLPart::paint(TQPainter *p, const TQRect &rc, int yOff, bool *more) +void TDEHTMLPart::paint(TQPainter *p, const TQRect &rc, int yOff, bool *more) { if (!d->m_view) return; d->m_view->paint(p, rc, yOff, more); } -void KHTMLPart::stopAnimations() +void TDEHTMLPart::stopAnimations() { if ( d->m_doc ) - d->m_doc->docLoader()->setShowAnimations( KHTMLSettings::KAnimationDisabled ); + d->m_doc->docLoader()->setShowAnimations( TDEHTMLSettings::KAnimationDisabled ); ConstFrameIt it = d->m_frames.begin(); const ConstFrameIt end = d->m_frames.end(); for (; it != end; ++it ) - if ( !(*it)->m_part.isNull() && (*it)->m_part->inherits( "KHTMLPart" ) ) { + if ( !(*it)->m_part.isNull() && (*it)->m_part->inherits( "TDEHTMLPart" ) ) { KParts::ReadOnlyPart* const p = ( *it )->m_part; - static_cast<KHTMLPart*>( p )->stopAnimations(); + static_cast<TDEHTMLPart*>( p )->stopAnimations(); } } -void KHTMLPart::resetFromScript() +void TDEHTMLPart::resetFromScript() { closeURL(); d->m_bComplete = false; @@ -2075,7 +2075,7 @@ void KHTMLPart::resetFromScript() emit started( 0L ); } -void KHTMLPart::slotFinishedParsing() +void TDEHTMLPart::slotFinishedParsing() { d->m_doc->setParsing(false); checkEmitLoadEvent(); @@ -2087,12 +2087,12 @@ void KHTMLPart::slotFinishedParsing() checkCompleted(); } -void KHTMLPart::slotLoaderRequestStarted( tdehtml::DocLoader* dl, tdehtml::CachedObject *obj ) +void TDEHTMLPart::slotLoaderRequestStarted( tdehtml::DocLoader* dl, tdehtml::CachedObject *obj ) { if ( obj && obj->type() == tdehtml::CachedObject::Image && d->m_doc && d->m_doc->docLoader() == dl ) { - KHTMLPart* p = this; + TDEHTMLPart* p = this; while ( p ) { - KHTMLPart* const op = p; + TDEHTMLPart* const op = p; ++(p->d->m_totalObjectCount); p = p->parentPart(); if ( !p && op->d->m_loadedObjects <= op->d->m_totalObjectCount @@ -2102,12 +2102,12 @@ void KHTMLPart::slotLoaderRequestStarted( tdehtml::DocLoader* dl, tdehtml::Cache } } -void KHTMLPart::slotLoaderRequestDone( tdehtml::DocLoader* dl, tdehtml::CachedObject *obj ) +void TDEHTMLPart::slotLoaderRequestDone( tdehtml::DocLoader* dl, tdehtml::CachedObject *obj ) { if ( obj && obj->type() == tdehtml::CachedObject::Image && d->m_doc && d->m_doc->docLoader() == dl ) { - KHTMLPart* p = this; + TDEHTMLPart* p = this; while ( p ) { - KHTMLPart* const op = p; + TDEHTMLPart* const op = p; ++(p->d->m_loadedObjects); p = p->parentPart(); if ( !p && op->d->m_loadedObjects <= op->d->m_totalObjectCount && op->d->m_jobPercent <= 100 @@ -2119,7 +2119,7 @@ void KHTMLPart::slotLoaderRequestDone( tdehtml::DocLoader* dl, tdehtml::CachedOb checkCompleted(); } -void KHTMLPart::slotProgressUpdate() +void TDEHTMLPart::slotProgressUpdate() { int percent; if ( d->m_loadedObjects < d->m_totalObjectCount ) @@ -2140,14 +2140,14 @@ void KHTMLPart::slotProgressUpdate() emit d->m_extension->loadingProgress( percent ); } -void KHTMLPart::slotJobSpeed( TDEIO::Job* /*job*/, unsigned long speed ) +void TDEHTMLPart::slotJobSpeed( TDEIO::Job* /*job*/, unsigned long speed ) { d->m_jobspeed = speed; if (!parentPart()) setStatusBarText(jsStatusBarText(), BarOverrideText); } -void KHTMLPart::slotJobPercent( TDEIO::Job* /*job*/, unsigned long percent ) +void TDEHTMLPart::slotJobPercent( TDEIO::Job* /*job*/, unsigned long percent ) { d->m_jobPercent = percent; @@ -2155,7 +2155,7 @@ void KHTMLPart::slotJobPercent( TDEIO::Job* /*job*/, unsigned long percent ) d->m_progressUpdateTimer.start( 0, true ); } -void KHTMLPart::slotJobDone( TDEIO::Job* /*job*/ ) +void TDEHTMLPart::slotJobDone( TDEIO::Job* /*job*/ ) { d->m_jobPercent = 100; @@ -2163,7 +2163,7 @@ void KHTMLPart::slotJobDone( TDEIO::Job* /*job*/ ) d->m_progressUpdateTimer.start( 0, true ); } -void KHTMLPart::slotUserSheetStatDone( TDEIO::Job *_job ) +void TDEHTMLPart::slotUserSheetStatDone( TDEIO::Job *_job ) { using namespace TDEIO; @@ -2194,9 +2194,9 @@ void KHTMLPart::slotUserSheetStatDone( TDEIO::Job *_job ) setUserStyleSheet( KURL( settings()->userStyleSheet() ) ); } -void KHTMLPart::checkCompleted() +void TDEHTMLPart::checkCompleted() { -// kdDebug( 6050 ) << "KHTMLPart::checkCompleted() " << this << " " << name() << endl; +// kdDebug( 6050 ) << "TDEHTMLPart::checkCompleted() " << this << " " << name() << endl; // kdDebug( 6050 ) << " parsing: " << (d->m_doc && d->m_doc->parsing()) << endl; // kdDebug( 6050 ) << " complete: " << d->m_bComplete << endl; @@ -2255,9 +2255,9 @@ void KHTMLPart::checkCompleted() d->m_totalObjectCount = 0; d->m_loadedObjects = 0; - KHTMLPart* p = this; + TDEHTMLPart* p = this; while ( p ) { - KHTMLPart* op = p; + TDEHTMLPart* op = p; p = p->parentPart(); if ( !p && !op->d->m_progressUpdateTimer.isActive()) op->d->m_progressUpdateTimer.start( 0, true ); @@ -2312,7 +2312,7 @@ void KHTMLPart::checkCompleted() #endif } -void KHTMLPart::checkEmitLoadEvent() +void TDEHTMLPart::checkEmitLoadEvent() { if ( d->m_bLoadEventEmitted || !d->m_doc || d->m_doc->parsing() ) return; @@ -2344,20 +2344,20 @@ void KHTMLPart::checkEmitLoadEvent() d->m_doc->close(); } -const KHTMLSettings *KHTMLPart::settings() const +const TDEHTMLSettings *TDEHTMLPart::settings() const { return d->m_settings; } #ifndef KDE_NO_COMPAT -KURL KHTMLPart::baseURL() const +KURL TDEHTMLPart::baseURL() const { if ( !d->m_doc ) return KURL(); return d->m_doc->baseURL(); } -TQString KHTMLPart::baseTarget() const +TQString TDEHTMLPart::baseTarget() const { if ( !d->m_doc ) return TQString(); @@ -2365,7 +2365,7 @@ TQString KHTMLPart::baseTarget() const } #endif -KURL KHTMLPart::completeURL( const TQString &url ) +KURL TDEHTMLPart::completeURL( const TQString &url ) { if ( !d->m_doc ) return KURL( url ); @@ -2377,9 +2377,9 @@ KURL KHTMLPart::completeURL( const TQString &url ) // Called by ecma/kjs_window in case of redirections from Javascript, // and by xml/dom_docimpl.cpp in case of http-equiv meta refresh. -void KHTMLPart::scheduleRedirection( int delay, const TQString &url, bool doLockHistory ) +void TDEHTMLPart::scheduleRedirection( int delay, const TQString &url, bool doLockHistory ) { - kdDebug(6050) << "KHTMLPart::scheduleRedirection delay=" << delay << " url=" << url << endl; + kdDebug(6050) << "TDEHTMLPart::scheduleRedirection delay=" << delay << " url=" << url << endl; kdDebug(6050) << "current redirectURL=" << d->m_redirectURL << " with delay " << d->m_delayRedirect << endl; if( delay < 24*60*60 && ( d->m_redirectURL.isEmpty() || delay <= d->m_delayRedirect) ) { @@ -2394,7 +2394,7 @@ void KHTMLPart::scheduleRedirection( int delay, const TQString &url, bool doLock } } -void KHTMLPart::slotRedirect() +void TDEHTMLPart::slotRedirect() { kdDebug(6050) << this << " slotRedirect()" << endl; TQString u = d->m_redirectURL; @@ -2405,7 +2405,7 @@ void KHTMLPart::slotRedirect() if ( u.find( TQString::fromLatin1( "javascript:" ), 0, false ) == 0 ) { TQString script = KURL::decode_string( u.right( u.length() - 11 ) ); - kdDebug( 6050 ) << "KHTMLPart::slotRedirect script=" << script << endl; + kdDebug( 6050 ) << "TDEHTMLPart::slotRedirect script=" << script << endl; TQVariant res = executeScript( DOM::Node(), script ); if ( res.type() == TQVariant::String ) { begin( url() ); @@ -2425,7 +2425,7 @@ void KHTMLPart::slotRedirect() if (!kapp || !kapp->authorizeURLAction("redirect", cUrl, url)) { - kdWarning(6050) << "KHTMLPart::scheduleRedirection: Redirection from " << cUrl << " to " << url << " REJECTED!" << endl; + kdWarning(6050) << "TDEHTMLPart::scheduleRedirection: Redirection from " << cUrl << " to " << url << " REJECTED!" << endl; emit completed(); return; } @@ -2453,7 +2453,7 @@ void KHTMLPart::slotRedirect() emit completed(); } -void KHTMLPart::slotRedirection(TDEIO::Job*, const KURL& url) +void TDEHTMLPart::slotRedirection(TDEIO::Job*, const KURL& url) { // the slave told us that we got redirected //kdDebug( 6050 ) << "redirection by KIO to " << url.url() << endl; @@ -2461,7 +2461,7 @@ void KHTMLPart::slotRedirection(TDEIO::Job*, const KURL& url) d->m_workingURL = url; } -bool KHTMLPart::setEncoding( const TQString &name, bool override ) +bool TDEHTMLPart::setEncoding( const TQString &name, bool override ) { d->m_encoding = name; d->m_haveEncoding = override; @@ -2479,7 +2479,7 @@ bool KHTMLPart::setEncoding( const TQString &name, bool override ) return true; } -TQString KHTMLPart::encoding() const +TQString TDEHTMLPart::encoding() const { if(d->m_haveEncoding && !d->m_encoding.isEmpty()) return d->m_encoding; @@ -2490,7 +2490,7 @@ TQString KHTMLPart::encoding() const return defaultEncoding(); } -TQString KHTMLPart::defaultEncoding() const +TQString TDEHTMLPart::defaultEncoding() const { TQString encoding = settings()->encoding(); if ( !encoding.isEmpty() ) @@ -2503,19 +2503,19 @@ TQString KHTMLPart::defaultEncoding() const return TDEGlobal::locale()->encoding(); } -void KHTMLPart::setUserStyleSheet(const KURL &url) +void TDEHTMLPart::setUserStyleSheet(const KURL &url) { if ( d->m_doc && d->m_doc->docLoader() ) (void) new tdehtml::PartStyleSheetLoader(this, url.url(), d->m_doc->docLoader()); } -void KHTMLPart::setUserStyleSheet(const TQString &styleSheet) +void TDEHTMLPart::setUserStyleSheet(const TQString &styleSheet) { if ( d->m_doc ) d->m_doc->setUserStyleSheet( styleSheet ); } -bool KHTMLPart::gotoAnchor( const TQString &name ) +bool TDEHTMLPart::gotoAnchor( const TQString &name ) { if (!d->m_doc) return false; @@ -2539,7 +2539,7 @@ bool KHTMLPart::gotoAnchor( const TQString &name ) d->m_view->setContentsPos(0, 0); return true; } else if (!n) { - kdDebug(6050) << "KHTMLPart::gotoAnchor node '" << name << "' not found" << endl; + kdDebug(6050) << "TDEHTMLPart::gotoAnchor node '" << name << "' not found" << endl; return false; } @@ -2563,7 +2563,7 @@ bool KHTMLPart::gotoAnchor( const TQString &name ) return true; } -bool KHTMLPart::nextAnchor() +bool TDEHTMLPart::nextAnchor() { if (!d->m_doc) return false; @@ -2572,7 +2572,7 @@ bool KHTMLPart::nextAnchor() return true; } -bool KHTMLPart::prevAnchor() +bool TDEHTMLPart::prevAnchor() { if (!d->m_doc) return false; @@ -2581,38 +2581,38 @@ bool KHTMLPart::prevAnchor() return true; } -void KHTMLPart::setStandardFont( const TQString &name ) +void TDEHTMLPart::setStandardFont( const TQString &name ) { d->m_settings->setStdFontName(name); } -void KHTMLPart::setFixedFont( const TQString &name ) +void TDEHTMLPart::setFixedFont( const TQString &name ) { d->m_settings->setFixedFontName(name); } -void KHTMLPart::setURLCursor( const TQCursor &c ) +void TDEHTMLPart::setURLCursor( const TQCursor &c ) { d->m_linkCursor = c; } -TQCursor KHTMLPart::urlCursor() const +TQCursor TDEHTMLPart::urlCursor() const { return d->m_linkCursor; } -bool KHTMLPart::onlyLocalReferences() const +bool TDEHTMLPart::onlyLocalReferences() const { return d->m_onlyLocalReferences; } -void KHTMLPart::setOnlyLocalReferences(bool enable) +void TDEHTMLPart::setOnlyLocalReferences(bool enable) { d->m_onlyLocalReferences = enable; } -void KHTMLPartPrivate::setFlagRecursively( - bool KHTMLPartPrivate::*flag, bool value) +void TDEHTMLPartPrivate::setFlagRecursively( + bool TDEHTMLPartPrivate::*flag, bool value) { // first set it on the current one this->*flag = value; @@ -2622,8 +2622,8 @@ void KHTMLPartPrivate::setFlagRecursively( TQValueList<tdehtml::ChildFrame*>::Iterator it = m_frames.begin(); const TQValueList<tdehtml::ChildFrame*>::Iterator itEnd = m_frames.end(); for (; it != itEnd; ++it) { - KHTMLPart* const part = static_cast<KHTMLPart *>((KParts::ReadOnlyPart *)(*it)->m_part); - if (part->inherits("KHTMLPart")) + TDEHTMLPart* const part = static_cast<TDEHTMLPart *>((KParts::ReadOnlyPart *)(*it)->m_part); + if (part->inherits("TDEHTMLPart")) part->d->setFlagRecursively(flag, value); }/*next it*/ } @@ -2632,19 +2632,19 @@ void KHTMLPartPrivate::setFlagRecursively( TQValueList<tdehtml::ChildFrame*>::Iterator it = m_objects.begin(); const TQValueList<tdehtml::ChildFrame*>::Iterator itEnd = m_objects.end(); for (; it != itEnd; ++it) { - KHTMLPart* const part = static_cast<KHTMLPart *>((KParts::ReadOnlyPart *)(*it)->m_part); - if (part->inherits("KHTMLPart")) + TDEHTMLPart* const part = static_cast<TDEHTMLPart *>((KParts::ReadOnlyPart *)(*it)->m_part); + if (part->inherits("TDEHTMLPart")) part->d->setFlagRecursively(flag, value); }/*next it*/ } } -void KHTMLPart::setCaretMode(bool enable) +void TDEHTMLPart::setCaretMode(bool enable) { -#ifndef KHTML_NO_CARET +#ifndef TDEHTML_NO_CARET kdDebug(6200) << "setCaretMode(" << enable << ")" << endl; if (isCaretMode() == enable) return; - d->setFlagRecursively(&KHTMLPartPrivate::m_caretMode, enable); + d->setFlagRecursively(&TDEHTMLPartPrivate::m_caretMode, enable); // FIXME: this won't work on frames as expected if (!isEditable()) { if (enable) { @@ -2653,19 +2653,19 @@ void KHTMLPart::setCaretMode(bool enable) } else view()->caretOff(); }/*end if*/ -#endif // KHTML_NO_CARET +#endif // TDEHTML_NO_CARET } -bool KHTMLPart::isCaretMode() const +bool TDEHTMLPart::isCaretMode() const { return d->m_caretMode; } -void KHTMLPart::setEditable(bool enable) +void TDEHTMLPart::setEditable(bool enable) { -#ifndef KHTML_NO_CARET +#ifndef TDEHTML_NO_CARET if (isEditable() == enable) return; - d->setFlagRecursively(&KHTMLPartPrivate::m_designMode, enable); + d->setFlagRecursively(&TDEHTMLPartPrivate::m_designMode, enable); // FIXME: this won't work on frames as expected if (!isCaretMode()) { if (enable) { @@ -2674,17 +2674,17 @@ void KHTMLPart::setEditable(bool enable) } else view()->caretOff(); }/*end if*/ -#endif // KHTML_NO_CARET +#endif // TDEHTML_NO_CARET } -bool KHTMLPart::isEditable() const +bool TDEHTMLPart::isEditable() const { return d->m_designMode; } -void KHTMLPart::setCaretPosition(DOM::Node node, long offset, bool extendSelection) +void TDEHTMLPart::setCaretPosition(DOM::Node node, long offset, bool extendSelection) { -#ifndef KHTML_NO_CARET +#ifndef TDEHTML_NO_CARET #if 0 kdDebug(6200) << k_funcinfo << "node: " << node.handle() << " nodeName: " << node.nodeName().string() << " offset: " << offset @@ -2693,28 +2693,28 @@ void KHTMLPart::setCaretPosition(DOM::Node node, long offset, bool extendSelecti if (view()->moveCaretTo(node.handle(), offset, !extendSelection)) emitSelectionChanged(); view()->ensureCaretVisible(); -#endif // KHTML_NO_CARET +#endif // TDEHTML_NO_CARET } -KHTMLPart::CaretDisplayPolicy KHTMLPart::caretDisplayPolicyNonFocused() const +TDEHTMLPart::CaretDisplayPolicy TDEHTMLPart::caretDisplayPolicyNonFocused() const { -#ifndef KHTML_NO_CARET +#ifndef TDEHTML_NO_CARET return (CaretDisplayPolicy)view()->caretDisplayPolicyNonFocused(); -#else // KHTML_NO_CARET +#else // TDEHTML_NO_CARET return CaretInvisible; -#endif // KHTML_NO_CARET +#endif // TDEHTML_NO_CARET } -void KHTMLPart::setCaretDisplayPolicyNonFocused(CaretDisplayPolicy policy) +void TDEHTMLPart::setCaretDisplayPolicyNonFocused(CaretDisplayPolicy policy) { -#ifndef KHTML_NO_CARET +#ifndef TDEHTML_NO_CARET view()->setCaretDisplayPolicyNonFocused(policy); -#endif // KHTML_NO_CARET +#endif // TDEHTML_NO_CARET } -void KHTMLPart::setCaretVisible(bool show) +void TDEHTMLPart::setCaretVisible(bool show) { -#ifndef KHTML_NO_CARET +#ifndef TDEHTML_NO_CARET if (show) { NodeImpl *caretNode = xmlDocImpl()->focusNode(); @@ -2728,10 +2728,10 @@ void KHTMLPart::setCaretVisible(bool show) view()->caretOff(); }/*end if*/ -#endif // KHTML_NO_CARET +#endif // TDEHTML_NO_CARET } -void KHTMLPart::findTextBegin() +void TDEHTMLPart::findTextBegin() { d->m_findPos = -1; d->m_findNode = 0; @@ -2744,7 +2744,7 @@ void KHTMLPart::findTextBegin() d->m_find = 0L; } -bool KHTMLPart::initFindNode( bool selection, bool reverse, bool fromCursor ) +bool TDEHTMLPart::initFindNode( bool selection, bool reverse, bool fromCursor ) { if ( !d->m_doc ) return false; @@ -2817,7 +2817,7 @@ bool KHTMLPart::initFindNode( bool selection, bool reverse, bool fromCursor ) } // Old method (its API limits the available features - remove in KDE-4) -bool KHTMLPart::findTextNext( const TQString &str, bool forward, bool caseSensitive, bool isRegExp ) +bool TDEHTMLPart::findTextNext( const TQString &str, bool forward, bool caseSensitive, bool isRegExp ) { if ( !initFindNode( false, !forward, d->m_findNode ) ) return false; @@ -2898,91 +2898,91 @@ bool KHTMLPart::findTextNext( const TQString &str, bool forward, bool caseSensit } -void KHTMLPart::slotFind() +void TDEHTMLPart::slotFind() { KParts::ReadOnlyPart *part = currentFrame(); if (!part) return; - if (!part->inherits("KHTMLPart") ) + if (!part->inherits("TDEHTMLPart") ) { kdError(6000) << "slotFind: part is a " << part->className() << ", can't do a search into it" << endl; return; } - static_cast<KHTMLPart *>( part )->findText(); + static_cast<TDEHTMLPart *>( part )->findText(); } -void KHTMLPart::slotFindNext() +void TDEHTMLPart::slotFindNext() { KParts::ReadOnlyPart *part = currentFrame(); if (!part) return; - if (!part->inherits("KHTMLPart") ) + if (!part->inherits("TDEHTMLPart") ) { kdError(6000) << "slotFindNext: part is a " << part->className() << ", can't do a search into it" << endl; return; } - static_cast<KHTMLPart *>( part )->findTextNext(); + static_cast<TDEHTMLPart *>( part )->findTextNext(); } -void KHTMLPart::slotFindPrev() +void TDEHTMLPart::slotFindPrev() { KParts::ReadOnlyPart *part = currentFrame(); if (!part) return; - if (!part->inherits("KHTMLPart") ) + if (!part->inherits("TDEHTMLPart") ) { kdError(6000) << "slotFindNext: part is a " << part->className() << ", can't do a search into it" << endl; return; } - static_cast<KHTMLPart *>( part )->findTextNext( true ); // reverse + static_cast<TDEHTMLPart *>( part )->findTextNext( true ); // reverse } -void KHTMLPart::slotFindDone() +void TDEHTMLPart::slotFindDone() { // ### remove me } -void KHTMLPart::slotFindAheadText() +void TDEHTMLPart::slotFindAheadText() { -#ifndef KHTML_NO_TYPE_AHEAD_FIND +#ifndef TDEHTML_NO_TYPE_AHEAD_FIND KParts::ReadOnlyPart *part = currentFrame(); if (!part) return; - if (!part->inherits("KHTMLPart") ) + if (!part->inherits("TDEHTMLPart") ) { kdError(6000) << "slotFindNext: part is a " << part->className() << ", can't do a search into it" << endl; return; } - static_cast<KHTMLPart *>( part )->view()->startFindAhead( false ); -#endif // KHTML_NO_TYPE_AHEAD_FIND + static_cast<TDEHTMLPart *>( part )->view()->startFindAhead( false ); +#endif // TDEHTML_NO_TYPE_AHEAD_FIND } -void KHTMLPart::slotFindAheadLink() +void TDEHTMLPart::slotFindAheadLink() { -#ifndef KHTML_NO_TYPE_AHEAD_FIND +#ifndef TDEHTML_NO_TYPE_AHEAD_FIND KParts::ReadOnlyPart *part = currentFrame(); if (!part) return; - if (!part->inherits("KHTMLPart") ) + if (!part->inherits("TDEHTMLPart") ) { kdError(6000) << "slotFindNext: part is a " << part->className() << ", can't do a search into it" << endl; return; } - static_cast<KHTMLPart *>( part )->view()->startFindAhead( true ); -#endif // KHTML_NO_TYPE_AHEAD_FIND + static_cast<TDEHTMLPart *>( part )->view()->startFindAhead( true ); +#endif // TDEHTML_NO_TYPE_AHEAD_FIND } -void KHTMLPart::enableFindAheadActions( bool enable ) +void TDEHTMLPart::enableFindAheadActions( bool enable ) { // only the topmost one has shortcuts - KHTMLPart* p = this; + TDEHTMLPart* p = this; while( p->parentPart()) p = p->parentPart(); p->d->m_paFindAheadText->setEnabled( enable ); p->d->m_paFindAheadLinks->setEnabled( enable ); } -void KHTMLPart::slotFindDialogDestroyed() +void TDEHTMLPart::slotFindDialogDestroyed() { d->m_lastFindState.options = d->m_findDialog->options(); d->m_lastFindState.history = d->m_findDialog->findHistory(); @@ -2990,7 +2990,7 @@ void KHTMLPart::slotFindDialogDestroyed() d->m_findDialog = 0L; } -void KHTMLPart::findText() +void TDEHTMLPart::findText() { // First do some init to make sure we can search in this frame if ( !d->m_doc ) @@ -3029,7 +3029,7 @@ void KHTMLPart::findText() findText( d->m_findDialog->pattern(), 0 /*options*/, widget(), d->m_findDialog ); } -void KHTMLPart::findText( const TQString &str, long options, TQWidget *parent, KFindDialog *findDialog ) +void TDEHTMLPart::findText( const TQString &str, long options, TQWidget *parent, KFindDialog *findDialog ) { // First do some init to make sure we can search in this frame if ( !d->m_doc ) @@ -3057,13 +3057,13 @@ void KHTMLPart::findText( const TQString &str, long options, TQWidget *parent, K } } -bool KHTMLPart::findTextNext() +bool TDEHTMLPart::findTextNext() { return findTextNext( false ); } // New method -bool KHTMLPart::findTextNext( bool reverse ) +bool TDEHTMLPart::findTextNext( bool reverse ) { if (!d->m_find) { @@ -3216,16 +3216,16 @@ bool KHTMLPart::findTextNext( bool reverse ) if( !( options & KFindDialog::FindBackwards )) { //kdDebug(6050) << "StringPortion: " << index << "-" << index+s.length()-1 << " -> " << lastNode << endl; - d->m_stringPortions.append( KHTMLPartPrivate::StringPortion( str.length(), lastNode ) ); + d->m_stringPortions.append( TDEHTMLPartPrivate::StringPortion( str.length(), lastNode ) ); str += s; } else // KFind itself can search backwards, so str must not be built backwards { - for( TQValueList<KHTMLPartPrivate::StringPortion>::Iterator it = d->m_stringPortions.begin(); + for( TQValueList<TDEHTMLPartPrivate::StringPortion>::Iterator it = d->m_stringPortions.begin(); it != d->m_stringPortions.end(); ++it ) (*it).index += s.length(); - d->m_stringPortions.prepend( KHTMLPartPrivate::StringPortion( 0, lastNode ) ); + d->m_stringPortions.prepend( TDEHTMLPartPrivate::StringPortion( 0, lastNode ) ); str.prepend( s ); } } @@ -3290,12 +3290,12 @@ bool KHTMLPart::findTextNext( bool reverse ) return res == KFind::Match; } -void KHTMLPart::slotHighlight( const TQString& /*text*/, int index, int length ) +void TDEHTMLPart::slotHighlight( const TQString& /*text*/, int index, int length ) { //kdDebug(6050) << "slotHighlight index=" << index << " length=" << length << endl; - TQValueList<KHTMLPartPrivate::StringPortion>::Iterator it = d->m_stringPortions.begin(); - const TQValueList<KHTMLPartPrivate::StringPortion>::Iterator itEnd = d->m_stringPortions.end(); - TQValueList<KHTMLPartPrivate::StringPortion>::Iterator prev = it; + TQValueList<TDEHTMLPartPrivate::StringPortion>::Iterator it = d->m_stringPortions.begin(); + const TQValueList<TDEHTMLPartPrivate::StringPortion>::Iterator itEnd = d->m_stringPortions.end(); + TQValueList<TDEHTMLPartPrivate::StringPortion>::Iterator prev = it; // We stop at the first portion whose index is 'greater than', and then use the previous one while ( it != itEnd && (*it).index <= index ) { @@ -3431,7 +3431,7 @@ void KHTMLPart::slotHighlight( const TQString& /*text*/, int index, int length ) } } -TQString KHTMLPart::selectedTextAsHTML() const +TQString TDEHTMLPart::selectedTextAsHTML() const { if(!hasSelection()) { kdDebug() << "selectedTextAsHTML(): selection is not valid. Returning empty selection" << endl; @@ -3448,7 +3448,7 @@ TQString KHTMLPart::selectedTextAsHTML() const return r.handle()->toHTML(exceptioncode).string(); } -TQString KHTMLPart::selectedText() const +TQString TDEHTMLPart::selectedText() const { bool hasNewLine = true; bool seenTDTag = false; @@ -3590,7 +3590,7 @@ TQString KHTMLPart::selectedText() const return text.mid(start, end-start); } -bool KHTMLPart::hasSelection() const +bool TDEHTMLPart::hasSelection() const { if ( d->m_selectionStart.isNull() || d->m_selectionEnd.isNull() ) return false; @@ -3600,7 +3600,7 @@ bool KHTMLPart::hasSelection() const return true; } -DOM::Range KHTMLPart::selection() const +DOM::Range TDEHTMLPart::selection() const { if( d->m_selectionStart.isNull() || d->m_selectionEnd.isNull() ) return DOM::Range(); @@ -3654,7 +3654,7 @@ DOM::Range KHTMLPart::selection() const return r; } -void KHTMLPart::selection(DOM::Node &s, long &so, DOM::Node &e, long &eo) const +void TDEHTMLPart::selection(DOM::Node &s, long &so, DOM::Node &e, long &eo) const { s = d->m_selectionStart; so = d->m_startOffset; @@ -3662,7 +3662,7 @@ void KHTMLPart::selection(DOM::Node &s, long &so, DOM::Node &e, long &eo) const eo = d->m_endOffset; } -void KHTMLPart::setSelection( const DOM::Range &r ) +void TDEHTMLPart::setSelection( const DOM::Range &r ) { // Quick-fix: a collapsed range shouldn't select the whole node. // The real problem is in RenderCanvas::setSelection though (when index==0 the whole node is selected). @@ -3675,17 +3675,17 @@ void KHTMLPart::setSelection( const DOM::Range &r ) d->m_endOffset = r.endOffset(); d->m_doc->setSelection(d->m_selectionStart.handle(),d->m_startOffset, d->m_selectionEnd.handle(),d->m_endOffset); -#ifndef KHTML_NO_CARET +#ifndef TDEHTML_NO_CARET bool v = d->m_view->placeCaret(); emitCaretPositionChanged(v ? d->caretNode() : 0, d->caretOffset()); #endif } } -void KHTMLPart::slotClearSelection() +void TDEHTMLPart::slotClearSelection() { bool hadSelection = hasSelection(); -#ifndef KHTML_NO_CARET +#ifndef TDEHTML_NO_CARET //kdDebug(6000) << "d->m_selectionStart " << d->m_selectionStart.handle() // << " d->m_selectionEnd " << d->m_selectionEnd.handle() << endl; // nothing, leave selection parameters as is @@ -3698,13 +3698,13 @@ void KHTMLPart::slotClearSelection() if ( d->m_doc ) d->m_doc->clearSelection(); if ( hadSelection ) emitSelectionChanged(); -#ifndef KHTML_NO_CARET +#ifndef TDEHTML_NO_CARET bool v = d->m_view->placeCaret(); emitCaretPositionChanged(v ? d->caretNode() : 0, d->caretOffset()); #endif } -void KHTMLPart::resetHoverText() +void TDEHTMLPart::resetHoverText() { if( !d->m_overURL.isEmpty() ) // Only if we were showing a link { @@ -3716,7 +3716,7 @@ void KHTMLPart::resetHoverText() } } -void KHTMLPart::overURL( const TQString &url, const TQString &target, bool /*shiftPressed*/ ) +void TDEHTMLPart::overURL( const TQString &url, const TQString &target, bool /*shiftPressed*/ ) { KURL u = completeURL(url); @@ -3829,7 +3829,7 @@ void KHTMLPart::overURL( const TQString &url, const TQString &target, bool /*shi (target.lower() != "_self") && (target.lower() != "_parent")) { - KHTMLPart *p = this; + TDEHTMLPart *p = this; while (p->parentPart()) p = p->parentPart(); if (!p->frameExists(target)) @@ -3887,7 +3887,7 @@ void KHTMLPart::overURL( const TQString &url, const TQString &target, bool /*shi // This executes in the active part on a click or other url selection action in // that active part. // -void KHTMLPart::urlSelected( const TQString &url, int button, int state, const TQString &_target, KParts::URLArgs args ) +void TDEHTMLPart::urlSelected( const TQString &url, int button, int state, const TQString &_target, KParts::URLArgs args ) { // The member var is so that slotRedirection still calls the virtual urlSelected // but is able to know if is opened a url. KDE4: just make urlSelected return a bool @@ -3896,7 +3896,7 @@ void KHTMLPart::urlSelected( const TQString &url, int button, int state, const T } // Return value: true if an url was opened, false if not (e.g. error, or jumping to anchor) -bool KHTMLPart::urlSelectedIntern( const TQString &url, int button, int state, const TQString &_target, KParts::URLArgs args ) +bool TDEHTMLPart::urlSelectedIntern( const TQString &url, int button, int state, const TQString &_target, KParts::URLArgs args ) { bool hasTarget = false; @@ -3934,7 +3934,7 @@ bool KHTMLPart::urlSelectedIntern( const TQString &url, int button, int state, c { TDEIO::MetaData metaData; metaData["referrer"] = d->m_referrer; - KHTMLPopupGUIClient::saveURL( d->m_view, i18n( "Save As" ), cURL, metaData ); + TDEHTMLPopupGUIClient::saveURL( d->m_view, i18n( "Save As" ), cURL, metaData ); return false; } @@ -4011,16 +4011,16 @@ bool KHTMLPart::urlSelectedIntern( const TQString &url, int button, int state, c return true; } -void KHTMLPart::slotViewDocumentSource() +void TDEHTMLPart::slotViewDocumentSource() { KURL url(m_url); bool isTempFile = false; - if (!(url.isLocalFile()) && KHTMLPageCache::self()->isComplete(d->m_cacheId)) + if (!(url.isLocalFile()) && TDEHTMLPageCache::self()->isComplete(d->m_cacheId)) { KTempFile sourceFile(TQString(), defaultExtension()); if (sourceFile.status() == 0) { - KHTMLPageCache::self()->saveData(d->m_cacheId, sourceFile.dataStream()); + TDEHTMLPageCache::self()->saveData(d->m_cacheId, sourceFile.dataStream()); url = KURL(); url.setPath(sourceFile.name()); isTempFile = true; @@ -4030,9 +4030,9 @@ void KHTMLPart::slotViewDocumentSource() (void) KRun::runURL( url, TQString::fromLatin1("text/plain"), isTempFile ); } -void KHTMLPart::slotViewPageInfo() +void TDEHTMLPart::slotViewPageInfo() { - KHTMLInfoDlg *dlg = new KHTMLInfoDlg(NULL, "KHTML Page Info Dialog", false, (WFlags)WDestructiveClose); + TDEHTMLInfoDlg *dlg = new TDEHTMLInfoDlg(NULL, "TDEHTML Page Info Dialog", false, (WFlags)WDestructiveClose); dlg->_close->setGuiItem(KStdGuiItem::close()); if (d->m_doc) @@ -4083,7 +4083,7 @@ void KHTMLPart::slotViewPageInfo() } -void KHTMLPart::slotViewFrameSource() +void TDEHTMLPart::slotViewFrameSource() { KParts::ReadOnlyPart *frame = currentFrame(); if ( !frame ) @@ -4091,16 +4091,16 @@ void KHTMLPart::slotViewFrameSource() KURL url = frame->url(); bool isTempFile = false; - if (!(url.isLocalFile()) && frame->inherits("KHTMLPart")) + if (!(url.isLocalFile()) && frame->inherits("TDEHTMLPart")) { - long cacheId = static_cast<KHTMLPart *>(frame)->d->m_cacheId; + long cacheId = static_cast<TDEHTMLPart *>(frame)->d->m_cacheId; - if (KHTMLPageCache::self()->isComplete(cacheId)) + if (TDEHTMLPageCache::self()->isComplete(cacheId)) { KTempFile sourceFile(TQString(), defaultExtension()); if (sourceFile.status() == 0) { - KHTMLPageCache::self()->saveData(cacheId, sourceFile.dataStream()); + TDEHTMLPageCache::self()->saveData(cacheId, sourceFile.dataStream()); url = KURL(); url.setPath(sourceFile.name()); isTempFile = true; @@ -4111,7 +4111,7 @@ void KHTMLPart::slotViewFrameSource() (void) KRun::runURL( url, TQString::fromLatin1("text/plain"), isTempFile ); } -KURL KHTMLPart::backgroundURL() const +KURL TDEHTMLPart::backgroundURL() const { // ### what about XML documents? get from CSS? if (!d->m_doc || !d->m_doc->isHTMLDocument()) @@ -4122,14 +4122,14 @@ KURL KHTMLPart::backgroundURL() const return KURL( m_url, relURL ); } -void KHTMLPart::slotSaveBackground() +void TDEHTMLPart::slotSaveBackground() { TDEIO::MetaData metaData; metaData["referrer"] = d->m_referrer; - KHTMLPopupGUIClient::saveURL( d->m_view, i18n("Save Background Image As"), backgroundURL(), metaData ); + TDEHTMLPopupGUIClient::saveURL( d->m_view, i18n("Save Background Image As"), backgroundURL(), metaData ); } -void KHTMLPart::slotSaveDocument() +void TDEHTMLPart::slotSaveDocument() { KURL srcURL( m_url ); @@ -4138,10 +4138,10 @@ void KHTMLPart::slotSaveDocument() TDEIO::MetaData metaData; // Referre unknown? - KHTMLPopupGUIClient::saveURL( d->m_view, i18n( "Save As" ), srcURL, metaData, "text/html", d->m_cacheId ); + TDEHTMLPopupGUIClient::saveURL( d->m_view, i18n( "Save As" ), srcURL, metaData, "text/html", d->m_cacheId ); } -void KHTMLPart::slotSecurity() +void TDEHTMLPart::slotSecurity() { // kdDebug( 6050 ) << "Meta Data:" << endl // << d->m_ssl_peer_cert_subject @@ -4200,7 +4200,7 @@ void KHTMLPart::slotSecurity() } else kid->exec(); } -void KHTMLPart::slotSaveFrame() +void TDEHTMLPart::slotSaveFrame() { KParts::ReadOnlyPart *frame = currentFrame(); if ( !frame ) @@ -4213,10 +4213,10 @@ void KHTMLPart::slotSaveFrame() TDEIO::MetaData metaData; // Referrer unknown? - KHTMLPopupGUIClient::saveURL( d->m_view, i18n( "Save Frame As" ), srcURL, metaData, "text/html" ); + TDEHTMLPopupGUIClient::saveURL( d->m_view, i18n( "Save Frame As" ), srcURL, metaData, "text/html" ); } -void KHTMLPart::slotSetEncoding() +void TDEHTMLPart::slotSetEncoding() { d->m_automaticDetection->setItemChecked( int( d->m_autoDetectLanguage ), false ); d->m_paSetEncoding->popupMenu()->setItemChecked( 0, false ); @@ -4226,7 +4226,7 @@ void KHTMLPart::slotSetEncoding() setEncoding( enc, true ); } -void KHTMLPart::slotUseStylesheet() +void TDEHTMLPart::slotUseStylesheet() { if (d->m_doc) { @@ -4236,7 +4236,7 @@ void KHTMLPart::slotUseStylesheet() } } -void KHTMLPart::updateActions() +void TDEHTMLPart::updateActions() { bool frames = false; @@ -4265,7 +4265,7 @@ void KHTMLPart::updateActions() bool enableFindAndSelectAll = true; if ( frame ) - enableFindAndSelectAll = frame->inherits( "KHTMLPart" ); + enableFindAndSelectAll = frame->inherits( "TDEHTMLPart" ); d->m_paFind->setEnabled( enableFindAndSelectAll ); d->m_paSelectAll->setEnabled( enableFindAndSelectAll ); @@ -4293,7 +4293,7 @@ void KHTMLPart::updateActions() d->m_paDebugScript->setEnabled( d->m_frame ? d->m_frame->m_jscript : 0L ); } -KParts::LiveConnectExtension *KHTMLPart::liveConnectExtension( const tdehtml::RenderPart *frame) const { +KParts::LiveConnectExtension *TDEHTMLPart::liveConnectExtension( const tdehtml::RenderPart *frame) const { const ConstFrameIt end = d->m_objects.end(); for(ConstFrameIt it = d->m_objects.begin(); it != end; ++it ) if ((*it)->m_frame == frame) @@ -4301,7 +4301,7 @@ KParts::LiveConnectExtension *KHTMLPart::liveConnectExtension( const tdehtml::Re return 0L; } -bool KHTMLPart::requestFrame( tdehtml::RenderPart *frame, const TQString &url, const TQString &frameName, +bool TDEHTMLPart::requestFrame( tdehtml::RenderPart *frame, const TQString &url, const TQString &frameName, const TQStringList ¶ms, bool isIFrame ) { //kdDebug( 6050 ) << this << " requestFrame( ..., " << url << ", " << frameName << " )" << endl; @@ -4322,7 +4322,7 @@ bool KHTMLPart::requestFrame( tdehtml::RenderPart *frame, const TQString &url, c if ( url.find( TQString::fromLatin1( "javascript:" ), 0, false ) == 0 ) { if ( processObjectRequest(*it, KURL("about:blank"), TQString("text/html") ) ) { - KHTMLPart* p = static_cast<KHTMLPart*>(static_cast<KParts::ReadOnlyPart *>((*it)->m_part)); + TDEHTMLPart* p = static_cast<TDEHTMLPart*>(static_cast<KParts::ReadOnlyPart *>((*it)->m_part)); // See if we want to replace content with javascript: output.. TQVariant res = p->executeScript( DOM::Node(), KURL::decode_string( url.right( url.length() - 11) ) ); @@ -4339,15 +4339,15 @@ bool KHTMLPart::requestFrame( tdehtml::RenderPart *frame, const TQString &url, c return requestObject( *it, u ); } -TQString KHTMLPart::requestFrameName() +TQString TDEHTMLPart::requestFrameName() { return TQString::fromLatin1("<!--frame %1-->").arg(d->m_frameNameId++); } -bool KHTMLPart::requestObject( tdehtml::RenderPart *frame, const TQString &url, const TQString &serviceType, +bool TDEHTMLPart::requestObject( tdehtml::RenderPart *frame, const TQString &url, const TQString &serviceType, const TQStringList ¶ms ) { - //kdDebug( 6005 ) << "KHTMLPart::requestObject " << this << " frame=" << frame << endl; + //kdDebug( 6005 ) << "TDEHTMLPart::requestObject " << this << " frame=" << frame << endl; tdehtml::ChildFrame *child = new tdehtml::ChildFrame; FrameIt it = d->m_objects.append( child ); (*it)->m_frame = frame; @@ -4363,16 +4363,16 @@ bool KHTMLPart::requestObject( tdehtml::RenderPart *frame, const TQString &url, return true; } -bool KHTMLPart::requestObject( tdehtml::ChildFrame *child, const KURL &url, const KParts::URLArgs &_args ) +bool TDEHTMLPart::requestObject( tdehtml::ChildFrame *child, const KURL &url, const KParts::URLArgs &_args ) { if (!checkLinkSecurity(url)) { - kdDebug(6005) << this << " KHTMLPart::requestObject checkLinkSecurity refused" << endl; + kdDebug(6005) << this << " TDEHTMLPart::requestObject checkLinkSecurity refused" << endl; return false; } if ( child->m_bPreloaded ) { - kdDebug(6005) << "KHTMLPart::requestObject preload" << endl; + kdDebug(6005) << "TDEHTMLPart::requestObject preload" << endl; if ( child->m_frame && child->m_part ) child->m_frame->setWidget( child->m_part->widget() ); @@ -4380,7 +4380,7 @@ bool KHTMLPart::requestObject( tdehtml::ChildFrame *child, const KURL &url, cons return true; } - //kdDebug(6005) << "KHTMLPart::requestObject child=" << child << " child->m_part=" << child->m_part << endl; + //kdDebug(6005) << "TDEHTMLPart::requestObject child=" << child << " child->m_part=" << child->m_part << endl; KParts::URLArgs args( _args ); @@ -4406,13 +4406,13 @@ bool KHTMLPart::requestObject( tdehtml::ChildFrame *child, const KURL &url, cons child->m_args.metaData().insert("ssl_activate_warnings", "TRUE"); child->m_args.metaData().insert("cross-domain", toplevelURL().url()); - // We want a KHTMLPart if the HTML says <frame src=""> or <frame src="about:blank"> + // We want a TDEHTMLPart if the HTML says <frame src=""> or <frame src="about:blank"> if ((url.isEmpty() || url.url() == "about:blank") && args.serviceType.isEmpty()) args.serviceType = TQString::fromLatin1( "text/html" ); if ( args.serviceType.isEmpty() ) { - kdDebug(6050) << "Running new KHTMLRun for " << this << " and child=" << child << endl; - child->m_run = new KHTMLRun( this, child, url, child->m_args, true ); + kdDebug(6050) << "Running new TDEHTMLRun for " << this << " and child=" << child << endl; + child->m_run = new TDEHTMLRun( this, child, url, child->m_args, true ); d->m_bComplete = false; // ensures we stop it in checkCompleted... return false; } else { @@ -4420,9 +4420,9 @@ bool KHTMLPart::requestObject( tdehtml::ChildFrame *child, const KURL &url, cons } } -bool KHTMLPart::processObjectRequest( tdehtml::ChildFrame *child, const KURL &_url, const TQString &mimetype ) +bool TDEHTMLPart::processObjectRequest( tdehtml::ChildFrame *child, const KURL &_url, const TQString &mimetype ) { - //kdDebug( 6050 ) << "KHTMLPart::processObjectRequest trying to create part for " << mimetype << endl; + //kdDebug( 6050 ) << "TDEHTMLPart::processObjectRequest trying to create part for " << mimetype << endl; // IMPORTANT: create a copy of the url here, because it is just a reference, which was likely to be given // by an emitting frame part (emit openURLRequest( blahurl, ... ) . A few lines below we delete the part @@ -4459,7 +4459,7 @@ bool KHTMLPart::processObjectRequest( tdehtml::ChildFrame *child, const KURL &_u url, mimetype, suggestedFilename ); switch( res ) { case KParts::BrowserRun::Save: - KHTMLPopupGUIClient::saveURL( widget(), i18n( "Save As" ), url, child->m_args.metaData(), TQString(), 0, suggestedFilename); + TDEHTMLPopupGUIClient::saveURL( widget(), i18n( "Save As" ), url, child->m_args.metaData(), TQString(), 0, suggestedFilename); // fall-through case KParts::BrowserRun::Cancel: child->m_bCompleted = true; @@ -4486,7 +4486,7 @@ bool KHTMLPart::processObjectRequest( tdehtml::ChildFrame *child, const KURL &_u //CRITICAL STUFF if ( child->m_part ) { - if (!::tqqt_cast<KHTMLPart*>(child->m_part) && child->m_jscript) + if (!::tqqt_cast<TDEHTMLPart*>(child->m_part) && child->m_jscript) child->m_jscript->clear(); partManager()->removePart( (KParts::ReadOnlyPart *)child->m_part ); delete (KParts::ReadOnlyPart *)child->m_part; @@ -4507,8 +4507,8 @@ bool KHTMLPart::processObjectRequest( tdehtml::ChildFrame *child, const KURL &_u child->m_part = part; - if (::tqqt_cast<KHTMLPart*>(part)) { - static_cast<KHTMLPart*>(part)->d->m_frame = child; + if (::tqqt_cast<TDEHTMLPart*>(part)) { + static_cast<TDEHTMLPart*>(part)->d->m_frame = child; } else if (child->m_frame) { child->m_liveconnect = KParts::LiveConnectExtension::childObject(part); if (child->m_liveconnect) @@ -4526,7 +4526,7 @@ bool KHTMLPart::processObjectRequest( tdehtml::ChildFrame *child, const KURL &_u this, TQT_SLOT( slotChildCompleted(bool) ) ); connect( part, TQT_SIGNAL( setStatusBarText( const TQString & ) ), this, TQT_SIGNAL( setStatusBarText( const TQString & ) ) ); - if ( part->inherits( "KHTMLPart" ) ) + if ( part->inherits( "TDEHTMLPart" ) ) { connect( this, TQT_SIGNAL( completed() ), part, TQT_SLOT( slotParentCompleted() ) ); @@ -4598,7 +4598,7 @@ bool KHTMLPart::processObjectRequest( tdehtml::ChildFrame *child, const KURL &_u // make sure the part has a way to find out about the mimetype. // we actually set it in child->m_args in requestObject already, - // but it's useless if we had to use a KHTMLRun instance, as the + // but it's useless if we had to use a TDEHTMLRun instance, as the // point the run object is to find out exactly the mimetype. child->m_args.serviceType = mimetype; @@ -4609,10 +4609,10 @@ bool KHTMLPart::processObjectRequest( tdehtml::ChildFrame *child, const KURL &_u child->m_extension->setURLArgs( child->m_args ); if(url.protocol() == "javascript" || url.url() == "about:blank") { - if (!child->m_part->inherits("KHTMLPart")) + if (!child->m_part->inherits("TDEHTMLPart")) return false; - KHTMLPart* p = static_cast<KHTMLPart*>(static_cast<KParts::ReadOnlyPart *>(child->m_part)); + TDEHTMLPart* p = static_cast<TDEHTMLPart*>(static_cast<KParts::ReadOnlyPart *>(child->m_part)); p->begin(); if (d->m_doc && p->d->m_doc) @@ -4643,7 +4643,7 @@ bool KHTMLPart::processObjectRequest( tdehtml::ChildFrame *child, const KURL &_u } } -KParts::ReadOnlyPart *KHTMLPart::createPart( TQWidget *parentWidget, const char *widgetName, +KParts::ReadOnlyPart *TDEHTMLPart::createPart( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const TQString &mimetype, TQString &serviceName, TQStringList &serviceTypes, const TQStringList ¶ms ) @@ -4697,7 +4697,7 @@ KParts::ReadOnlyPart *KHTMLPart::createPart( TQWidget *parentWidget, const char return 0; } -KParts::PartManager *KHTMLPart::partManager() +KParts::PartManager *TDEHTMLPart::partManager() { if ( !d->m_manager && d->m_view ) { @@ -4712,28 +4712,28 @@ KParts::PartManager *KHTMLPart::partManager() return d->m_manager; } -void KHTMLPart::submitFormAgain() +void TDEHTMLPart::submitFormAgain() { disconnect(this, TQT_SIGNAL(completed()), this, TQT_SLOT(submitFormAgain())); if( d->m_doc && !d->m_doc->parsing() && d->m_submitForm) - KHTMLPart::submitForm( d->m_submitForm->submitAction, d->m_submitForm->submitUrl, d->m_submitForm->submitFormData, d->m_submitForm->target, d->m_submitForm->submitContentType, d->m_submitForm->submitBoundary ); + TDEHTMLPart::submitForm( d->m_submitForm->submitAction, d->m_submitForm->submitUrl, d->m_submitForm->submitFormData, d->m_submitForm->target, d->m_submitForm->submitContentType, d->m_submitForm->submitBoundary ); delete d->m_submitForm; d->m_submitForm = 0; } -void KHTMLPart::submitFormProxy( const char *action, const TQString &url, const TQByteArray &formData, const TQString &_target, const TQString& contentType, const TQString& boundary ) +void TDEHTMLPart::submitFormProxy( const char *action, const TQString &url, const TQByteArray &formData, const TQString &_target, const TQString& contentType, const TQString& boundary ) { submitForm(action, url, formData, _target, contentType, boundary); } -void KHTMLPart::submitForm( const char *action, const TQString &url, const TQByteArray &formData, const TQString &_target, const TQString& contentType, const TQString& boundary ) +void TDEHTMLPart::submitForm( const char *action, const TQString &url, const TQByteArray &formData, const TQString &_target, const TQString& contentType, const TQString& boundary ) { - kdDebug(6000) << this << ": KHTMLPart::submitForm target=" << _target << " url=" << url << endl; - if (d->m_formNotification == KHTMLPart::Only) { + kdDebug(6000) << this << ": TDEHTMLPart::submitForm target=" << _target << " url=" << url << endl; + if (d->m_formNotification == TDEHTMLPart::Only) { emit formSubmitNotification(action, url, formData, _target, contentType, boundary); return; - } else if (d->m_formNotification == KHTMLPart::Before) { + } else if (d->m_formNotification == TDEHTMLPart::Before) { emit formSubmitNotification(action, url, formData, _target, contentType, boundary); } @@ -4911,10 +4911,10 @@ void KHTMLPart::submitForm( const char *action, const TQString &url, const TQByt if ( d->m_doc->parsing() || d->m_runningScripts > 0 ) { if( d->m_submitForm ) { - kdDebug(6000) << "KHTMLPart::submitForm ABORTING!" << endl; + kdDebug(6000) << "TDEHTMLPart::submitForm ABORTING!" << endl; return; } - d->m_submitForm = new KHTMLPartPrivate::SubmitForm; + d->m_submitForm = new TDEHTMLPartPrivate::SubmitForm; d->m_submitForm->submitAction = action; d->m_submitForm->submitUrl = url; d->m_submitForm->submitFormData = formData; @@ -4929,7 +4929,7 @@ void KHTMLPart::submitForm( const char *action, const TQString &url, const TQByt } } -void KHTMLPart::popupMenu( const TQString &linkUrl ) +void TDEHTMLPart::popupMenu( const TQString &linkUrl ) { KURL popupURL; KURL linkKURL; @@ -4938,7 +4938,7 @@ void KHTMLPart::popupMenu( const TQString &linkUrl ) KParts::BrowserExtension::PopupFlags itemflags=KParts::BrowserExtension::ShowBookmark | KParts::BrowserExtension::ShowReload; if ( linkUrl.isEmpty() ) { // click on background - KHTMLPart* tdehtmlPart = this; + TDEHTMLPart* tdehtmlPart = this; while ( tdehtmlPart->parentPart() ) { tdehtmlPart=tdehtmlPart->parentPart(); @@ -4961,7 +4961,7 @@ void KHTMLPart::popupMenu( const TQString &linkUrl ) if (d->m_strSelectedURLTarget.lower() == "_blank") args.setForcesNewWindow(true); else { - KHTMLPart *p = this; + TDEHTMLPart *p = this; while (p->parentPart()) p = p->parentPart(); if (!p->frameExists(d->m_strSelectedURLTarget)) @@ -4971,8 +4971,8 @@ void KHTMLPart::popupMenu( const TQString &linkUrl ) } // Danger, Will Robinson. The Popup might stay around for a much - // longer time than KHTMLPart. Deal with it. - KHTMLPopupGUIClient* client = new KHTMLPopupGUIClient( this, d->m_popupMenuXML, linkKURL ); + // longer time than TDEHTMLPart. Deal with it. + TDEHTMLPopupGUIClient* client = new TDEHTMLPopupGUIClient( this, d->m_popupMenuXML, linkKURL ); TQGuardedPtr<TQObject> guard( client ); TQString mimetype = TQString::fromLatin1( "text/html" ); @@ -5018,7 +5018,7 @@ void KHTMLPart::popupMenu( const TQString &linkUrl ) } } -void KHTMLPart::slotParentCompleted() +void TDEHTMLPart::slotParentCompleted() { //kdDebug(6050) << this << " slotParentCompleted()" << endl; if ( !d->m_redirectURL.isEmpty() && !d->m_redirectionTimer.isActive() ) @@ -5028,7 +5028,7 @@ void KHTMLPart::slotParentCompleted() } } -void KHTMLPart::slotChildStarted( TDEIO::Job *job ) +void TDEHTMLPart::slotChildStarted( TDEIO::Job *job ) { tdehtml::ChildFrame *child = frame( TQT_TQOBJECT_CONST(sender()) ); @@ -5050,12 +5050,12 @@ void KHTMLPart::slotChildStarted( TDEIO::Job *job ) } } -void KHTMLPart::slotChildCompleted() +void TDEHTMLPart::slotChildCompleted() { slotChildCompleted( false ); } -void KHTMLPart::slotChildCompleted( bool pendingAction ) +void TDEHTMLPart::slotChildCompleted( bool pendingAction ) { tdehtml::ChildFrame *child = frame( TQT_TQOBJECT_CONST(sender()) ); @@ -5068,19 +5068,19 @@ void KHTMLPart::slotChildCompleted( bool pendingAction ) checkCompleted(); } -void KHTMLPart::slotChildDocCreated() +void TDEHTMLPart::slotChildDocCreated() { - const KHTMLPart* htmlFrame = static_cast<const KHTMLPart *>(sender()); + const TDEHTMLPart* htmlFrame = static_cast<const TDEHTMLPart *>(sender()); // Set domain to the frameset's domain // This must only be done when loading the frameset initially (#22039), // not when following a link in a frame (#44162). if ( d->m_doc && d->m_doc->isHTMLDocument() ) { - if ( sender()->inherits("KHTMLPart") ) + if ( sender()->inherits("TDEHTMLPart") ) { DOMString domain = static_cast<HTMLDocumentImpl*>(d->m_doc)->domain(); if (htmlFrame->d->m_doc && htmlFrame->d->m_doc->isHTMLDocument() ) - //kdDebug(6050) << "KHTMLPart::slotChildDocCreated: url: " << htmlFrame->m_url.url() << endl; + //kdDebug(6050) << "TDEHTMLPart::slotChildDocCreated: url: " << htmlFrame->m_url.url() << endl; static_cast<HTMLDocumentImpl*>(htmlFrame->d->m_doc)->setDomain( domain ); } } @@ -5088,10 +5088,10 @@ void KHTMLPart::slotChildDocCreated() disconnect( htmlFrame, TQT_SIGNAL( docCreated() ), this, TQT_SLOT( slotChildDocCreated() ) ); } -void KHTMLPart::slotChildURLRequest( const KURL &url, const KParts::URLArgs &args ) +void TDEHTMLPart::slotChildURLRequest( const KURL &url, const KParts::URLArgs &args ) { tdehtml::ChildFrame *child = frame( TQT_TQOBJECT_CONST(sender())->parent() ); - KHTMLPart *callingHtmlPart = const_cast<KHTMLPart *>(dynamic_cast<const KHTMLPart *>(sender()->parent())); + TDEHTMLPart *callingHtmlPart = const_cast<TDEHTMLPart *>(dynamic_cast<const TDEHTMLPart *>(sender()->parent())); // TODO: handle child target correctly! currently the script are always executed fur the parent TQString urlStr = url.url(); @@ -5147,12 +5147,12 @@ void KHTMLPart::slotChildURLRequest( const KURL &url, const KParts::URLArgs &arg } } -void KHTMLPart::slotRequestFocus( KParts::ReadOnlyPart * ) +void TDEHTMLPart::slotRequestFocus( KParts::ReadOnlyPart * ) { emit d->m_extension->requestFocus(this); } -tdehtml::ChildFrame *KHTMLPart::frame( const TQObject *obj ) +tdehtml::ChildFrame *TDEHTMLPart::frame( const TQObject *obj ) { assert( obj->inherits( "KParts::ReadOnlyPart" ) ); const KParts::ReadOnlyPart* const part = static_cast<const KParts::ReadOnlyPart *>( obj ); @@ -5174,14 +5174,14 @@ tdehtml::ChildFrame *KHTMLPart::frame( const TQObject *obj ) //#define DEBUG_FINDFRAME -bool KHTMLPart::checkFrameAccess(KHTMLPart *callingHtmlPart) +bool TDEHTMLPart::checkFrameAccess(TDEHTMLPart *callingHtmlPart) { if (callingHtmlPart == this) return true; // trivial if (htmlDocument().isNull()) { #ifdef DEBUG_FINDFRAME - kdDebug(6050) << "KHTMLPart::checkFrameAccess: Empty part " << this << " URL = " << m_url << endl; + kdDebug(6050) << "TDEHTMLPart::checkFrameAccess: Empty part " << this << " URL = " << m_url << endl; #endif return false; // we are empty? } @@ -5193,7 +5193,7 @@ bool KHTMLPart::checkFrameAccess(KHTMLPart *callingHtmlPart) DOM::DOMString destDomain = htmlDocument().domain(); #ifdef DEBUG_FINDFRAME - kdDebug(6050) << "KHTMLPart::checkFrameAccess: actDomain = '" << actDomain.string() << "' destDomain = '" << destDomain.string() << "'" << endl; + kdDebug(6050) << "TDEHTMLPart::checkFrameAccess: actDomain = '" << actDomain.string() << "' destDomain = '" << destDomain.string() << "'" << endl; #endif if (actDomain == destDomain) @@ -5202,20 +5202,20 @@ bool KHTMLPart::checkFrameAccess(KHTMLPart *callingHtmlPart) #ifdef DEBUG_FINDFRAME else { - kdDebug(6050) << "KHTMLPart::checkFrameAccess: Unknown part/domain " << callingHtmlPart << " tries to access part " << this << endl; + kdDebug(6050) << "TDEHTMLPart::checkFrameAccess: Unknown part/domain " << callingHtmlPart << " tries to access part " << this << endl; } #endif return false; } -KHTMLPart * -KHTMLPart::findFrameParent( KParts::ReadOnlyPart *callingPart, const TQString &f, tdehtml::ChildFrame **childFrame ) +TDEHTMLPart * +TDEHTMLPart::findFrameParent( KParts::ReadOnlyPart *callingPart, const TQString &f, tdehtml::ChildFrame **childFrame ) { #ifdef DEBUG_FINDFRAME - kdDebug(6050) << "KHTMLPart::findFrameParent: this = " << this << " URL = " << m_url << " name = " << name() << " findFrameParent( " << f << " )" << endl; + kdDebug(6050) << "TDEHTMLPart::findFrameParent: this = " << this << " URL = " << m_url << " name = " << name() << " findFrameParent( " << f << " )" << endl; #endif // Check access - KHTMLPart* const callingHtmlPart = dynamic_cast<KHTMLPart *>(callingPart); + TDEHTMLPart* const callingHtmlPart = dynamic_cast<TDEHTMLPart *>(callingPart); if (!checkFrameAccess(callingHtmlPart)) return 0; @@ -5229,7 +5229,7 @@ KHTMLPart::findFrameParent( KParts::ReadOnlyPart *callingPart, const TQString &f if ( it != end ) { #ifdef DEBUG_FINDFRAME - kdDebug(6050) << "KHTMLPart::findFrameParent: FOUND!" << endl; + kdDebug(6050) << "TDEHTMLPart::findFrameParent: FOUND!" << endl; #endif if (childFrame) *childFrame = *it; @@ -5240,9 +5240,9 @@ KHTMLPart::findFrameParent( KParts::ReadOnlyPart *callingPart, const TQString &f for (; it != end; ++it ) { KParts::ReadOnlyPart* const p = (*it)->m_part; - if ( p && p->inherits( "KHTMLPart" )) + if ( p && p->inherits( "TDEHTMLPart" )) { - KHTMLPart* const frameParent = static_cast<KHTMLPart*>(p)->findFrameParent(callingPart, f, childFrame); + TDEHTMLPart* const frameParent = static_cast<TDEHTMLPart*>(p)->findFrameParent(callingPart, f, childFrame); if (frameParent) return frameParent; } @@ -5251,41 +5251,41 @@ KHTMLPart::findFrameParent( KParts::ReadOnlyPart *callingPart, const TQString &f } -KHTMLPart *KHTMLPart::findFrame( const TQString &f ) +TDEHTMLPart *TDEHTMLPart::findFrame( const TQString &f ) { tdehtml::ChildFrame *childFrame; - KHTMLPart *parentFrame = findFrameParent(this, f, &childFrame); + TDEHTMLPart *parentFrame = findFrameParent(this, f, &childFrame); if (parentFrame) { KParts::ReadOnlyPart *p = childFrame->m_part; - if ( p && p->inherits( "KHTMLPart" )) - return static_cast<KHTMLPart *>(p); + if ( p && p->inherits( "TDEHTMLPart" )) + return static_cast<TDEHTMLPart *>(p); } return 0; } -KParts::ReadOnlyPart *KHTMLPart::findFramePart(const TQString &f) +KParts::ReadOnlyPart *TDEHTMLPart::findFramePart(const TQString &f) { tdehtml::ChildFrame *childFrame; return findFrameParent(this, f, &childFrame) ? static_cast<KParts::ReadOnlyPart *>(childFrame->m_part) : 0L; } -KParts::ReadOnlyPart *KHTMLPart::currentFrame() const +KParts::ReadOnlyPart *TDEHTMLPart::currentFrame() const { KParts::ReadOnlyPart* part = (KParts::ReadOnlyPart*)(this); // Find active part in our frame manager, in case we are a frameset // and keep doing that (in case of nested framesets). // Just realized we could also do this recursively, calling part->currentFrame()... - while ( part && part->inherits("KHTMLPart") && - static_cast<KHTMLPart *>(part)->d->m_frames.count() > 0 ) { - KHTMLPart* frameset = static_cast<KHTMLPart *>(part); + while ( part && part->inherits("TDEHTMLPart") && + static_cast<TDEHTMLPart *>(part)->d->m_frames.count() > 0 ) { + TDEHTMLPart* frameset = static_cast<TDEHTMLPart *>(part); part = static_cast<KParts::ReadOnlyPart *>(frameset->partManager()->activePart()); if ( !part ) return frameset; } return part; } -bool KHTMLPart::frameExists( const TQString &frameName ) +bool TDEHTMLPart::frameExists( const TQString &frameName ) { ConstFrameIt it = d->m_frames.find( frameName ); if ( it == d->m_frames.end() ) @@ -5297,9 +5297,9 @@ bool KHTMLPart::frameExists( const TQString &frameName ) return (!(*it)->m_frame.isNull()); } -KJSProxy *KHTMLPart::framejScript(KParts::ReadOnlyPart *framePart) +KJSProxy *TDEHTMLPart::framejScript(KParts::ReadOnlyPart *framePart) { - KHTMLPart* const kp = ::tqqt_cast<KHTMLPart*>(framePart); + TDEHTMLPart* const kp = ::tqqt_cast<TDEHTMLPart*>(framePart); if (kp) return kp->jScript(); @@ -5315,19 +5315,19 @@ KJSProxy *KHTMLPart::framejScript(KParts::ReadOnlyPart *framePart) return 0L; } -KHTMLPart *KHTMLPart::parentPart() +TDEHTMLPart *TDEHTMLPart::parentPart() { - return ::tqqt_cast<KHTMLPart *>( parent() ); + return ::tqqt_cast<TDEHTMLPart *>( parent() ); } -tdehtml::ChildFrame *KHTMLPart::recursiveFrameRequest( KHTMLPart *callingHtmlPart, const KURL &url, +tdehtml::ChildFrame *TDEHTMLPart::recursiveFrameRequest( TDEHTMLPart *callingHtmlPart, const KURL &url, const KParts::URLArgs &args, bool callParent ) { #ifdef DEBUG_FINDFRAME - kdDebug( 6050 ) << "KHTMLPart::recursiveFrameRequest this = " << this << ", frame = " << args.frameName << ", url = " << url << endl; + kdDebug( 6050 ) << "TDEHTMLPart::recursiveFrameRequest this = " << this << ", frame = " << args.frameName << ", url = " << url << endl; #endif tdehtml::ChildFrame *childFrame; - KHTMLPart *childPart = findFrameParent(callingHtmlPart, args.frameName, &childFrame); + TDEHTMLPart *childPart = findFrameParent(callingHtmlPart, args.frameName, &childFrame); if (childPart) { if (childPart == this) @@ -5352,7 +5352,7 @@ tdehtml::ChildFrame *KHTMLPart::recursiveFrameRequest( KHTMLPart *callingHtmlPar static int s_saveStateIndentLevel = 0; #endif -void KHTMLPart::saveState( TQDataStream &stream ) +void TDEHTMLPart::saveState( TQDataStream &stream ) { #ifndef NDEBUG TQString indent = TQString().leftJustify( s_saveStateIndentLevel * 4, ' ' ); @@ -5438,7 +5438,7 @@ void KHTMLPart::saveState( TQDataStream &stream ) #endif } -void KHTMLPart::restoreState( TQDataStream &stream ) +void TDEHTMLPart::restoreState( TQDataStream &stream ) { KURL u; TQ_INT32 xOffset, yOffset, wContents, hContents, mWidth, mHeight; @@ -5610,7 +5610,7 @@ void KHTMLPart::restoreState( TQDataStream &stream ) args.docState = docState; d->m_extension->setURLArgs( args ); - if (!KHTMLPageCache::self()->isComplete(d->m_cacheId)) + if (!TDEHTMLPageCache::self()->isComplete(d->m_cacheId)) { d->m_restored = true; openURL( u ); @@ -5624,29 +5624,29 @@ void KHTMLPart::restoreState( TQDataStream &stream ) } -void KHTMLPart::show() +void TDEHTMLPart::show() { if ( d->m_view ) d->m_view->show(); } -void KHTMLPart::hide() +void TDEHTMLPart::hide() { if ( d->m_view ) d->m_view->hide(); } -DOM::Node KHTMLPart::nodeUnderMouse() const +DOM::Node TDEHTMLPart::nodeUnderMouse() const { return d->m_view->nodeUnderMouse(); } -DOM::Node KHTMLPart::nonSharedNodeUnderMouse() const +DOM::Node TDEHTMLPart::nonSharedNodeUnderMouse() const { return d->m_view->nonSharedNodeUnderMouse(); } -void KHTMLPart::emitSelectionChanged() +void TDEHTMLPart::emitSelectionChanged() { emit d->m_extension->enableAction( "copy", hasSelection() ); if ( d->m_findDialog ) @@ -5656,7 +5656,7 @@ void KHTMLPart::emitSelectionChanged() emit selectionChanged(); } -int KHTMLPart::zoomFactor() const +int TDEHTMLPart::zoomFactor() const { return d->m_zoomFactor; } @@ -5671,27 +5671,27 @@ static const int maxZoom = 300; extern const int KDE_NO_EXPORT fastZoomSizes[] = { 20, 50, 75, 90, 100, 120, 150, 200, 300 }; extern const int KDE_NO_EXPORT fastZoomSizeCount = sizeof fastZoomSizes / sizeof fastZoomSizes[0]; -void KHTMLPart::slotIncZoom() +void TDEHTMLPart::slotIncZoom() { zoomIn(zoomSizes, zoomSizeCount); } -void KHTMLPart::slotDecZoom() +void TDEHTMLPart::slotDecZoom() { zoomOut(zoomSizes, zoomSizeCount); } -void KHTMLPart::slotIncZoomFast() +void TDEHTMLPart::slotIncZoomFast() { zoomIn(fastZoomSizes, fastZoomSizeCount); } -void KHTMLPart::slotDecZoomFast() +void TDEHTMLPart::slotDecZoomFast() { zoomOut(fastZoomSizes, fastZoomSizeCount); } -void KHTMLPart::zoomIn(const int stepping[], int count) +void TDEHTMLPart::zoomIn(const int stepping[], int count) { int zoomFactor = d->m_zoomFactor; @@ -5706,7 +5706,7 @@ void KHTMLPart::zoomIn(const int stepping[], int count) } } -void KHTMLPart::zoomOut(const int stepping[], int count) +void TDEHTMLPart::zoomOut(const int stepping[], int count) { int zoomFactor = d->m_zoomFactor; if (zoomFactor > minZoom) { @@ -5720,7 +5720,7 @@ void KHTMLPart::zoomOut(const int stepping[], int count) } } -void KHTMLPart::setZoomFactor (int percent) +void TDEHTMLPart::setZoomFactor (int percent) { if (percent < minZoom) percent = minZoom; if (percent > maxZoom) percent = maxZoom; @@ -5738,9 +5738,9 @@ void KHTMLPart::setZoomFactor (int percent) ConstFrameIt it = d->m_frames.begin(); const ConstFrameIt end = d->m_frames.end(); for (; it != end; ++it ) - if ( !( *it )->m_part.isNull() && (*it)->m_part->inherits( "KHTMLPart" ) ) { + if ( !( *it )->m_part.isNull() && (*it)->m_part->inherits( "TDEHTMLPart" ) ) { KParts::ReadOnlyPart* const p = ( *it )->m_part; - static_cast<KHTMLPart*>( p )->setZoomFactor(d->m_zoomFactor); + static_cast<TDEHTMLPart*>( p )->setZoomFactor(d->m_zoomFactor); } if ( d->m_guiProfile == BrowserViewGUI ) { @@ -5749,7 +5749,7 @@ void KHTMLPart::setZoomFactor (int percent) } } -void KHTMLPart::slotZoomView( int delta ) +void TDEHTMLPart::slotZoomView( int delta ) { if ( delta < 0 ) slotIncZoom(); @@ -5757,7 +5757,7 @@ void KHTMLPart::slotZoomView( int delta ) slotDecZoom(); } -void KHTMLPart::setStatusBarText( const TQString& text, StatusBarPriority p) +void TDEHTMLPart::setStatusBarText( const TQString& text, StatusBarPriority p) { if (!d->m_statusMessagesEnabled) return; @@ -5781,32 +5781,32 @@ void KHTMLPart::setStatusBarText( const TQString& text, StatusBarPriority p) } -void KHTMLPart::setJSStatusBarText( const TQString &text ) +void TDEHTMLPart::setJSStatusBarText( const TQString &text ) { setStatusBarText(text, BarOverrideText); } -void KHTMLPart::setJSDefaultStatusBarText( const TQString &text ) +void TDEHTMLPart::setJSDefaultStatusBarText( const TQString &text ) { setStatusBarText(text, BarDefaultText); } -TQString KHTMLPart::jsStatusBarText() const +TQString TDEHTMLPart::jsStatusBarText() const { return d->m_statusBarText[BarOverrideText]; } -TQString KHTMLPart::jsDefaultStatusBarText() const +TQString TDEHTMLPart::jsDefaultStatusBarText() const { return d->m_statusBarText[BarDefaultText]; } -TQString KHTMLPart::referrer() const +TQString TDEHTMLPart::referrer() const { return d->m_referrer; } -TQString KHTMLPart::pageReferrer() const +TQString TDEHTMLPart::pageReferrer() const { KURL referrerURL = KURL( d->m_pageReferrer ); if (referrerURL.isValid()) @@ -5827,7 +5827,7 @@ TQString KHTMLPart::pageReferrer() const } -TQString KHTMLPart::lastModified() const +TQString TDEHTMLPart::lastModified() const { if ( d->m_lastModified.isEmpty() && m_url.isLocalFile() ) { // Local file: set last-modified from the file's mtime. @@ -5836,11 +5836,11 @@ TQString KHTMLPart::lastModified() const TQDateTime lastModif = TQFileInfo( m_url.path() ).lastModified(); d->m_lastModified = lastModif.toString( Qt::LocalDate ); } - //kdDebug(6050) << "KHTMLPart::lastModified: " << d->m_lastModified << endl; + //kdDebug(6050) << "TDEHTMLPart::lastModified: " << d->m_lastModified << endl; return d->m_lastModified; } -void KHTMLPart::slotLoadImages() +void TDEHTMLPart::slotLoadImages() { if (d->m_doc ) d->m_doc->docLoader()->setAutoloadImages( !d->m_doc->docLoader()->autoloadImages() ); @@ -5848,15 +5848,15 @@ void KHTMLPart::slotLoadImages() ConstFrameIt it = d->m_frames.begin(); const ConstFrameIt end = d->m_frames.end(); for (; it != end; ++it ) - if ( !( *it )->m_part.isNull() && (*it)->m_part->inherits( "KHTMLPart" ) ) { + if ( !( *it )->m_part.isNull() && (*it)->m_part->inherits( "TDEHTMLPart" ) ) { KParts::ReadOnlyPart* const p = ( *it )->m_part; - static_cast<KHTMLPart*>( p )->slotLoadImages(); + static_cast<TDEHTMLPart*>( p )->slotLoadImages(); } } -void KHTMLPart::reparseConfiguration() +void TDEHTMLPart::reparseConfiguration() { - KHTMLSettings *settings = KHTMLFactory::defaultHTMLSettings(); + TDEHTMLSettings *settings = TDEHTMLFactory::defaultHTMLSettings(); settings->init(); setAutoloadImages( settings->autoLoadImages() ); @@ -5872,18 +5872,18 @@ void KHTMLPart::reparseConfiguration() d->m_metaRefreshEnabled = settings->isAutoDelayedActionsEnabled (); delete d->m_settings; - d->m_settings = new KHTMLSettings(*KHTMLFactory::defaultHTMLSettings()); + d->m_settings = new TDEHTMLSettings(*TDEHTMLFactory::defaultHTMLSettings()); TQApplication::setOverrideCursor( tqwaitCursor ); tdehtml::CSSStyleSelector::reparseConfiguration(); if(d->m_doc) d->m_doc->updateStyleSelector(); TQApplication::restoreOverrideCursor(); - if (KHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled()) + if (TDEHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled()) runAdFilter(); } -TQStringList KHTMLPart::frameNames() const +TQStringList TDEHTMLPart::frameNames() const { TQStringList res; @@ -5896,7 +5896,7 @@ TQStringList KHTMLPart::frameNames() const return res; } -TQPtrList<KParts::ReadOnlyPart> KHTMLPart::frames() const +TQPtrList<KParts::ReadOnlyPart> TDEHTMLPart::frames() const { TQPtrList<KParts::ReadOnlyPart> res; @@ -5909,9 +5909,9 @@ TQPtrList<KParts::ReadOnlyPart> KHTMLPart::frames() const return res; } -bool KHTMLPart::openURLInFrame( const KURL &url, const KParts::URLArgs &urlArgs ) +bool TDEHTMLPart::openURLInFrame( const KURL &url, const KParts::URLArgs &urlArgs ) { - kdDebug( 6050 ) << this << "KHTMLPart::openURLInFrame " << url << endl; + kdDebug( 6050 ) << this << "TDEHTMLPart::openURLInFrame " << url << endl; FrameIt it = d->m_frames.find( urlArgs.frameName ); if ( it == d->m_frames.end() ) @@ -5926,17 +5926,17 @@ bool KHTMLPart::openURLInFrame( const KURL &url, const KParts::URLArgs &urlArgs return true; } -void KHTMLPart::setDNDEnabled( bool b ) +void TDEHTMLPart::setDNDEnabled( bool b ) { d->m_bDnd = b; } -bool KHTMLPart::dndEnabled() const +bool TDEHTMLPart::dndEnabled() const { return d->m_bDnd; } -void KHTMLPart::customEvent( TQCustomEvent *event ) +void TDEHTMLPart::customEvent( TQCustomEvent *event ) { if ( tdehtml::MousePressEvent::test( event ) ) { @@ -6041,7 +6041,7 @@ static bool lastRunAt(tdehtml::RenderObject *renderNode, int y, NodeImpl *&endNo } } -void KHTMLPart::tdehtmlMousePressEvent( tdehtml::MousePressEvent *event ) +void TDEHTMLPart::tdehtmlMousePressEvent( tdehtml::MousePressEvent *event ) { DOM::DOMString url = event->url(); TQMouseEvent *_mouse = event->qmouseEvent(); @@ -6062,7 +6062,7 @@ void KHTMLPart::tdehtmlMousePressEvent( tdehtml::MousePressEvent *event ) { d->m_bMousePressed = true; -#ifndef KHTML_NO_SELECTION +#ifndef TDEHTML_NO_SELECTION if ( _mouse->button() == Qt::LeftButton ) { if ( (!d->m_strSelectedURL.isNull() && !isEditable()) @@ -6076,27 +6076,27 @@ void KHTMLPart::tdehtmlMousePressEvent( tdehtml::MousePressEvent *event ) event->absX()-innerNode.handle()->renderer()->xPos(), event->absY()-innerNode.handle()->renderer()->yPos(), node, offset, state ); d->m_extendMode = d->ExtendByChar; -#ifdef KHTML_NO_CARET +#ifdef TDEHTML_NO_CARET d->m_selectionStart = node; d->m_startOffset = offset; //if ( node ) - // kdDebug(6005) << "KHTMLPart::tdehtmlMousePressEvent selectionStart=" << d->m_selectionStart.handle()->renderer() + // kdDebug(6005) << "TDEHTMLPart::tdehtmlMousePressEvent selectionStart=" << d->m_selectionStart.handle()->renderer() // << " offset=" << d->m_startOffset << endl; //else - // kdDebug(6005) << "KHTML::tdehtmlMousePressEvent selectionStart=(nil)" << endl; + // kdDebug(6005) << "TDEHTML::tdehtmlMousePressEvent selectionStart=(nil)" << endl; d->m_selectionEnd = d->m_selectionStart; d->m_endOffset = d->m_startOffset; d->m_doc->clearSelection(); -#else // KHTML_NO_CARET +#else // TDEHTML_NO_CARET d->m_view->moveCaretTo(node, offset, (_mouse->state() & ShiftButton) == 0); -#endif // KHTML_NO_CARET +#endif // TDEHTML_NO_CARET d->m_initialNode = d->m_selectionStart; d->m_initialOffset = d->m_startOffset; // kdDebug(6000) << "press: initOfs " << d->m_initialOffset << endl; } else { -#ifndef KHTML_NO_CARET +#ifndef TDEHTML_NO_CARET // simply leave it. Is this a good idea? #else d->m_selectionStart = DOM::Node(); @@ -6121,7 +6121,7 @@ void KHTMLPart::tdehtmlMousePressEvent( tdehtml::MousePressEvent *event ) } } -void KHTMLPart::tdehtmlMouseDoubleClickEvent( tdehtml::MouseDoubleClickEvent *event ) +void TDEHTMLPart::tdehtmlMouseDoubleClickEvent( tdehtml::MouseDoubleClickEvent *event ) { TQMouseEvent *_mouse = event->qmouseEvent(); if ( _mouse->button() == Qt::LeftButton ) @@ -6175,7 +6175,7 @@ void KHTMLPart::tdehtmlMouseDoubleClickEvent( tdehtml::MouseDoubleClickEvent *ev d->m_doc ->setSelection(d->m_selectionStart.handle(),d->m_startOffset, d->m_selectionEnd.handle(),d->m_endOffset); -#ifndef KHTML_NO_CARET +#ifndef TDEHTML_NO_CARET bool v = d->m_view->placeCaret(); emitCaretPositionChanged(v ? d->caretNode() : 0, d->caretOffset()); #endif @@ -6185,7 +6185,7 @@ void KHTMLPart::tdehtmlMouseDoubleClickEvent( tdehtml::MouseDoubleClickEvent *ev } } -void KHTMLPart::extendSelection( DOM::NodeImpl* node, long offset, DOM::Node& selectionNode, long& selectionOffset, bool right, bool selectLines ) +void TDEHTMLPart::extendSelection( DOM::NodeImpl* node, long offset, DOM::Node& selectionNode, long& selectionOffset, bool right, bool selectLines ) { tdehtml::RenderObject* obj = node->renderer(); @@ -6289,11 +6289,11 @@ void KHTMLPart::extendSelection( DOM::NodeImpl* node, long offset, DOM::Node& se if (right) ++selectionOffset; } -#ifndef KHTML_NO_SELECTION -void KHTMLPart::extendSelectionTo(int x, int y, int absX, int absY, const DOM::Node &innerNode) +#ifndef TDEHTML_NO_SELECTION +void TDEHTMLPart::extendSelectionTo(int x, int y, int absX, int absY, const DOM::Node &innerNode) { int offset; - //kdDebug(6000) << "KHTMLPart::tdehtmlMouseMoveEvent x=" << event->x() << " y=" << event->y() << endl; + //kdDebug(6000) << "TDEHTMLPart::tdehtmlMouseMoveEvent x=" << event->x() << " y=" << event->y() << endl; DOM::NodeImpl* node=0; tdehtml::RenderObject::SelPointState state; innerNode.handle()->renderer()->checkSelectionPoint( x, y, @@ -6357,21 +6357,21 @@ void KHTMLPart::extendSelectionTo(int x, int y, int absX, int absY, const DOM::N ->setSelection(d->m_selectionEnd.handle(),d->m_endOffset, d->m_selectionStart.handle(),d->m_startOffset); } -#ifndef KHTML_NO_CARET +#ifndef TDEHTML_NO_CARET d->m_view->placeCaret(); #endif } -bool KHTMLPart::isExtendingSelection() const +bool TDEHTMLPart::isExtendingSelection() const { // This is it, the whole detection. tdehtmlMousePressEvent only sets this // on LMB or MMB, but never on RMB. As text selection doesn't work for MMB, // it's sufficient to only rely on this flag to detect selection extension. return d->m_bMousePressed; } -#endif // KHTML_NO_SELECTION +#endif // TDEHTML_NO_SELECTION -void KHTMLPart::tdehtmlMouseMoveEvent( tdehtml::MouseMoveEvent *event ) +void TDEHTMLPart::tdehtmlMouseMoveEvent( tdehtml::MouseMoveEvent *event ) { TQMouseEvent *_mouse = event->qmouseEvent(); @@ -6490,7 +6490,7 @@ void KHTMLPart::tdehtmlMouseMoveEvent( tdehtml::MouseMoveEvent *event ) } } else { -#ifndef KHTML_NO_SELECTION +#ifndef TDEHTML_NO_SELECTION // selection stuff if( d->m_bMousePressed && innerNode.handle() && innerNode.handle()->renderer() && ( (_mouse->state() & Qt::LeftButton) != 0 )) { @@ -6510,7 +6510,7 @@ void KHTMLPart::tdehtmlMouseMoveEvent( tdehtml::MouseMoveEvent *event ) } -void KHTMLPart::tdehtmlMouseReleaseEvent( tdehtml::MouseReleaseEvent *event ) +void TDEHTMLPart::tdehtmlMouseReleaseEvent( tdehtml::MouseReleaseEvent *event ) { DOM::Node innerNode = event->innerNode(); d->m_mousePressNode = DOM::Node(); @@ -6535,21 +6535,21 @@ void KHTMLPart::tdehtmlMouseReleaseEvent( tdehtml::MouseReleaseEvent *event ) } #ifndef QT_NO_CLIPBOARD if ((d->m_guiProfile == BrowserViewGUI) && (_mouse->button() == Qt::MidButton) && (event->url().isNull())) { - kdDebug( 6050 ) << "KHTMLPart::tdehtmlMouseReleaseEvent() MMB shouldOpen=" + kdDebug( 6050 ) << "TDEHTMLPart::tdehtmlMouseReleaseEvent() MMB shouldOpen=" << d->m_bOpenMiddleClick << endl; if (d->m_bOpenMiddleClick) { - KHTMLPart *p = this; + TDEHTMLPart *p = this; while (p->parentPart()) p = p->parentPart(); p->d->m_extension->pasteRequest(); } } #endif -#ifndef KHTML_NO_SELECTION +#ifndef TDEHTML_NO_SELECTION // delete selection in case start and end position are at the same point if(d->m_selectionStart == d->m_selectionEnd && d->m_startOffset == d->m_endOffset) { -#ifndef KHTML_NO_CARET +#ifndef TDEHTML_NO_CARET d->m_extendAtEnd = true; #else d->m_selectionStart = 0; @@ -6602,7 +6602,7 @@ void KHTMLPart::tdehtmlMouseReleaseEvent( tdehtml::MouseReleaseEvent *event ) d->m_startBeforeEnd = true; d->m_extendAtEnd = !d->m_extendAtEnd; } -#ifndef KHTML_NO_CARET +#ifndef TDEHTML_NO_CARET bool v = d->m_view->placeCaret(); emitCaretPositionChanged(v ? d->caretNode() : 0, d->caretOffset()); #endif @@ -6624,11 +6624,11 @@ void KHTMLPart::tdehtmlMouseReleaseEvent( tdehtml::MouseReleaseEvent *event ) } -void KHTMLPart::tdehtmlDrawContentsEvent( tdehtml::DrawContentsEvent * ) +void TDEHTMLPart::tdehtmlDrawContentsEvent( tdehtml::DrawContentsEvent * ) { } -void KHTMLPart::guiActivateEvent( KParts::GUIActivateEvent *event ) +void TDEHTMLPart::guiActivateEvent( KParts::GUIActivateEvent *event ) { if ( event->activated() ) { @@ -6644,7 +6644,7 @@ void KHTMLPart::guiActivateEvent( KParts::GUIActivateEvent *event ) } } -void KHTMLPart::slotPrintFrame() +void TDEHTMLPart::slotPrintFrame() { if ( d->m_frames.count() == 0 ) return; @@ -6667,20 +6667,20 @@ void KHTMLPart::slotPrintFrame() } } -void KHTMLPart::slotSelectAll() +void TDEHTMLPart::slotSelectAll() { KParts::ReadOnlyPart *part = currentFrame(); - if (part && part->inherits("KHTMLPart")) - static_cast<KHTMLPart *>(part)->selectAll(); + if (part && part->inherits("TDEHTMLPart")) + static_cast<TDEHTMLPart *>(part)->selectAll(); } -void KHTMLPart::startAutoScroll() +void TDEHTMLPart::startAutoScroll() { connect(&d->m_scrollTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotAutoScroll() )); d->m_scrollTimer.start(100, false); } -void KHTMLPart::stopAutoScroll() +void TDEHTMLPart::stopAutoScroll() { disconnect(&d->m_scrollTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotAutoScroll() )); if (d->m_scrollTimer.isActive()) @@ -6688,7 +6688,7 @@ void KHTMLPart::stopAutoScroll() } -void KHTMLPart::slotAutoScroll() +void TDEHTMLPart::slotAutoScroll() { if (d->m_view) d->m_view->doAutoScroll(); @@ -6696,7 +6696,7 @@ void KHTMLPart::slotAutoScroll() stopAutoScroll(); // Safety } -void KHTMLPart::runAdFilter() +void TDEHTMLPart::runAdFilter() { if ( parentPart() ) parentPart()->runAdFilter(); @@ -6709,12 +6709,12 @@ void KHTMLPart::runAdFilter() if ( it.current()->type() == tdehtml::CachedObject::Image ) { tdehtml::CachedImage *image = static_cast<tdehtml::CachedImage *>(it.current()); bool wasBlocked = image->m_wasBlocked; - image->m_wasBlocked = KHTMLFactory::defaultHTMLSettings()->isAdFiltered( d->m_doc->completeURL( (*it).url().string() ) ); + image->m_wasBlocked = TDEHTMLFactory::defaultHTMLSettings()->isAdFiltered( d->m_doc->completeURL( (*it).url().string() ) ); if ( image->m_wasBlocked != wasBlocked ) image->do_notify(image->pixmap(), image->valid_rect()); } - if ( KHTMLFactory::defaultHTMLSettings()->isHideAdsEnabled() ) { + if ( TDEHTMLFactory::defaultHTMLSettings()->isHideAdsEnabled() ) { for ( NodeImpl *nextNode, *node = d->m_doc; node; node = nextNode ) { // We might be deleting 'node' shortly. @@ -6724,7 +6724,7 @@ void KHTMLPart::runAdFilter() node->id() == ID_IFRAME || (node->id() == ID_INPUT && static_cast<HTMLInputElementImpl *>(node)->inputType() == HTMLInputElementImpl::IMAGE )) { - if ( KHTMLFactory::defaultHTMLSettings()->isAdFiltered( d->m_doc->completeURL( static_cast<ElementImpl *>(node)->getAttribute(ATTR_SRC).string() ) ) ) + if ( TDEHTMLFactory::defaultHTMLSettings()->isAdFiltered( d->m_doc->completeURL( static_cast<ElementImpl *>(node)->getAttribute(ATTR_SRC).string() ) ) ) { // We found an IMG, IFRAME or INPUT (of type IMAGE) matching a filter. node->ref(); @@ -6741,7 +6741,7 @@ void KHTMLPart::runAdFilter() } } -void KHTMLPart::selectAll() +void TDEHTMLPart::selectAll() { if (!d->m_doc) return; @@ -6809,7 +6809,7 @@ void KHTMLPart::selectAll() emitSelectionChanged(); } -bool KHTMLPart::checkLinkSecurity(const KURL &linkURL,const TQString &message, const TQString &button) +bool TDEHTMLPart::checkLinkSecurity(const KURL &linkURL,const TQString &message, const TQString &button) { bool linkAllowed = true; @@ -6843,13 +6843,13 @@ bool KHTMLPart::checkLinkSecurity(const KURL &linkURL,const TQString &message, c return true; } -void KHTMLPart::slotPartRemoved( KParts::Part *part ) +void TDEHTMLPart::slotPartRemoved( KParts::Part *part ) { -// kdDebug(6050) << "KHTMLPart::slotPartRemoved " << part << endl; +// kdDebug(6050) << "TDEHTMLPart::slotPartRemoved " << part << endl; if ( part == d->m_activeFrame ) { d->m_activeFrame = 0L; - if ( !part->inherits( "KHTMLPart" ) ) + if ( !part->inherits( "TDEHTMLPart" ) ) { if (factory()) { factory()->removeClient( part ); @@ -6861,16 +6861,16 @@ void KHTMLPart::slotPartRemoved( KParts::Part *part ) } } -void KHTMLPart::slotActiveFrameChanged( KParts::Part *part ) +void TDEHTMLPart::slotActiveFrameChanged( KParts::Part *part ) { -// kdDebug(6050) << "KHTMLPart::slotActiveFrameChanged this=" << this << "part=" << part << endl; +// kdDebug(6050) << "TDEHTMLPart::slotActiveFrameChanged this=" << this << "part=" << part << endl; if ( part == this ) { kdError(6050) << "strange error! we activated ourselves" << endl; assert( false ); return; } -// kdDebug(6050) << "KHTMLPart::slotActiveFrameChanged d->m_activeFrame=" << d->m_activeFrame << endl; +// kdDebug(6050) << "TDEHTMLPart::slotActiveFrameChanged d->m_activeFrame=" << d->m_activeFrame << endl; if ( d->m_activeFrame && d->m_activeFrame->widget() && d->m_activeFrame->widget()->inherits( TQFRAME_OBJECT_NAME_STRING ) ) { TQFrame *frame = static_cast<TQFrame *>( d->m_activeFrame->widget() ); @@ -6881,14 +6881,14 @@ void KHTMLPart::slotActiveFrameChanged( KParts::Part *part ) } } - if( d->m_activeFrame && !d->m_activeFrame->inherits( "KHTMLPart" ) ) + if( d->m_activeFrame && !d->m_activeFrame->inherits( "TDEHTMLPart" ) ) { if (factory()) { factory()->removeClient( d->m_activeFrame ); } removeChildClient( d->m_activeFrame ); } - if( part && !part->inherits( "KHTMLPart" ) ) + if( part && !part->inherits( "TDEHTMLPart" ) ) { if (factory()) { factory()->addClient( part ); @@ -6916,7 +6916,7 @@ void KHTMLPart::slotActiveFrameChanged( KParts::Part *part ) d->m_extension->setExtensionProxy( KParts::BrowserExtension::childObject( d->m_activeFrame ) ); } -void KHTMLPart::setActiveNode(const DOM::Node &node) +void TDEHTMLPart::setActiveNode(const DOM::Node &node) { if (!d->m_doc || !d->m_view) return; @@ -6930,12 +6930,12 @@ void KHTMLPart::setActiveNode(const DOM::Node &node) d->m_view->ensureVisible(rect.left(), rect.top()); } -DOM::Node KHTMLPart::activeNode() const +DOM::Node TDEHTMLPart::activeNode() const { return DOM::Node(d->m_doc?d->m_doc->focusNode():0); } -DOM::EventListener *KHTMLPart::createHTMLEventListener( TQString code, TQString name, NodeImpl* node ) +DOM::EventListener *TDEHTMLPart::createHTMLEventListener( TQString code, TQString name, NodeImpl* node ) { KJSProxy *proxy = jScript(); @@ -6945,64 +6945,64 @@ DOM::EventListener *KHTMLPart::createHTMLEventListener( TQString code, TQString return proxy->createHTMLEventHandler( m_url.url(), name, code, node ); } -KHTMLPart *KHTMLPart::opener() +TDEHTMLPart *TDEHTMLPart::opener() { return d->m_opener; } -void KHTMLPart::setOpener(KHTMLPart *_opener) +void TDEHTMLPart::setOpener(TDEHTMLPart *_opener) { d->m_opener = _opener; } -bool KHTMLPart::openedByJS() +bool TDEHTMLPart::openedByJS() { return d->m_openedByJS; } -void KHTMLPart::setOpenedByJS(bool _openedByJS) +void TDEHTMLPart::setOpenedByJS(bool _openedByJS) { d->m_openedByJS = _openedByJS; } -void KHTMLPart::preloadStyleSheet(const TQString &url, const TQString &stylesheet) +void TDEHTMLPart::preloadStyleSheet(const TQString &url, const TQString &stylesheet) { tdehtml::Cache::preloadStyleSheet(url, stylesheet); } -void KHTMLPart::preloadScript(const TQString &url, const TQString &script) +void TDEHTMLPart::preloadScript(const TQString &url, const TQString &script) { tdehtml::Cache::preloadScript(url, script); } -TQCString KHTMLPart::dcopObjectId() const +TQCString TDEHTMLPart::dcopObjectId() const { TQCString id; id.sprintf("html-widget%d", d->m_dcop_counter); return id; } -long KHTMLPart::cacheId() const +long TDEHTMLPart::cacheId() const { return d->m_cacheId; } -bool KHTMLPart::restored() const +bool TDEHTMLPart::restored() const { return d->m_restored; } -bool KHTMLPart::pluginPageQuestionAsked(const TQString& mimetype) const +bool TDEHTMLPart::pluginPageQuestionAsked(const TQString& mimetype) const { // parentPart() should be const! - KHTMLPart* parent = const_cast<KHTMLPart *>(this)->parentPart(); + TDEHTMLPart* parent = const_cast<TDEHTMLPart *>(this)->parentPart(); if ( parent ) return parent->pluginPageQuestionAsked(mimetype); return d->m_pluginPageQuestionAsked.contains(mimetype); } -void KHTMLPart::setPluginPageQuestionAsked(const TQString& mimetype) +void TDEHTMLPart::setPluginPageQuestionAsked(const TQString& mimetype) { if ( parentPart() ) parentPart()->setPluginPageQuestionAsked(mimetype); @@ -7010,7 +7010,7 @@ void KHTMLPart::setPluginPageQuestionAsked(const TQString& mimetype) d->m_pluginPageQuestionAsked.append(mimetype); } -void KHTMLPart::slotAutomaticDetectionLanguage( int _id ) +void TDEHTMLPart::slotAutomaticDetectionLanguage( int _id ) { d->m_automaticDetection->setItemChecked( _id, true ); @@ -7079,7 +7079,7 @@ void KHTMLPart::slotAutomaticDetectionLanguage( int _id ) d->m_paSetEncoding->popupMenu()->setItemChecked( d->m_paSetEncoding->popupMenu()->idAt( 2 ), false ); } -tdehtml::Decoder *KHTMLPart::createDecoder() +tdehtml::Decoder *TDEHTMLPart::createDecoder() { tdehtml::Decoder *dec = new tdehtml::Decoder(); if( !d->m_encoding.isNull() ) @@ -7099,11 +7099,11 @@ tdehtml::Decoder *KHTMLPart::createDecoder() return dec; } -void KHTMLPart::emitCaretPositionChanged(const DOM::Node &node, long offset) { +void TDEHTMLPart::emitCaretPositionChanged(const DOM::Node &node, long offset) { emit caretPositionChanged(node, offset); } -void KHTMLPart::restoreScrollPosition() +void TDEHTMLPart::restoreScrollPosition() { KParts::URLArgs args = d->m_extension->urlArgs(); @@ -7127,10 +7127,10 @@ void KHTMLPart::restoreScrollPosition() } -void KHTMLPart::openWallet(DOM::HTMLFormElementImpl *form) +void TDEHTMLPart::openWallet(DOM::HTMLFormElementImpl *form) { -#ifndef KHTML_NO_WALLET - KHTMLPart *p; +#ifndef TDEHTML_NO_WALLET + TDEHTMLPart *p; for (p = parentPart(); p && p->parentPart(); p = p->parentPart()) { } @@ -7158,21 +7158,21 @@ void KHTMLPart::openWallet(DOM::HTMLFormElementImpl *form) if (!d->m_wq) { KWallet::Wallet *wallet = KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), widget() ? widget()->topLevelWidget()->winId() : 0, KWallet::Wallet::Asynchronous); - d->m_wq = new KHTMLWalletQueue(this); + d->m_wq = new TDEHTMLWalletQueue(this); d->m_wq->wallet = wallet; connect(wallet, TQT_SIGNAL(walletOpened(bool)), d->m_wq, TQT_SLOT(walletOpened(bool))); connect(d->m_wq, TQT_SIGNAL(walletOpened(KWallet::Wallet*)), this, TQT_SLOT(walletOpened(KWallet::Wallet*))); } assert(form); - d->m_wq->callers.append(KHTMLWalletQueue::Caller(form, form->getDocument())); -#endif // KHTML_NO_WALLET + d->m_wq->callers.append(TDEHTMLWalletQueue::Caller(form, form->getDocument())); +#endif // TDEHTML_NO_WALLET } -void KHTMLPart::saveToWallet(const TQString& key, const TQMap<TQString,TQString>& data) +void TDEHTMLPart::saveToWallet(const TQString& key, const TQMap<TQString,TQString>& data) { -#ifndef KHTML_NO_WALLET - KHTMLPart *p; +#ifndef TDEHTML_NO_WALLET + TDEHTMLPart *p; for (p = parentPart(); p && p->parentPart(); p = p->parentPart()) { } @@ -7200,19 +7200,19 @@ void KHTMLPart::saveToWallet(const TQString& key, const TQMap<TQString,TQString> if (!d->m_wq) { KWallet::Wallet *wallet = KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), widget() ? widget()->topLevelWidget()->winId() : 0, KWallet::Wallet::Asynchronous); - d->m_wq = new KHTMLWalletQueue(this); + d->m_wq = new TDEHTMLWalletQueue(this); d->m_wq->wallet = wallet; connect(wallet, TQT_SIGNAL(walletOpened(bool)), d->m_wq, TQT_SLOT(walletOpened(bool))); connect(d->m_wq, TQT_SIGNAL(walletOpened(KWallet::Wallet*)), this, TQT_SLOT(walletOpened(KWallet::Wallet*))); } d->m_wq->savers.append(qMakePair(key, data)); -#endif // KHTML_NO_WALLET +#endif // TDEHTML_NO_WALLET } -void KHTMLPart::dequeueWallet(DOM::HTMLFormElementImpl *form) { -#ifndef KHTML_NO_WALLET - KHTMLPart *p; +void TDEHTMLPart::dequeueWallet(DOM::HTMLFormElementImpl *form) { +#ifndef TDEHTML_NO_WALLET + TDEHTMLPart *p; for (p = parentPart(); p && p->parentPart(); p = p->parentPart()) { } @@ -7223,14 +7223,14 @@ void KHTMLPart::dequeueWallet(DOM::HTMLFormElementImpl *form) { } if (d->m_wq) { - d->m_wq->callers.remove(KHTMLWalletQueue::Caller(form, form->getDocument())); + d->m_wq->callers.remove(TDEHTMLWalletQueue::Caller(form, form->getDocument())); } -#endif // KHTML_NO_WALLET +#endif // TDEHTML_NO_WALLET } -void KHTMLPart::walletOpened(KWallet::Wallet *wallet) { -#ifndef KHTML_NO_WALLET +void TDEHTMLPart::walletOpened(KWallet::Wallet *wallet) { +#ifndef TDEHTML_NO_WALLET assert(!d->m_wallet); assert(d->m_wq); @@ -7259,14 +7259,14 @@ void KHTMLPart::walletOpened(KWallet::Wallet *wallet) { TQToolTip::remove(d->m_statusBarWalletLabel); } TQToolTip::add(d->m_statusBarWalletLabel, i18n("The wallet '%1' is open and being used for form data and passwords.").arg(KWallet::Wallet::NetworkWallet())); -#endif // KHTML_NO_WALLET +#endif // TDEHTML_NO_WALLET } -KWallet::Wallet *KHTMLPart::wallet() +KWallet::Wallet *TDEHTMLPart::wallet() { -#ifndef KHTML_NO_WALLET - KHTMLPart *p; +#ifndef TDEHTML_NO_WALLET + TDEHTMLPart *p; for (p = parentPart(); p && p->parentPart(); p = p->parentPart()) ; @@ -7274,14 +7274,14 @@ KWallet::Wallet *KHTMLPart::wallet() if (p) return p->wallet(); -#endif // KHTML_NO_WALLET +#endif // TDEHTML_NO_WALLET return d->m_wallet; } -void KHTMLPart::slotWalletClosed() +void TDEHTMLPart::slotWalletClosed() { -#ifndef KHTML_NO_WALLET +#ifndef TDEHTML_NO_WALLET if (d->m_wallet) { d->m_wallet->deleteLater(); d->m_wallet = 0L; @@ -7292,12 +7292,12 @@ void KHTMLPart::slotWalletClosed() delete d->m_statusBarWalletLabel; d->m_statusBarWalletLabel = 0L; } -#endif // KHTML_NO_WALLET +#endif // TDEHTML_NO_WALLET } -void KHTMLPart::launchWalletManager() +void TDEHTMLPart::launchWalletManager() { -#ifndef KHTML_NO_WALLET +#ifndef TDEHTML_NO_WALLET if (!DCOPClient::mainClient()->isApplicationRegistered("tdewalletmanager")) { TDEApplication::startServiceByDesktopName("tdewalletmanager_show"); } else { @@ -7305,34 +7305,34 @@ void KHTMLPart::launchWalletManager() r.send("show"); r.send("raise"); } -#endif // KHTML_NO_WALLET +#endif // TDEHTML_NO_WALLET } -void KHTMLPart::walletMenu() +void TDEHTMLPart::walletMenu() { -#ifndef KHTML_NO_WALLET +#ifndef TDEHTML_NO_WALLET KPopupMenu *m = new KPopupMenu(0L); m->insertItem(i18n("&Close Wallet"), this, TQT_SLOT(slotWalletClosed())); m->popup(TQCursor::pos()); -#endif // KHTML_NO_WALLET +#endif // TDEHTML_NO_WALLET } -void KHTMLPart::slotToggleCaretMode() +void TDEHTMLPart::slotToggleCaretMode() { setCaretMode(d->m_paToggleCaretMode->isChecked()); } -void KHTMLPart::setFormNotification(KHTMLPart::FormNotification fn) { +void TDEHTMLPart::setFormNotification(TDEHTMLPart::FormNotification fn) { d->m_formNotification = fn; } -KHTMLPart::FormNotification KHTMLPart::formNotification() const { +TDEHTMLPart::FormNotification TDEHTMLPart::formNotification() const { return d->m_formNotification; } -KURL KHTMLPart::toplevelURL() +KURL TDEHTMLPart::toplevelURL() { - KHTMLPart* part = this; + TDEHTMLPart* part = this; while (part->parentPart()) part = part->parentPart(); @@ -7342,7 +7342,7 @@ KURL KHTMLPart::toplevelURL() return part->url(); } -bool KHTMLPart::isModified() const +bool TDEHTMLPart::isModified() const { if ( !d->m_doc ) return false; @@ -7350,7 +7350,7 @@ bool KHTMLPart::isModified() const return d->m_doc->unsubmittedFormChanges(); } -void KHTMLPart::setDebugScript( bool enable ) +void TDEHTMLPart::setDebugScript( bool enable ) { unplugActionList( "debugScriptList" ); if ( enable ) { @@ -7365,12 +7365,12 @@ void KHTMLPart::setDebugScript( bool enable ) d->m_bJScriptDebugEnabled = enable; } -void KHTMLPart::setSuppressedPopupIndicator( bool enable ) +void TDEHTMLPart::setSuppressedPopupIndicator( bool enable ) { setSuppressedPopupIndicator( enable, 0 ); } -void KHTMLPart::setSuppressedPopupIndicator( bool enable, KHTMLPart *originPart ) +void TDEHTMLPart::setSuppressedPopupIndicator( bool enable, TDEHTMLPart *originPart ) { if ( parentPart() ) { parentPart()->setSuppressedPopupIndicator( enable, originPart ); @@ -7406,7 +7406,7 @@ void KHTMLPart::setSuppressedPopupIndicator( bool enable, KHTMLPart *originPart } } -void KHTMLPart::suppressedPopupMenu() { +void TDEHTMLPart::suppressedPopupMenu() { KPopupMenu *m = new KPopupMenu(0L); m->setCheckable(true); if ( d->m_openableSuppressedPopups ) @@ -7417,16 +7417,16 @@ void KHTMLPart::suppressedPopupMenu() { m->popup(TQCursor::pos()); } -void KHTMLPart::togglePopupPassivePopup() { +void TDEHTMLPart::togglePopupPassivePopup() { // Same hack as in disableJSErrorExtension() d->m_settings->setJSPopupBlockerPassivePopup( !d->m_settings->jsPopupBlockerPassivePopup() ); DCOPClient::mainClient()->send("konqueror*", "KonquerorIface", "reparseConfiguration()", TQByteArray()); } -void KHTMLPart::showSuppressedPopups() { - for ( TQValueListIterator<TQGuardedPtr<KHTMLPart> > i = d->m_suppressedPopupOriginParts.begin(); +void TDEHTMLPart::showSuppressedPopups() { + for ( TQValueListIterator<TQGuardedPtr<TDEHTMLPart> > i = d->m_suppressedPopupOriginParts.begin(); i != d->m_suppressedPopupOriginParts.end(); ++i ) { - if (KHTMLPart* part = *i) { + if (TDEHTMLPart* part = *i) { KJS::Window *w = KJS::Window::retrieveWindow( part ); if (w) { w->showSuppressedWindows(); @@ -7441,7 +7441,7 @@ void KHTMLPart::showSuppressedPopups() { // Extension to use for "view document source", "save as" etc. // Using the right extension can help the viewer get into the right mode (#40496) -TQString KHTMLPart::defaultExtension() const +TQString TDEHTMLPart::defaultExtension() const { if ( !d->m_doc ) return ".html"; @@ -7450,7 +7450,7 @@ TQString KHTMLPart::defaultExtension() const return d->m_doc->htmlMode() == DOM::DocumentImpl::XHtml ? ".xhtml" : ".html"; } -bool KHTMLPart::inProgress() const +bool TDEHTMLPart::inProgress() const { if (d->m_runningScripts || (d->m_doc && d->m_doc->parsing())) return true; diff --git a/tdehtml/tdehtml_part.h b/tdehtml/tdehtml_part.h index e4e20c03c..452083708 100644 --- a/tdehtml/tdehtml_part.h +++ b/tdehtml/tdehtml_part.h @@ -36,11 +36,11 @@ #include <tqregexp.h> -class KHTMLPartPrivate; -class KHTMLPartBrowserExtension; +class TDEHTMLPartPrivate; +class TDEHTMLPartBrowserExtension; class KJSProxy; -class KHTMLView; -class KHTMLSettings; +class TDEHTMLView; +class TDEHTMLSettings; class KJavaAppletContext; class KJSErrorDlg; @@ -120,7 +120,7 @@ namespace KWallet * * \code * KURL url = "http://www.kde.org"; - * KHTMLPart *w = new KHTMLPart(); + * TDEHTMLPart *w = new TDEHTMLPart(); * w->openURL(url); * w->view()->resize(500, 400); * w->show(); @@ -139,7 +139,7 @@ namespace KWallet * w->setPluginsEnabled(false); * \endcode * - * You may also wish to disable external references. This will prevent KHTML + * You may also wish to disable external references. This will prevent TDEHTML * from loading images, frames, etc, or redirecting to external sites. * * \code @@ -151,7 +151,7 @@ namespace KWallet * * \code * TQString myHTMLCode = ...; - * KHTMLPart *w = new KHTMLPart(); + * TDEHTMLPart *w = new TDEHTMLPart(); * w->begin(); * w->write(myHTMLCode); * ... @@ -171,9 +171,9 @@ namespace KWallet * described above as the following example shows: * * \code - * KHTMLPart *doc = new KHTMLPart(); + * TDEHTMLPart *doc = new TDEHTMLPart(); * doc->openStream( "text/html", KURL() ); - * doc->writeStream( TQCString( "<html><body><p>KHTML Rocks!</p></body></html>" ) ); + * doc->writeStream( TQCString( "<html><body><p>TDEHTML Rocks!</p></body></html>" ) ); * doc->closeStream(); * \endcode * @@ -181,10 +181,10 @@ namespace KWallet * @author Lars Knoll ([email protected]) * */ -class KHTML_EXPORT KHTMLPart : public KParts::ReadOnlyPart +class TDEHTML_EXPORT TDEHTMLPart : public KParts::ReadOnlyPart { Q_OBJECT - friend class KHTMLView; + friend class TDEHTMLView; friend class DOM::HTMLTitleElementImpl; friend class DOM::HTMLFrameElementImpl; friend class DOM::HTMLIFrameElementImpl; @@ -192,7 +192,7 @@ class KHTML_EXPORT KHTMLPart : public KParts::ReadOnlyPart friend class DOM::HTMLAnchorElementImpl; friend class DOM::HTMLMetaElementImpl; friend class DOM::NodeImpl; - friend class KHTMLRun; + friend class TDEHTMLRun; friend class DOM::HTMLFormElementImpl; friend class tdehtml::RenderPartObject; friend class KJS::Window; @@ -205,17 +205,17 @@ class KHTML_EXPORT KHTMLPart : public KParts::ReadOnlyPart friend class KJS::DOMDocument; friend class KJS::SourceFile; friend class KJSProxy; - friend class KHTMLPartBrowserExtension; + friend class TDEHTMLPartBrowserExtension; friend class DOM::DocumentImpl; friend class DOM::HTMLDocumentImpl; - friend class KHTMLPartBrowserHostExtension; + friend class TDEHTMLPartBrowserHostExtension; friend class tdehtml::HTMLTokenizer; friend class tdehtml::XMLTokenizer; friend class tdehtml::RenderWidget; friend class tdehtml::CSSStyleSelector; - friend class KHTMLPartIface; - friend class KHTMLPartFunction; - friend class KHTMLPopupGUIClient; + friend class TDEHTMLPartIface; + friend class TDEHTMLPartFunction; + friend class TDEHTMLPopupGUIClient; TQ_PROPERTY( bool javaScriptEnabled READ jScriptEnabled WRITE setJScriptEnabled ) TQ_PROPERTY( bool javaEnabled READ javaEnabled WRITE setJavaEnabled ) @@ -235,26 +235,26 @@ public: enum GUIProfile { DefaultGUI, BrowserViewGUI /* ... */ }; /** - * Constructs a new KHTMLPart. + * Constructs a new TDEHTMLPart. * - * KHTML basically consists of two objects: The KHTMLPart itself, - * holding the document data (DOM document), and the KHTMLView, + * TDEHTML basically consists of two objects: The TDEHTMLPart itself, + * holding the document data (DOM document), and the TDEHTMLView, * derived from TQScrollView, in which the document content is * rendered in. You can specify two different parent objects for a - * KHTMLPart, one parent for the KHTMLPart document and on parent - * for the KHTMLView. If the second @p parent argument is 0L, then + * TDEHTMLPart, one parent for the TDEHTMLPart document and on parent + * for the TDEHTMLView. If the second @p parent argument is 0L, then * @p parentWidget is used as parent for both objects, the part and * the view. */ - KHTMLPart( TQWidget *parentWidget = 0, const char *widgetname = 0, + TDEHTMLPart( TQWidget *parentWidget = 0, const char *widgetname = 0, TQObject *parent = 0, const char *name = 0, GUIProfile prof = DefaultGUI ); - KHTMLPart( KHTMLView *view, TQObject *parent = 0, const char *name = 0, GUIProfile prof = DefaultGUI ); + TDEHTMLPart( TDEHTMLView *view, TQObject *parent = 0, const char *name = 0, GUIProfile prof = DefaultGUI ); /** * Destructor. */ - virtual ~KHTMLPart(); + virtual ~TDEHTMLPart(); /** * Opens the specified URL @p url. @@ -307,7 +307,7 @@ public: /** * Returns a pointer to the HTML document's view. */ - KHTMLView *view() const; + TDEHTMLView *view() const; /** * Enable/disable Javascript support. Note that this will @@ -440,7 +440,7 @@ public: * Security option. * * Specify whether only file:/ or data:/ urls are allowed to be loaded without - * user confirmation by KHTML. + * user confirmation by TDEHTML. * ( for example referenced by stylesheets, images, scripts, subdocuments, embedded elements ). * * This option is mainly intended for enabling the "mail reader mode", where you load untrusted @@ -605,7 +605,7 @@ public: // void print(TQPainter *, int pageHeight, int pageWidth); /** - * Paints the HTML page to a TQPainter. See KHTMLView::paint for details + * Paints the HTML page to a TQPainter. See TDEHTMLView::paint for details */ void paint( TQPainter *, const TQRect &, int = 0, bool * = 0 ); @@ -845,7 +845,7 @@ public: KParts::PartManager *partManager(); /** - * Saves the KHTMLPart's complete state (including child frame + * Saves the TDEHTMLPart's complete state (including child frame * objects) to the provided TQDataStream. * * This is called from the saveState() method of the @@ -853,7 +853,7 @@ public: */ virtual void saveState( TQDataStream &stream ); /** - * Restores the KHTMLPart's previously saved state (including + * Restores the TDEHTMLPart's previously saved state (including * child frame objects) from the provided TQDataStream. * * @see saveState() @@ -884,15 +884,15 @@ public: /** * @internal */ - const KHTMLSettings *settings() const; + const TDEHTMLSettings *settings() const; /** - * Returns a pointer to the parent KHTMLPart if the part is a frame + * Returns a pointer to the parent TDEHTMLPart if the part is a frame * in an HTML frameset. * * Returns 0L otherwise. */ - KHTMLPart *parentPart(); + TDEHTMLPart *parentPart(); /** * Returns a list of names of all frame (including iframe) objects of @@ -906,7 +906,7 @@ public: /** * Finds a frame by name. Returns 0L if frame can't be found. */ - KHTMLPart *findFrame( const TQString &f ); + TDEHTMLPart *findFrame( const TQString &f ); /** * Recursively finds the part containing the frame with name @p f @@ -916,7 +916,7 @@ public: * frame info in @p *childFrame * @since 3.3 */ - KHTMLPart *findFrameParent( KParts::ReadOnlyPart *callingPart, const TQString &f, tdehtml::ChildFrame **childFrame=0 ); + TDEHTMLPart *findFrameParent( KParts::ReadOnlyPart *callingPart, const TQString &f, tdehtml::ChildFrame **childFrame=0 ); /** * Return the current frame (the one that has focus) @@ -1046,7 +1046,7 @@ public: * Shows or hides the suppressed popup indicator * @since 3.5 */ - void setSuppressedPopupIndicator( bool enable, KHTMLPart *originPart ); + void setSuppressedPopupIndicator( bool enable, TDEHTMLPart *originPart ); /** * @internal @@ -1553,7 +1553,7 @@ private: void resetFromScript(); void emitSelectionChanged(); // Returns whether callingHtmlPart may access this part - bool checkFrameAccess(KHTMLPart *callingHtmlPart); + bool checkFrameAccess(TDEHTMLPart *callingHtmlPart); bool openURLInFrame( const KURL &url, const KParts::URLArgs &urlArgs ); bool urlSelectedIntern( const TQString &url, int button, int state, const TQString &_target, KParts::URLArgs args = KParts::URLArgs()); @@ -1588,7 +1588,7 @@ private: void popupMenu( const TQString &url ); - void init( KHTMLView *view, GUIProfile prof ); + void init( TDEHTMLView *view, GUIProfile prof ); void clear(); @@ -1621,16 +1621,16 @@ private: DOM::DocumentImpl *xmlDocImpl() const; tdehtml::ChildFrame *frame( const TQObject *obj ); - tdehtml::ChildFrame *recursiveFrameRequest( KHTMLPart *callingHtmlPart, const KURL &url, const KParts::URLArgs &args, bool callParent = true ); + tdehtml::ChildFrame *recursiveFrameRequest( TDEHTMLPart *callingHtmlPart, const KURL &url, const KParts::URLArgs &args, bool callParent = true ); bool checkLinkSecurity( const KURL &linkURL,const TQString &message = TQString::null, const TQString &button = TQString::null ); TQVariant executeScript( const TQString& filename, int baseLine, const DOM::Node &n, const TQString& script ); KJSProxy *jScript(); - KHTMLPart *opener(); + TDEHTMLPart *opener(); long cacheId() const; - void setOpener( KHTMLPart *_opener ); + void setOpener( TDEHTMLPart *_opener ); bool openedByJS(); void setOpenedByJS( bool _openedByJS ); @@ -1675,8 +1675,8 @@ private: void runAdFilter(); - KHTMLPartPrivate *d; - friend class KHTMLPartPrivate; + TDEHTMLPartPrivate *d; + friend class TDEHTMLPartPrivate; }; diff --git a/tdehtml/tdehtml_printsettings.cpp b/tdehtml/tdehtml_printsettings.cpp index 41b87244a..251c3403f 100644 --- a/tdehtml/tdehtml_printsettings.cpp +++ b/tdehtml/tdehtml_printsettings.cpp @@ -24,7 +24,7 @@ #include <tqlayout.h> #include <tqwhatsthis.h> -KHTMLPrintSettings::KHTMLPrintSettings(TQWidget *parent, const char *name) +TDEHTMLPrintSettings::TDEHTMLPrintSettings(TQWidget *parent, const char *name) : KPrintDialogPage(parent, name) { //WhatsThis strings.... (added by [email protected]) @@ -87,18 +87,18 @@ KHTMLPrintSettings::KHTMLPrintSettings(TQWidget *parent, const char *name) l0->addStretch(1); } -KHTMLPrintSettings::~KHTMLPrintSettings() +TDEHTMLPrintSettings::~TDEHTMLPrintSettings() { } -void KHTMLPrintSettings::getOptions(TQMap<TQString,TQString>& opts, bool /*incldef*/) +void TDEHTMLPrintSettings::getOptions(TQMap<TQString,TQString>& opts, bool /*incldef*/) { opts["app-tdehtml-printfriendly"] = (m_printfriendly->isChecked() ? "true" : "false"); opts["app-tdehtml-printimages"] = (m_printimages->isChecked() ? "true" : "false"); opts["app-tdehtml-printheader"] = (m_printheader->isChecked() ? "true" : "false"); } -void KHTMLPrintSettings::setOptions(const TQMap<TQString,TQString>& opts) +void TDEHTMLPrintSettings::setOptions(const TQMap<TQString,TQString>& opts) { m_printfriendly->setChecked(opts["app-tdehtml-printfriendly"] != "false"); m_printimages->setChecked(opts["app-tdehtml-printimages"] != "false"); diff --git a/tdehtml/tdehtml_printsettings.h b/tdehtml/tdehtml_printsettings.h index 9f69d9b88..2a92d0e3c 100644 --- a/tdehtml/tdehtml_printsettings.h +++ b/tdehtml/tdehtml_printsettings.h @@ -17,19 +17,19 @@ * Boston, MA 02110-1301, USA. **/ -#ifndef KHTML_PRINTSETTINGS_H -#define KHTML_PRINTSETTINGS_H +#ifndef TDEHTML_PRINTSETTINGS_H +#define TDEHTML_PRINTSETTINGS_H #include <tdeprint/kprintdialogpage.h> class TQCheckBox; -class KHTMLPrintSettings : public KPrintDialogPage +class TDEHTMLPrintSettings : public KPrintDialogPage { Q_OBJECT public: - KHTMLPrintSettings(TQWidget *parent = 0, const char *name = 0); - ~KHTMLPrintSettings(); + TDEHTMLPrintSettings(TQWidget *parent = 0, const char *name = 0); + ~TDEHTMLPrintSettings(); void getOptions(TQMap<TQString,TQString>& opts, bool incldef = false); void setOptions(const TQMap<TQString,TQString>& opts); diff --git a/tdehtml/tdehtml_run.cpp b/tdehtml/tdehtml_run.cpp index 6ae958d67..2a5fd1861 100644 --- a/tdehtml/tdehtml_run.cpp +++ b/tdehtml/tdehtml_run.cpp @@ -28,7 +28,7 @@ #include "tdehtml_ext.h" #include <tqwidget.h> -KHTMLRun::KHTMLRun( KHTMLPart *part, tdehtml::ChildFrame *child, const KURL &url, +TDEHTMLRun::TDEHTMLRun( TDEHTMLPart *part, tdehtml::ChildFrame *child, const KURL &url, const KParts::URLArgs &args, bool hideErrorDialog ) : KParts::BrowserRun( url, args, part, part->widget() ? part->widget()->topLevelWidget() : 0, false, false, hideErrorDialog ), @@ -41,14 +41,14 @@ KHTMLRun::KHTMLRun( KHTMLPart *part, tdehtml::ChildFrame *child, const KURL &url part->started(0L); } -//KHTMLPart *KHTMLRun::htmlPart() const -//{ return static_cast<KHTMLPart *>(m_part); } +//TDEHTMLPart *TDEHTMLRun::htmlPart() const +//{ return static_cast<TDEHTMLPart *>(m_part); } -void KHTMLRun::foundMimeType( const TQString &_type ) +void TDEHTMLRun::foundMimeType( const TQString &_type ) { Q_ASSERT(!m_bFinished); TQString mimeType = _type; // this ref comes from the job, we lose it when using KIO again - if ( static_cast<KHTMLPart *>(m_part)->processObjectRequest( m_child, m_strURL, mimeType ) ) + if ( static_cast<TDEHTMLPart *>(m_part)->processObjectRequest( m_child, m_strURL, mimeType ) ) m_bFinished = true; else { if ( m_bFinished ) // abort was called (this happens with the activex fallback for instance) @@ -60,7 +60,7 @@ void KHTMLRun::foundMimeType( const TQString &_type ) m_bFinished = ( res == KParts::BrowserRun::Handled ); if ( m_bFinished ) { // saved or canceled -> flag completed m_child->m_bCompleted = true; - static_cast<KHTMLPart *>(m_part)->checkCompleted(); + static_cast<TDEHTMLPart *>(m_part)->checkCompleted(); } } @@ -70,21 +70,21 @@ void KHTMLRun::foundMimeType( const TQString &_type ) return; } - //kdDebug(6050) << "KHTMLRun::foundMimeType " << _type << " couldn't open" << endl; + //kdDebug(6050) << "TDEHTMLRun::foundMimeType " << _type << " couldn't open" << endl; KRun::foundMimeType( mimeType ); // "open" is finished -> flag completed m_child->m_bCompleted = true; - static_cast<KHTMLPart *>(m_part)->checkCompleted(); + static_cast<TDEHTMLPart *>(m_part)->checkCompleted(); } -void KHTMLRun::save( const KURL & url, const TQString & suggestedFilename ) +void TDEHTMLRun::save( const KURL & url, const TQString & suggestedFilename ) { - KHTMLPopupGUIClient::saveURL( m_part->widget(), i18n( "Save As" ), url, m_args.metaData(), TQString::null, 0, suggestedFilename ); + TDEHTMLPopupGUIClient::saveURL( m_part->widget(), i18n( "Save As" ), url, m_args.metaData(), TQString::null, 0, suggestedFilename ); } // KDE4: remove -void KHTMLRun::handleError( TDEIO::Job *job ) +void TDEHTMLRun::handleError( TDEIO::Job *job ) { KParts::BrowserRun::handleError( job ); } diff --git a/tdehtml/tdehtml_run.h b/tdehtml/tdehtml_run.h index e549f9b2d..401bc7fd6 100644 --- a/tdehtml/tdehtml_run.h +++ b/tdehtml/tdehtml_run.h @@ -28,23 +28,23 @@ #include <kservice.h> #include <tdeparts/browserextension.h> -class KHTMLPart; +class TDEHTMLPart; namespace tdehtml { class ChildFrame; } -class KHTMLRun : public KParts::BrowserRun +class TDEHTMLRun : public KParts::BrowserRun { Q_OBJECT public: - KHTMLRun( KHTMLPart *part, tdehtml::ChildFrame *child, const KURL &url, + TDEHTMLRun( TDEHTMLPart *part, tdehtml::ChildFrame *child, const KURL &url, const KParts::URLArgs &args, bool hideErrorDialog ); virtual void foundMimeType( const TQString &mimetype ); - //KHTMLPart *htmlPart() const; + //TDEHTMLPart *htmlPart() const; protected: virtual void handleError( TDEIO::Job * job ); diff --git a/tdehtml/tdehtml_settings.cc b/tdehtml/tdehtml_settings.cc index 5675b2105..8e36f5891 100644 --- a/tdehtml/tdehtml_settings.cc +++ b/tdehtml/tdehtml_settings.cc @@ -39,11 +39,11 @@ struct KPerDomainSettings { bool m_bEnableJavaScript : 1; bool m_bEnablePlugins : 1; // don't forget to maintain the bitfields as the enums grow - KHTMLSettings::KJSWindowOpenPolicy m_windowOpenPolicy : 2; - KHTMLSettings::KJSWindowStatusPolicy m_windowStatusPolicy : 1; - KHTMLSettings::KJSWindowFocusPolicy m_windowFocusPolicy : 1; - KHTMLSettings::KJSWindowMovePolicy m_windowMovePolicy : 1; - KHTMLSettings::KJSWindowResizePolicy m_windowResizePolicy : 1; + TDEHTMLSettings::KJSWindowOpenPolicy m_windowOpenPolicy : 2; + TDEHTMLSettings::KJSWindowStatusPolicy m_windowStatusPolicy : 1; + TDEHTMLSettings::KJSWindowFocusPolicy m_windowFocusPolicy : 1; + TDEHTMLSettings::KJSWindowMovePolicy m_windowMovePolicy : 1; + TDEHTMLSettings::KJSWindowResizePolicy m_windowResizePolicy : 1; #ifdef DEBUG_SETTINGS void dump(const TQString &infix = TQString::null) const { @@ -62,7 +62,7 @@ struct KPerDomainSettings { typedef TQMap<TQString,KPerDomainSettings> PolicyMap; -class KHTMLSettingsPrivate +class TDEHTMLSettingsPrivate { public: bool m_bChangeCursor : 1; @@ -92,7 +92,7 @@ public: int m_fontSize; int m_minFontSize; int m_maxFormCompletionItems; - KHTMLSettings::KAnimationAdvice m_showAnimations; + TDEHTMLSettings::KAnimationAdvice m_showAnimations; TQString m_encoding; TQString m_userSheet; @@ -115,7 +115,7 @@ public: * or a deep copy of the global settings if not existent. */ static KPerDomainSettings &setup_per_domain_policy( - KHTMLSettingsPrivate *d, + TDEHTMLSettingsPrivate *d, const TQString &domain) { if (domain.isEmpty()) { kdWarning() << "setup_per_domain_policy: domain is empty" << endl; @@ -131,7 +131,7 @@ static KPerDomainSettings &setup_per_domain_policy( } -KHTMLSettings::KJavaScriptAdvice KHTMLSettings::strToAdvice(const TQString& _str) +TDEHTMLSettings::KJavaScriptAdvice TDEHTMLSettings::strToAdvice(const TQString& _str) { KJavaScriptAdvice ret = KJavaScriptDunno; @@ -146,7 +146,7 @@ KHTMLSettings::KJavaScriptAdvice KHTMLSettings::strToAdvice(const TQString& _str return ret; } -const char* KHTMLSettings::adviceToStr(KJavaScriptAdvice _advice) +const char* TDEHTMLSettings::adviceToStr(KJavaScriptAdvice _advice) { switch( _advice ) { case KJavaScriptAccept: return I18N_NOOP("Accept"); @@ -157,7 +157,7 @@ const char* KHTMLSettings::adviceToStr(KJavaScriptAdvice _advice) } -void KHTMLSettings::splitDomainAdvice(const TQString& configStr, TQString &domain, +void TDEHTMLSettings::splitDomainAdvice(const TQString& configStr, TQString &domain, KJavaScriptAdvice &javaAdvice, KJavaScriptAdvice& javaScriptAdvice) { TQString tmp(configStr); @@ -186,7 +186,7 @@ void KHTMLSettings::splitDomainAdvice(const TQString& configStr, TQString &domai } } -void KHTMLSettings::readDomainSettings(TDEConfig *config, bool reset, +void TDEHTMLSettings::readDomainSettings(TDEConfig *config, bool reset, bool global, KPerDomainSettings &pd_settings) { TQString jsPrefix = global ? TQString::null : TQString::fromLatin1("javascript."); @@ -255,39 +255,39 @@ void KHTMLSettings::readDomainSettings(TDEConfig *config, bool reset, } -KHTMLSettings::KHTMLSettings() +TDEHTMLSettings::TDEHTMLSettings() { - d = new KHTMLSettingsPrivate(); + d = new TDEHTMLSettingsPrivate(); init(); } -KHTMLSettings::KHTMLSettings(const KHTMLSettings &other) +TDEHTMLSettings::TDEHTMLSettings(const TDEHTMLSettings &other) { - d = new KHTMLSettingsPrivate(); + d = new TDEHTMLSettingsPrivate(); *d = *other.d; } -KHTMLSettings::~KHTMLSettings() +TDEHTMLSettings::~TDEHTMLSettings() { delete d; } -bool KHTMLSettings::changeCursor() const +bool TDEHTMLSettings::changeCursor() const { return d->m_bChangeCursor; } -bool KHTMLSettings::underlineLink() const +bool TDEHTMLSettings::underlineLink() const { return d->m_underlineLink; } -bool KHTMLSettings::hoverLink() const +bool TDEHTMLSettings::hoverLink() const { return d->m_hoverLink; } -void KHTMLSettings::init() +void TDEHTMLSettings::init() { TDEConfig global( "tdehtmlrc", true, false ); init( &global, true ); @@ -299,7 +299,7 @@ void KHTMLSettings::init() init( local, false ); } -void KHTMLSettings::init( TDEConfig * config, bool reset ) +void TDEHTMLSettings::init( TDEConfig * config, bool reset ) { TQString group_save = config->group(); if (reset || config->hasGroup("MainView Settings")) @@ -640,7 +640,7 @@ void KHTMLSettings::init( TDEConfig * config, bool reset ) * In case of doubt, the global domain is returned. */ static const KPerDomainSettings &lookup_hostname_policy( - const KHTMLSettingsPrivate *d, + const TDEHTMLSettingsPrivate *d, const TQString& hostname) { #ifdef DEBUG_SETTINGS @@ -693,32 +693,32 @@ static const KPerDomainSettings &lookup_hostname_policy( return d->global; } -bool KHTMLSettings::isOpenMiddleClickEnabled() +bool TDEHTMLSettings::isOpenMiddleClickEnabled() { return d->m_bOpenMiddleClick; } -bool KHTMLSettings::isBackRightClickEnabled() +bool TDEHTMLSettings::isBackRightClickEnabled() { return d->m_bBackRightClick; } -bool KHTMLSettings::accessKeysEnabled() const +bool TDEHTMLSettings::accessKeysEnabled() const { return d->m_accessKeysEnabled; } -bool KHTMLSettings::isAdFilterEnabled() const +bool TDEHTMLSettings::isAdFilterEnabled() const { return d->m_adFilterEnabled; } -bool KHTMLSettings::isHideAdsEnabled() const +bool TDEHTMLSettings::isHideAdsEnabled() const { return d->m_hideAdsEnabled; } -bool KHTMLSettings::isAdFiltered( const TQString &url ) const +bool TDEHTMLSettings::isAdFiltered( const TQString &url ) const { if (d->m_adFilterEnabled) { @@ -739,7 +739,7 @@ bool KHTMLSettings::isAdFiltered( const TQString &url ) const return false; } -void KHTMLSettings::addAdFilter( const TQString &url ) +void TDEHTMLSettings::addAdFilter( const TQString &url ) { TDEConfig config( "tdehtmlrc", false, false ); config.setGroup( "Filter Settings" ); @@ -780,69 +780,69 @@ void KHTMLSettings::addAdFilter( const TQString &url ) } } -bool KHTMLSettings::isJavaEnabled( const TQString& hostname ) +bool TDEHTMLSettings::isJavaEnabled( const TQString& hostname ) { return lookup_hostname_policy(d,hostname.lower()).m_bEnableJava; } -bool KHTMLSettings::isJavaScriptEnabled( const TQString& hostname ) +bool TDEHTMLSettings::isJavaScriptEnabled( const TQString& hostname ) { return lookup_hostname_policy(d,hostname.lower()).m_bEnableJavaScript; } -bool KHTMLSettings::isJavaScriptDebugEnabled( const TQString& /*hostname*/ ) +bool TDEHTMLSettings::isJavaScriptDebugEnabled( const TQString& /*hostname*/ ) { // debug setting is global for now, but could change in the future return d->m_bEnableJavaScriptDebug; } -bool KHTMLSettings::isJavaScriptErrorReportingEnabled( const TQString& /*hostname*/ ) const +bool TDEHTMLSettings::isJavaScriptErrorReportingEnabled( const TQString& /*hostname*/ ) const { // error reporting setting is global for now, but could change in the future return d->m_bEnableJavaScriptErrorReporting; } -bool KHTMLSettings::isPluginsEnabled( const TQString& hostname ) +bool TDEHTMLSettings::isPluginsEnabled( const TQString& hostname ) { return lookup_hostname_policy(d,hostname.lower()).m_bEnablePlugins; } -KHTMLSettings::KJSWindowOpenPolicy KHTMLSettings::windowOpenPolicy( +TDEHTMLSettings::KJSWindowOpenPolicy TDEHTMLSettings::windowOpenPolicy( const TQString& hostname) const { return lookup_hostname_policy(d,hostname.lower()).m_windowOpenPolicy; } -KHTMLSettings::KJSWindowMovePolicy KHTMLSettings::windowMovePolicy( +TDEHTMLSettings::KJSWindowMovePolicy TDEHTMLSettings::windowMovePolicy( const TQString& hostname) const { return lookup_hostname_policy(d,hostname.lower()).m_windowMovePolicy; } -KHTMLSettings::KJSWindowResizePolicy KHTMLSettings::windowResizePolicy( +TDEHTMLSettings::KJSWindowResizePolicy TDEHTMLSettings::windowResizePolicy( const TQString& hostname) const { return lookup_hostname_policy(d,hostname.lower()).m_windowResizePolicy; } -KHTMLSettings::KJSWindowStatusPolicy KHTMLSettings::windowStatusPolicy( +TDEHTMLSettings::KJSWindowStatusPolicy TDEHTMLSettings::windowStatusPolicy( const TQString& hostname) const { return lookup_hostname_policy(d,hostname.lower()).m_windowStatusPolicy; } -KHTMLSettings::KJSWindowFocusPolicy KHTMLSettings::windowFocusPolicy( +TDEHTMLSettings::KJSWindowFocusPolicy TDEHTMLSettings::windowFocusPolicy( const TQString& hostname) const { return lookup_hostname_policy(d,hostname.lower()).m_windowFocusPolicy; } -int KHTMLSettings::mediumFontSize() const +int TDEHTMLSettings::mediumFontSize() const { return d->m_fontSize; } -int KHTMLSettings::minFontSize() const +int TDEHTMLSettings::minFontSize() const { return d->m_minFontSize; } -TQString KHTMLSettings::settingsToCSS() const +TQString TDEHTMLSettings::settingsToCSS() const { // lets start with the link properties TQString str = "a:link {\ncolor: "; @@ -873,7 +873,7 @@ TQString KHTMLSettings::settingsToCSS() const return str; } -const TQString &KHTMLSettings::availableFamilies() +const TQString &TDEHTMLSettings::availableFamilies() { if ( !avFamilies ) { avFamilies = new TQString; @@ -899,7 +899,7 @@ const TQString &KHTMLSettings::availableFamilies() return *avFamilies; } -TQString KHTMLSettings::lookupFont(int i) const +TQString TDEHTMLSettings::lookupFont(int i) const { TQString font; if (d->fonts.count() > (uint) i) @@ -909,121 +909,121 @@ TQString KHTMLSettings::lookupFont(int i) const return font; } -TQString KHTMLSettings::stdFontName() const +TQString TDEHTMLSettings::stdFontName() const { return lookupFont(0); } -TQString KHTMLSettings::fixedFontName() const +TQString TDEHTMLSettings::fixedFontName() const { return lookupFont(1); } -TQString KHTMLSettings::serifFontName() const +TQString TDEHTMLSettings::serifFontName() const { return lookupFont(2); } -TQString KHTMLSettings::sansSerifFontName() const +TQString TDEHTMLSettings::sansSerifFontName() const { return lookupFont(3); } -TQString KHTMLSettings::cursiveFontName() const +TQString TDEHTMLSettings::cursiveFontName() const { return lookupFont(4); } -TQString KHTMLSettings::fantasyFontName() const +TQString TDEHTMLSettings::fantasyFontName() const { return lookupFont(5); } -void KHTMLSettings::setStdFontName(const TQString &n) +void TDEHTMLSettings::setStdFontName(const TQString &n) { while(d->fonts.count() <= 0) d->fonts.append(TQString::null); d->fonts[0] = n; } -void KHTMLSettings::setFixedFontName(const TQString &n) +void TDEHTMLSettings::setFixedFontName(const TQString &n) { while(d->fonts.count() <= 1) d->fonts.append(TQString::null); d->fonts[1] = n; } -TQString KHTMLSettings::userStyleSheet() const +TQString TDEHTMLSettings::userStyleSheet() const { return d->m_userSheet; } -bool KHTMLSettings::isFormCompletionEnabled() const +bool TDEHTMLSettings::isFormCompletionEnabled() const { return d->m_formCompletionEnabled; } -int KHTMLSettings::maxFormCompletionItems() const +int TDEHTMLSettings::maxFormCompletionItems() const { return d->m_maxFormCompletionItems; } -const TQString &KHTMLSettings::encoding() const +const TQString &TDEHTMLSettings::encoding() const { return d->m_encoding; } -bool KHTMLSettings::followSystemColors() const +bool TDEHTMLSettings::followSystemColors() const { return d->m_follow_system_colors; } -const TQColor& KHTMLSettings::textColor() const +const TQColor& TDEHTMLSettings::textColor() const { return d->m_textColor; } -const TQColor& KHTMLSettings::baseColor() const +const TQColor& TDEHTMLSettings::baseColor() const { return d->m_baseColor; } -const TQColor& KHTMLSettings::linkColor() const +const TQColor& TDEHTMLSettings::linkColor() const { return d->m_linkColor; } -const TQColor& KHTMLSettings::vLinkColor() const +const TQColor& TDEHTMLSettings::vLinkColor() const { return d->m_vLinkColor; } -bool KHTMLSettings::autoLoadImages() const +bool TDEHTMLSettings::autoLoadImages() const { return d->m_bAutoLoadImages; } -bool KHTMLSettings::unfinishedImageFrame() const +bool TDEHTMLSettings::unfinishedImageFrame() const { return d->m_bUnfinishedImageFrame; } -KHTMLSettings::KAnimationAdvice KHTMLSettings::showAnimations() const +TDEHTMLSettings::KAnimationAdvice TDEHTMLSettings::showAnimations() const { return d->m_showAnimations; } -bool KHTMLSettings::isAutoDelayedActionsEnabled() const +bool TDEHTMLSettings::isAutoDelayedActionsEnabled() const { return d->m_autoDelayedActionsEnabled; } -bool KHTMLSettings::jsErrorsEnabled() const +bool TDEHTMLSettings::jsErrorsEnabled() const { return d->m_jsErrorsEnabled; } -void KHTMLSettings::setJSErrorsEnabled(bool enabled) +void TDEHTMLSettings::setJSErrorsEnabled(bool enabled) { d->m_jsErrorsEnabled = enabled; // save it @@ -1033,22 +1033,22 @@ void KHTMLSettings::setJSErrorsEnabled(bool enabled) config->sync(); } -bool KHTMLSettings::allowTabulation() const +bool TDEHTMLSettings::allowTabulation() const { return d->m_allowTabulation; } -bool KHTMLSettings::autoSpellCheck() const +bool TDEHTMLSettings::autoSpellCheck() const { return d->m_autoSpellCheck; } -TQValueList< TQPair< TQString, TQChar > > KHTMLSettings::fallbackAccessKeysAssignments() const +TQValueList< TQPair< TQString, TQChar > > TDEHTMLSettings::fallbackAccessKeysAssignments() const { return d->m_fallbackAccessKeysAssignments; } -void KHTMLSettings::setJSPopupBlockerPassivePopup(bool enabled) +void TDEHTMLSettings::setJSPopupBlockerPassivePopup(bool enabled) { d->m_jsPopupBlockerPassivePopup = enabled; // save it @@ -1058,7 +1058,7 @@ void KHTMLSettings::setJSPopupBlockerPassivePopup(bool enabled) config->sync(); } -bool KHTMLSettings::jsPopupBlockerPassivePopup() const +bool TDEHTMLSettings::jsPopupBlockerPassivePopup() const { return d->m_jsPopupBlockerPassivePopup; } diff --git a/tdehtml/tdehtml_settings.h b/tdehtml/tdehtml_settings.h index 4d68845f7..c2dd2684c 100644 --- a/tdehtml/tdehtml_settings.h +++ b/tdehtml/tdehtml_settings.h @@ -30,12 +30,12 @@ class TDEConfig; #include <tdelibs_export.h> struct KPerDomainSettings; -class KHTMLSettingsPrivate; +class TDEHTMLSettingsPrivate; /** * Settings for the HTML view. */ -class KHTML_EXPORT KHTMLSettings +class TDEHTML_EXPORT TDEHTMLSettings { public: @@ -99,8 +99,8 @@ public: /** * @internal Constructor */ - KHTMLSettings(); - KHTMLSettings(const KHTMLSettings &other); + TDEHTMLSettings(); + TDEHTMLSettings(const TDEHTMLSettings &other); /** * Called by constructor and reparseConfiguration @@ -117,7 +117,7 @@ public: /** * Destructor. Don't delete any instance by yourself. */ - virtual ~KHTMLSettings(); + virtual ~TDEHTMLSettings(); // Behavior settings bool changeCursor() const; @@ -135,7 +135,7 @@ public: TQString cursiveFontName() const; TQString fantasyFontName() const; - // these two can be set. Mainly for historical reasons (the method in KHTMLPart exists...) + // these two can be set. Mainly for historical reasons (the method in TDEHTMLPart exists...) void setStdFontName(const TQString &n); void setFixedFontName(const TQString &n); @@ -222,10 +222,10 @@ public: bool jsPopupBlockerPassivePopup() const; private: - friend class KHTMLFactory; + friend class TDEHTMLFactory; TQString lookupFont(int i) const; - KHTMLSettingsPrivate *d; + TDEHTMLSettingsPrivate *d; static TQString *avFamilies; }; diff --git a/tdehtml/tdehtmlimage.cpp b/tdehtml/tdehtmlimage.cpp index a2b73db5c..021f95149 100644 --- a/tdehtml/tdehtmlimage.cpp +++ b/tdehtml/tdehtmlimage.cpp @@ -34,40 +34,40 @@ #include <kmimetype.h> #include <klocale.h> -K_EXPORT_COMPONENT_FACTORY( tdehtmlimagefactory /*NOT the part name, see Makefile.am*/, KHTMLImageFactory ) +K_EXPORT_COMPONENT_FACTORY( tdehtmlimagefactory /*NOT the part name, see Makefile.am*/, TDEHTMLImageFactory ) -TDEInstance *KHTMLImageFactory::s_instance = 0; +TDEInstance *TDEHTMLImageFactory::s_instance = 0; -KHTMLImageFactory::KHTMLImageFactory() +TDEHTMLImageFactory::TDEHTMLImageFactory() { s_instance = new TDEInstance( "tdehtmlimage" ); } -KHTMLImageFactory::~KHTMLImageFactory() +TDEHTMLImageFactory::~TDEHTMLImageFactory() { delete s_instance; } -KParts::Part *KHTMLImageFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, +KParts::Part *TDEHTMLImageFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList & ) { - KHTMLPart::GUIProfile prof = KHTMLPart::DefaultGUI; + TDEHTMLPart::GUIProfile prof = TDEHTMLPart::DefaultGUI; if ( strcmp( className, "Browser/View" ) == 0 ) - prof = KHTMLPart::BrowserViewGUI; - return new KHTMLImage( parentWidget, widgetName, parent, name, prof ); + prof = TDEHTMLPart::BrowserViewGUI; + return new TDEHTMLImage( parentWidget, widgetName, parent, name, prof ); } -KHTMLImage::KHTMLImage( TQWidget *parentWidget, const char *widgetName, - TQObject *parent, const char *name, KHTMLPart::GUIProfile prof ) +TDEHTMLImage::TDEHTMLImage( TQWidget *parentWidget, const char *widgetName, + TQObject *parent, const char *name, TDEHTMLPart::GUIProfile prof ) : KParts::ReadOnlyPart( parent, name ), m_image( 0 ) { - KHTMLPart* parentPart = ::tqqt_cast<KHTMLPart *>( parent ); - setInstance( KHTMLImageFactory::instance(), prof == KHTMLPart::BrowserViewGUI && !parentPart ); + TDEHTMLPart* parentPart = ::tqqt_cast<TDEHTMLPart *>( parent ); + setInstance( TDEHTMLImageFactory::instance(), prof == TDEHTMLPart::BrowserViewGUI && !parentPart ); TQVBox *box = new TQVBox( parentWidget, widgetName ); - m_tdehtml = new KHTMLPart( box, widgetName, this, "htmlimagepart", prof ); + m_tdehtml = new TDEHTMLPart( box, widgetName, this, "htmlimagepart", prof ); m_tdehtml->setAutoloadImages( true ); m_tdehtml->widget()->installEventFilter(this); connect( m_tdehtml->view(), TQT_SIGNAL( finishedLayout() ), this, TQT_SLOT( restoreScrollPosition() ) ); @@ -77,7 +77,7 @@ KHTMLImage::KHTMLImage( TQWidget *parentWidget, const char *widgetName, // VBox can't take focus, so pass it on to sub-widget box->setFocusProxy( m_tdehtml->widget() ); - m_ext = new KHTMLImageBrowserExtension( this, "be" ); + m_ext = new TDEHTMLImageBrowserExtension( this, "be" ); // Remove unnecessary actions. KAction *encodingAction = actionCollection()->action( "setEncoding" ); @@ -103,7 +103,7 @@ KHTMLImage::KHTMLImage( TQWidget *parentWidget, const char *widgetName, // forward important signals from the tdehtml part // forward opening requests to parent frame (if existing) - KHTMLPart *p = ::tqqt_cast<KHTMLPart *>(parent); + TDEHTMLPart *p = ::tqqt_cast<TDEHTMLPart *>(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 &))); @@ -118,7 +118,7 @@ KHTMLImage::KHTMLImage( TQWidget *parentWidget, const char *widgetName, m_ext->setURLDropHandlingEnabled( true ); } -KHTMLImage::~KHTMLImage() +TDEHTMLImage::~TDEHTMLImage() { disposeImage(); @@ -130,10 +130,10 @@ KHTMLImage::~KHTMLImage() // when we're in a html frameset and the view dies first, then it will also // kill the htmlpart if ( m_tdehtml ) - delete static_cast<KHTMLPart *>( m_tdehtml ); + delete static_cast<TDEHTMLPart *>( m_tdehtml ); } -bool KHTMLImage::openURL( const KURL &url ) +bool TDEHTMLImage::openURL( const KURL &url ) { static const TQString &html = TDEGlobal::staticQString( "<html><body><img src=\"%1\"></body></html>" ); @@ -175,14 +175,14 @@ bool KHTMLImage::openURL( const KURL &url ) return true; } -bool KHTMLImage::closeURL() +bool TDEHTMLImage::closeURL() { disposeImage(); return m_tdehtml->closeURL(); } // This can happen after openURL returns, or directly from m_image->ref() -void KHTMLImage::notifyFinished( tdehtml::CachedObject *o ) +void TDEHTMLImage::notifyFinished( tdehtml::CachedObject *o ) { if ( !m_image || o != m_image ) return; @@ -214,14 +214,14 @@ void KHTMLImage::notifyFinished( tdehtml::CachedObject *o ) emit setStatusBarText(i18n("Done.")); } -void KHTMLImage::restoreScrollPosition() +void TDEHTMLImage::restoreScrollPosition() { if ( m_tdehtml->view()->contentsY() == 0 ) { m_tdehtml->view()->setContentsPos( m_xOffset, m_yOffset ); } } -void KHTMLImage::guiActivateEvent( KParts::GUIActivateEvent *e ) +void TDEHTMLImage::guiActivateEvent( KParts::GUIActivateEvent *e ) { // prevent the base implementation from emitting setWindowCaption with // our url. It destroys our pretty, previously caption. Konq saves/restores @@ -232,7 +232,7 @@ void KHTMLImage::guiActivateEvent( KParts::GUIActivateEvent *e ) } /* -void KHTMLImage::slotImageJobFinished( TDEIO::Job *job ) +void TDEHTMLImage::slotImageJobFinished( TDEIO::Job *job ) { if ( job->error() ) { @@ -246,7 +246,7 @@ void KHTMLImage::slotImageJobFinished( TDEIO::Job *job ) } } -void KHTMLImage::updateWindowCaption() +void TDEHTMLImage::updateWindowCaption() { if ( !m_tdehtml ) return; @@ -287,7 +287,7 @@ void KHTMLImage::updateWindowCaption() } */ -void KHTMLImage::disposeImage() +void TDEHTMLImage::disposeImage() { if ( !m_image ) return; @@ -296,7 +296,7 @@ void KHTMLImage::disposeImage() m_image = 0; } -bool KHTMLImage::eventFilter(TQObject *, TQEvent *e) { +bool TDEHTMLImage::eventFilter(TQObject *, TQEvent *e) { switch (e->type()) { case TQEvent::DragEnter: case TQEvent::DragMove: @@ -304,7 +304,7 @@ bool KHTMLImage::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 - KHTMLPart *p = ::tqqt_cast<KHTMLPart *>(parent()); + TDEHTMLPart *p = ::tqqt_cast<TDEHTMLPart *>(parent()); if (p) return TQApplication::sendEvent(p->widget(), e); // otherwise simply forward all dnd events to the part widget, @@ -316,37 +316,37 @@ bool KHTMLImage::eventFilter(TQObject *, TQEvent *e) { return false; } -KHTMLImageBrowserExtension::KHTMLImageBrowserExtension( KHTMLImage *parent, const char *name ) +TDEHTMLImageBrowserExtension::TDEHTMLImageBrowserExtension( TDEHTMLImage *parent, const char *name ) : KParts::BrowserExtension( parent, name ) { m_imgPart = parent; } -int KHTMLImageBrowserExtension::xOffset() +int TDEHTMLImageBrowserExtension::xOffset() { return m_imgPart->doc()->view()->contentsX(); } -int KHTMLImageBrowserExtension::yOffset() +int TDEHTMLImageBrowserExtension::yOffset() { return m_imgPart->doc()->view()->contentsY(); } -void KHTMLImageBrowserExtension::print() +void TDEHTMLImageBrowserExtension::print() { - static_cast<KHTMLPartBrowserExtension *>( m_imgPart->doc()->browserExtension() )->print(); + static_cast<TDEHTMLPartBrowserExtension *>( m_imgPart->doc()->browserExtension() )->print(); } -void KHTMLImageBrowserExtension::reparseConfiguration() +void TDEHTMLImageBrowserExtension::reparseConfiguration() { - static_cast<KHTMLPartBrowserExtension *>( m_imgPart->doc()->browserExtension() )->reparseConfiguration(); + static_cast<TDEHTMLPartBrowserExtension *>( m_imgPart->doc()->browserExtension() )->reparseConfiguration(); m_imgPart->doc()->setAutoloadImages( true ); } -void KHTMLImageBrowserExtension::disableScrolling() +void TDEHTMLImageBrowserExtension::disableScrolling() { - static_cast<KHTMLPartBrowserExtension *>( m_imgPart->doc()->browserExtension() )->disableScrolling(); + static_cast<TDEHTMLPartBrowserExtension *>( m_imgPart->doc()->browserExtension() )->disableScrolling(); } using namespace KParts; diff --git a/tdehtml/tdehtmlimage.h b/tdehtml/tdehtmlimage.h index b8d2d86d4..8b8b5893b 100644 --- a/tdehtml/tdehtmlimage.h +++ b/tdehtml/tdehtmlimage.h @@ -26,7 +26,7 @@ #include "misc/loader_client.h" -class KHTMLPart; +class TDEHTMLPart; class TDEInstance; namespace tdehtml @@ -37,12 +37,12 @@ namespace tdehtml /** * @internal */ -class KHTMLImageFactory : public KParts::Factory +class TDEHTMLImageFactory : public KParts::Factory { Q_OBJECT public: - KHTMLImageFactory(); - virtual ~KHTMLImageFactory(); + TDEHTMLImageFactory(); + virtual ~TDEHTMLImageFactory(); virtual KParts::Part *createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, @@ -57,13 +57,13 @@ private: /** * @internal */ -class KHTMLImage : public KParts::ReadOnlyPart, public tdehtml::CachedObjectClient +class TDEHTMLImage : public KParts::ReadOnlyPart, public tdehtml::CachedObjectClient { Q_OBJECT public: - KHTMLImage( TQWidget *parentWidget, const char *widgetName, - TQObject *parent, const char *name, KHTMLPart::GUIProfile prof ); - virtual ~KHTMLImage(); + TDEHTMLImage( TQWidget *parentWidget, const char *widgetName, + TQObject *parent, const char *name, TDEHTMLPart::GUIProfile prof ); + virtual ~TDEHTMLImage(); virtual bool openFile() { return true; } // grmbl, should be non-pure in part.h, IMHO @@ -71,7 +71,7 @@ public: virtual bool closeURL(); - KHTMLPart *doc() const { return m_tdehtml; } + TDEHTMLPart *doc() const { return m_tdehtml; } virtual void notifyFinished( tdehtml::CachedObject *o ); @@ -88,7 +88,7 @@ private slots: private: void disposeImage(); - TQGuardedPtr<KHTMLPart> m_tdehtml; + TQGuardedPtr<TDEHTMLPart> m_tdehtml; KParts::BrowserExtension *m_ext; TQString m_mimeType; tdehtml::CachedImage *m_image; @@ -98,11 +98,11 @@ private: /** * @internal */ -class KHTMLImageBrowserExtension : public KParts::BrowserExtension +class TDEHTMLImageBrowserExtension : public KParts::BrowserExtension { Q_OBJECT public: - KHTMLImageBrowserExtension( KHTMLImage *parent, const char *name = 0 ); + TDEHTMLImageBrowserExtension( TDEHTMLImage *parent, const char *name = 0 ); virtual int xOffset(); virtual int yOffset(); @@ -113,7 +113,7 @@ protected slots: void disableScrolling(); private: - KHTMLImage *m_imgPart; + TDEHTMLImage *m_imgPart; }; #endif diff --git a/tdehtml/tdehtmlpart_p.h b/tdehtml/tdehtmlpart_p.h index a18aa5cf8..c1e641cb9 100644 --- a/tdehtml/tdehtmlpart_p.h +++ b/tdehtml/tdehtmlpart_p.h @@ -33,7 +33,7 @@ #include <tdeparts/partmanager.h> #include <tdeparts/statusbarextension.h> #include <tdeparts/browserextension.h> -#ifndef KHTML_NO_WALLET +#ifndef TDEHTML_NO_WALLET #include <tdewallet.h> #endif @@ -103,7 +103,7 @@ namespace tdehtml bool m_bCompleted; TQString m_name; KParts::URLArgs m_args; - TQGuardedPtr<KHTMLRun> m_run; + TQGuardedPtr<TDEHTMLRun> m_run; bool m_bPreloaded; KURL m_workingURL; Type m_type; @@ -116,36 +116,36 @@ namespace tdehtml } -struct KHTMLFrameList : public TQValueList<tdehtml::ChildFrame*> +struct TDEHTMLFrameList : public TQValueList<tdehtml::ChildFrame*> { Iterator find( const TQString &name ) KDE_NO_EXPORT; }; -typedef KHTMLFrameList::ConstIterator ConstFrameIt; -typedef KHTMLFrameList::Iterator FrameIt; +typedef TDEHTMLFrameList::ConstIterator ConstFrameIt; +typedef TDEHTMLFrameList::Iterator FrameIt; static int tdehtml_part_dcop_counter = 0; -class KHTMLWalletQueue : public TQObject +class TDEHTMLWalletQueue : public TQObject { Q_OBJECT public: - KHTMLWalletQueue(TQObject *parent) : TQObject(parent) { -#ifndef KHTML_NO_WALLET + TDEHTMLWalletQueue(TQObject *parent) : TQObject(parent) { +#ifndef TDEHTML_NO_WALLET wallet = 0L; -#endif // KHTML_NO_WALLET +#endif // TDEHTML_NO_WALLET } - virtual ~KHTMLWalletQueue() { -#ifndef KHTML_NO_WALLET + virtual ~TDEHTMLWalletQueue() { +#ifndef TDEHTML_NO_WALLET delete wallet; wallet = 0L; -#endif // KHTML_NO_WALLET +#endif // TDEHTML_NO_WALLET } -#ifndef KHTML_NO_WALLET +#ifndef TDEHTML_NO_WALLET KWallet::Wallet *wallet; -#endif // KHTML_NO_WALLET +#endif // TDEHTML_NO_WALLET typedef QPair<DOM::HTMLFormElementImpl*, TQGuardedPtr<DOM::DocumentImpl> > Caller; typedef TQValueList<Caller> CallerList; CallerList callers; @@ -156,7 +156,7 @@ class KHTMLWalletQueue : public TQObject public slots: void walletOpened(bool success) { -#ifndef KHTML_NO_WALLET +#ifndef TDEHTML_NO_WALLET if (!success) { delete wallet; wallet = 0L; @@ -179,16 +179,16 @@ class KHTMLWalletQueue : public TQObject callers.clear(); savers.clear(); wallet = 0L; // gave it away -#endif // KHTML_NO_WALLET +#endif // TDEHTML_NO_WALLET } }; -class KHTMLPartPrivate +class TDEHTMLPartPrivate { - KHTMLPartPrivate(const KHTMLPartPrivate & other); - KHTMLPartPrivate& operator=(const KHTMLPartPrivate&); + TDEHTMLPartPrivate(const TDEHTMLPartPrivate & other); + TDEHTMLPartPrivate& operator=(const TDEHTMLPartPrivate&); public: - KHTMLPartPrivate(TQObject* parent) + TDEHTMLPartPrivate(TQObject* parent) { m_doc = 0L; m_decoder = 0L; @@ -200,7 +200,7 @@ public: m_bLoadEventEmitted = true; m_cachePolicy = TDEIO::CC_Verify; m_manager = 0L; - m_settings = new KHTMLSettings(*KHTMLFactory::defaultHTMLSettings()); + m_settings = new TDEHTMLSettings(*TDEHTMLFactory::defaultHTMLSettings()); m_bClearing = false; m_bCleared = false; m_zoomFactor = 100; @@ -218,7 +218,7 @@ public: m_findDialog = 0; m_ssl_in_use = false; m_jsedlg = 0; - m_formNotification = KHTMLPart::NoNotification; + m_formNotification = TDEHTMLPart::NoNotification; #ifndef Q_WS_QWS m_javaContext = 0; @@ -252,9 +252,9 @@ public: m_autoDetectLanguage = tdehtml::Decoder::SemiautomaticDetection; // inherit settings from parent - if(parent && parent->inherits("KHTMLPart")) + if(parent && parent->inherits("TDEHTMLPart")) { - KHTMLPart* part = static_cast<KHTMLPart*>(parent); + TDEHTMLPart* part = static_cast<TDEHTMLPart*>(parent); if(part->d) { m_bJScriptForce = part->d->m_bJScriptForce; @@ -289,13 +289,13 @@ public: m_userStyleSheetLastModified = 0; m_wq = 0; } - ~KHTMLPartPrivate() + ~TDEHTMLPartPrivate() { delete m_dcopobject; delete m_statusBarExtension; delete m_extension; delete m_settings; -#ifndef KHTML_NO_WALLET +#ifndef TDEHTML_NO_WALLET delete m_wallet; #endif #ifndef Q_WS_QWS @@ -304,19 +304,19 @@ public: } TQGuardedPtr<tdehtml::ChildFrame> m_frame; - KHTMLFrameList m_frames; - KHTMLFrameList m_objects; + TDEHTMLFrameList m_frames; + TDEHTMLFrameList m_objects; - TQGuardedPtr<KHTMLView> m_view; - KHTMLPartBrowserExtension *m_extension; + TQGuardedPtr<TDEHTMLView> m_view; + TDEHTMLPartBrowserExtension *m_extension; KParts::StatusBarExtension *m_statusBarExtension; - KHTMLPartBrowserHostExtension *m_hostExtension; + TDEHTMLPartBrowserHostExtension *m_hostExtension; KURLLabel* m_statusBarIconLabel; KURLLabel* m_statusBarWalletLabel; KURLLabel* m_statusBarUALabel; KURLLabel* m_statusBarJSErrorLabel; KURLLabel* m_statusBarPopupLabel; - TQValueList<TQGuardedPtr<KHTMLPart> > m_suppressedPopupOriginParts; + TQValueList<TQGuardedPtr<TDEHTMLPart> > m_suppressedPopupOriginParts; int m_openableSuppressedPopups; DOM::DocumentImpl *m_doc; tdehtml::Decoder *m_decoder; @@ -354,7 +354,7 @@ public: KJavaAppletContext *m_javaContext; #endif - KHTMLSettings *m_settings; + TDEHTMLSettings *m_settings; TDEIO::TransferJob * m_job; @@ -402,8 +402,8 @@ public: KAction *m_paSecurity; KActionMenu *m_paSetEncoding; KSelectAction *m_paUseStylesheet; - KHTMLZoomFactorAction *m_paIncZoomFactor; - KHTMLZoomFactorAction *m_paDecZoomFactor; + TDEHTMLZoomFactorAction *m_paIncZoomFactor; + TDEHTMLZoomFactorAction *m_paDecZoomFactor; KAction *m_paLoadImages; KAction *m_paFind; KAction *m_paFindNext; @@ -421,7 +421,7 @@ public: KParts::PartManager *m_manager; TQString m_popupMenuXML; - KHTMLPart::GUIProfile m_guiProfile; + TDEHTMLPart::GUIProfile m_guiProfile; int m_zoomFactor; @@ -476,7 +476,7 @@ public: int m_focusNodeNumber; TQPoint m_dragStartPos; -#ifdef KHTML_NO_SELECTION +#ifdef TDEHTML_NO_SELECTION TQPoint m_dragLastPos; #endif @@ -490,7 +490,7 @@ public: unsigned long m_totalObjectCount; unsigned int m_jobPercent; - KHTMLPart::FormNotification m_formNotification; + TDEHTMLPart::FormNotification m_formNotification; TQTimer m_progressUpdateTimer; TQStringList m_pluginPageQuestionAsked; @@ -543,7 +543,7 @@ public: //TQGuardedPtr<KParts::Part> m_activeFrame; KParts::Part * m_activeFrame; - TQGuardedPtr<KHTMLPart> m_opener; + TQGuardedPtr<TDEHTMLPart> m_opener; bool m_openedByJS; bool m_newJSInterpreterExists; // set to 1 by setOpenedByJS, for window.open @@ -551,7 +551,7 @@ public: KPopupMenu *m_automaticDetection; KSelectAction *m_manualDetection; - void setFlagRecursively(bool KHTMLPartPrivate::*flag, bool value); + void setFlagRecursively(bool TDEHTMLPartPrivate::*flag, bool value); /** returns the caret node */ DOM::Node &caretNode() { return m_extendAtEnd ? m_selectionEnd : m_selectionStart; @@ -563,7 +563,7 @@ public: time_t m_userStyleSheetLastModified; - KHTMLWalletQueue *m_wq; + TDEHTMLWalletQueue *m_wq; }; #endif diff --git a/tdehtml/tdehtmlview.cpp b/tdehtml/tdehtmlview.cpp index 383c7628a..049ac0073 100644 --- a/tdehtml/tdehtmlview.cpp +++ b/tdehtml/tdehtmlview.cpp @@ -56,7 +56,7 @@ #include "tdehtmlpart_p.h" -#ifndef KHTML_NO_CARET +#ifndef TDEHTML_NO_CARET #include "tdehtml_caret_p.h" #include "xml/dom2_rangeimpl.h" #endif @@ -109,15 +109,15 @@ namespace tdehtml { using namespace DOM; using namespace tdehtml; -class KHTMLToolTip; +class TDEHTMLToolTip; #ifndef QT_NO_TOOLTIP -class KHTMLToolTip : public TQToolTip +class TDEHTMLToolTip : public TQToolTip { public: - KHTMLToolTip(KHTMLView *view, KHTMLViewPrivate* vp) : TQToolTip(view->viewport()) + TDEHTMLToolTip(TDEHTMLView *view, TDEHTMLViewPrivate* vp) : TQToolTip(view->viewport()) { m_view = view; m_viewprivate = vp; @@ -127,14 +127,14 @@ protected: virtual void maybeTip(const TQPoint &); private: - KHTMLView *m_view; - KHTMLViewPrivate* m_viewprivate; + TDEHTMLView *m_view; + TDEHTMLViewPrivate* m_viewprivate; }; #endif -class KHTMLViewPrivate { - friend class KHTMLToolTip; +class TDEHTMLViewPrivate { + friend class TDEHTMLToolTip; public: enum PseudoFocusNodes { @@ -149,16 +149,16 @@ public: CSActionPending }; - KHTMLViewPrivate() + TDEHTMLViewPrivate() : underMouse( 0 ), underMouseNonShared( 0 ), visibleWidgets( 107 ) #ifndef NO_SMOOTH_SCROLL_HACK , dx(0), dy(0), ddx(0), ddy(0), rdx(0), rdy(0), scrolling(false) #endif { -#ifndef KHTML_NO_CARET +#ifndef TDEHTML_NO_CARET m_caretViewContext = 0; m_editorContext = 0; -#endif // KHTML_NO_CARET +#endif // TDEHTML_NO_CARET postponed_autorepeat = NULL; reset(); vmode = TQScrollView::Auto; @@ -175,7 +175,7 @@ public: m_mouseScrollTimer = 0; m_mouseScrollIndicator = 0; } - ~KHTMLViewPrivate() + ~TDEHTMLViewPrivate() { delete formCompletions; delete tp; tp = 0; @@ -187,10 +187,10 @@ public: if (underMouseNonShared) underMouseNonShared->deref(); delete tooltip; -#ifndef KHTML_NO_CARET +#ifndef TDEHTML_NO_CARET delete m_caretViewContext; delete m_editorContext; -#endif // KHTML_NO_CARET +#endif // TDEHTML_NO_CARET delete cursor_icon_widget; delete m_mouseScrollTimer; delete m_mouseScrollIndicator; @@ -208,7 +208,7 @@ public: tabMovePending = false; lastTabbingDirection = true; pseudoFocusNode = PFNone; -#ifndef KHTML_NO_SCROLLBARS +#ifndef TDEHTML_NO_SCROLLBARS //We don't turn off the toolbars here //since if the user turns them //off, then chances are they want them turned @@ -250,22 +250,22 @@ public: painting = false; updateRegion = TQRegion(); m_dialogsAllowed = true; -#ifndef KHTML_NO_CARET +#ifndef TDEHTML_NO_CARET if (m_caretViewContext) { m_caretViewContext->caretMoved = false; m_caretViewContext->keyReleasePending = false; }/*end if*/ -#endif // KHTML_NO_CARET -#ifndef KHTML_NO_TYPE_AHEAD_FIND +#endif // TDEHTML_NO_CARET +#ifndef TDEHTML_NO_TYPE_AHEAD_FIND typeAheadActivated = false; -#endif // KHTML_NO_TYPE_AHEAD_FIND +#endif // TDEHTML_NO_TYPE_AHEAD_FIND accessKeysActivated = false; accessKeysPreActivate = false; // We ref/deref to ensure defaultHTMLSettings is available - KHTMLFactory::ref(); - accessKeysEnabled = KHTMLFactory::defaultHTMLSettings()->accessKeysEnabled(); - KHTMLFactory::deref(); + TDEHTMLFactory::ref(); + accessKeysEnabled = TDEHTMLFactory::defaultHTMLSettings()->accessKeysEnabled(); + TDEHTMLFactory::deref(); emitCompletedAfterRepaint = CSNone; } @@ -304,7 +304,7 @@ public: scrollSuspended = false; } -#ifndef KHTML_NO_CARET +#ifndef TDEHTML_NO_CARET /** this function returns an instance of the caret view context. If none * exists, it will be instantiated. */ @@ -319,7 +319,7 @@ public: if (!m_editorContext) m_editorContext = new EditorContext(); return m_editorContext; } -#endif // KHTML_NO_CARET +#endif // TDEHTML_NO_CARET #ifdef DEBUG_PIXEL TQTime timer; @@ -375,18 +375,18 @@ public: bool dirtyLayout :1; bool m_dialogsAllowed :1; TQRegion updateRegion; - KHTMLToolTip *tooltip; + TDEHTMLToolTip *tooltip; TQPtrDict<TQWidget> visibleWidgets; -#ifndef KHTML_NO_CARET +#ifndef TDEHTML_NO_CARET CaretViewContext *m_caretViewContext; EditorContext *m_editorContext; -#endif // KHTML_NO_CARET -#ifndef KHTML_NO_TYPE_AHEAD_FIND +#endif // TDEHTML_NO_CARET +#ifndef TDEHTML_NO_TYPE_AHEAD_FIND TQString findString; TQTimer timer; bool findLinksOnly; bool typeAheadActivated; -#endif // KHTML_NO_TYPE_AHEAD_FIND +#endif // TDEHTML_NO_TYPE_AHEAD_FIND bool accessKeysEnabled; bool accessKeysActivated; bool accessKeysPreActivate; @@ -453,7 +453,7 @@ static bool findImageMapRect(HTMLImageElementImpl *img, const TQPoint &scrollOfs return false; } -void KHTMLToolTip::maybeTip(const TQPoint& p) +void TDEHTMLToolTip::maybeTip(const TQPoint& p) { DOM::NodeImpl *node = m_viewprivate->underMouseNonShared; TQRect region; @@ -484,13 +484,13 @@ void KHTMLToolTip::maybeTip(const TQPoint& p) } #endif -KHTMLView::KHTMLView( KHTMLPart *part, TQWidget *parent, const char *name) +TDEHTMLView::TDEHTMLView( TDEHTMLPart *part, TQWidget *parent, const char *name) : TQScrollView( parent, name, (WFlags)(WResizeNoErase | WRepaintNoErase) ) { m_medium = "screen"; m_part = part; - d = new KHTMLViewPrivate; + d = new TDEHTMLViewPrivate; TQScrollView::setVScrollBarMode(d->vmode); TQScrollView::setHScrollBarMode(d->hmode); connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), this, TQT_SLOT(slotPaletteChanged())); @@ -499,7 +499,7 @@ KHTMLView::KHTMLView( KHTMLPart *part, TQWidget *parent, const char *name) // initialize QScrollView enableClipper(true); // hack to get unclipped painting on the viewport. - static_cast<KHTMLView *>(TQT_TQWIDGET(viewport()))->setWFlags(WPaintUnclipped); + static_cast<TDEHTMLView *>(TQT_TQWIDGET(viewport()))->setWFlags(WPaintUnclipped); setResizePolicy(Manual); viewport()->setMouseTracking(true); @@ -508,12 +508,12 @@ KHTMLView::KHTMLView( KHTMLPart *part, TQWidget *parent, const char *name) KImageIO::registerFormats(); #ifndef QT_NO_TOOLTIP - d->tooltip = new KHTMLToolTip( this, d ); + d->tooltip = new TDEHTMLToolTip( this, d ); #endif -#ifndef KHTML_NO_TYPE_AHEAD_FIND +#ifndef TDEHTML_NO_TYPE_AHEAD_FIND connect(&d->timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(findTimeout())); -#endif // KHTML_NO_TYPE_AHEAD_FIND +#endif // TDEHTML_NO_TYPE_AHEAD_FIND init(); @@ -525,7 +525,7 @@ KHTMLView::KHTMLView( KHTMLPart *part, TQWidget *parent, const char *name) #endif } -KHTMLView::~KHTMLView() +TDEHTMLView::~TDEHTMLView() { closeChildDialogs(); if (m_part) @@ -539,7 +539,7 @@ KHTMLView::~KHTMLView() delete d; d = 0; } -void KHTMLView::init() +void TDEHTMLView::init() { if(!d->paintBuffer) d->paintBuffer = new TQPixmap(PAINT_BUFFER_HEIGHT, PAINT_BUFFER_HEIGHT); if(!d->vertPaintBuffer) @@ -561,15 +561,15 @@ void KHTMLView::init() resizeContents(s.width(), s.height()); } -void KHTMLView::clear() +void TDEHTMLView::clear() { // work around QScrollview's unbelievable bugginess setStaticBackground(true); -#ifndef KHTML_NO_CARET +#ifndef TDEHTML_NO_CARET if (!m_part->isCaretMode() && !m_part->isEditable()) caretOff(); #endif -#ifndef KHTML_NO_TYPE_AHEAD_FIND +#ifndef TDEHTML_NO_TYPE_AHEAD_FIND if( d->typeAheadActivated ) findTimeout(); #endif @@ -588,21 +588,21 @@ void KHTMLView::clear() horizontalScrollBar()->setEnabled( false ); } -void KHTMLView::hideEvent(TQHideEvent* e) +void TDEHTMLView::hideEvent(TQHideEvent* e) { TQScrollView::hideEvent(e); if ( m_part && m_part->xmlDocImpl() ) m_part->xmlDocImpl()->docLoader()->pauseAnimations(); } -void KHTMLView::showEvent(TQShowEvent* e) +void TDEHTMLView::showEvent(TQShowEvent* e) { TQScrollView::showEvent(e); if ( m_part && m_part->xmlDocImpl() ) m_part->xmlDocImpl()->docLoader()->resumeAnimations(); } -void KHTMLView::resizeEvent (TQResizeEvent* e) +void TDEHTMLView::resizeEvent (TQResizeEvent* e) { int dw = e->oldSize().width() - e->size().width(); int dh = e->oldSize().height() - e->size().height(); @@ -620,7 +620,7 @@ void KHTMLView::resizeEvent (TQResizeEvent* e) m_part->xmlDocImpl()->dispatchWindowEvent( EventImpl::RESIZE_EVENT, false, false ); } -void KHTMLView::viewportResizeEvent (TQResizeEvent* e) +void TDEHTMLView::viewportResizeEvent (TQResizeEvent* e) { TQScrollView::viewportResizeEvent(e); @@ -629,7 +629,7 @@ void KHTMLView::viewportResizeEvent (TQResizeEvent* e) if (d->layoutSchedulingEnabled) layout(); -#ifndef KHTML_NO_CARET +#ifndef TDEHTML_NO_CARET else { hideCaret(); recalcAndStoreCaretPos(); @@ -641,11 +641,11 @@ void KHTMLView::viewportResizeEvent (TQResizeEvent* e) } // this is to get rid of a compiler virtual overload mismatch warning. do not remove -void KHTMLView::drawContents( TQPainter*) +void TDEHTMLView::drawContents( TQPainter*) { } -void KHTMLView::drawContents( TQPainter *p, int ex, int ey, int ew, int eh ) +void TDEHTMLView::drawContents( TQPainter *p, int ex, int ey, int ew, int eh ) { #ifdef DEBUG_PIXEL @@ -683,7 +683,7 @@ void KHTMLView::drawContents( TQPainter *p, int ex, int ey, int ew, int eh ) for (TQPtrDictIterator<TQWidget> it(d->visibleWidgets); it.current(); ++it) { TQWidget *w = it.current(); RenderWidget* rw = static_cast<RenderWidget*>( it.currentKey() ); - if (w && rw && !rw->isKHTMLWidget()) { + if (w && rw && !rw->isTDEHTMLWidget()) { int x, y; rw->absolutePosition(x, y); contentsToViewport(x, y, x, y); @@ -760,7 +760,7 @@ static int cnt=0; m_part->xmlDocImpl()->renderer()->layer()->paint(p, pr); #endif // DEBUG_NO_PAINT_BUFFER -#ifndef KHTML_NO_CARET +#ifndef TDEHTML_NO_CARET if (d->m_caretViewContext && d->m_caretViewContext->visible) { TQRect pos(d->m_caretViewContext->x, d->m_caretViewContext->y, d->m_caretViewContext->width, d->m_caretViewContext->height); @@ -774,7 +774,7 @@ static int cnt=0; }/*end if*/ }/*end if*/ }/*end if*/ -#endif // KHTML_NO_CARET +#endif // TDEHTML_NO_CARET // p->setPen(TQPen(magenta,0,DashDotDotLine)); // p->drawRect(dbg_paint_rect); @@ -785,19 +785,19 @@ static int cnt=0; d->painting = false; } -void KHTMLView::setMarginWidth(int w) +void TDEHTMLView::setMarginWidth(int w) { // make it update the rendering area when set _marginWidth = w; } -void KHTMLView::setMarginHeight(int h) +void TDEHTMLView::setMarginHeight(int h) { // make it update the rendering area when set _marginHeight = h; } -void KHTMLView::layout() +void TDEHTMLView::layout() { if( m_part && m_part->xmlDocImpl() ) { DOM::DocumentImpl *document = m_part->xmlDocImpl(); @@ -824,7 +824,7 @@ void KHTMLView::layout() } else { if (!d->tooltip) - d->tooltip = new KHTMLToolTip( this, d ); + d->tooltip = new TDEHTMLToolTip( this, d ); // only apply body's overflow to canvas if root as a visible overflow if (root) ref = (!body || root->style()->hidesOverflow()) ? root : body->renderer(); @@ -870,7 +870,7 @@ void KHTMLView::layout() if (listitem) kdDebug(6000) << "after layout, before repaint" << endl; if (listitem) dumpLineBoxes(static_cast<RenderFlow *>(listitem->renderer())); #endif -#ifndef KHTML_NO_CARET +#ifndef TDEHTML_NO_CARET hideCaret(); if ((m_part->isCaretMode() || m_part->isEditable()) && !d->complete && d->m_caretViewContext @@ -895,7 +895,7 @@ void KHTMLView::layout() d->layoutSchedulingEnabled=true; } -void KHTMLView::closeChildDialogs() +void TDEHTMLView::closeChildDialogs() { TQObjectList *dlgs = queryList(TQDIALOG_OBJECT_NAME_STRING); for (TQObject *dlg = dlgs->first(); dlg; dlg = dlgs->next()) @@ -919,15 +919,15 @@ void KHTMLView::closeChildDialogs() d->m_dialogsAllowed = false; } -bool KHTMLView::dialogsAllowed() { +bool TDEHTMLView::dialogsAllowed() { bool allowed = d->m_dialogsAllowed; - KHTMLPart* p = m_part->parentPart(); + TDEHTMLPart* p = m_part->parentPart(); if (p && p->view()) allowed &= p->view()->dialogsAllowed(); return allowed; } -void KHTMLView::closeEvent( TQCloseEvent* ev ) +void TDEHTMLView::closeEvent( TQCloseEvent* ev ) { closeChildDialogs(); TQScrollView::closeEvent( ev ); @@ -938,7 +938,7 @@ void KHTMLView::closeEvent( TQCloseEvent* ev ) // ///////////////// -void KHTMLView::viewportMousePressEvent( TQMouseEvent *_mouse ) +void TDEHTMLView::viewportMousePressEvent( TQMouseEvent *_mouse ) { if (!m_part->xmlDocImpl()) return; if (d->possibleTripleClick && ( _mouse->button() & Qt::MouseButtonMask ) == Qt::LeftButton) @@ -1058,7 +1058,7 @@ void KHTMLView::viewportMousePressEvent( TQMouseEvent *_mouse ) } } -void KHTMLView::viewportMouseDoubleClickEvent( TQMouseEvent *_mouse ) +void TDEHTMLView::viewportMouseDoubleClickEvent( TQMouseEvent *_mouse ) { if(!m_part->xmlDocImpl()) return; @@ -1098,7 +1098,7 @@ void KHTMLView::viewportMouseDoubleClickEvent( TQMouseEvent *_mouse ) TQTimer::singleShot(TQApplication::doubleClickInterval(),this,TQT_SLOT(tripleClickTimeout())); } -void KHTMLView::tripleClickTimeout() +void TDEHTMLView::tripleClickTimeout() { d->possibleTripleClick = false; d->clickCount = 0; @@ -1120,7 +1120,7 @@ static inline void forwardPeripheralEvent(tdehtml::RenderWidget* r, TQMouseEvent } -static bool targetOpensNewWindow(KHTMLPart *part, TQString target) +static bool targetOpensNewWindow(TDEHTMLPart *part, TQString target) { if (!target.isEmpty() && (target.lower() != "_top") && (target.lower() != "_self") && (target.lower() != "_parent")) { @@ -1136,7 +1136,7 @@ static bool targetOpensNewWindow(KHTMLPart *part, TQString target) return false; } -void KHTMLView::viewportMouseMoveEvent( TQMouseEvent * _mouse ) +void TDEHTMLView::viewportMouseMoveEvent( TQMouseEvent * _mouse ) { if ( d->m_mouseScrollTimer ) { TQPoint point = mapFromGlobal( _mouse->globalPos() ); @@ -1259,7 +1259,7 @@ void KHTMLView::viewportMouseMoveEvent( TQMouseEvent * _mouse ) if ( viewport()->cursor().handle() != c.handle() ) { if( c.handle() == KCursor::arrowCursor().handle()) { - for (KHTMLPart* p = m_part; p; p = p->parentPart()) + for (TDEHTMLPart* p = m_part; p; p = p->parentPart()) p->view()->viewport()->unsetCursor(); } else { @@ -1316,7 +1316,7 @@ void KHTMLView::viewportMouseMoveEvent( TQMouseEvent * _mouse ) } } -void KHTMLView::viewportMouseReleaseEvent( TQMouseEvent * _mouse ) +void TDEHTMLView::viewportMouseReleaseEvent( TQMouseEvent * _mouse ) { bool swallowEvent = false; int xm, ym; @@ -1357,7 +1357,7 @@ void KHTMLView::viewportMouseReleaseEvent( TQMouseEvent * _mouse ) } // returns true if event should be swallowed -bool KHTMLView::dispatchKeyEvent( TQKeyEvent *_ke ) +bool TDEHTMLView::dispatchKeyEvent( TQKeyEvent *_ke ) { if (!m_part->xmlDocImpl()) return false; @@ -1432,7 +1432,7 @@ bool KHTMLView::dispatchKeyEvent( TQKeyEvent *_ke ) } // returns true if event should be swallowed -bool KHTMLView::dispatchKeyEventHelper( TQKeyEvent *_ke, bool keypress ) +bool TDEHTMLView::dispatchKeyEventHelper( TQKeyEvent *_ke, bool keypress ) { DOM::NodeImpl* keyNode = m_part->xmlDocImpl()->focusNode(); if (keyNode) { @@ -1442,9 +1442,9 @@ bool KHTMLView::dispatchKeyEventHelper( TQKeyEvent *_ke, bool keypress ) } } -void KHTMLView::keyPressEvent( TQKeyEvent *_ke ) +void TDEHTMLView::keyPressEvent( TQKeyEvent *_ke ) { -#ifndef KHTML_NO_TYPE_AHEAD_FIND +#ifndef TDEHTML_NO_TYPE_AHEAD_FIND if(d->typeAheadActivated) { // type-ahead find aka find-as-you-type @@ -1483,9 +1483,9 @@ void KHTMLView::keyPressEvent( TQKeyEvent *_ke ) return; } } -#endif // KHTML_NO_TYPE_AHEAD_FIND +#endif // TDEHTML_NO_TYPE_AHEAD_FIND -#ifndef KHTML_NO_CARET +#ifndef TDEHTML_NO_CARET if (m_part->isEditable() || m_part->isCaretMode() || (m_part->xmlDocImpl() && m_part->xmlDocImpl()->focusNode() && m_part->xmlDocImpl()->focusNode()->contentEditable())) { @@ -1493,7 +1493,7 @@ void KHTMLView::keyPressEvent( TQKeyEvent *_ke ) caretKeyPressEvent(_ke); return; } -#endif // KHTML_NO_CARET +#endif // TDEHTML_NO_CARET // If CTRL was hit, be prepared for access keys if (d->accessKeysEnabled && _ke->key() == Key_Control && _ke->state()==0 && !d->accessKeysActivated) @@ -1539,22 +1539,22 @@ void KHTMLView::keyPressEvent( TQKeyEvent *_ke ) case Key_Down: case Key_J: - d->adjustScroller(this, KHTMLViewPrivate::ScrollDown, KHTMLViewPrivate::ScrollUp); + d->adjustScroller(this, TDEHTMLViewPrivate::ScrollDown, TDEHTMLViewPrivate::ScrollUp); break; case Key_Up: case Key_K: - d->adjustScroller(this, KHTMLViewPrivate::ScrollUp, KHTMLViewPrivate::ScrollDown); + d->adjustScroller(this, TDEHTMLViewPrivate::ScrollUp, TDEHTMLViewPrivate::ScrollDown); break; case Key_Left: case Key_H: - d->adjustScroller(this, KHTMLViewPrivate::ScrollLeft, KHTMLViewPrivate::ScrollRight); + d->adjustScroller(this, TDEHTMLViewPrivate::ScrollLeft, TDEHTMLViewPrivate::ScrollRight); break; case Key_Right: case Key_L: - d->adjustScroller(this, KHTMLViewPrivate::ScrollRight, KHTMLViewPrivate::ScrollLeft); + d->adjustScroller(this, TDEHTMLViewPrivate::ScrollRight, TDEHTMLViewPrivate::ScrollLeft); break; } else @@ -1636,30 +1636,30 @@ void KHTMLView::keyPressEvent( TQKeyEvent *_ke ) _ke->accept(); } -void KHTMLView::findTimeout() +void TDEHTMLView::findTimeout() { -#ifndef KHTML_NO_TYPE_AHEAD_FIND +#ifndef TDEHTML_NO_TYPE_AHEAD_FIND d->typeAheadActivated = false; d->findString = ""; - m_part->setStatusBarText(i18n("Find stopped."), KHTMLPart::BarDefaultText); + m_part->setStatusBarText(i18n("Find stopped."), TDEHTMLPart::BarDefaultText); m_part->enableFindAheadActions( true ); -#endif // KHTML_NO_TYPE_AHEAD_FIND +#endif // TDEHTML_NO_TYPE_AHEAD_FIND } -#ifndef KHTML_NO_TYPE_AHEAD_FIND -void KHTMLView::startFindAhead( bool linksOnly ) +#ifndef TDEHTML_NO_TYPE_AHEAD_FIND +void TDEHTMLView::startFindAhead( bool linksOnly ) { if( linksOnly ) { d->findLinksOnly = true; m_part->setStatusBarText(i18n("Starting -- find links as you type"), - KHTMLPart::BarDefaultText); + TDEHTMLPart::BarDefaultText); } else { d->findLinksOnly = false; m_part->setStatusBarText(i18n("Starting -- find text as you type"), - KHTMLPart::BarDefaultText); + TDEHTMLPart::BarDefaultText); } m_part->findTextBegin(); @@ -1669,14 +1669,14 @@ void KHTMLView::startFindAhead( bool linksOnly ) d->timer.start(3000, true); } -void KHTMLView::findAhead(bool increase) +void TDEHTMLView::findAhead(bool increase) { TQString status; if(d->findLinksOnly) { - m_part->findText(d->findString, KHTMLPart::FindNoPopups | - KHTMLPart::FindLinksOnly, this); + m_part->findText(d->findString, TDEHTMLPart::FindNoPopups | + TDEHTMLPart::FindLinksOnly, this); if(m_part->findTextNext()) { status = i18n("Link found: \"%1\"."); @@ -1689,7 +1689,7 @@ void KHTMLView::findAhead(bool increase) } else { - m_part->findText(d->findString, KHTMLPart::FindNoPopups, this); + m_part->findText(d->findString, TDEHTMLPart::FindNoPopups, this); if(m_part->findTextNext()) { status = i18n("Text found: \"%1\"."); @@ -1702,20 +1702,20 @@ void KHTMLView::findAhead(bool increase) } m_part->setStatusBarText(status.arg(d->findString.lower()), - KHTMLPart::BarDefaultText); + TDEHTMLPart::BarDefaultText); } -void KHTMLView::updateFindAheadTimeout() +void TDEHTMLView::updateFindAheadTimeout() { if( d->typeAheadActivated ) d->timer.start( 3000, true ); } -#endif // KHTML_NO_TYPE_AHEAD_FIND +#endif // TDEHTML_NO_TYPE_AHEAD_FIND -void KHTMLView::keyReleaseEvent(TQKeyEvent *_ke) +void TDEHTMLView::keyReleaseEvent(TQKeyEvent *_ke) { -#ifndef KHTML_NO_TYPE_AHEAD_FIND +#ifndef TDEHTML_NO_TYPE_AHEAD_FIND if(d->typeAheadActivated) { _ke->accept(); return; @@ -1749,7 +1749,7 @@ void KHTMLView::keyReleaseEvent(TQKeyEvent *_ke) if (d->accessKeysPreActivate && _ke->state() == TQt::ControlButton && !(TDEApplication::keyboardMouseState() & TQt::ControlButton)) { displayAccessKeys(); - m_part->setStatusBarText(i18n("Access Keys activated"),KHTMLPart::BarOverrideText); + m_part->setStatusBarText(i18n("Access Keys activated"),TDEHTMLPart::BarOverrideText); d->accessKeysActivated = true; d->accessKeysPreActivate = false; _ke->accept(); @@ -1773,7 +1773,7 @@ void KHTMLView::keyReleaseEvent(TQKeyEvent *_ke) TQScrollView::keyReleaseEvent(_ke); } -void KHTMLView::contentsContextMenuEvent ( TQContextMenuEvent * /*ce*/ ) +void TDEHTMLView::contentsContextMenuEvent ( TQContextMenuEvent * /*ce*/ ) { // ### what kind of c*** is that ? #if 0 @@ -1800,7 +1800,7 @@ void KHTMLView::contentsContextMenuEvent ( TQContextMenuEvent * /*ce*/ ) #endif } -bool KHTMLView::focusNextPrevChild( bool next ) +bool TDEHTMLView::focusNextPrevChild( bool next ) { // Now try to find the next child if (m_part->xmlDocImpl() && focusNextPrevNode(next)) @@ -1812,14 +1812,14 @@ bool KHTMLView::focusNextPrevChild( bool next ) } // If we get here, pass tabbing control up to the next/previous child in our parent - d->pseudoFocusNode = KHTMLViewPrivate::PFNone; + d->pseudoFocusNode = TDEHTMLViewPrivate::PFNone; if (m_part->parentPart() && m_part->parentPart()->view()) return m_part->parentPart()->view()->focusNextPrevChild(next); return TQWidget::focusNextPrevChild(next); } -void KHTMLView::doAutoScroll() +void TDEHTMLView::doAutoScroll() { TQPoint pos = TQCursor::pos(); pos = viewport()->mapFromGlobal( pos ); @@ -1833,7 +1833,7 @@ void KHTMLView::doAutoScroll() { ensureVisible( xm, ym, 0, 5 ); -#ifndef KHTML_NO_SELECTION +#ifndef TDEHTML_NO_SELECTION // extend the selection while scrolling DOM::Node innerNode; if (m_part->isExtendingSelection()) { @@ -1849,7 +1849,7 @@ void KHTMLView::doAutoScroll() m_part->extendSelectionTo(xm, ym, absX, absY, innerNode); }/*end if*/ -#endif // KHTML_NO_SELECTION +#endif // TDEHTML_NO_SELECTION } } @@ -1860,7 +1860,7 @@ class HackWidget : public TQWidget inline void setNoErase() { setWFlags(getWFlags()|WRepaintNoErase); } }; -bool KHTMLView::eventFilter(TQObject *o, TQEvent *e) +bool TDEHTMLView::eventFilter(TQObject *o, TQEvent *e) { if ( e->type() == TQEvent::AccelOverride ) { TQKeyEvent* ke = (TQKeyEvent*) e; @@ -2011,17 +2011,17 @@ bool KHTMLView::eventFilter(TQObject *o, TQEvent *e) } -DOM::NodeImpl *KHTMLView::nodeUnderMouse() const +DOM::NodeImpl *TDEHTMLView::nodeUnderMouse() const { return d->underMouse; } -DOM::NodeImpl *KHTMLView::nonSharedNodeUnderMouse() const +DOM::NodeImpl *TDEHTMLView::nonSharedNodeUnderMouse() const { return d->underMouseNonShared; } -bool KHTMLView::scrollTo(const TQRect &bounds) +bool TDEHTMLView::scrollTo(const TQRect &bounds) { d->scrollingSelf = true; // so scroll events get ignored @@ -2091,7 +2091,7 @@ bool KHTMLView::scrollTo(const TQRect &bounds) } -bool KHTMLView::focusNextPrevNode(bool next) +bool TDEHTMLView::focusNextPrevNode(bool next) { // Sets the focus node of the document to be the node after (or if // next is false, before) the current focus node. Only nodes that @@ -2143,7 +2143,7 @@ bool KHTMLView::focusNextPrevNode(bool next) d->scrollBarMoved = false; d->tabMovePending = false; d->lastTabbingDirection = next; - d->pseudoFocusNode = KHTMLViewPrivate::PFNone; + d->pseudoFocusNode = TDEHTMLViewPrivate::PFNone; m_part->xmlDocImpl()->setFocusNode(toFocus); Node guard(toFocus); if (!toFocus->hasOneRef() ) @@ -2169,11 +2169,11 @@ bool KHTMLView::focusNextPrevNode(bool next) } #endif - if (!oldFocusNode && d->pseudoFocusNode == KHTMLViewPrivate::PFNone) + if (!oldFocusNode && d->pseudoFocusNode == TDEHTMLViewPrivate::PFNone) { ensureVisible(contentsX(), next?0:contentsHeight()); d->scrollBarMoved = false; - d->pseudoFocusNode = next?KHTMLViewPrivate::PFTop:KHTMLViewPrivate::PFBottom; + d->pseudoFocusNode = next?TDEHTMLViewPrivate::PFTop:TDEHTMLViewPrivate::PFBottom; return true; } @@ -2186,12 +2186,12 @@ bool KHTMLView::focusNextPrevNode(bool next) } else if (next) { - if (oldFocusNode || d->pseudoFocusNode == KHTMLViewPrivate::PFTop ) + if (oldFocusNode || d->pseudoFocusNode == TDEHTMLViewPrivate::PFTop ) newFocusNode = doc->nextFocusNode(oldFocusNode); } else { - if (oldFocusNode || d->pseudoFocusNode == KHTMLViewPrivate::PFBottom ) + if (oldFocusNode || d->pseudoFocusNode == TDEHTMLViewPrivate::PFBottom ) newFocusNode = doc->previousFocusNode(oldFocusNode); } @@ -2209,7 +2209,7 @@ bool KHTMLView::focusNextPrevNode(bool next) } else { -#ifndef KHTML_NO_CARET +#ifndef TDEHTML_NO_CARET // if it's an editable element, activate the caret if (!m_part->isCaretMode() && !m_part->isEditable() && newFocusNode->contentEditable()) { @@ -2218,7 +2218,7 @@ bool KHTMLView::focusNextPrevNode(bool next) } else { caretOff(); } -#endif // KHTML_NO_CARET +#endif // TDEHTML_NO_CARET targetVisible = scrollTo(newFocusNode->getRect()); } @@ -2240,7 +2240,7 @@ bool KHTMLView::focusNextPrevNode(bool next) } else { - d->pseudoFocusNode = next?KHTMLViewPrivate::PFBottom:KHTMLViewPrivate::PFTop; + d->pseudoFocusNode = next?TDEHTMLViewPrivate::PFBottom:TDEHTMLViewPrivate::PFTop; return false; } } @@ -2253,14 +2253,14 @@ bool KHTMLView::focusNextPrevNode(bool next) } } -void KHTMLView::displayAccessKeys() +void TDEHTMLView::displayAccessKeys() { TQValueVector< TQChar > taken; displayAccessKeys( NULL, this, taken, false ); displayAccessKeys( NULL, this, taken, true ); } -void KHTMLView::displayAccessKeys( KHTMLView* caller, KHTMLView* origview, TQValueVector< TQChar >& taken, bool use_fallbacks ) +void TDEHTMLView::displayAccessKeys( TDEHTMLView* caller, TDEHTMLView* origview, TQValueVector< TQChar >& taken, bool use_fallbacks ) { TQMap< ElementImpl*, TQChar > fallbacks; if( use_fallbacks ) @@ -2304,9 +2304,9 @@ void KHTMLView::displayAccessKeys( KHTMLView* caller, KHTMLView* origview, TQVal for( TQPtrListIterator<KParts::ReadOnlyPart> it( frames ); it != NULL; ++it ) { - if( !(*it)->inherits( "KHTMLPart" )) + if( !(*it)->inherits( "TDEHTMLPart" )) continue; - KHTMLPart* part = static_cast< KHTMLPart* >( *it ); + TDEHTMLPart* part = static_cast< TDEHTMLPart* >( *it ); if( part->view() && part->view() != caller ) part->view()->displayAccessKeys( this, origview, taken, use_fallbacks ); } @@ -2318,16 +2318,16 @@ void KHTMLView::displayAccessKeys( KHTMLView* caller, KHTMLView* origview, TQVal -void KHTMLView::accessKeysTimeout() +void TDEHTMLView::accessKeysTimeout() { d->accessKeysActivated=false; d->accessKeysPreActivate = false; -m_part->setStatusBarText(TQString::null, KHTMLPart::BarOverrideText); +m_part->setStatusBarText(TQString::null, TDEHTMLPart::BarOverrideText); emit hideAccessKeys(); } // Handling of the HTML accesskey attribute. -bool KHTMLView::handleAccessKey( const TQKeyEvent* ev ) +bool TDEHTMLView::handleAccessKey( const TQKeyEvent* ev ) { // Qt interprets the keyevent also with the modifiers, and ev->text() matches that, // but this code must act as if the modifiers weren't pressed @@ -2347,7 +2347,7 @@ bool KHTMLView::handleAccessKey( const TQKeyEvent* ev ) return focusNodeWithAccessKey( c ); } -bool KHTMLView::focusNodeWithAccessKey( TQChar c, KHTMLView* caller ) +bool TDEHTMLView::focusNodeWithAccessKey( TQChar c, TDEHTMLView* caller ) { DocumentImpl *doc = m_part->xmlDocImpl(); if( !doc ) @@ -2358,9 +2358,9 @@ bool KHTMLView::focusNodeWithAccessKey( TQChar c, KHTMLView* caller ) for( TQPtrListIterator<KParts::ReadOnlyPart> it( frames ); it != NULL; ++it ) { - if( !(*it)->inherits( "KHTMLPart" )) + if( !(*it)->inherits( "TDEHTMLPart" )) continue; - KHTMLPart* part = static_cast< KHTMLPart* >( *it ); + TDEHTMLPart* part = static_cast< TDEHTMLPart* >( *it ); if( part->view() && part->view() != caller && part->view()->focusNodeWithAccessKey( c, this )) return true; @@ -2385,7 +2385,7 @@ bool KHTMLView::focusNodeWithAccessKey( TQChar c, KHTMLView* caller ) } // Scroll the view as necessary to ensure that the new focus node is visible -#ifndef KHTML_NO_CARET +#ifndef TDEHTML_NO_CARET // if it's an editable element, activate the caret if (!m_part->isCaretMode() && !m_part->isEditable() && node->contentEditable()) { @@ -2394,7 +2394,7 @@ bool KHTMLView::focusNodeWithAccessKey( TQChar c, KHTMLView* caller ) } else { caretOff(); } -#endif // KHTML_NO_CARET +#endif // TDEHTML_NO_CARET TQRect r = node->getRect(); ensureVisible( r.right(), r.bottom()); @@ -2521,7 +2521,7 @@ struct AccessKeyData { }; } -TQMap< ElementImpl*, TQChar > KHTMLView::buildFallbackAccessKeys() const +TQMap< ElementImpl*, TQChar > TDEHTMLView::buildFallbackAccessKeys() const { // build a list of all possible candidate elements that could use an accesskey TQValueList< AccessKeyData > data; @@ -2739,22 +2739,22 @@ TQMap< ElementImpl*, TQChar > KHTMLView::buildFallbackAccessKeys() const return ret; } -void KHTMLView::setMediaType( const TQString &medium ) +void TDEHTMLView::setMediaType( const TQString &medium ) { m_medium = medium; } -TQString KHTMLView::mediaType() const +TQString TDEHTMLView::mediaType() const { return m_medium; } -bool KHTMLView::pagedMode() const +bool TDEHTMLView::pagedMode() const { return d->paged; } -void KHTMLView::setWidgetVisible(RenderWidget* w, bool vis) +void TDEHTMLView::setWidgetVisible(RenderWidget* w, bool vis) { if (vis) { d->visibleWidgets.replace(w, w->widget()); @@ -2763,24 +2763,24 @@ void KHTMLView::setWidgetVisible(RenderWidget* w, bool vis) d->visibleWidgets.remove(w); } -bool KHTMLView::needsFullRepaint() const +bool TDEHTMLView::needsFullRepaint() const { return d->needsFullRepaint; } -void KHTMLView::print() +void TDEHTMLView::print() { print( false ); } -void KHTMLView::print(bool quick) +void TDEHTMLView::print(bool quick) { if(!m_part->xmlDocImpl()) return; tdehtml::RenderCanvas *root = static_cast<tdehtml::RenderCanvas *>(m_part->xmlDocImpl()->renderer()); if(!root) return; KPrinter *printer = new KPrinter(true, TQPrinter::ScreenResolution); - printer->addDialogPage(new KHTMLPrintSettings()); + printer->addDialogPage(new TDEHTMLPrintSettings()); TQString docname = m_part->xmlDocImpl()->URL().prettyURL(); if ( !docname.isEmpty() ) docname = KStringHandler::csqueeze(docname, 80); @@ -2963,7 +2963,7 @@ void KHTMLView::print(bool quick) delete printer; } -void KHTMLView::slotPaletteChanged() +void TDEHTMLView::slotPaletteChanged() { if(!m_part->xmlDocImpl()) return; DOM::DocumentImpl *document = m_part->xmlDocImpl(); @@ -2977,7 +2977,7 @@ void KHTMLView::slotPaletteChanged() body->recalcStyle( NodeImpl::Force ); } -void KHTMLView::paint(TQPainter *p, const TQRect &rc, int yOff, bool *more) +void TDEHTMLView::paint(TQPainter *p, const TQRect &rc, int yOff, bool *more) { if(!m_part->xmlDocImpl()) return; tdehtml::RenderCanvas *root = static_cast<tdehtml::RenderCanvas *>(m_part->xmlDocImpl()->renderer()); @@ -3010,16 +3010,16 @@ void KHTMLView::paint(TQPainter *p, const TQRect &rc, int yOff, bool *more) } -void KHTMLView::useSlowRepaints() +void TDEHTMLView::useSlowRepaints() { d->useSlowRepaints = true; setStaticBackground(true); } -void KHTMLView::setVScrollBarMode ( ScrollBarMode mode ) +void TDEHTMLView::setVScrollBarMode ( ScrollBarMode mode ) { -#ifndef KHTML_NO_SCROLLBARS +#ifndef TDEHTML_NO_SCROLLBARS d->vmode = mode; TQScrollView::setVScrollBarMode(mode); #else @@ -3027,9 +3027,9 @@ void KHTMLView::setVScrollBarMode ( ScrollBarMode mode ) #endif } -void KHTMLView::setHScrollBarMode ( ScrollBarMode mode ) +void TDEHTMLView::setHScrollBarMode ( ScrollBarMode mode ) { -#ifndef KHTML_NO_SCROLLBARS +#ifndef TDEHTML_NO_SCROLLBARS d->hmode = mode; TQScrollView::setHScrollBarMode(mode); #else @@ -3037,7 +3037,7 @@ void KHTMLView::setHScrollBarMode ( ScrollBarMode mode ) #endif } -void KHTMLView::restoreScrollBar() +void TDEHTMLView::restoreScrollBar() { int ow = visibleWidth(); TQScrollView::setVScrollBarMode(d->vmode); @@ -3046,7 +3046,7 @@ void KHTMLView::restoreScrollBar() d->prevScrollbarVisible = verticalScrollBar()->isVisible(); } -TQStringList KHTMLView::formCompletionItems(const TQString &name) const +TQStringList TDEHTMLView::formCompletionItems(const TQString &name) const { if (!m_part->settings()->isFormCompletionEnabled()) return TQStringList(); @@ -3055,7 +3055,7 @@ TQStringList KHTMLView::formCompletionItems(const TQString &name) const return d->formCompletions->readListEntry(name); } -void KHTMLView::clearCompletionHistory(const TQString& name) +void TDEHTMLView::clearCompletionHistory(const TQString& name) { if (!d->formCompletions) { @@ -3065,7 +3065,7 @@ void KHTMLView::clearCompletionHistory(const TQString& name) d->formCompletions->sync(); } -void KHTMLView::addFormCompletionItem(const TQString &name, const TQString &value) +void TDEHTMLView::addFormCompletionItem(const TQString &name, const TQString &value) { if (!m_part->settings()->isFormCompletionEnabled()) return; @@ -3092,7 +3092,7 @@ void KHTMLView::addFormCompletionItem(const TQString &name, const TQString &valu d->formCompletions->writeEntry(name, items); } -void KHTMLView::removeFormCompletionItem(const TQString &name, const TQString &value) +void TDEHTMLView::removeFormCompletionItem(const TQString &name, const TQString &value) { if (!m_part->settings()->isFormCompletionEnabled()) return; @@ -3102,7 +3102,7 @@ void KHTMLView::removeFormCompletionItem(const TQString &name, const TQString &v d->formCompletions->writeEntry(name, items); } -void KHTMLView::addNonPasswordStorableSite(const TQString& host) +void TDEHTMLView::addNonPasswordStorableSite(const TQString& host) { if (!d->formCompletions) { d->formCompletions = new KSimpleConfig(locateLocal("data", "tdehtml/formcompletions")); @@ -3116,7 +3116,7 @@ void KHTMLView::addNonPasswordStorableSite(const TQString& host) d->formCompletions->setGroup(TQString::null);//reset } -bool KHTMLView::nonPasswordStorableSite(const TQString& host) const +bool TDEHTMLView::nonPasswordStorableSite(const TQString& host) const { if (!d->formCompletions) { d->formCompletions = new KSimpleConfig(locateLocal("data", "tdehtml/formcompletions")); @@ -3129,7 +3129,7 @@ bool KHTMLView::nonPasswordStorableSite(const TQString& host) const } // returns true if event should be swallowed -bool KHTMLView::dispatchMouseEvent(int eventId, DOM::NodeImpl *targetNode, +bool TDEHTMLView::dispatchMouseEvent(int eventId, DOM::NodeImpl *targetNode, DOM::NodeImpl *targetNodeNonShared, bool cancelable, int detail,TQMouseEvent *_mouse, bool setUnder, int mouseEventType) @@ -3262,14 +3262,14 @@ bool KHTMLView::dispatchMouseEvent(int eventId, DOM::NodeImpl *targetNode, return swallowEvent; } -void KHTMLView::setIgnoreWheelEvents( bool e ) +void TDEHTMLView::setIgnoreWheelEvents( bool e ) { d->ignoreWheelEvents = e; } #ifndef QT_NO_WHEELEVENT -void KHTMLView::viewportWheelEvent(TQWheelEvent* e) +void TDEHTMLView::viewportWheelEvent(TQWheelEvent* e) { if (d->accessKeysEnabled && d->accessKeysPreActivate) d->accessKeysPreActivate=false; @@ -3314,7 +3314,7 @@ void KHTMLView::viewportWheelEvent(TQWheelEvent* e) } #endif -void KHTMLView::dragEnterEvent( TQDragEnterEvent* ev ) +void TDEHTMLView::dragEnterEvent( TQDragEnterEvent* ev ) { // Handle drops onto frames (#16820) // Drops on the main html part is handled by Konqueror (and shouldn't do anything @@ -3327,7 +3327,7 @@ void KHTMLView::dragEnterEvent( TQDragEnterEvent* ev ) TQScrollView::dragEnterEvent( ev ); } -void KHTMLView::dropEvent( TQDropEvent *ev ) +void TDEHTMLView::dropEvent( TQDropEvent *ev ) { // Handle drops onto frames (#16820) // Drops on the main html part is handled by Konqueror (and shouldn't do anything @@ -3340,9 +3340,9 @@ void KHTMLView::dropEvent( TQDropEvent *ev ) TQScrollView::dropEvent( ev ); } -void KHTMLView::focusInEvent( TQFocusEvent *e ) +void TDEHTMLView::focusInEvent( TQFocusEvent *e ) { -#ifndef KHTML_NO_TYPE_AHEAD_FIND +#ifndef TDEHTML_NO_TYPE_AHEAD_FIND m_part->enableFindAheadActions( true ); #endif DOM::NodeImpl* fn = m_part->xmlDocImpl() ? m_part->xmlDocImpl()->focusNode() : 0; @@ -3350,7 +3350,7 @@ void KHTMLView::focusInEvent( TQFocusEvent *e ) (e->reason() != TQFocusEvent::Mouse) && static_cast<tdehtml::RenderWidget*>(fn->renderer())->widget()) static_cast<tdehtml::RenderWidget*>(fn->renderer())->widget()->setFocus(); -#ifndef KHTML_NO_CARET +#ifndef TDEHTML_NO_CARET // Restart blink frequency timer if it has been killed, but only on // editable nodes if (d->m_caretViewContext && @@ -3366,29 +3366,29 @@ void KHTMLView::focusInEvent( TQFocusEvent *e ) }/*end if*/ }/*end if*/ showCaret(); -#endif // KHTML_NO_CARET +#endif // TDEHTML_NO_CARET TQScrollView::focusInEvent( e ); } -void KHTMLView::focusOutEvent( TQFocusEvent *e ) +void TDEHTMLView::focusOutEvent( TQFocusEvent *e ) { if(m_part) m_part->stopAutoScroll(); -#ifndef KHTML_NO_TYPE_AHEAD_FIND +#ifndef TDEHTML_NO_TYPE_AHEAD_FIND if(d->typeAheadActivated) { findTimeout(); } m_part->enableFindAheadActions( false ); -#endif // KHTML_NO_TYPE_AHEAD_FIND +#endif // TDEHTML_NO_TYPE_AHEAD_FIND -#ifndef KHTML_NO_CARET +#ifndef TDEHTML_NO_CARET if (d->m_caretViewContext) { switch (d->m_caretViewContext->displayNonFocused) { - case KHTMLPart::CaretInvisible: + case TDEHTMLPart::CaretInvisible: hideCaret(); break; - case KHTMLPart::CaretVisible: { + case TDEHTMLPart::CaretVisible: { killTimer(d->m_caretViewContext->freqTimerId); d->m_caretViewContext->freqTimerId = -1; NodeImpl *caretNode = m_part->xmlDocImpl()->focusNode(); @@ -3402,12 +3402,12 @@ void KHTMLView::focusOutEvent( TQFocusEvent *e ) }/*end if*/ break; } - case KHTMLPart::CaretBlink: + case TDEHTMLPart::CaretBlink: // simply leave as is break; }/*end switch*/ }/*end if*/ -#endif // KHTML_NO_CARET +#endif // TDEHTML_NO_CARET if ( d->cursor_icon_widget ) d->cursor_icon_widget->hide(); @@ -3415,7 +3415,7 @@ void KHTMLView::focusOutEvent( TQFocusEvent *e ) TQScrollView::focusOutEvent( e ); } -void KHTMLView::slotScrollBarMoved() +void TDEHTMLView::slotScrollBarMoved() { if ( !d->firstRelayout && !d->complete && m_part->xmlDocImpl() && d->layoutSchedulingEnabled) { @@ -3437,32 +3437,32 @@ void KHTMLView::slotScrollBarMoved() m_part->xmlDocImpl()->documentElement()->dispatchHTMLEvent(EventImpl::SCROLL_EVENT, true, false); } -void KHTMLView::timerEvent ( TQTimerEvent *e ) +void TDEHTMLView::timerEvent ( TQTimerEvent *e ) { // kdDebug() << "timer event " << e->timerId() << endl; if ( e->timerId() == d->scrollTimerId ) { if( d->scrollSuspended ) return; switch (d->scrollDirection) { - case KHTMLViewPrivate::ScrollDown: + case TDEHTMLViewPrivate::ScrollDown: if (contentsY() + visibleHeight () >= contentsHeight()) d->newScrollTimer(this, 0); else scrollBy( 0, d->scrollBy ); break; - case KHTMLViewPrivate::ScrollUp: + case TDEHTMLViewPrivate::ScrollUp: if (contentsY() <= 0) d->newScrollTimer(this, 0); else scrollBy( 0, -d->scrollBy ); break; - case KHTMLViewPrivate::ScrollRight: + case TDEHTMLViewPrivate::ScrollRight: if (contentsX() + visibleWidth () >= contentsWidth()) d->newScrollTimer(this, 0); else scrollBy( d->scrollBy, 0 ); break; - case KHTMLViewPrivate::ScrollLeft: + case TDEHTMLViewPrivate::ScrollLeft: if (contentsX() <= 0) d->newScrollTimer(this, 0); else @@ -3480,7 +3480,7 @@ void KHTMLView::timerEvent ( TQTimerEvent *e ) horizontalScrollBar()->setEnabled( true ); } } -#ifndef KHTML_NO_CARET +#ifndef TDEHTML_NO_CARET else if (d->m_caretViewContext && e->timerId() == d->m_caretViewContext->freqTimerId) { d->m_caretViewContext->visible = !d->m_caretViewContext->visible; @@ -3562,8 +3562,8 @@ void KHTMLView::timerEvent ( TQTimerEvent *e ) emit repaintAccessKeys(); if (d->emitCompletedAfterRepaint) { - bool full = d->emitCompletedAfterRepaint == KHTMLViewPrivate::CSFull; - d->emitCompletedAfterRepaint = KHTMLViewPrivate::CSNone; + bool full = d->emitCompletedAfterRepaint == TDEHTMLViewPrivate::CSFull; + d->emitCompletedAfterRepaint = TDEHTMLViewPrivate::CSNone; if ( full ) emit m_part->completed(); else @@ -3571,7 +3571,7 @@ void KHTMLView::timerEvent ( TQTimerEvent *e ) } } -void KHTMLView::scheduleRelayout(tdehtml::RenderObject * /*clippedObj*/) +void TDEHTMLView::scheduleRelayout(tdehtml::RenderObject * /*clippedObj*/) { if (!d->layoutSchedulingEnabled || d->layoutTimerId) return; @@ -3580,7 +3580,7 @@ void KHTMLView::scheduleRelayout(tdehtml::RenderObject * /*clippedObj*/) ? 1000 : 0 ); } -void KHTMLView::unscheduleRelayout() +void TDEHTMLView::unscheduleRelayout() { if (!d->layoutTimerId) return; @@ -3589,7 +3589,7 @@ void KHTMLView::unscheduleRelayout() d->layoutTimerId = 0; } -void KHTMLView::unscheduleRepaint() +void TDEHTMLView::unscheduleRepaint() { if (!d->repaintTimerId) return; @@ -3598,7 +3598,7 @@ void KHTMLView::unscheduleRepaint() d->repaintTimerId = 0; } -void KHTMLView::scheduleRepaint(int x, int y, int w, int h, bool asap) +void TDEHTMLView::scheduleRepaint(int x, int y, int w, int h, bool asap) { bool parsing = !m_part->xmlDocImpl() || m_part->xmlDocImpl()->parsing(); @@ -3628,9 +3628,9 @@ void KHTMLView::scheduleRepaint(int x, int y, int w, int h, bool asap) // kdDebug() << "starting timer " << time << endl; } -void KHTMLView::complete( bool pendingAction ) +void TDEHTMLView::complete( bool pendingAction ) { -// kdDebug() << "KHTMLView::complete()" << endl; +// kdDebug() << "TDEHTMLView::complete()" << endl; d->complete = true; @@ -3642,7 +3642,7 @@ void KHTMLView::complete( bool pendingAction ) killTimer(d->layoutTimerId); d->layoutTimerId = startTimer( 0 ); d->emitCompletedAfterRepaint = pendingAction ? - KHTMLViewPrivate::CSActionPending : KHTMLViewPrivate::CSFull; + TDEHTMLViewPrivate::CSActionPending : TDEHTMLViewPrivate::CSFull; } // is there a repaint pending? @@ -3653,7 +3653,7 @@ void KHTMLView::complete( bool pendingAction ) killTimer(d->repaintTimerId); d->repaintTimerId = startTimer( 20 ); d->emitCompletedAfterRepaint = pendingAction ? - KHTMLViewPrivate::CSActionPending : KHTMLViewPrivate::CSFull; + TDEHTMLViewPrivate::CSActionPending : TDEHTMLViewPrivate::CSFull; } if (!d->emitCompletedAfterRepaint) @@ -3666,19 +3666,19 @@ void KHTMLView::complete( bool pendingAction ) } -void KHTMLView::slotMouseScrollTimer() +void TDEHTMLView::slotMouseScrollTimer() { scrollBy( d->m_mouseScroll_byX, d->m_mouseScroll_byY ); } -#ifndef KHTML_NO_CARET +#ifndef TDEHTML_NO_CARET // ### the dependencies on static functions are a nightmare. just be // hacky and include the implementation here. Clean me up, please. #include "tdehtml_caret.cpp" -void KHTMLView::initCaret(bool keepSelection) +void TDEHTMLView::initCaret(bool keepSelection) { #if DEBUG_CARETMODE > 0 kdDebug(6200) << "begin initCaret" << endl; @@ -3713,7 +3713,7 @@ void KHTMLView::initCaret(bool keepSelection) #endif } -bool KHTMLView::caretOverrides() const +bool TDEHTMLView::caretOverrides() const { bool cm = m_part->isCaretMode(); bool dm = m_part->isEditable(); @@ -3722,7 +3722,7 @@ bool KHTMLView::caretOverrides() const && d->editorContext()->override; } -void KHTMLView::ensureNodeHasFocus(NodeImpl *node) +void TDEHTMLView::ensureNodeHasFocus(NodeImpl *node) { if (m_part->isCaretMode() || m_part->isEditable()) return; if (node->focused()) return; @@ -3754,7 +3754,7 @@ void KHTMLView::ensureNodeHasFocus(NodeImpl *node) emit m_part->nodeActivated(Node(firstAncestor)); } -void KHTMLView::recalcAndStoreCaretPos(CaretBox *hintBox) +void TDEHTMLView::recalcAndStoreCaretPos(CaretBox *hintBox) { if (!m_part || m_part->d->caretNode().isNull()) return; d->caretViewContext(); @@ -3795,13 +3795,13 @@ void KHTMLView::recalcAndStoreCaretPos(CaretBox *hintBox) #endif } -void KHTMLView::caretOn() +void TDEHTMLView::caretOn() { if (d->m_caretViewContext) { killTimer(d->m_caretViewContext->freqTimerId); if (hasFocus() || d->m_caretViewContext->displayNonFocused - == KHTMLPart::CaretBlink) { + == TDEHTMLPart::CaretBlink) { d->m_caretViewContext->freqTimerId = startTimer(500); } else { d->m_caretViewContext->freqTimerId = -1; @@ -3810,7 +3810,7 @@ void KHTMLView::caretOn() d->m_caretViewContext->visible = true; if ((d->m_caretViewContext->displayed = (hasFocus() || d->m_caretViewContext->displayNonFocused - != KHTMLPart::CaretInvisible))) { + != TDEHTMLPart::CaretInvisible))) { updateContents(d->m_caretViewContext->x, d->m_caretViewContext->y, d->m_caretViewContext->width, d->m_caretViewContext->height); @@ -3819,7 +3819,7 @@ void KHTMLView::caretOn() }/*end if*/ } -void KHTMLView::caretOff() +void TDEHTMLView::caretOff() { if (d->m_caretViewContext) { killTimer(d->m_caretViewContext->freqTimerId); @@ -3835,7 +3835,7 @@ void KHTMLView::caretOff() }/*end if*/ } -void KHTMLView::showCaret(bool forceRepaint) +void TDEHTMLView::showCaret(bool forceRepaint) { if (d->m_caretViewContext) { d->m_caretViewContext->displayed = true; @@ -3854,7 +3854,7 @@ void KHTMLView::showCaret(bool forceRepaint) }/*end if*/ } -bool KHTMLView::foldSelectionToCaret(NodeImpl *startNode, long startOffset, +bool TDEHTMLView::foldSelectionToCaret(NodeImpl *startNode, long startOffset, NodeImpl *endNode, long endOffset) { m_part->d->m_selectionStart = m_part->d->m_selectionEnd = m_part->d->caretNode(); @@ -3871,7 +3871,7 @@ bool KHTMLView::foldSelectionToCaret(NodeImpl *startNode, long startOffset, return folded; } -void KHTMLView::hideCaret() +void TDEHTMLView::hideCaret() { if (d->m_caretViewContext) { if (d->m_caretViewContext->visible) { @@ -3889,31 +3889,31 @@ void KHTMLView::hideCaret() }/*end if*/ } -int KHTMLView::caretDisplayPolicyNonFocused() const +int TDEHTMLView::caretDisplayPolicyNonFocused() const { if (d->m_caretViewContext) return d->m_caretViewContext->displayNonFocused; else - return KHTMLPart::CaretInvisible; + return TDEHTMLPart::CaretInvisible; } -void KHTMLView::setCaretDisplayPolicyNonFocused(int policy) +void TDEHTMLView::setCaretDisplayPolicyNonFocused(int policy) { d->caretViewContext(); // int old = d->m_caretViewContext->displayNonFocused; - d->m_caretViewContext->displayNonFocused = (KHTMLPart::CaretDisplayPolicy)policy; + d->m_caretViewContext->displayNonFocused = (TDEHTMLPart::CaretDisplayPolicy)policy; // make change immediately take effect if not focused if (!hasFocus()) { switch (d->m_caretViewContext->displayNonFocused) { - case KHTMLPart::CaretInvisible: + case TDEHTMLPart::CaretInvisible: hideCaret(); break; - case KHTMLPart::CaretBlink: + case TDEHTMLPart::CaretBlink: if (d->m_caretViewContext->freqTimerId != -1) break; d->m_caretViewContext->freqTimerId = startTimer(500); // fall through - case KHTMLPart::CaretVisible: + case TDEHTMLPart::CaretVisible: d->m_caretViewContext->displayed = true; showCaret(); break; @@ -3921,7 +3921,7 @@ void KHTMLView::setCaretDisplayPolicyNonFocused(int policy) }/*end if*/ } -bool KHTMLView::placeCaret(CaretBox *hintBox) +bool TDEHTMLView::placeCaret(CaretBox *hintBox) { CaretViewContext *cv = d->caretViewContext(); caretOff(); @@ -3941,7 +3941,7 @@ bool KHTMLView::placeCaret(CaretBox *hintBox) return false; } -void KHTMLView::ensureCaretVisible() +void TDEHTMLView::ensureCaretVisible() { CaretViewContext *cv = d->m_caretViewContext; if (!cv) return; @@ -3949,7 +3949,7 @@ void KHTMLView::ensureCaretVisible() d->scrollBarMoved = false; } -bool KHTMLView::extendSelection(NodeImpl *oldStartSel, long oldStartOfs, +bool TDEHTMLView::extendSelection(NodeImpl *oldStartSel, long oldStartOfs, NodeImpl *oldEndSel, long oldEndOfs) { bool changed = false; @@ -4001,7 +4001,7 @@ bool KHTMLView::extendSelection(NodeImpl *oldStartSel, long oldStartOfs, return changed; } -void KHTMLView::updateSelection(NodeImpl *oldStartSel, long oldStartOfs, +void TDEHTMLView::updateSelection(NodeImpl *oldStartSel, long oldStartOfs, NodeImpl *oldEndSel, long oldEndOfs) { if (m_part->d->m_selectionStart == m_part->d->m_selectionEnd @@ -4035,7 +4035,7 @@ void KHTMLView::updateSelection(NodeImpl *oldStartSel, long oldStartOfs, }/*end if*/ } -void KHTMLView::caretKeyPressEvent(TQKeyEvent *_ke) +void TDEHTMLView::caretKeyPressEvent(TQKeyEvent *_ke) { NodeImpl *oldStartSel = m_part->d->m_selectionStart.handle(); long oldStartOfs = m_part->d->m_startOffset; @@ -4112,7 +4112,7 @@ void KHTMLView::caretKeyPressEvent(TQKeyEvent *_ke) _ke->accept(); } -bool KHTMLView::moveCaretTo(NodeImpl *node, long offset, bool clearSel) +bool TDEHTMLView::moveCaretTo(NodeImpl *node, long offset, bool clearSel) { if (!node) return false; ElementImpl *baseElem = determineBaseElement(node); @@ -4128,7 +4128,7 @@ bool KHTMLView::moveCaretTo(NodeImpl *node, long offset, bool clearSel) CaretBoxIterator cbit; CaretBoxLine *cbl = findCaretBoxLine(node, offset, &cblDeleter, base, r_ofs, cbit); if(!cbl) { - kdWarning() << "KHTMLView::moveCaretTo - findCaretBoxLine() returns NULL" << endl; + kdWarning() << "TDEHTMLView::moveCaretTo - findCaretBoxLine() returns NULL" << endl; return false; } @@ -4187,7 +4187,7 @@ bool KHTMLView::moveCaretTo(NodeImpl *node, long offset, bool clearSel) return selChanged; } -void KHTMLView::moveCaretByLine(bool next, int count) +void TDEHTMLView::moveCaretByLine(bool next, int count) { Node &caretNodeRef = m_part->d->caretNode(); if (caretNodeRef.isNull()) return; @@ -4218,7 +4218,7 @@ void KHTMLView::moveCaretByLine(bool next, int count) placeCaretOnLine(caretBox, x, absx, absy); } -void KHTMLView::placeCaretOnLine(CaretBox *caretBox, int x, int absx, int absy) +void TDEHTMLView::placeCaretOnLine(CaretBox *caretBox, int x, int absx, int absy) { // paranoia sanity check if (!caretBox) return; @@ -4313,7 +4313,7 @@ void KHTMLView::placeCaretOnLine(CaretBox *caretBox, int x, int absx, int absy) caretOn(); } -void KHTMLView::moveCaretToLineBoundary(bool end) +void TDEHTMLView::moveCaretToLineBoundary(bool end) { Node &caretNodeRef = m_part->d->caretNode(); if (caretNodeRef.isNull()) return; @@ -4343,7 +4343,7 @@ void KHTMLView::moveCaretToLineBoundary(bool end) placeCaretOnLine(b, x, absx, absy); } -void KHTMLView::moveCaretToDocumentBoundary(bool end) +void TDEHTMLView::moveCaretToDocumentBoundary(bool end) { Node &caretNodeRef = m_part->d->caretNode(); if (caretNodeRef.isNull()) return; @@ -4373,7 +4373,7 @@ void KHTMLView::moveCaretToDocumentBoundary(bool end) placeCaretOnLine(b, x, absx, absy); } -void KHTMLView::moveCaretBy(bool next, CaretMovement cmv, int count) +void TDEHTMLView::moveCaretBy(bool next, CaretMovement cmv, int count) { if (!m_part) return; Node &caretNodeRef = m_part->d->caretNode(); @@ -4421,7 +4421,7 @@ void KHTMLView::moveCaretBy(bool next, CaretMovement cmv, int count) placeCaretOnChar(hintBox); } -void KHTMLView::placeCaretOnChar(CaretBox *hintBox) +void TDEHTMLView::placeCaretOnChar(CaretBox *hintBox) { caretOff(); recalcAndStoreCaretPos(hintBox); @@ -4436,7 +4436,7 @@ void KHTMLView::placeCaretOnChar(CaretBox *hintBox) caretOn(); } -void KHTMLView::moveCaretByPage(bool next) +void TDEHTMLView::moveCaretByPage(bool next) { Node &caretNodeRef = m_part->d->caretNode(); if (caretNodeRef.isNull()) return; @@ -4465,47 +4465,47 @@ void KHTMLView::moveCaretByPage(bool next) placeCaretOnLine(caretBox, x, absx, absy); } -void KHTMLView::moveCaretPrevWord() +void TDEHTMLView::moveCaretPrevWord() { moveCaretBy(false, CaretByWord, 1); } -void KHTMLView::moveCaretNextWord() +void TDEHTMLView::moveCaretNextWord() { moveCaretBy(true, CaretByWord, 1); } -void KHTMLView::moveCaretPrevLine(int n) +void TDEHTMLView::moveCaretPrevLine(int n) { moveCaretByLine(false, n); } -void KHTMLView::moveCaretNextLine(int n) +void TDEHTMLView::moveCaretNextLine(int n) { moveCaretByLine(true, n); } -void KHTMLView::moveCaretPrevPage() +void TDEHTMLView::moveCaretPrevPage() { moveCaretByPage(false); } -void KHTMLView::moveCaretNextPage() +void TDEHTMLView::moveCaretNextPage() { moveCaretByPage(true); } -void KHTMLView::moveCaretToLineBegin() +void TDEHTMLView::moveCaretToLineBegin() { moveCaretToLineBoundary(false); } -void KHTMLView::moveCaretToLineEnd() +void TDEHTMLView::moveCaretToLineEnd() { moveCaretToLineBoundary(true); } -#endif // KHTML_NO_CARET +#endif // TDEHTML_NO_CARET #ifndef NO_SMOOTH_SCROLL_HACK #define timer timer2 @@ -4515,7 +4515,7 @@ static const int SCROLL_TIME = 240; // Each step is 20 ms == 50 frames/second static const int SCROLL_TICK = 20; -void KHTMLView::scrollBy(int dx, int dy) +void TDEHTMLView::scrollBy(int dx, int dy) { TDEConfigGroup cfg( TDEGlobal::config(), "KDE" ); if( !cfg.readBoolEntry( "SmoothScrolling", false )) { @@ -4552,7 +4552,7 @@ void KHTMLView::scrollBy(int dx, int dy) } } -void KHTMLView::scrollTick() { +void TDEHTMLView::scrollTick() { if (d->dx == 0 && d->dy == 0) { stopScrolling(); return; @@ -4586,13 +4586,13 @@ void KHTMLView::scrollTick() { kapp->syncX(); } -void KHTMLView::startScrolling() +void TDEHTMLView::startScrolling() { d->scrolling = true; d->timer.start(SCROLL_TICK, false); } -void KHTMLView::stopScrolling() +void TDEHTMLView::stopScrolling() { d->timer.stop(); d->dx = d->dy = 0; @@ -4600,7 +4600,7 @@ void KHTMLView::stopScrolling() } // Overloaded from TQScrollView and TQScrollBar -void KHTMLView::scrollViewWheelEvent( TQWheelEvent *e ) +void TDEHTMLView::scrollViewWheelEvent( TQWheelEvent *e ) { int pageStep = verticalScrollBar()->pageStep(); int lineStep = verticalScrollBar()->lineStep(); diff --git a/tdehtml/tdehtmlview.h b/tdehtml/tdehtmlview.h index 5448f32f8..f67f712f0 100644 --- a/tdehtml/tdehtmlview.h +++ b/tdehtml/tdehtmlview.h @@ -22,8 +22,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef KHTMLVIEW_H -#define KHTMLVIEW_H +#ifndef TDEHTMLVIEW_H +#define TDEHTMLVIEW_H // qt includes and classes #include <tqscrollview.h> @@ -67,15 +67,15 @@ namespace tdehtml { void applyRule(DOM::CSSProperty *prop); } -class KHTMLPart; -class KHTMLViewPrivate; +class TDEHTMLPart; +class TDEHTMLViewPrivate; /** * Renders and displays HTML in a TQScrollView. * * Suitable for use as an application's main view. **/ -class KHTML_EXPORT KHTMLView : public TQScrollView +class TDEHTML_EXPORT TDEHTMLView : public TQScrollView { Q_OBJECT @@ -86,7 +86,7 @@ class KHTML_EXPORT KHTMLView : public TQScrollView friend class DOM::HTMLAnchorElementImpl; friend class DOM::HTMLInputElementImpl; friend class DOM::DocumentImpl; - friend class KHTMLPart; + friend class TDEHTMLPart; friend class tdehtml::RenderCanvas; friend class tdehtml::RenderObject; friend class tdehtml::RenderLineEdit; @@ -101,16 +101,16 @@ class KHTML_EXPORT KHTMLView : public TQScrollView public: /** - * Constructs a KHTMLView. + * Constructs a TDEHTMLView. */ - KHTMLView( KHTMLPart *part, TQWidget *parent, const char *name=0 ); - virtual ~KHTMLView(); + TDEHTMLView( TDEHTMLPart *part, TQWidget *parent, const char *name=0 ); + virtual ~TDEHTMLView(); /** - * Returns a pointer to the KHTMLPart that is + * Returns a pointer to the TDEHTMLPart that is * rendering the page. **/ - KHTMLPart *part() const { return m_part; } + TDEHTMLPart *part() const { return m_part; } int frameWidth() const { return _width; } @@ -173,7 +173,7 @@ public: signals: /** * This signal is used for internal layouting. Don't use it to check if rendering finished. - * Use @ref KHTMLPart completed() signal instead. + * Use @ref TDEHTMLPart completed() signal instead. */ void finishedLayout(); void cleared(); @@ -296,9 +296,9 @@ private: bool focusNextPrevNode(bool next); bool handleAccessKey(const TQKeyEvent* ev); - bool focusNodeWithAccessKey(TQChar c, KHTMLView* caller = NULL); + bool focusNodeWithAccessKey(TQChar c, TDEHTMLView* caller = NULL); TQMap< DOM::ElementImpl*, TQChar > buildFallbackAccessKeys() const; - void displayAccessKeys( KHTMLView* caller, KHTMLView* origview, TQValueVector< TQChar >& taken, bool use_fallbacks ); + void displayAccessKeys( TDEHTMLView* caller, TDEHTMLView* origview, TQValueVector< TQChar >& taken, bool use_fallbacks ); void useSlowRepaints(); @@ -328,13 +328,13 @@ private: void complete( bool pendingAction ); -#ifndef KHTML_NO_TYPE_AHEAD_FIND +#ifndef TDEHTML_NO_TYPE_AHEAD_FIND void findAhead(bool increase); void updateFindAheadTimeout(); void startFindAhead( bool linksOnly ); -#endif // KHTML_NO_TYPE_AHEAD_FIND +#endif // TDEHTML_NO_TYPE_AHEAD_FIND -#ifndef KHTML_NO_CARET +#ifndef TDEHTML_NO_CARET // -- caret-related member functions (for caretMode as well as designMode) /** initializes the caret if it hasn't been initialized yet. @@ -463,14 +463,14 @@ private: /** * Returns the current caret policy when the view is not focused. - * @return a KHTMLPart::CaretDisplay value + * @return a TDEHTMLPart::CaretDisplay value */ int caretDisplayPolicyNonFocused() const; /** * Sets the caret display policy when the view is not focused. * @param policy new display policy as - * defined by KHTMLPart::CaretDisplayPolicy + * defined by TDEHTMLPart::CaretDisplayPolicy * @since 3.2 */ void setCaretDisplayPolicyNonFocused(int policy); @@ -601,7 +601,7 @@ private: */ void moveCaretToLineEnd(); -#endif // KHTML_NO_CARET +#endif // TDEHTML_NO_CARET // ------------------------------------- member variables ------------------------------------ private: @@ -614,8 +614,8 @@ private: int _marginWidth; int _marginHeight; - KHTMLPart *m_part; - KHTMLViewPrivate *d; + TDEHTMLPart *m_part; + TDEHTMLViewPrivate *d; TQString m_medium; // media type }; diff --git a/tdehtml/tdemultipart/README b/tdehtml/tdemultipart/README index c8a342d68..0fd6eb306 100644 --- a/tdehtml/tdemultipart/README +++ b/tdehtml/tdemultipart/README @@ -1,4 +1,4 @@ -KMultiPart implements "server push" for KHTML/Konqueror: +KMultiPart implements "server push" for TDEHTML/Konqueror: it handles the multipart/mixed and multipart/x-mixed-replace mimetype, embedding the appropriate component (part). @@ -11,6 +11,6 @@ Testcases: TODO: * Use the new streaming API of KParts to pipe data into the part, -the current code does that for KHTML only. -* Change KHTML so that it embeds KMultiPart for images which send multipart/x-mixed-replace +the current code does that for TDEHTML only. +* Change TDEHTML so that it embeds KMultiPart for images which send multipart/x-mixed-replace data. diff --git a/tdehtml/tdemultipart/tdemultipart.cpp b/tdehtml/tdemultipart/tdemultipart.cpp index 82e94a4c0..ac0c67b53 100644 --- a/tdehtml/tdemultipart/tdemultipart.cpp +++ b/tdehtml/tdemultipart/tdemultipart.cpp @@ -334,7 +334,7 @@ void KMultiPart::setPart( const TQString& mimeType ) { // Forward signals from the part's browser extension - // this is very related (but not exactly like) KHTMLPart::processObjectRequest + // this is very related (but not exactly like) TDEHTMLPart::processObjectRequest connect( childExtension, TQT_SIGNAL( openURLNotify() ), m_extension, TQT_SIGNAL( openURLNotify() ) ); @@ -396,7 +396,7 @@ void KMultiPart::setPart( const TQString& mimeType ) m_partIsLoading = false; // Load the part's plugins too. - // ###### This is a hack. The bug is that KHTMLPart doesn't load its plugins + // ###### This is a hack. The bug is that TDEHTMLPart doesn't load its plugins // if className != "Browser/View". loadPlugins( this, m_part, m_part->instance() ); // Get the part's GUI to appear @@ -437,7 +437,7 @@ void KMultiPart::startOfData() } if ( m_isHTMLPart ) { - KHTMLPart* htmlPart = static_cast<KHTMLPart *>( static_cast<KParts::ReadOnlyPart *>( m_part ) ); + TDEHTMLPart* htmlPart = static_cast<TDEHTMLPart *>( static_cast<KParts::ReadOnlyPart *>( m_part ) ); htmlPart->begin( url() ); } else @@ -463,7 +463,7 @@ void KMultiPart::reallySendData( const TQByteArray& line ) { if ( m_isHTMLPart ) { - KHTMLPart* htmlPart = static_cast<KHTMLPart *>( static_cast<KParts::ReadOnlyPart *>( m_part ) ); + TDEHTMLPart* htmlPart = static_cast<TDEHTMLPart *>( static_cast<KParts::ReadOnlyPart *>( m_part ) ); htmlPart->write( line.data(), line.size() ); } else if ( m_tempFile ) @@ -477,7 +477,7 @@ void KMultiPart::endOfData() Q_ASSERT( m_part ); if ( m_isHTMLPart ) { - KHTMLPart* htmlPart = static_cast<KHTMLPart *>( static_cast<KParts::ReadOnlyPart *>( m_part ) ); + TDEHTMLPart* htmlPart = static_cast<TDEHTMLPart *>( static_cast<KParts::ReadOnlyPart *>( m_part ) ); htmlPart->end(); } else if ( m_tempFile ) { @@ -600,12 +600,12 @@ int KMultiPartBrowserExtension::yOffset() void KMultiPartBrowserExtension::print() { - static_cast<KHTMLPartBrowserExtension *>( m_imgPart->doc()->browserExtension() )->print(); + static_cast<TDEHTMLPartBrowserExtension *>( m_imgPart->doc()->browserExtension() )->print(); } void KMultiPartBrowserExtension::reparseConfiguration() { - static_cast<KHTMLPartBrowserExtension *>( m_imgPart->doc()->browserExtension() )->reparseConfiguration(); + static_cast<TDEHTMLPartBrowserExtension *>( m_imgPart->doc()->browserExtension() )->reparseConfiguration(); m_imgPart->doc()->setAutoloadImages( true ); } #endif diff --git a/tdehtml/tdemultipart/tdemultipart.h b/tdehtml/tdemultipart/tdemultipart.h index e4add0816..776584c91 100644 --- a/tdehtml/tdemultipart/tdemultipart.h +++ b/tdehtml/tdemultipart/tdemultipart.h @@ -28,7 +28,7 @@ #include <kaboutdata.h> #include <tqdatetime.h> -class KHTMLPart; +class TDEHTMLPart; class TDEInstance; class KTempFile; class KLineParser; diff --git a/tdehtml/test_regression.cpp b/tdehtml/test_regression.cpp index 497126d8c..1cea041ee 100644 --- a/tdehtml/test_regression.cpp +++ b/tdehtml/test_regression.cpp @@ -114,7 +114,7 @@ static pid_t xvfb; PartMonitor *PartMonitor::sm_highestMonitor = NULL; -PartMonitor::PartMonitor(KHTMLPart *_part) +PartMonitor::PartMonitor(TDEHTMLPart *_part) { m_part = _part; m_completed = false; @@ -271,19 +271,19 @@ Value RegTestFunction::call(ExecState *exec, Object &/*thisObj*/, const List &ar // ------------------------------------------------------------------------- -KHTMLPartObject::KHTMLPartObject(ExecState *exec, KHTMLPart *_part) +TDEHTMLPartObject::TDEHTMLPartObject(ExecState *exec, TDEHTMLPart *_part) { m_part = _part; - putDirect("openPage", new KHTMLPartFunction(exec,m_part,KHTMLPartFunction::OpenPage,1), DontEnum); - putDirect("openPageAsUrl", new KHTMLPartFunction(exec,m_part,KHTMLPartFunction::OpenPageAsUrl,1), DontEnum); - putDirect("begin", new KHTMLPartFunction(exec,m_part,KHTMLPartFunction::Begin,1), DontEnum); - putDirect("write", new KHTMLPartFunction(exec,m_part,KHTMLPartFunction::Write,1), DontEnum); - putDirect("end", new KHTMLPartFunction(exec,m_part,KHTMLPartFunction::End,0), DontEnum); - putDirect("executeScript", new KHTMLPartFunction(exec,m_part,KHTMLPartFunction::ExecuteScript,0), DontEnum); - putDirect("processEvents", new KHTMLPartFunction(exec,m_part,KHTMLPartFunction::ProcessEvents,0), DontEnum); + putDirect("openPage", new TDEHTMLPartFunction(exec,m_part,TDEHTMLPartFunction::OpenPage,1), DontEnum); + putDirect("openPageAsUrl", new TDEHTMLPartFunction(exec,m_part,TDEHTMLPartFunction::OpenPageAsUrl,1), DontEnum); + putDirect("begin", new TDEHTMLPartFunction(exec,m_part,TDEHTMLPartFunction::Begin,1), DontEnum); + putDirect("write", new TDEHTMLPartFunction(exec,m_part,TDEHTMLPartFunction::Write,1), DontEnum); + putDirect("end", new TDEHTMLPartFunction(exec,m_part,TDEHTMLPartFunction::End,0), DontEnum); + putDirect("executeScript", new TDEHTMLPartFunction(exec,m_part,TDEHTMLPartFunction::ExecuteScript,0), DontEnum); + putDirect("processEvents", new TDEHTMLPartFunction(exec,m_part,TDEHTMLPartFunction::ProcessEvents,0), DontEnum); } -Value KHTMLPartObject::get(ExecState *exec, const Identifier &propertyName) const +Value TDEHTMLPartObject::get(ExecState *exec, const Identifier &propertyName) const { if (propertyName == "document") return getDOMNode(exec,m_part->document()); @@ -293,19 +293,19 @@ Value KHTMLPartObject::get(ExecState *exec, const Identifier &propertyName) cons return ObjectImp::get(exec,propertyName); } -KHTMLPartFunction::KHTMLPartFunction(ExecState */*exec*/, KHTMLPart *_part, int _id, int length) +TDEHTMLPartFunction::TDEHTMLPartFunction(ExecState */*exec*/, TDEHTMLPart *_part, int _id, int length) { m_part = _part; id = _id; putDirect("length",length); } -bool KHTMLPartFunction::implementsCall() const +bool TDEHTMLPartFunction::implementsCall() const { return true; } -Value KHTMLPartFunction::call(ExecState *exec, Object &/*thisObj*/, const List &args) +Value TDEHTMLPartFunction::call(ExecState *exec, Object &/*thisObj*/, const List &args) { Value result = Undefined(); @@ -534,7 +534,7 @@ int main(int argc, char *argv[]) cfg.writeEntry( "Fonts", TQStringList() ); cfg.writeEntry( "DefaultEncoding", "" ); cfg.setGroup("Java/JavaScript Settings"); - cfg.writeEntry( "WindowOpenPolicy", KHTMLSettings::KJSWindowOpenAllow); + cfg.writeEntry( "WindowOpenPolicy", TDEHTMLSettings::KJSWindowOpenAllow); cfg.sync(); @@ -557,9 +557,9 @@ int main(int argc, char *argv[]) } // create widgets - KHTMLFactory *fac = new KHTMLFactory(); + TDEHTMLFactory *fac = new TDEHTMLFactory(); KMainWindow *toplevel = new KMainWindow(); - KHTMLPart *part = new KHTMLPart( toplevel, 0, toplevel, 0, KHTMLPart::BrowserViewGUI ); + TDEHTMLPart *part = new TDEHTMLPart( toplevel, 0, toplevel, 0, TDEHTMLPart::BrowserViewGUI ); toplevel->setCentralWidget( part->widget() ); part->setJScriptEnabled(true); @@ -670,7 +670,7 @@ int main(int argc, char *argv[]) RegressionTest *RegressionTest::curr = 0; -RegressionTest::RegressionTest(KHTMLPart *part, const TQString &baseDir, const TQString &outputDir, +RegressionTest::RegressionTest(TDEHTMLPart *part, const TQString &baseDir, const TQString &outputDir, bool _genOutput, bool runJS, bool runHTML) : TQObject(part) { @@ -820,7 +820,7 @@ bool RegressionTest::runTests(TQString relPath, bool mustExist, int known_failur return true; } -void RegressionTest::getPartDOMOutput( TQTextStream &outputStream, KHTMLPart* part, uint indent ) +void RegressionTest::getPartDOMOutput( TQTextStream &outputStream, TDEHTMLPart* part, uint indent ) { Node node = part->document(); while (!node.isNull()) { @@ -849,7 +849,7 @@ void RegressionTest::getPartDOMOutput( TQTextStream &outputStream, KHTMLPart* pa if ( node.handle()->id() == ID_FRAME ) { outputStream << endl; TQString frameName = static_cast<DOM::HTMLFrameElementImpl *>( node.handle() )->name.string(); - KHTMLPart* frame = part->findFrame( frameName ); + TDEHTMLPart* frame = part->findFrame( frameName ); Q_ASSERT( frame ); if ( frame ) getPartDOMOutput( outputStream, frame, indent ); @@ -910,7 +910,7 @@ void RegressionTest::getPartDOMOutput( TQTextStream &outputStream, KHTMLPart* pa } } -void RegressionTest::dumpRenderTree( TQTextStream &outputStream, KHTMLPart* part ) +void RegressionTest::dumpRenderTree( TQTextStream &outputStream, TDEHTMLPart* part ) { DOM::DocumentImpl* doc = static_cast<DocumentImpl*>( part->document().handle() ); if ( !doc || !doc->renderer() ) @@ -923,7 +923,7 @@ void RegressionTest::dumpRenderTree( TQTextStream &outputStream, KHTMLPart* part names.sort(); for ( TQStringList::iterator it = names.begin(); it != names.end(); ++it ) { outputStream << "FRAME: " << (*it) << "\n"; - KHTMLPart* frame = part->findFrame( (*it) ); + TDEHTMLPart* frame = part->findFrame( (*it) ); Q_ASSERT( frame ); if ( frame ) dumpRenderTree( outputStream, frame ); @@ -1411,7 +1411,7 @@ void RegressionTest::testJSFile(const TQString & filename ) ScriptInterpreter interp(global,&frame); ExecState *exec = interp.globalExec(); - global.put(exec, "part", Object(new KHTMLPartObject(exec,m_part))); + global.put(exec, "part", Object(new TDEHTMLPartObject(exec,m_part))); global.put(exec, "regtest", Object(new RegTestObject(exec,this))); global.put(exec, "debug", Object(new RegTestFunction(exec,this,RegTestFunction::Print,1) ) ); global.put(exec, "print", Object(new RegTestFunction(exec,this,RegTestFunction::Print,1) ) ); diff --git a/tdehtml/test_regression.h b/tdehtml/test_regression.h index 74f56cc72..b6791bd32 100644 --- a/tdehtml/test_regression.h +++ b/tdehtml/test_regression.h @@ -40,12 +40,12 @@ class PartMonitor : public TQObject { Q_OBJECT public: - PartMonitor(KHTMLPart *_part); + PartMonitor(TDEHTMLPart *_part); ~PartMonitor(); void waitForCompletion(); static PartMonitor* sm_highestMonitor; bool m_completed; - KHTMLPart *m_part; + TDEHTMLPart *m_part; int m_timer_waits; TQTimer *m_timeout_timer; public slots: @@ -87,31 +87,31 @@ private: /** * @internal */ -class KHTMLPartObject : public KJS::ObjectImp +class TDEHTMLPartObject : public KJS::ObjectImp { public: - KHTMLPartObject(KJS::ExecState *exec, KHTMLPart *_part); + TDEHTMLPartObject(KJS::ExecState *exec, TDEHTMLPart *_part); virtual KJS::Value get(KJS::ExecState *exec, const KJS::Identifier &propertyName) const; private: - KHTMLPart *m_part; + TDEHTMLPart *m_part; }; /** * @internal */ -class KHTMLPartFunction : public KJS::ObjectImp +class TDEHTMLPartFunction : public KJS::ObjectImp { public: - KHTMLPartFunction(KJS::ExecState *exec, KHTMLPart *_part, int _id, int length); + TDEHTMLPartFunction(KJS::ExecState *exec, TDEHTMLPart *_part, int _id, int length); bool implementsCall() const; KJS::Value call(KJS::ExecState *exec, KJS::Object &thisObj, const KJS::List &args); enum { OpenPage, OpenPageAsUrl, Begin, Write, End, ExecuteScript, ProcessEvents }; private: - KHTMLPart *m_part; + TDEHTMLPart *m_part; int id; }; @@ -127,14 +127,14 @@ class RegressionTest : public TQObject Q_OBJECT public: - RegressionTest(KHTMLPart *part, const TQString &baseDir, const TQString &outputDir, + RegressionTest(TDEHTMLPart *part, const TQString &baseDir, const TQString &outputDir, bool _genOutput, bool runJS, bool runHTML); ~RegressionTest(); enum OutputType { DOMTree, RenderTree }; TQString getPartOutput( OutputType type ); - void getPartDOMOutput( TQTextStream &outputStream, KHTMLPart* part, uint indent ); - void dumpRenderTree( TQTextStream &outputStream, KHTMLPart* part ); + void getPartDOMOutput( TQTextStream &outputStream, TDEHTMLPart* part, uint indent ); + void dumpRenderTree( TQTextStream &outputStream, TDEHTMLPart* part ); void testStaticFile(const TQString& filename); void testJSFile(const TQString& filename); enum CheckResult { Failure = 0, Success = 1, Ignored = 2 }; @@ -152,7 +152,7 @@ public: void doJavascriptReport( const TQString &test ); void doFailureReport( const TQString& test, int failures ); - KHTMLPart *m_part; + TDEHTMLPart *m_part; TQString m_baseDir; TQString m_outputDir; bool m_genOutput; diff --git a/tdehtml/test_regression_fontoverload.cpp b/tdehtml/test_regression_fontoverload.cpp index f3102b20b..744150ffe 100644 --- a/tdehtml/test_regression_fontoverload.cpp +++ b/tdehtml/test_regression_fontoverload.cpp @@ -265,7 +265,7 @@ KDE_EXPORT bool TQFontDatabase::isSmoothlyScalable( const TQString &, return true; } -const TQString &KHTMLSettings::availableFamilies() +const TQString &TDEHTMLSettings::availableFamilies() { if ( !avFamilies ) { avFamilies = new TQString; @@ -275,7 +275,7 @@ const TQString &KHTMLSettings::availableFamilies() return *avFamilies; } -bool KHTMLSettings::unfinishedImageFrame() const +bool TDEHTMLSettings::unfinishedImageFrame() const { return false; } diff --git a/tdehtml/testtdehtml.cpp b/tdehtml/testtdehtml.cpp index 1da21be1f..001780dc2 100644 --- a/tdehtml/testtdehtml.cpp +++ b/tdehtml/testtdehtml.cpp @@ -38,7 +38,7 @@ int main(int argc, char *argv[]) { TDECmdLineArgs::init(argc, argv, "testtdehtml", "Testtdehtml", - "a basic web browser using the KHTML library", "1.0"); + "a basic web browser using the TDEHTML library", "1.0"); TDECmdLineArgs::addCmdLineOptions(options); TDEApplication a; @@ -49,11 +49,11 @@ int main(int argc, char *argv[]) } #ifndef __KDE_HAVE_GCC_VISIBILITY - KHTMLFactory *fac = new KHTMLFactory(true); + TDEHTMLFactory *fac = new TDEHTMLFactory(true); #endif KMainWindow *toplevel = new KMainWindow(); - KHTMLPart *doc = new KHTMLPart( toplevel, 0, toplevel, 0, KHTMLPart::BrowserViewGUI ); + TDEHTMLPart *doc = new TDEHTMLPart( toplevel, 0, toplevel, 0, TDEHTMLPart::BrowserViewGUI ); Dummy *dummy = new Dummy( doc ); TQObject::connect( doc->browserExtension(), TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ), diff --git a/tdehtml/testtdehtml.h b/tdehtml/testtdehtml.h index 4fd76d044..dcb4c1583 100644 --- a/tdehtml/testtdehtml.h +++ b/tdehtml/testtdehtml.h @@ -1,5 +1,5 @@ -#ifndef TESTKHTML_H -#define TESTKHTML_H +#ifndef TESTTDEHTML_H +#define TESTTDEHTML_H #include <kdebug.h> #include <tqvaluelist.h> @@ -12,7 +12,7 @@ class Dummy : public TQObject { Q_OBJECT public: - Dummy( KHTMLPart *part ) : TQObject( part ) { m_part = part; }; + Dummy( TDEHTMLPart *part ) : TQObject( part ) { m_part = part; }; private slots: void slotOpenURL( const KURL &url, const KParts::URLArgs &args ) @@ -43,7 +43,7 @@ private slots: void handleDone(); private: - KHTMLPart *m_part; + TDEHTMLPart *m_part; TQValueList<TQString> filesToBenchmark; TQMap<TQString, TQValueList<int> > results; int benchmarkRun; diff --git a/tdehtml/xml/dom2_eventsimpl.cpp b/tdehtml/xml/dom2_eventsimpl.cpp index c0bb10f9a..e6af64184 100644 --- a/tdehtml/xml/dom2_eventsimpl.cpp +++ b/tdehtml/xml/dom2_eventsimpl.cpp @@ -179,11 +179,11 @@ EventImpl::EventId EventImpl::typeToId(DOMString type) else if ( type == "keypress" ) return KEYPRESS_EVENT; else if ( type == "readystatechange" ) - return KHTML_READYSTATECHANGE_EVENT; + return TDEHTML_READYSTATECHANGE_EVENT; else if ( type == "dblclick" ) - return KHTML_ECMA_DBLCLICK_EVENT; + return TDEHTML_ECMA_DBLCLICK_EVENT; - // ignore: KHTML_CLICK_EVENT + // ignore: TDEHTML_CLICK_EVENT return UNKNOWN_EVENT; } @@ -254,15 +254,15 @@ DOMString EventImpl::idToType(EventImpl::EventId id) return "keypress"; //DOM3 ev. suggests textInput, but it's better for compat this way //tdehtml extensions - case KHTML_ECMA_DBLCLICK_EVENT: + case TDEHTML_ECMA_DBLCLICK_EVENT: return "dblclick"; - case KHTML_ECMA_CLICK_EVENT: + case TDEHTML_ECMA_CLICK_EVENT: return "click"; - case KHTML_DRAGDROP_EVENT: + case TDEHTML_DRAGDROP_EVENT: return "tdehtml_dragdrop"; - case KHTML_MOVE_EVENT: + case TDEHTML_MOVE_EVENT: return "tdehtml_move"; - case KHTML_READYSTATECHANGE_EVENT: + case TDEHTML_READYSTATECHANGE_EVENT: return "readystatechange"; default: @@ -454,7 +454,7 @@ void MouseEventImpl::initMouseEvent(const DOMString &typeArg, m_clientY = clientYArg; m_pageX = clientXArg; m_pageY = clientYArg; - KHTMLView* v; + TDEHTMLView* v; if ( view() && view()->document() && ( v = view()->document()->view() ) ) { m_pageX += v->contentsX(); m_pageY += v->contentsY(); diff --git a/tdehtml/xml/dom2_eventsimpl.h b/tdehtml/xml/dom2_eventsimpl.h index 5d99afbbe..0f48fa605 100644 --- a/tdehtml/xml/dom2_eventsimpl.h +++ b/tdehtml/xml/dom2_eventsimpl.h @@ -28,7 +28,7 @@ #include "dom/dom2_events.h" #include "xml/dom2_viewsimpl.h" -class KHTMLPart; +class TDEHTMLPart; class TQMouseEvent; namespace DOM { @@ -81,12 +81,12 @@ public: KEYUP_EVENT, KEYPRESS_EVENT, //Mostly corresponds to DOM3 textInput event. // tdehtml events (not part of DOM) - KHTML_ECMA_DBLCLICK_EVENT, // for html ondblclick - KHTML_ECMA_CLICK_EVENT, // for html onclick - KHTML_DRAGDROP_EVENT, - KHTML_MOVE_EVENT, + TDEHTML_ECMA_DBLCLICK_EVENT, // for html ondblclick + TDEHTML_ECMA_CLICK_EVENT, // for html onclick + TDEHTML_DRAGDROP_EVENT, + TDEHTML_MOVE_EVENT, // XMLHttpRequest events - KHTML_READYSTATECHANGE_EVENT + TDEHTML_READYSTATECHANGE_EVENT }; EventImpl(); diff --git a/tdehtml/xml/dom2_rangeimpl.cpp b/tdehtml/xml/dom2_rangeimpl.cpp index b160ce23f..c7b19de5c 100644 --- a/tdehtml/xml/dom2_rangeimpl.cpp +++ b/tdehtml/xml/dom2_rangeimpl.cpp @@ -1139,7 +1139,7 @@ DOMString RangeImpl::toHTML( int &exceptioncode ) text = DOMString("<html xmlns=\"http://www.w3.org/1999/xhtml\">\n" "<head>\n" "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n" - "<meta name=\"Generator\" content=\"KHTML, the KDE Web Page Viewer\" />\n" + "<meta name=\"Generator\" content=\"TDEHTML, the KDE Web Page Viewer\" />\n" "</head>\n") + text + "</html>"; diff --git a/tdehtml/xml/dom_docimpl.cpp b/tdehtml/xml/dom_docimpl.cpp index 5614dbf2e..854d7b3e3 100644 --- a/tdehtml/xml/dom_docimpl.cpp +++ b/tdehtml/xml/dom_docimpl.cpp @@ -200,12 +200,12 @@ CSSStyleSheetImpl *DOMImplementationImpl::createCSSStyleSheet(DOMStringImpl* /*t return sheet; } -DocumentImpl *DOMImplementationImpl::createDocument( KHTMLView *v ) +DocumentImpl *DOMImplementationImpl::createDocument( TDEHTMLView *v ) { return new DocumentImpl(this, v); } -HTMLDocumentImpl *DOMImplementationImpl::createHTMLDocument( KHTMLView *v ) +HTMLDocumentImpl *DOMImplementationImpl::createHTMLDocument( TDEHTMLView *v ) { return new HTMLDocumentImpl(this, v); } @@ -288,8 +288,8 @@ ElementMappingCache::ItemInfo* ElementMappingCache::get(const TQString& id) static KStaticDeleter< TQPtrList<DocumentImpl> > s_changedDocumentsDeleter; TQPtrList<DocumentImpl> * DocumentImpl::changedDocuments; -// KHTMLView might be 0 -DocumentImpl::DocumentImpl(DOMImplementationImpl *_implementation, KHTMLView *v) +// TDEHTMLView might be 0 +DocumentImpl::DocumentImpl(DOMImplementationImpl *_implementation, TDEHTMLView *v) : NodeBaseImpl( 0 ), m_domtree_version(0), m_counterDict(257), m_imageLoadEventTimer(0) { @@ -304,7 +304,7 @@ DocumentImpl::DocumentImpl(DOMImplementationImpl *_implementation, KHTMLView *v) m_view = v; m_renderArena.reset(); - KHTMLFactory::ref(); + TDEHTMLFactory::ref(); if ( v ) { m_docLoader = new DocLoader(v->part(), this ); @@ -459,7 +459,7 @@ DocumentImpl::~DocumentImpl() m_renderArena.reset(); - KHTMLFactory::deref(); + TDEHTMLFactory::deref(); } @@ -1132,7 +1132,7 @@ void DocumentImpl::recalcStyle( StyleChange change ) fontDef.italic = f.italic(); fontDef.weight = f.weight(); if (m_view) { - const KHTMLSettings *settings = m_view->part()->settings(); + const TDEHTMLSettings *settings = m_view->part()->settings(); TQString stdfont = settings->stdFontName(); if ( !stdfont.isEmpty() ) fontDef.family = stdfont; @@ -1317,7 +1317,7 @@ void DocumentImpl::open( bool clearEventListeners ) delete m_tokenizer; m_tokenizer = 0; - KHTMLView* view = m_view; + TDEHTMLView* view = m_view; bool was_attached = attached(); if ( was_attached ) detach(); @@ -1662,7 +1662,7 @@ void DocumentImpl::processHttpEquiv(const DOMString &equiv, const DOMString &con { assert(!equiv.isNull() && !content.isNull()); - KHTMLView *v = getDocument()->view(); + TDEHTMLView *v = getDocument()->view(); if(strcasecmp(equiv, "refresh") == 0 && v && v->part()->metaRefreshEnabled()) { @@ -2336,12 +2336,12 @@ void DocumentImpl::notifyBeforeNodeRemoval(NodeImpl *n) bool DocumentImpl::isURLAllowed(const TQString& url) const { - KHTMLPart *thisPart = part(); + TDEHTMLPart *thisPart = part(); KURL newURL(completeURL(url)); newURL.setRef(TQString::null); - if (KHTMLFactory::defaultHTMLSettings()->isAdFiltered( newURL.url() )) + if (TDEHTMLFactory::defaultHTMLSettings()->isAdFiltered( newURL.url() )) return false; // Prohibit non-file URLs if we are asked to. @@ -2355,7 +2355,7 @@ bool DocumentImpl::isURLAllowed(const TQString& url) const // We allow one level of self-reference because some sites depend on that. // But we don't allow more than one. bool foundSelfReference = false; - for (KHTMLPart *part = thisPart; part; part = part->parentPart()) { + for (TDEHTMLPart *part = thisPart; part; part = part->parentPart()) { KURL partURL = part->url(); partURL.setRef(TQString::null); if (partURL == newURL) { @@ -2619,7 +2619,7 @@ void DocumentImpl::setDecoderCodec(const TQTextCodec *codec) ElementImpl *DocumentImpl::ownerElement() const { - KHTMLPart *childPart = part(); + TDEHTMLPart *childPart = part(); if (!childPart) return 0; ChildFrame *childFrame = childPart->d->m_frame; @@ -2675,9 +2675,9 @@ DOMString DocumentImpl::toString() const } -KHTMLPart* DOM::DocumentImpl::part() const +TDEHTMLPart* DOM::DocumentImpl::part() const { - // ### TODO: make this independent from a KHTMLView one day. + // ### TODO: make this independent from a TDEHTMLView one day. return view() ? view()->part() : 0; } diff --git a/tdehtml/xml/dom_docimpl.h b/tdehtml/xml/dom_docimpl.h index 18b164643..9cacfd9f5 100644 --- a/tdehtml/xml/dom_docimpl.h +++ b/tdehtml/xml/dom_docimpl.h @@ -47,7 +47,7 @@ class TQPaintDevice; class TQTextCodec; class TQPaintDeviceMetrics; -class KHTMLView; +class TDEHTMLView; namespace tdehtml { class Tokenizer; @@ -115,8 +115,8 @@ public: HTMLDocumentImpl* createHTMLDocument( const DOMString& title); // Other methods (not part of DOM) - DocumentImpl *createDocument( KHTMLView *v = 0 ); - HTMLDocumentImpl *createHTMLDocument( KHTMLView *v = 0 ); + DocumentImpl *createDocument( TDEHTMLView *v = 0 ); + HTMLDocumentImpl *createHTMLDocument( TDEHTMLView *v = 0 ); // Returns the static instance of this class - only one instance of this class should // ever be present, and is used as a factory method for creating DocumentImpl objects @@ -184,7 +184,7 @@ class DocumentImpl : public TQObject, private tdehtml::CachedObjectClient, publi { Q_OBJECT public: - DocumentImpl(DOMImplementationImpl *_implementation, KHTMLView *v); + DocumentImpl(DOMImplementationImpl *_implementation, TDEHTMLView *v); ~DocumentImpl(); // DOM methods & attributes for Document @@ -281,8 +281,8 @@ public: // Set the state the document should restore to void setRestoreState( const TQStringList &s) { m_state = s; } - KHTMLView *view() const { return m_view; } - KHTMLPart* part() const; + TDEHTMLView *view() const { return m_view; } + TDEHTMLPart* part() const; RangeImpl *createRange(); @@ -550,7 +550,7 @@ signals: protected: tdehtml::CSSStyleSelector *m_styleSelector; - KHTMLView *m_view; + TDEHTMLView *m_view; TQStringList m_state; tdehtml::DocLoader *m_docLoader; diff --git a/tdehtml/xml/dom_elementimpl.cpp b/tdehtml/xml/dom_elementimpl.cpp index 75ed41dfc..3941154d7 100644 --- a/tdehtml/xml/dom_elementimpl.cpp +++ b/tdehtml/xml/dom_elementimpl.cpp @@ -896,8 +896,8 @@ void ElementImpl::setContentEditable(bool enabled) { // FIXME: reset caret if it is in this node or a child }/*end if*/ // FIXME: use addCSSProperty when I get permission to move it here -// kdDebug(6000) << "CSS_PROP__KHTML_USER_INPUT: "<< value << endl; - styleRules()->setProperty(CSS_PROP__KHTML_USER_INPUT, value, false, true); +// kdDebug(6000) << "CSS_PROP__TDEHTML_USER_INPUT: "<< value << endl; + styleRules()->setProperty(CSS_PROP__TDEHTML_USER_INPUT, value, false, true); setChanged(); } diff --git a/tdehtml/xml/dom_nodeimpl.cpp b/tdehtml/xml/dom_nodeimpl.cpp index 251cb1444..ac8ca630e 100644 --- a/tdehtml/xml/dom_nodeimpl.cpp +++ b/tdehtml/xml/dom_nodeimpl.cpp @@ -337,7 +337,7 @@ void NodeImpl::dispatchEvent(EventImpl *evt, int &exceptioncode, bool tempEvent) evt->setTarget(this); // Since event handling code could cause this object to be deleted, grab a reference to the view now - KHTMLView *view = getDocument()->view(); + TDEHTMLView *view = getDocument()->view(); dispatchGenericEvent( evt, exceptioncode ); @@ -610,8 +610,8 @@ void NodeImpl::handleLocalEvents(EventImpl *evt, bool useCapture) // * use me->qEvent(), it's not available when using initMouseEvent/dispatchEvent // So we currently store a bool in MouseEventImpl. If anyone needs to trigger // dblclicks from the DOM API, we'll need a timer here (well in the doc). - if ( ( !me->isDoubleClick() && current.id == EventImpl::KHTML_ECMA_CLICK_EVENT) || - ( me->isDoubleClick() && current.id == EventImpl::KHTML_ECMA_DBLCLICK_EVENT) ) + if ( ( !me->isDoubleClick() && current.id == EventImpl::TDEHTML_ECMA_CLICK_EVENT) || + ( me->isDoubleClick() && current.id == EventImpl::TDEHTML_ECMA_DBLCLICK_EVENT) ) current.listener->handleEvent(ev); } } diff --git a/tdehtml/xml/dom_nodeimpl.h b/tdehtml/xml/dom_nodeimpl.h index c01e69c0a..457a05787 100644 --- a/tdehtml/xml/dom_nodeimpl.h +++ b/tdehtml/xml/dom_nodeimpl.h @@ -37,7 +37,7 @@ class TQPainter; template <class type> class TQPtrList; template <class type> class TQValueList; -class KHTMLView; +class TDEHTMLView; class TQRect; class TQMouseEvent; class TQKeyEvent; @@ -283,7 +283,7 @@ public: void dispatchUIEvent(int _id, int detail = 0); void dispatchSubtreeModifiedEvent(); // return true if defaultPrevented (i.e. event should be swallowed) - // this matches the logic in KHTMLView. + // this matches the logic in TDEHTMLView. bool dispatchKeyEvent(TQKeyEvent *key, bool keypress); void handleLocalEvents(EventImpl *evt, bool useCapture); @@ -351,7 +351,7 @@ public: /** * Attaches this node to the rendering tree. This calculates the style to be applied to the node and creates an * appropriate RenderObject which will be inserted into the tree (except when the style has display: none). This - * makes the node visible in the KHTMLView. + * makes the node visible in the TDEHTMLView. */ virtual void attach(); diff --git a/tdehtml/xml/xml_tokenizer.cpp b/tdehtml/xml/xml_tokenizer.cpp index ff4a33a99..44f90673f 100644 --- a/tdehtml/xml/xml_tokenizer.cpp +++ b/tdehtml/xml/xml_tokenizer.cpp @@ -91,7 +91,7 @@ void XMLIncrementalSource::setFinished( bool finished ) m_finished = finished; } -XMLHandler::XMLHandler(DocumentImpl *_doc, KHTMLView *_view) +XMLHandler::XMLHandler(DocumentImpl *_doc, TDEHTMLView *_view) : errorLine(0) { m_doc = _doc; @@ -390,7 +390,7 @@ bool XMLHandler::unparsedEntityDecl(const TQString &/*name*/, const TQString &/* //------------------------------------------------------------------------------ -XMLTokenizer::XMLTokenizer(DOM::DocumentImpl *_doc, KHTMLView *_view) +XMLTokenizer::XMLTokenizer(DOM::DocumentImpl *_doc, TDEHTMLView *_view) : m_handler(_doc,_view) { m_doc = _doc; diff --git a/tdehtml/xml/xml_tokenizer.h b/tdehtml/xml/xml_tokenizer.h index 49a9c970d..f89e5eb2f 100644 --- a/tdehtml/xml/xml_tokenizer.h +++ b/tdehtml/xml/xml_tokenizer.h @@ -31,7 +31,7 @@ #include "misc/loader_client.h" #include "misc/stringit.h" -class KHTMLView; +class TDEHTMLView; namespace tdehtml { class CachedObject; @@ -51,7 +51,7 @@ namespace tdehtml { class XMLHandler : public TQXmlDefaultHandler { public: - XMLHandler(DOM::DocumentImpl *_doc, KHTMLView *_view); + XMLHandler(DOM::DocumentImpl *_doc, TDEHTMLView *_view); virtual ~XMLHandler(); // return the error protocol if parsing failed @@ -101,7 +101,7 @@ private: private: TQString errorProt; DOM::DocumentImpl *m_doc; - KHTMLView *m_view; + TDEHTMLView *m_view; TQPtrStack<DOM::NodeImpl> m_nodes; DOM::NodeImpl *m_rootNode; @@ -162,7 +162,7 @@ private: class XMLTokenizer : public Tokenizer, public tdehtml::CachedObjectClient { public: - XMLTokenizer(DOM::DocumentImpl *, KHTMLView * = 0); + XMLTokenizer(DOM::DocumentImpl *, TDEHTMLView * = 0); virtual ~XMLTokenizer(); virtual void begin(); virtual void write( const TokenizerString &str, bool ); @@ -178,7 +178,7 @@ public: protected: DOM::DocumentImpl *m_doc; - KHTMLView *m_view; + TDEHTMLView *m_view; void executeScripts(); void addScripts(DOM::NodeImpl *n); diff --git a/tdeio/tdeio/kprotocolmanager.cpp b/tdeio/tdeio/kprotocolmanager.cpp index 450b9d107..363992988 100644 --- a/tdeio/tdeio/kprotocolmanager.cpp +++ b/tdeio/tdeio/kprotocolmanager.cpp @@ -72,7 +72,7 @@ KProtocolManagerPrivate::~KProtocolManagerPrivate() // DEFAULT USERAGENT STRING #define CFG_DEFAULT_UAGENT(X) \ -TQString("Mozilla/5.0 (compatible; Konqueror/%1.%2%3) KHTML/%4.%5.%6 (like Gecko)") \ +TQString("Mozilla/5.0 (compatible; Konqueror/%1.%2%3) TDEHTML/%4.%5.%6 (like Gecko)") \ .arg(TDE_VERSION_MAJOR).arg(TDE_VERSION_MINOR).arg(X).arg(TDE_VERSION_MAJOR).arg(TDE_VERSION_MINOR).arg(TDE_VERSION_RELEASE) void KProtocolManager::reparseConfiguration() diff --git a/tdeparts/COMMENTS b/tdeparts/COMMENTS index 32f0be1d9..7d17ebdc0 100644 --- a/tdeparts/COMMENTS +++ b/tdeparts/COMMENTS @@ -391,7 +391,7 @@ KOfficeMainWindow (a tdeparts aware shell) | |- KReportGeneratorView/Part (a koffice component) | - |- KHTMLBrowserView/Part (something like konqui, this is a kpart) + |- TDEHTMLBrowserView/Part (something like konqui, this is a kpart) Imagine all are added to one KPartManager. Now the user clicks on the report generator and gets the @@ -487,7 +487,7 @@ KOfficeMainWindow (a tdeparts aware shell) | |- KReportGeneratorView/Part (a koffice component) | - |- KHTMLBrowserView/Part (something like konqui, this is a kpart) + |- TDEHTMLBrowserView/Part (something like konqui, this is a kpart) The report generator does not want GUI merging of its HTML browser. But it wants to offer an action called "HTMLSettings" to allow choosing the default font of the HTML Widget. Obviously this action diff --git a/tdeparts/browserextension.h b/tdeparts/browserextension.h index 8d3a109ff..8dcbe68f7 100644 --- a/tdeparts/browserextension.h +++ b/tdeparts/browserextension.h @@ -65,7 +65,7 @@ struct KPARTS_EXPORT URLArgs /** * This buffer can be used by the part to save and restore its contents. - * See KHTMLPart for instance. + * See TDEHTMLPart for instance. */ TQStringList docState; @@ -89,26 +89,26 @@ struct KPARTS_EXPORT URLArgs TQString serviceType; /** - * KHTML-specific field, contents of the HTTP POST data. + * TDEHTML-specific field, contents of the HTTP POST data. */ TQByteArray postData; /** - * KHTML-specific field, header defining the type of the POST data. + * TDEHTML-specific field, header defining the type of the POST data. */ void setContentType( const TQString & contentType ); /** - * KHTML-specific field, header defining the type of the POST data. + * TDEHTML-specific field, header defining the type of the POST data. */ TQString contentType() const; /** - * KHTML-specific field, whether to do a POST instead of a GET, + * TDEHTML-specific field, whether to do a POST instead of a GET, * for the next openURL. */ void setDoPost( bool enable ); /** - * KHTML-specific field, whether to do a POST instead of a GET, + * TDEHTML-specific field, whether to do a POST instead of a GET, * for the next openURL. */ bool doPost() const; @@ -134,7 +134,7 @@ struct KPARTS_EXPORT URLArgs TQMap<TQString, TQString> &metaData(); /** - * The frame in which to open the URL. KHTML/Konqueror-specific. + * The frame in which to open the URL. TDEHTML/Konqueror-specific. */ TQString frameName; @@ -719,7 +719,7 @@ private: /** * An extension class for container parts, i.e. parts that contain * other parts. - * For instance a KHTMLPart hosts one part per frame. + * For instance a TDEHTMLPart hosts one part per frame. */ class KPARTS_EXPORT BrowserHostExtension : public TQObject { diff --git a/tdeparts/browserrun.cpp b/tdeparts/browserrun.cpp index f0951b382..96de9f904 100644 --- a/tdeparts/browserrun.cpp +++ b/tdeparts/browserrun.cpp @@ -356,7 +356,7 @@ BrowserRun::AskSaveResult BrowserRun::askEmbedOrSave( const KURL & url, const TQ // SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC SYNC } -// Default implementation, overridden in KHTMLRun +// Default implementation, overridden in TDEHTMLRun void BrowserRun::save( const KURL & url, const TQString & suggestedFilename ) { simpleSave( url, suggestedFilename, m_window ); @@ -461,7 +461,7 @@ void BrowserRun::handleError( TDEIO::Job * job ) void BrowserRun::redirectToError( int error, const TQString& errorText ) { /** - * To display this error in KHTMLPart instead of inside a dialog box, + * To display this error in TDEHTMLPart instead of inside a dialog box, * we tell konq that the mimetype is text/html, and we redirect to * an error:/ URL that sends the info to tdehtml. * diff --git a/tdeparts/browserrun.h b/tdeparts/browserrun.h index edd46d40d..f84e088b3 100644 --- a/tdeparts/browserrun.h +++ b/tdeparts/browserrun.h @@ -123,7 +123,7 @@ namespace KParts { */ static AskSaveResult askEmbedOrSave( const KURL & url, const TQString& mimeType, const TQString & suggestedFilename = TQString::null, int flags = 0 ); - // virtual so that KHTML can implement differently (HTML cache) + // virtual so that TDEHTML can implement differently (HTML cache) virtual void save( const KURL & url, const TQString & suggestedFilename ); // static so that it can be called from other classes diff --git a/tdeparts/browserview.desktop b/tdeparts/browserview.desktop index 42d6131ec..9c534c8f1 100644 --- a/tdeparts/browserview.desktop +++ b/tdeparts/browserview.desktop @@ -149,7 +149,7 @@ Type=bool [PropertyDef::X-TDE-BrowserView-Built-Into] Type=TQString -# If the part has a plugin for KHTML Javascript's window.navigator.plugins +# If the part has a plugin for TDEHTML Javascript's window.navigator.plugins # array, it should create a plugin info file and set this property to the # file path here. The path should be relative to TDE's data dir # ($TDEDIR/share/apps) diff --git a/tdespell2/tests/backgroundtest.cpp b/tdespell2/tests/backgroundtest.cpp index aca02af53..14f9e029d 100644 --- a/tdespell2/tests/backgroundtest.cpp +++ b/tdespell2/tests/backgroundtest.cpp @@ -31,7 +31,7 @@ const char *text = "Rationale \ ========= \ \ This code is intended to provide an implementation of the W3C's XPath \ -specification for KHTML. XPath isn't particularly useful on its own, however\ +specification for TDEHTML. XPath isn't particularly useful on its own, however\ it is an essential building block for the implementation of other standards \ like XSLT and XQuery. XPath is supported to a greater or lesser extent by both\ IE and Mozilla so it is likely to become increasingly important over the next\ @@ -45,7 +45,7 @@ licenses including Mozilla's, libxml2, Xerces and probably others, so it is \ reasonable to ask why there should be another one. \ \ It would certainly be possible to integrate one of these implementations into\ -KHTML, but it would actually be quite a lot of work. I looked at all of the\ +TDEHTML, but it would actually be quite a lot of work. I looked at all of the\ implementations mentioned with a view to using this approach before I decided\ to start from scratch.\ \ @@ -62,7 +62,7 @@ Xerces XPath (C++ version)\ \ The Xerces code seemed pretty clean and was reasonably understandable, however\ it doesn't seem to be used very much which greatly reduces the utility. As\ -with the mozilla code, porting it to use KHTML's DOM would take a fair bit of \ +with the mozilla code, porting it to use TDEHTML's DOM would take a fair bit of \ work. The main issue here being that Xerces is based around pointers to Nodes\ rather than implicitly shared Node objects.\ \ @@ -72,7 +72,7 @@ libxml2 \ This is the most obvious library to reuse as it is currently used to generate\ the KDE documentation, and is also a very complete and fast\ implementation. The down side of using this code is that it would either need\ -a new DOM implementation in KHTML (which used the libxml2 structures), a \ +a new DOM implementation in TDEHTML (which used the libxml2 structures), a \ wrapper library that made on of the DOM trees support the API of the other, or\ binding layer that parsed the XML twice and somehow maintained a mapping\ between the two DOM trees. Unfortunately the documentation of this library is\ @@ -83,7 +83,7 @@ for. They are well documented and have a well structured API. Unfortunately\ using this library still requires some mechanism to integrate the two\ underlying DOM implementations.\ \ -KHTML XPath\ +TDEHTML XPath\ ----------- \ \ There are some advantages to the XPath implementation Zack and I are working\ @@ -95,7 +95,7 @@ on, namely: \ - The code is clean and uses familiar types and idioms. \ \ We intend the code to be build on top of the DOM api rather than tying it\ -directly to the Qt or KHTML XML implementations. This will allow us to take\ +directly to the Qt or TDEHTML XML implementations. This will allow us to take\ advantage of any improvements that might be made to the underlying parser\ etc. The DOM2 traversal APIs provide a set of classes that map almost directly \ to the XPath location steps, since we need to implement these facilities\ diff --git a/tdeui/ksyntaxhighlighter.cpp b/tdeui/ksyntaxhighlighter.cpp index 07ddf93c4..1d0ce4159 100644 --- a/tdeui/ksyntaxhighlighter.cpp +++ b/tdeui/ksyntaxhighlighter.cpp @@ -234,7 +234,7 @@ TQStringList KSpellingHighlighter::personalWords() l.append( "KMail" ); l.append( "KOrganizer" ); l.append( "KAddressBook" ); - l.append( "KHTML" ); + l.append( "TDEHTML" ); l.append( "KIO" ); l.append( "KJS" ); l.append( "Konqueror" ); diff --git a/win/tdelibs_export_win.h b/win/tdelibs_export_win.h index a61464ed3..9eee4ac73 100644 --- a/win/tdelibs_export_win.h +++ b/win/tdelibs_export_win.h @@ -145,8 +145,8 @@ # define KATEPART_EXPORT KDE_IMPORT #endif -#ifdef MAKE_KHTML_LIB -# define KHTML_EXPORT KDE_EXPORT +#ifdef MAKE_TDEHTML_LIB +# define TDEHTML_EXPORT KDE_EXPORT #else -# define KHTML_EXPORT KDE_IMPORT +# define TDEHTML_EXPORT KDE_IMPORT #endif |