Rename KHTML and kiobuffer

pull/16/head
Timothy Pearson 11 years ago
parent 72eecb041b
commit 7427e43835

@ -351,13 +351,13 @@ This makes KRun the recommended way to run another program in KDE 2.
tdehtmlw has been replaced with tdehtml.<BR> tdehtmlw has been replaced with tdehtml.<BR>
<UL> <UL>
<LI>KHTMLView has vanished. Just use KHTMLWidget, which does scrollbar <LI>TDEHTMLView has vanished. Just use TDEHTMLWidget, which does scrollbar
managing for free. managing for free.
<LI>A lot of the API has changed. If you just want to open a file/URL, <LI>A lot of the API has changed. If you just want to open a file/URL,
you just need to do:<P> you just need to do:<P>
<PRE> <PRE>
KHTMLWidget *w = new KHTMLWidget(); TDEHTMLWidget *w = new TDEHTMLWidget();
w-&gt;openURL(myURL); w-&gt;openURL(myURL);
</PRE> </PRE>
@ -367,18 +367,18 @@ tdehtmlw has been replaced with tdehtml.<BR>
const char * -&gt; QString const char * -&gt; QString
TQStrList -&gt; QStringList TQStrList -&gt; QStringList
</PRE> </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> also exist in a const char * version.<P>
<LI>you won't need the getKHTMLWiget function anymore. Just replace <LI>you won't need the getTDEHTMLWiget function anymore. Just replace
getKHTMLWidget-&gt;xxx() with xxx()<P> getTDEHTMLWidget-&gt;xxx() with xxx()<P>
<LI>xxx(TQString) -&gt; xxx(const TQString &amp;)<P> <LI>xxx(TQString) -&gt; xxx(const TQString &amp;)<P>
<LI>consistent naming. All getXyz() functions are renamed to xyz()<P> <LI>consistent naming. All getXyz() functions are renamed to xyz()<P>
<LI>replaced/changed functions:<P> <LI>replaced/changed functions:<P>
<TABLE BORDER="1"> <TABLE BORDER="1">
<TR> <TR>
<TD>KHTMLWidget::setDefaultFontBase()</TD> <TD>TDEHTMLWidget::setDefaultFontBase()</TD>
<TD>-&gt; setFontSizes()</TD> <TD>-&gt; setFontSizes()</TD>
</TR> </TR>
<TR> <TR>

@ -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="#kio">Changes in kio</A></LI>
<LI><A HREF="#tdeparts">Changes in tdeparts</A></LI> <LI><A HREF="#tdeparts">Changes in tdeparts</A></LI>
<LI><A HREF="#tdespell">Changes in tdespell</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="#tdefile">Changes in tdefile</A></LI>
<LI><A HREF="#kcontrol">TDE Control Center</A></LI> <LI><A HREF="#kcontrol">TDE Control Center</A></LI>
<LI><A HREF="#kicker">Panel Applets and Extensions</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> <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) <ul><li>enableJScript(bool) has been replaced by setJScriptEnabled(bool)
<li>enableJava(bool) has been replaced by setJavaEnabled(bool) <li>enableJava(bool) has been replaced by setJavaEnabled(bool)
<li>enablePlugins(bool) has been replaced by setPluginsEnabled(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>enableMetaRefresh(bool) has been replaced by setMetaRefreshEnabled(bool)
<li>setBaseURL and setBaseTarget have been removed. baseURL(), baseTarget() and <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. 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. any effect before either.
</ul> </ul>
Besides that, all methods previously marked as deprecated or were internal 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 As they were marked as becoming private already you should not experience
any problems. Backward compatibility exists for the common methods, to any problems. Backward compatibility exists for the common methods, to
disable this use a #define KDE_NO_COMPAT. 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> <ul>
<li>gotoNextLink has been replaced by gotoLink(true); <li>gotoNextLink has been replaced by gotoLink(true);
<li>gotoPrevLink has been replaced by gotoLink(false); <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. - 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 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 make SSL much easier to implement and allow removal of many hacks, mostly
involving metadata. involving metadata.

@ -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_KIO, '$(top_builddir)/tdeio/libtdeio.la')
AC_SUBST(LIB_KFILE, '$(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_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_TDEPRINT, '$(top_builddir)/tdeprint/libtdeprint.la')
AC_SUBST(LIB_KPARTS, '$(top_builddir)/tdeparts/libtdeparts.la') AC_SUBST(LIB_KPARTS, '$(top_builddir)/tdeparts/libtdeparts.la')
AC_SUBST(LIB_KIMGIO, '$(top_builddir)/kimgio/libkimgio.la') AC_SUBST(LIB_KIMGIO, '$(top_builddir)/kimgio/libkimgio.la')

@ -13,7 +13,7 @@ for the standard page.
About 95% of the required features should be covered by now. Note that this 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 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 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 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 a later point in time. Feel free to contact me via mail if you have any

@ -1357,7 +1357,7 @@ void KeramikStyle::drawKStylePrimitive( KStylePrimitive kpe,
bool KeramikStyle::isFormWidget(const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget* widget) const bool KeramikStyle::isFormWidget(const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget* widget) const
{ {
if (widget) { 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 //of widgets - QClipperWidget, and outside of that, QViewportWidget
TQWidget* potentialClipPort = widget->parentWidget(); TQWidget* potentialClipPort = widget->parentWidget();
if ((ceData.parentWidgetData.widgetObjectTypes.isEmpty()) && (ceData.parentWidgetFlags & CEF_IsTopLevel)) { 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") ) qstrcmp(potentialViewPort->name(), "qt_viewport") )
return false; return false;
TQWidget* potentialKHTML = potentialViewPort->parentWidget(); TQWidget* potentialTDEHTML = potentialViewPort->parentWidget();
if (!potentialKHTML || potentialKHTML->isTopLevel() || if (!potentialTDEHTML || potentialTDEHTML->isTopLevel() ||
qstrcmp(potentialKHTML->className(), "KHTMLView") ) qstrcmp(potentialTDEHTML->className(), "TDEHTMLView") )
return false; return false;

@ -46,7 +46,7 @@
#define KVCARD_EXPORT KDE_EXPORT #define KVCARD_EXPORT KDE_EXPORT
#define KRESOURCES_EXPORT KDE_EXPORT #define KRESOURCES_EXPORT KDE_EXPORT
#define KSTYLE_EXPORT KDE_EXPORT #define KSTYLE_EXPORT KDE_EXPORT
#define KHTML_EXPORT KDE_EXPORT #define TDEHTML_EXPORT KDE_EXPORT
#define KMDI_EXPORT KDE_EXPORT #define KMDI_EXPORT KDE_EXPORT
#define KUTILS_EXPORT KDE_EXPORT #define KUTILS_EXPORT KDE_EXPORT
#define KATEPARTINTERFACES_EXPORT KDE_EXPORT #define KATEPARTINTERFACES_EXPORT KDE_EXPORT

@ -243,7 +243,7 @@
stalled layout flags problems - #121653). (updateWidgetMasks): mask the content box, not the border box. stalled layout flags problems - #121653). (updateWidgetMasks): mask the content box, not the border box.
(enclosingStackingContext) new. Returns the layer defining current stacking context. (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 (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). Only allow !tdehtml widgets to register in the view (only those need masking).
@ -473,7 +473,7 @@
2005-08-10 Dawit Alemayehu <adawit@kde.org> 2005-08-10 Dawit Alemayehu <adawit@kde.org>
* ecma/xmlhttprequest.cpp: Convert a 304 (Not Modified) HTTP response in * 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 Mozilla's behavior. BUG: 110272
* ecma/xmlhttprequest.cpp: Factored out the HTTP status line parsing code * ecma/xmlhttprequest.cpp: Factored out the HTTP status line parsing code
@ -510,7 +510,7 @@
replace them with the "blocked" pixmap.) replace them with the "blocked" pixmap.)
* tdehtml_part.{cpp,h}: Added runAdFilters() function which is called from reparseConfiguration() * 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. * misc/loader.cpp: Create blockedPixmap in Cache::init() instead of the CachedImage constructor.
2005-07-19 Allan Sandfeld Jensen <kde@carewolf.com> 2005-07-19 Allan Sandfeld Jensen <kde@carewolf.com>
@ -528,7 +528,7 @@
* tdehtml_ext.{cpp,h}: Added "blockiframe" to context popup menu * tdehtml_ext.{cpp,h}: Added "blockiframe" to context popup menu
* tdehtml_popupmenu.rc: Same * 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 <germain@ebooksfrance.org> 2005-07-08 Germain Garand <germain@ebooksfrance.org>
@ -544,11 +544,11 @@
2005-07-07 Allan Sandfeld Jensen <kde@carewolf.com> 2005-07-07 Allan Sandfeld Jensen <kde@carewolf.com>
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. 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 * 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 <kde@carewolf.com> 2005-07-05 Allan Sandfeld Jensen <kde@carewolf.com>
@ -1969,7 +1969,7 @@
2004-07-28 Leo Savernik <l.savernik@aon.at> 2004-07-28 Leo Savernik <l.savernik@aon.at>
* tdehtmlview.{cpp,h} (KHTMLToolTip::maybeTip): Query <area> elements * tdehtmlview.{cpp,h} (TDEHTMLToolTip::maybeTip): Query <area> elements
of image maps. of image maps.
(dispatchMouseEvent): Added parameter innerNonSharedNode. (dispatchMouseEvent): Added parameter innerNonSharedNode.
* tdehtml_part.{cpp,h}: Added method nonSharedNodeUnderMouse. * tdehtml_part.{cpp,h}: Added method nonSharedNodeUnderMouse.
@ -1978,7 +1978,7 @@
* xml/dom_nodeimpl.h: Added innerNonSharedNode to * xml/dom_nodeimpl.h: Added innerNonSharedNode to
NodeImpl::MouseEvent. NodeImpl::MouseEvent.
* html/html_imageimpl.h: Added cachedRegion() for being able to * 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 <coolo@kde.org> 2004-07-20 Stephan Kulow <coolo@kde.org>
@ -2297,7 +2297,7 @@
2004-05-06 Tobias Anton <anton@stud.fbi.fh-darmstadt.de> 2004-05-06 Tobias Anton <anton@stud.fbi.fh-darmstadt.de>
* 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. to avoid a memleak whenever the parser is used on a DocumentFragment.
2004-05-04 Leo Savernik <l.savernik@aon.at> 2004-05-04 Leo Savernik <l.savernik@aon.at>
@ -2370,8 +2370,8 @@
Added classes CaretBox, CaretBoxLine, CaretBoxIterator, Added classes CaretBox, CaretBoxLine, CaretBoxIterator,
EditableCaretBoxIterator. Changed every other class. EditableCaretBoxIterator. Changed every other class.
* tdehtmlview.[cpp,h}: (class KHTMLView) Adapt to tdehtml_caret* changes. * tdehtmlview.[cpp,h}: (class TDEHTMLView) Adapt to tdehtml_caret* changes.
(KHTMLToolTip::maybeTip) Save tooltip position instead of recalculating it. (TDEHTMLToolTip::maybeTip) Save tooltip position instead of recalculating it.
* rendering/render_{inline,box}.{cpp,h}: (Render{Box,Inline}::caretPos) * rendering/render_{inline,box}.{cpp,h}: (Render{Box,Inline}::caretPos)
Handle outside caret positions. Handle outside caret positions.
@ -2508,7 +2508,7 @@
* ecma/xmlhttprequest.h/cpp: Implement asynchronous interface * ecma/xmlhttprequest.h/cpp: Implement asynchronous interface
enough to pass the tests on http://www.mozilla.org/xmlextras/tests.html 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. to KEYUP/DOWN_EVENT. Add events needed for XMLHttpRequest.
* rendering/render_object.h (class RenderObject): introduce a PaintInfo * 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 * 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 on the user-defined stylesheet and reload it in case it changed in
the meanwhile (#39962). the meanwhile (#39962).
* tdehtmlpart_p.h (class KHTMLPartPrivate): Added * tdehtmlpart_p.h (class TDEHTMLPartPrivate): Added
m_userStyleSheetLastModified variable which keeps track of the m_userStyleSheetLastModified variable which keeps track of the
mtime of the user-defined sheet. mtime of the user-defined sheet.
@ -2825,7 +2825,7 @@
2004-01-18 Dirk Mueller <mueller@kde.org> 2004-01-18 Dirk Mueller <mueller@kde.org>
* tdehtmlpart_p.h (class KHTMLPartPrivate): experimental: * tdehtmlpart_p.h (class TDEHTMLPartPrivate): experimental:
copy encoding information from parent frame. helps on copy encoding information from parent frame. helps on
http://www.pfl.ru/ when manually setting the correct encoding. 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 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. 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 <mueller@kde.org> 2003-10-05 Dirk Mueller <mueller@kde.org>
@ -3852,7 +3852,7 @@
2003-10-04 Dirk Mueller <mueller@kde.org> 2003-10-04 Dirk Mueller <mueller@kde.org>
* 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. to avoid ugly crashes when DHTML deletes the node while we're still parsing.
#57020, testcase alja.html #57020, testcase alja.html

@ -15,7 +15,7 @@ document, but it'll hopefully make it easier for you to read the source code.
</p> </p>
<p> <p>
The library is build up out of several different parts. Basically, when you use the lib, you 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, 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 here's a sketch of the objects that will get constructed, when eg. running testtdehtml with
a url argument. a url argument.
@ -52,8 +52,8 @@ compatible to IE.
</blockquote> </blockquote>
<p> <p>
<a href="tdehtml_part.h">KHTMLPart</a> creates one instance of a <a href="tdehtml_part.h">TDEHTMLPart</a> creates one instance of a
<a href="tdehtmlview.h">KHTMLView</a> (derived from TQScrollView), <a href="tdehtmlview.h">TDEHTMLView</a> (derived from TQScrollView),
the widget showing the whole thing. At the same time a DOM tree 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. is built up from the HTML or XML found in the specified file.
<p> <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 not be seen from the outside for various reasons (make implementation of shared features easier
or to reduce memory consumption). or to reduce memory consumption).
<p> <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>. 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 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 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) <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 object causes the rendering tree to layout itself into the available space
(width) given by the the KHTMLView. After that, the drawContents() method of (width) given by the the TDEHTMLView. After that, the drawContents() method of
KHTMLView can call RenderRoot->print() with appropriate parameters to actually TDEHTMLView can call RenderRoot->print() with appropriate parameters to actually
paint the document. This is not 100% correct, when parsing incrementally, but paint the document. This is not 100% correct, when parsing incrementally, but
is exactly what happens when you resize the document. 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> <h2>Exception handling</h2>
To save on library size, C++-exceptions are only enabled in the dom/ subdirectory, 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 we pass an error flag (usually called "exceptionCode"), and the class that
is part of dom/* checks for this flag and throws the exception. is part of dom/* checks for this flag and throws the exception.

@ -1,19 +1,19 @@
/** @mainpage Trinity HTML Parser and Widget /** @mainpage Trinity HTML Parser and Widget
If you want a fully-fledged HTML browser widget in your application, 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 @code
KUrl url = "http://www.trinitydesktop.org"; KUrl url = "http://www.trinitydesktop.org";
KHTMLPart *w = new KHTMLPart(); TDEHTMLPart *w = new TDEHTMLPart();
w->openUrl(url); w->openUrl(url);
w->view()->resize(500, 400); w->view()->resize(500, 400);
w->show(); w->show();
@endcode @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 and unnecessary bloat to your application. Qt's text widgets are
rich-text capable, and will interpret a limited subset of HTML. rich-text capable, and will interpret a limited subset of HTML.
@ -30,7 +30,7 @@ George Staikos \<staikos@kde.org\><br>
Allan Sandfeld Jensen \<kde@carewolf.com\><br> Allan Sandfeld Jensen \<kde@carewolf.com\><br>
Germain Garand \<germain@ebooksfrance.org\><br> Germain Garand \<germain@ebooksfrance.org\><br>
Maksim Orlovich \<maksim@kde.org\><br> Maksim Orlovich \<maksim@kde.org\><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 @maintainers
Allan Sandfeld Jensen <br> Allan Sandfeld Jensen <br>
Germain Garand<br> Germain Garand<br>
@ -42,5 +42,5 @@ Maksim Orlovich
*/ */
// DOXYGEN_REFERENCES = tdecore tdeui kio tdeparts kjs // DOXYGEN_REFERENCES = tdecore tdeui kio tdeparts kjs
// DOXYGEN_EXCLUDE = test*.* html rendering xml misc ecma css imload pics test // 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 // vim:ts=4:sw=4:expandtab:filetype=doxygen

@ -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->show();
view->begin( "file:/tmp/test.html" ); view->begin( "file:/tmp/test.html" );

@ -41,8 +41,8 @@ static const int computedProperties[] = {
CSS_PROP_BACKGROUND_POSITION_Y, CSS_PROP_BACKGROUND_POSITION_Y,
CSS_PROP_BORDER_COLLAPSE, CSS_PROP_BORDER_COLLAPSE,
CSS_PROP_BORDER_SPACING, CSS_PROP_BORDER_SPACING,
CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING, CSS_PROP__TDEHTML_BORDER_HORIZONTAL_SPACING,
CSS_PROP__KHTML_BORDER_VERTICAL_SPACING, CSS_PROP__TDEHTML_BORDER_VERTICAL_SPACING,
CSS_PROP_BORDER_TOP_COLOR, CSS_PROP_BORDER_TOP_COLOR,
CSS_PROP_BORDER_RIGHT_COLOR, CSS_PROP_BORDER_RIGHT_COLOR,
CSS_PROP_BORDER_BOTTOM_COLOR, CSS_PROP_BORDER_BOTTOM_COLOR,
@ -80,10 +80,10 @@ static const int computedProperties[] = {
CSS_PROP_MARGIN_RIGHT, CSS_PROP_MARGIN_RIGHT,
CSS_PROP_MARGIN_BOTTOM, CSS_PROP_MARGIN_BOTTOM,
CSS_PROP_MARGIN_LEFT, CSS_PROP_MARGIN_LEFT,
CSS_PROP__KHTML_MARQUEE_DIRECTION, CSS_PROP__TDEHTML_MARQUEE_DIRECTION,
CSS_PROP__KHTML_MARQUEE_INCREMENT, CSS_PROP__TDEHTML_MARQUEE_INCREMENT,
CSS_PROP__KHTML_MARQUEE_REPETITION, CSS_PROP__TDEHTML_MARQUEE_REPETITION,
CSS_PROP__KHTML_MARQUEE_STYLE, CSS_PROP__TDEHTML_MARQUEE_STYLE,
CSS_PROP_MAX_HEIGHT, CSS_PROP_MAX_HEIGHT,
CSS_PROP_MAX_WIDTH, CSS_PROP_MAX_WIDTH,
CSS_PROP_MIN_HEIGHT, CSS_PROP_MIN_HEIGHT,
@ -137,7 +137,7 @@ static CSSValueImpl *valueForBorderStyle(EBorderStyle style)
{ {
switch (style) { switch (style) {
case tdehtml::BNATIVE: case tdehtml::BNATIVE:
return new CSSPrimitiveValueImpl(CSS_VAL__KHTML_NATIVE); return new CSSPrimitiveValueImpl(CSS_VAL__TDEHTML_NATIVE);
case tdehtml::BNONE: case tdehtml::BNONE:
return new CSSPrimitiveValueImpl(CSS_VAL_NONE); return new CSSPrimitiveValueImpl(CSS_VAL_NONE);
case tdehtml::BHIDDEN: case tdehtml::BHIDDEN:
@ -176,12 +176,12 @@ static CSSValueImpl *valueForTextAlign(ETextAlign align)
return new CSSPrimitiveValueImpl(CSS_VAL_CENTER); return new CSSPrimitiveValueImpl(CSS_VAL_CENTER);
case tdehtml::JUSTIFY: case tdehtml::JUSTIFY:
return new CSSPrimitiveValueImpl(CSS_VAL_JUSTIFY); return new CSSPrimitiveValueImpl(CSS_VAL_JUSTIFY);
case tdehtml::KHTML_LEFT: case tdehtml::TDEHTML_LEFT:
return new CSSPrimitiveValueImpl(CSS_VAL__KHTML_LEFT); return new CSSPrimitiveValueImpl(CSS_VAL__TDEHTML_LEFT);
case tdehtml::KHTML_RIGHT: case tdehtml::TDEHTML_RIGHT:
return new CSSPrimitiveValueImpl(CSS_VAL__KHTML_RIGHT); return new CSSPrimitiveValueImpl(CSS_VAL__TDEHTML_RIGHT);
case tdehtml::KHTML_CENTER: case tdehtml::TDEHTML_CENTER:
return new CSSPrimitiveValueImpl(CSS_VAL__KHTML_CENTER); return new CSSPrimitiveValueImpl(CSS_VAL__TDEHTML_CENTER);
} }
Q_ASSERT( 0 ); Q_ASSERT( 0 );
return 0; return 0;
@ -440,10 +440,10 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID )
"px"); "px");
return new CSSPrimitiveValueImpl(string, CSSPrimitiveValue::CSS_STRING); 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(), return new CSSPrimitiveValueImpl(style->borderHorizontalSpacing(),
CSSPrimitiveValue::CSS_PX); CSSPrimitiveValue::CSS_PX);
case CSS_PROP__KHTML_BORDER_VERTICAL_SPACING: case CSS_PROP__TDEHTML_BORDER_VERTICAL_SPACING:
return new CSSPrimitiveValueImpl(style->borderVerticalSpacing(), return new CSSPrimitiveValueImpl(style->borderVerticalSpacing(),
CSSPrimitiveValue::CSS_PX); CSSPrimitiveValue::CSS_PX);
case CSS_PROP_BORDER_TOP_COLOR: case CSS_PROP_BORDER_TOP_COLOR:
@ -614,9 +614,9 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID )
case FRIGHT: case FRIGHT:
return new CSSPrimitiveValueImpl(CSS_VAL_RIGHT); return new CSSPrimitiveValueImpl(CSS_VAL_RIGHT);
case FLEFT_ALIGN: case FLEFT_ALIGN:
return new CSSPrimitiveValueImpl(CSS_VAL__KHTML_LEFT); return new CSSPrimitiveValueImpl(CSS_VAL__TDEHTML_LEFT);
case FRIGHT_ALIGN: case FRIGHT_ALIGN:
return new CSSPrimitiveValueImpl(CSS_VAL__KHTML_RIGHT); return new CSSPrimitiveValueImpl(CSS_VAL__TDEHTML_RIGHT);
} }
} }
case CSS_PROP_FONT_FAMILY: case CSS_PROP_FONT_FAMILY:
@ -706,10 +706,10 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID )
return valueForLength(style->marginBottom(), renderer->contentHeight()); return valueForLength(style->marginBottom(), renderer->contentHeight());
case CSS_PROP_MARGIN_LEFT: case CSS_PROP_MARGIN_LEFT:
return valueForLength(style->marginLeft(), renderer->contentWidth()); return valueForLength(style->marginLeft(), renderer->contentWidth());
case CSS_PROP__KHTML_MARQUEE: case CSS_PROP__TDEHTML_MARQUEE:
// FIXME: unimplemented // FIXME: unimplemented
break; break;
case CSS_PROP__KHTML_MARQUEE_DIRECTION: case CSS_PROP__TDEHTML_MARQUEE_DIRECTION:
switch (style->marqueeDirection()) { switch (style->marqueeDirection()) {
case MFORWARD: case MFORWARD:
return new CSSPrimitiveValueImpl(CSS_VAL_FORWARDS); return new CSSPrimitiveValueImpl(CSS_VAL_FORWARDS);
@ -728,16 +728,16 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID )
} }
Q_ASSERT(0); Q_ASSERT(0);
return 0; return 0;
case CSS_PROP__KHTML_MARQUEE_INCREMENT: case CSS_PROP__TDEHTML_MARQUEE_INCREMENT:
return valueForLength(style->marqueeIncrement(), renderer->contentWidth()); return valueForLength(style->marqueeIncrement(), renderer->contentWidth());
case CSS_PROP__KHTML_MARQUEE_REPETITION: case CSS_PROP__TDEHTML_MARQUEE_REPETITION:
if (style->marqueeLoopCount() < 0) if (style->marqueeLoopCount() < 0)
return new CSSPrimitiveValueImpl(CSS_VAL_INFINITE); return new CSSPrimitiveValueImpl(CSS_VAL_INFINITE);
return new CSSPrimitiveValueImpl(style->marqueeLoopCount(), CSSPrimitiveValue::CSS_NUMBER); return new CSSPrimitiveValueImpl(style->marqueeLoopCount(), CSSPrimitiveValue::CSS_NUMBER);
case CSS_PROP__KHTML_MARQUEE_SPEED: case CSS_PROP__TDEHTML_MARQUEE_SPEED:
// FIXME: unimplemented // FIXME: unimplemented
break; break;
case CSS_PROP__KHTML_MARQUEE_STYLE: case CSS_PROP__TDEHTML_MARQUEE_STYLE:
switch (style->marqueeBehavior()) { switch (style->marqueeBehavior()) {
case MNONE: case MNONE:
return new CSSPrimitiveValueImpl(CSS_VAL_NONE); return new CSSPrimitiveValueImpl(CSS_VAL_NONE);
@ -960,7 +960,7 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID )
case BOTTOM: case BOTTOM:
return new CSSPrimitiveValueImpl(CSS_VAL_BOTTOM); return new CSSPrimitiveValueImpl(CSS_VAL_BOTTOM);
case BASELINE_MIDDLE: case BASELINE_MIDDLE:
return new CSSPrimitiveValueImpl(CSS_VAL__KHTML_BASELINE_MIDDLE); return new CSSPrimitiveValueImpl(CSS_VAL__TDEHTML_BASELINE_MIDDLE);
case LENGTH: case LENGTH:
return valueForLength(style->verticalAlignLength(), renderer->contentWidth()); return valueForLength(style->verticalAlignLength(), renderer->contentWidth());
} }
@ -991,8 +991,8 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID )
return new CSSPrimitiveValueImpl(CSS_VAL_PRE_LINE); return new CSSPrimitiveValueImpl(CSS_VAL_PRE_LINE);
case NOWRAP: case NOWRAP:
return new CSSPrimitiveValueImpl(CSS_VAL_NOWRAP); return new CSSPrimitiveValueImpl(CSS_VAL_NOWRAP);
case KHTML_NOWRAP: case TDEHTML_NOWRAP:
return new CSSPrimitiveValueImpl(CSS_VAL__KHTML_NOWRAP); return new CSSPrimitiveValueImpl(CSS_VAL__TDEHTML_NOWRAP);
} }
Q_ASSERT(0); Q_ASSERT(0);
break; break;
@ -1060,9 +1060,9 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID )
break; break;
case CSS_PROP_SCROLLBAR_ARROW_COLOR: case CSS_PROP_SCROLLBAR_ARROW_COLOR:
break; break;
case CSS_PROP__KHTML_FLOW_MODE: case CSS_PROP__TDEHTML_FLOW_MODE:
break; break;
case CSS_PROP__KHTML_USER_INPUT: case CSS_PROP__TDEHTML_USER_INPUT:
break; break;
default: default:
Q_ASSERT( 0 ); Q_ASSERT( 0 );

@ -891,7 +891,7 @@ FontFamilyValueImpl::FontFamilyValueImpl( const TQString &string)
parsedFontName.replace(braceReg, TQString()); parsedFontName.replace(braceReg, TQString());
#ifndef APPLE_CHANGES #ifndef APPLE_CHANGES
const TQString &available = KHTMLSettings::availableFamilies(); const TQString &available = TDEHTMLSettings::availableFamilies();
parsedFontName = parsedFontName.lower(); parsedFontName = parsedFontName.lower();
// kdDebug(0) << "searching for face '" << parsedFontName << "'" << endl; // kdDebug(0) << "searching for face '" << parsedFontName << "'" << endl;

@ -28,7 +28,7 @@
#include "dom/dom_string.h" #include "dom/dom_string.h"
class TQPaintDeviceMetrics; class TQPaintDeviceMetrics;
class KHTMLSettings; class TDEHTMLSettings;
namespace DOM namespace DOM
{ {

@ -533,7 +533,7 @@ bool CSSParser::parseValue( int propId, bool important )
* correctly and allows optimization in tdehtml::applyRule(..) * correctly and allows optimization in tdehtml::applyRule(..)
*/ */
case CSS_PROP_CAPTION_SIDE: // top | bottom | left | right | inherit 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 || */ if ( /* id == CSS_VAL_LEFT || id == CSS_VAL_RIGHT || */
id == CSS_VAL_TOP || id == CSS_VAL_BOTTOM) id == CSS_VAL_TOP || id == CSS_VAL_BOTTOM)
valid_primitive = true; 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-roman | lower-greek | lower-alpha | lower-latin | upper-alpha |
// upper-latin | hebrew | armenian | georgian | cjk-ideographic | hiragana | // upper-latin | hebrew | armenian | georgian | cjk-ideographic | hiragana |
// katakana | hiragana-iroha | katakana-iroha | none | inherit // 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; valid_primitive = true;
break; break;
@ -590,8 +590,8 @@ bool CSSParser::parseValue( int propId, bool important )
break; break;
case CSS_PROP_FLOAT: // left | right | none | tdehtml_left | tdehtml_right | inherit + center for buggy CSS 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 || if ( id == CSS_VAL_LEFT || id == CSS_VAL_RIGHT || id == CSS_VAL__TDEHTML_LEFT ||
id == CSS_VAL__KHTML_RIGHT ||id == CSS_VAL_NONE || id == CSS_VAL_CENTER) id == CSS_VAL__TDEHTML_RIGHT ||id == CSS_VAL_NONE || id == CSS_VAL_CENTER)
valid_primitive = true; valid_primitive = true;
break; break;
@ -603,7 +603,7 @@ bool CSSParser::parseValue( int propId, bool important )
case CSS_PROP_TEXT_ALIGN: case CSS_PROP_TEXT_ALIGN:
// left | right | center | justify | tdehtml_left | tdehtml_right | tdehtml_center | <string> | inherit // 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 ) value->unit == CSSPrimitiveValue::CSS_STRING )
valid_primitive = true; valid_primitive = true;
break; 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_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_BOTTOM_STYLE: // solid | double | groove | ridge | inset | outset | -tdehtml-native
case CSS_PROP_BORDER_LEFT_STYLE: //// 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; valid_primitive = true;
break; break;
@ -636,8 +636,8 @@ bool CSSParser::parseValue( int propId, bool important )
case CSS_PROP_BORDER_SPACING: case CSS_PROP_BORDER_SPACING:
{ {
const int properties[2] = { CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING, const int properties[2] = { CSS_PROP__TDEHTML_BORDER_HORIZONTAL_SPACING,
CSS_PROP__KHTML_BORDER_VERTICAL_SPACING }; CSS_PROP__TDEHTML_BORDER_VERTICAL_SPACING };
if (num == 1) { if (num == 1) {
ShorthandScope scope(this, CSS_PROP_BORDER_SPACING); ShorthandScope scope(this, CSS_PROP_BORDER_SPACING);
if (!parseValue(properties[0], important)) return false; if (!parseValue(properties[0], important)) return false;
@ -653,8 +653,8 @@ bool CSSParser::parseValue( int propId, bool important )
} }
return false; return false;
} }
case CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING: case CSS_PROP__TDEHTML_BORDER_HORIZONTAL_SPACING:
case CSS_PROP__KHTML_BORDER_VERTICAL_SPACING: case CSS_PROP__TDEHTML_BORDER_VERTICAL_SPACING:
valid_primitive = validUnit(value, FLength|FNonNeg, strict&(!nonCSSHint)); valid_primitive = validUnit(value, FLength|FNonNeg, strict&(!nonCSSHint));
break; break;
@ -682,10 +682,10 @@ bool CSSParser::parseValue( int propId, bool important )
case CSS_PROP_BORDER_BOTTOM_COLOR: // <color> | inherit case CSS_PROP_BORDER_BOTTOM_COLOR: // <color> | inherit
case CSS_PROP_BORDER_LEFT_COLOR: // <color> | inherit case CSS_PROP_BORDER_LEFT_COLOR: // <color> | inherit
case CSS_PROP_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_AQUA && id <= CSS_VAL_WINDOWTEXT ) ||
id == CSS_VAL_TRANSPARENT || 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; valid_primitive = true;
} else { } else {
parsedValue = parseColor(); parsedValue = parseColor();
@ -707,13 +707,13 @@ bool CSSParser::parseValue( int propId, bool important )
break; break;
case CSS_PROP_BACKGROUND_ATTACHMENT: 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_BACKGROUND_IMAGE:
case CSS_PROP__KHTML_BACKGROUND_ORIGIN: case CSS_PROP__TDEHTML_BACKGROUND_ORIGIN:
case CSS_PROP_BACKGROUND_POSITION: case CSS_PROP_BACKGROUND_POSITION:
case CSS_PROP_BACKGROUND_POSITION_X: case CSS_PROP_BACKGROUND_POSITION_X:
case CSS_PROP_BACKGROUND_POSITION_Y: case CSS_PROP_BACKGROUND_POSITION_Y:
case CSS_PROP__KHTML_BACKGROUND_SIZE: case CSS_PROP__TDEHTML_BACKGROUND_SIZE:
case CSS_PROP_BACKGROUND_REPEAT: { case CSS_PROP_BACKGROUND_REPEAT: {
CSSValueImpl *val1 = 0, *val2 = 0; CSSValueImpl *val1 = 0, *val2 = 0;
int propId1, propId2; 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_RIGHT: // <padding-width> | inherit
case CSS_PROP_PADDING_BOTTOM: // Which is defined as case CSS_PROP_PADDING_BOTTOM: // Which is defined as
case CSS_PROP_PADDING_LEFT: // <length> | <percentage> 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) ) ); valid_primitive = ( !id && validUnit( value, FLength|FPercent|FNonNeg, strict&(!nonCSSHint) ) );
break; break;
@ -807,7 +807,7 @@ bool CSSParser::parseValue( int propId, bool important )
// baseline | sub | super | top | text-top | middle | bottom | text-bottom | // baseline | sub | super | top | text-top | middle | bottom | text-bottom |
// <percentage> | <length> | inherit // <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; valid_primitive = true;
else else
valid_primitive = ( !id && validUnit( value, FLength|FPercent, strict&(!nonCSSHint) ) ); 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_RIGHT: // Which is defined as
case CSS_PROP_MARGIN_BOTTOM: // <length> | <percentage> | auto | inherit case CSS_PROP_MARGIN_BOTTOM: // <length> | <percentage> | auto | inherit
case CSS_PROP_MARGIN_LEFT: //// case CSS_PROP_MARGIN_LEFT: ////
case CSS_PROP__KHTML_MARGIN_START: case CSS_PROP__TDEHTML_MARGIN_START:
if ( id == CSS_VAL_AUTO ) if ( id == CSS_VAL_AUTO )
valid_primitive = true; valid_primitive = true;
else else
@ -912,8 +912,8 @@ bool CSSParser::parseValue( int propId, bool important )
valid_primitive = true; valid_primitive = true;
break; break;
case CSS_PROP__KHTML_FLOW_MODE: case CSS_PROP__TDEHTML_FLOW_MODE:
if ( id == CSS_VAL__KHTML_NORMAL || id == CSS_VAL__KHTML_AROUND_FLOATS ) if ( id == CSS_VAL__TDEHTML_NORMAL || id == CSS_VAL__TDEHTML_AROUND_FLOATS )
valid_primitive = true; valid_primitive = true;
break; break;
@ -934,41 +934,41 @@ bool CSSParser::parseValue( int propId, bool important )
case CSS_PROP_OPACITY: case CSS_PROP_OPACITY:
valid_primitive = validUnit(value, FNumber, strict); valid_primitive = validUnit(value, FNumber, strict);
break; 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 ) if ( id == CSS_VAL_NONE || id == CSS_VAL_ENABLED || id == CSS_VAL_DISABLED )
valid_primitive = true; valid_primitive = true;
// kdDebug(6080) << "CSS_PROP__KHTML_USER_INPUT: " << valid_primitive << endl; // kdDebug(6080) << "CSS_PROP__TDEHTML_USER_INPUT: " << valid_primitive << endl;
break; break;
case CSS_PROP__KHTML_MARQUEE: { case CSS_PROP__TDEHTML_MARQUEE: {
const int properties[5] = { CSS_PROP__KHTML_MARQUEE_DIRECTION, CSS_PROP__KHTML_MARQUEE_INCREMENT, const int properties[5] = { CSS_PROP__TDEHTML_MARQUEE_DIRECTION, CSS_PROP__TDEHTML_MARQUEE_INCREMENT,
CSS_PROP__KHTML_MARQUEE_REPETITION, CSS_PROP__TDEHTML_MARQUEE_REPETITION,
CSS_PROP__KHTML_MARQUEE_STYLE, CSS_PROP__KHTML_MARQUEE_SPEED }; CSS_PROP__TDEHTML_MARQUEE_STYLE, CSS_PROP__TDEHTML_MARQUEE_SPEED };
return parseShortHand(propId, properties, 5, important); 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 || 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_REVERSE || id == CSS_VAL_LEFT || id == CSS_VAL_RIGHT || id == CSS_VAL_DOWN ||
id == CSS_VAL_UP || id == CSS_VAL_AUTO) id == CSS_VAL_UP || id == CSS_VAL_AUTO)
valid_primitive = true; valid_primitive = true;
break; 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) if (id == CSS_VAL_SMALL || id == CSS_VAL_LARGE || id == CSS_VAL_MEDIUM)
valid_primitive = true; valid_primitive = true;
else else
valid_primitive = validUnit(value, FLength|FPercent, strict&(!nonCSSHint)); valid_primitive = validUnit(value, FLength|FPercent, strict&(!nonCSSHint));
break; 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 || if (id == CSS_VAL_NONE || id == CSS_VAL_SLIDE || id == CSS_VAL_SCROLL || id == CSS_VAL_ALTERNATE ||
id == CSS_VAL_UNFURL) id == CSS_VAL_UNFURL)
valid_primitive = true; valid_primitive = true;
break; break;
case CSS_PROP__KHTML_MARQUEE_REPETITION: case CSS_PROP__TDEHTML_MARQUEE_REPETITION:
if (id == CSS_VAL_INFINITE) if (id == CSS_VAL_INFINITE)
valid_primitive = true; valid_primitive = true;
else else
valid_primitive = validUnit(value, FInteger|FNonNeg, strict&(!nonCSSHint)); valid_primitive = validUnit(value, FInteger|FNonNeg, strict&(!nonCSSHint));
break; 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) if (id == CSS_VAL_NORMAL || id == CSS_VAL_SLOW || id == CSS_VAL_FAST)
valid_primitive = true; valid_primitive = true;
else 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 // 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. // 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 numProperties = 7;
const int properties[numProperties] = { CSS_PROP_BACKGROUND_IMAGE, CSS_PROP_BACKGROUND_REPEAT, 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_BACKGROUND_ATTACHMENT, CSS_PROP_BACKGROUND_POSITION, CSS_PROP__TDEHTML_BACKGROUND_CLIP,
CSS_PROP__KHTML_BACKGROUND_ORIGIN, CSS_PROP_BACKGROUND_COLOR }; CSS_PROP__TDEHTML_BACKGROUND_ORIGIN, CSS_PROP_BACKGROUND_COLOR };
ShorthandScope scope(this, CSS_PROP_BACKGROUND); 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; if (i->unit != Value::Operator || i->iValue != ',') goto invalid;
i = args->next(); i = args->next();
if (i->unit != CSSPrimitiveValue::CSS_IDENT) goto invalid; 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; counter->m_listStyle = i->id - CSS_VAL_DISC;
} }
return new CSSPrimitiveValueImpl(counter); return new CSSPrimitiveValueImpl(counter);
@ -1439,9 +1439,9 @@ invalid:
CSSValueImpl* CSSParser::parseBackgroundColor() CSSValueImpl* CSSParser::parseBackgroundColor()
{ {
int id = valueList->current()->id; 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_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 new CSSPrimitiveValueImpl(id);
return parseColor(); return parseColor();
} }
@ -1615,8 +1615,8 @@ bool CSSParser::parseBackgroundProperty(int propId, int& propId1, int& propId2,
if (currValue) if (currValue)
valueList->next(); valueList->next();
break; break;
case CSS_PROP__KHTML_BACKGROUND_CLIP: case CSS_PROP__TDEHTML_BACKGROUND_CLIP:
case CSS_PROP__KHTML_BACKGROUND_ORIGIN: case CSS_PROP__TDEHTML_BACKGROUND_ORIGIN:
if (val->id == CSS_VAL_BORDER || val->id == CSS_VAL_PADDING || val->id == CSS_VAL_CONTENT) { if (val->id == CSS_VAL_BORDER || val->id == CSS_VAL_PADDING || val->id == CSS_VAL_CONTENT) {
currValue = new CSSPrimitiveValueImpl(val->id); currValue = new CSSPrimitiveValueImpl(val->id);
valueList->next(); valueList->next();
@ -1646,7 +1646,7 @@ bool CSSParser::parseBackgroundProperty(int propId, int& propId1, int& propId2,
valueList->next(); valueList->next();
} }
break; break;
case CSS_PROP__KHTML_BACKGROUND_SIZE: case CSS_PROP__TDEHTML_BACKGROUND_SIZE:
currValue = parseBackgroundSize(); currValue = parseBackgroundSize();
if (currValue) if (currValue)
valueList->next(); 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. // The only other type of value that's ok is a color value.
CSSPrimitiveValueImpl* parsedColor = 0; CSSPrimitiveValueImpl* parsedColor = 0;
bool isColor = (val->id >= CSS_VAL_AQUA && val->id <= CSS_VAL_WINDOWTEXT || val->id == CSS_VAL_MENU || 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) if (!context.allowColor)
return context.failed(); return context.failed();

@ -295,7 +295,7 @@ findProp (register const char *str, register unsigned int len)
#line 104 "cssproperties.gperf" #line 104 "cssproperties.gperf"
{"text-indent", CSS_PROP_TEXT_INDENT}, {"text-indent", CSS_PROP_TEXT_INDENT},
#line 69 "cssproperties.gperf" #line 69 "cssproperties.gperf"
{"-tdehtml-margin-start", CSS_PROP__KHTML_MARGIN_START}, {"-tdehtml-margin-start", CSS_PROP__TDEHTML_MARGIN_START},
#line 14 "cssproperties.gperf" #line 14 "cssproperties.gperf"
{"background-color", CSS_PROP_BACKGROUND_COLOR}, {"background-color", CSS_PROP_BACKGROUND_COLOR},
#line 100 "cssproperties.gperf" #line 100 "cssproperties.gperf"
@ -305,7 +305,7 @@ findProp (register const char *str, register unsigned int len)
#line 47 "cssproperties.gperf" #line 47 "cssproperties.gperf"
{"counter-reset", CSS_PROP_COUNTER_RESET}, {"counter-reset", CSS_PROP_COUNTER_RESET},
#line 93 "cssproperties.gperf" #line 93 "cssproperties.gperf"
{"-tdehtml-padding-start", CSS_PROP__KHTML_PADDING_START}, {"-tdehtml-padding-start", CSS_PROP__TDEHTML_PADDING_START},
#line 15 "cssproperties.gperf" #line 15 "cssproperties.gperf"
{"background-image", CSS_PROP_BACKGROUND_IMAGE}, {"background-image", CSS_PROP_BACKGROUND_IMAGE},
#line 96 "cssproperties.gperf" #line 96 "cssproperties.gperf"
@ -319,11 +319,11 @@ findProp (register const char *str, register unsigned int len)
#line 52 "cssproperties.gperf" #line 52 "cssproperties.gperf"
{"float", CSS_PROP_FLOAT}, {"float", CSS_PROP_FLOAT},
#line 21 "cssproperties.gperf" #line 21 "cssproperties.gperf"
{"-tdehtml-background-clip", CSS_PROP__KHTML_BACKGROUND_CLIP}, {"-tdehtml-background-clip", CSS_PROP__TDEHTML_BACKGROUND_CLIP},
#line 70 "cssproperties.gperf" #line 70 "cssproperties.gperf"
{"-tdehtml-marquee", CSS_PROP__KHTML_MARQUEE}, {"-tdehtml-marquee", CSS_PROP__TDEHTML_MARQUEE},
#line 27 "cssproperties.gperf" #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" #line 46 "cssproperties.gperf"
{"counter-increment", CSS_PROP_COUNTER_INCREMENT}, {"counter-increment", CSS_PROP_COUNTER_INCREMENT},
#line 128 "cssproperties.gperf" #line 128 "cssproperties.gperf"
@ -337,7 +337,7 @@ findProp (register const char *str, register unsigned int len)
#line 31 "cssproperties.gperf" #line 31 "cssproperties.gperf"
{"border-left-color", CSS_PROP_BORDER_LEFT_COLOR}, {"border-left-color", CSS_PROP_BORDER_LEFT_COLOR},
#line 22 "cssproperties.gperf" #line 22 "cssproperties.gperf"
{"-tdehtml-background-origin", CSS_PROP__KHTML_BACKGROUND_ORIGIN}, {"-tdehtml-background-origin", CSS_PROP__TDEHTML_BACKGROUND_ORIGIN},
#line 17 "cssproperties.gperf" #line 17 "cssproperties.gperf"
{"background-attachment", CSS_PROP_BACKGROUND_ATTACHMENT}, {"background-attachment", CSS_PROP_BACKGROUND_ATTACHMENT},
#line 126 "cssproperties.gperf" #line 126 "cssproperties.gperf"
@ -353,7 +353,7 @@ findProp (register const char *str, register unsigned int len)
#line 68 "cssproperties.gperf" #line 68 "cssproperties.gperf"
{"margin-left", CSS_PROP_MARGIN_LEFT}, {"margin-left", CSS_PROP_MARGIN_LEFT},
#line 142 "cssproperties.gperf" #line 142 "cssproperties.gperf"
{"-tdehtml-user-input", CSS_PROP__KHTML_USER_INPUT}, {"-tdehtml-user-input", CSS_PROP__TDEHTML_USER_INPUT},
#line 79 "cssproperties.gperf" #line 79 "cssproperties.gperf"
{"min-width", CSS_PROP_MIN_WIDTH}, {"min-width", CSS_PROP_MIN_WIDTH},
#line 127 "cssproperties.gperf" #line 127 "cssproperties.gperf"
@ -361,13 +361,13 @@ findProp (register const char *str, register unsigned int len)
#line 92 "cssproperties.gperf" #line 92 "cssproperties.gperf"
{"padding-left", CSS_PROP_PADDING_LEFT}, {"padding-left", CSS_PROP_PADDING_LEFT},
#line 71 "cssproperties.gperf" #line 71 "cssproperties.gperf"
{"-tdehtml-marquee-direction", CSS_PROP__KHTML_MARQUEE_DIRECTION}, {"-tdehtml-marquee-direction", CSS_PROP__TDEHTML_MARQUEE_DIRECTION},
#line 73 "cssproperties.gperf" #line 73 "cssproperties.gperf"
{"-tdehtml-marquee-repetition", CSS_PROP__KHTML_MARQUEE_REPETITION}, {"-tdehtml-marquee-repetition", CSS_PROP__TDEHTML_MARQUEE_REPETITION},
#line 95 "cssproperties.gperf" #line 95 "cssproperties.gperf"
{"page-break-before", CSS_PROP_PAGE_BREAK_BEFORE}, {"page-break-before", CSS_PROP_PAGE_BREAK_BEFORE},
#line 74 "cssproperties.gperf" #line 74 "cssproperties.gperf"
{"-tdehtml-marquee-speed", CSS_PROP__KHTML_MARQUEE_SPEED}, {"-tdehtml-marquee-speed", CSS_PROP__TDEHTML_MARQUEE_SPEED},
#line 94 "cssproperties.gperf" #line 94 "cssproperties.gperf"
{"page-break-after", CSS_PROP_PAGE_BREAK_AFTER}, {"page-break-after", CSS_PROP_PAGE_BREAK_AFTER},
#line 81 "cssproperties.gperf" #line 81 "cssproperties.gperf"
@ -383,7 +383,7 @@ findProp (register const char *str, register unsigned int len)
#line 134 "cssproperties.gperf" #line 134 "cssproperties.gperf"
{"scrollbar-face-color", CSS_PROP_SCROLLBAR_FACE_COLOR}, {"scrollbar-face-color", CSS_PROP_SCROLLBAR_FACE_COLOR},
#line 72 "cssproperties.gperf" #line 72 "cssproperties.gperf"
{"-tdehtml-marquee-increment", CSS_PROP__KHTML_MARQUEE_INCREMENT}, {"-tdehtml-marquee-increment", CSS_PROP__TDEHTML_MARQUEE_INCREMENT},
#line 116 "cssproperties.gperf" #line 116 "cssproperties.gperf"
{"word-spacing", CSS_PROP_WORD_SPACING}, {"word-spacing", CSS_PROP_WORD_SPACING},
#line 111 "cssproperties.gperf" #line 111 "cssproperties.gperf"
@ -405,13 +405,13 @@ findProp (register const char *str, register unsigned int len)
#line 32 "cssproperties.gperf" #line 32 "cssproperties.gperf"
{"border-top-style", CSS_PROP_BORDER_TOP_STYLE}, {"border-top-style", CSS_PROP_BORDER_TOP_STYLE},
#line 26 "cssproperties.gperf" #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" #line 33 "cssproperties.gperf"
{"border-right-style", CSS_PROP_BORDER_RIGHT_STYLE}, {"border-right-style", CSS_PROP_BORDER_RIGHT_STYLE},
#line 34 "cssproperties.gperf" #line 34 "cssproperties.gperf"
{"border-bottom-style", CSS_PROP_BORDER_BOTTOM_STYLE}, {"border-bottom-style", CSS_PROP_BORDER_BOTTOM_STYLE},
#line 23 "cssproperties.gperf" #line 23 "cssproperties.gperf"
{"-tdehtml-background-size", CSS_PROP__KHTML_BACKGROUND_SIZE}, {"-tdehtml-background-size", CSS_PROP__TDEHTML_BACKGROUND_SIZE},
#line 135 "cssproperties.gperf" #line 135 "cssproperties.gperf"
{"scrollbar-shadow-color", CSS_PROP_SCROLLBAR_SHADOW_COLOR}, {"scrollbar-shadow-color", CSS_PROP_SCROLLBAR_SHADOW_COLOR},
#line 129 "cssproperties.gperf" #line 129 "cssproperties.gperf"
@ -435,7 +435,7 @@ findProp (register const char *str, register unsigned int len)
#line 84 "cssproperties.gperf" #line 84 "cssproperties.gperf"
{"outline-style", CSS_PROP_OUTLINE_STYLE}, {"outline-style", CSS_PROP_OUTLINE_STYLE},
#line 141 "cssproperties.gperf" #line 141 "cssproperties.gperf"
{"-tdehtml-flow-mode", CSS_PROP__KHTML_FLOW_MODE}, {"-tdehtml-flow-mode", CSS_PROP__TDEHTML_FLOW_MODE},
#line 87 "cssproperties.gperf" #line 87 "cssproperties.gperf"
{"overflow-x", CSS_PROP_OVERFLOW_X}, {"overflow-x", CSS_PROP_OVERFLOW_X},
#line 113 "cssproperties.gperf" #line 113 "cssproperties.gperf"
@ -449,7 +449,7 @@ findProp (register const char *str, register unsigned int len)
#line 83 "cssproperties.gperf" #line 83 "cssproperties.gperf"
{"outline-offset", CSS_PROP_OUTLINE_OFFSET}, {"outline-offset", CSS_PROP_OUTLINE_OFFSET},
#line 75 "cssproperties.gperf" #line 75 "cssproperties.gperf"
{"-tdehtml-marquee-style", CSS_PROP__KHTML_MARQUEE_STYLE}, {"-tdehtml-marquee-style", CSS_PROP__TDEHTML_MARQUEE_STYLE},
#line 55 "cssproperties.gperf" #line 55 "cssproperties.gperf"
{"font-style", CSS_PROP_FONT_STYLE}, {"font-style", CSS_PROP_FONT_STYLE},
#line 35 "cssproperties.gperf" #line 35 "cssproperties.gperf"

@ -15,13 +15,13 @@ DOM::DOMString getPropertyName(unsigned short id) KDE_NO_EXPORT;
#define CSS_PROP_BACKGROUND_POSITION 5 #define CSS_PROP_BACKGROUND_POSITION 5
#define CSS_PROP_BACKGROUND_POSITION_X 6 #define CSS_PROP_BACKGROUND_POSITION_X 6
#define CSS_PROP_BACKGROUND_POSITION_Y 7 #define CSS_PROP_BACKGROUND_POSITION_Y 7
#define CSS_PROP__KHTML_BACKGROUND_CLIP 8 #define CSS_PROP__TDEHTML_BACKGROUND_CLIP 8
#define CSS_PROP__KHTML_BACKGROUND_ORIGIN 9 #define CSS_PROP__TDEHTML_BACKGROUND_ORIGIN 9
#define CSS_PROP__KHTML_BACKGROUND_SIZE 10 #define CSS_PROP__TDEHTML_BACKGROUND_SIZE 10
#define CSS_PROP_BORDER_COLLAPSE 11 #define CSS_PROP_BORDER_COLLAPSE 11
#define CSS_PROP_BORDER_SPACING 12 #define CSS_PROP_BORDER_SPACING 12
#define CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING 13 #define CSS_PROP__TDEHTML_BORDER_HORIZONTAL_SPACING 13
#define CSS_PROP__KHTML_BORDER_VERTICAL_SPACING 14 #define CSS_PROP__TDEHTML_BORDER_VERTICAL_SPACING 14
#define CSS_PROP_BORDER_TOP_COLOR 15 #define CSS_PROP_BORDER_TOP_COLOR 15
#define CSS_PROP_BORDER_RIGHT_COLOR 16 #define CSS_PROP_BORDER_RIGHT_COLOR 16
#define CSS_PROP_BORDER_BOTTOM_COLOR 17 #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_RIGHT 53
#define CSS_PROP_MARGIN_BOTTOM 54 #define CSS_PROP_MARGIN_BOTTOM 54
#define CSS_PROP_MARGIN_LEFT 55 #define CSS_PROP_MARGIN_LEFT 55
#define CSS_PROP__KHTML_MARGIN_START 56 #define CSS_PROP__TDEHTML_MARGIN_START 56
#define CSS_PROP__KHTML_MARQUEE 57 #define CSS_PROP__TDEHTML_MARQUEE 57
#define CSS_PROP__KHTML_MARQUEE_DIRECTION 58 #define CSS_PROP__TDEHTML_MARQUEE_DIRECTION 58
#define CSS_PROP__KHTML_MARQUEE_INCREMENT 59 #define CSS_PROP__TDEHTML_MARQUEE_INCREMENT 59
#define CSS_PROP__KHTML_MARQUEE_REPETITION 60 #define CSS_PROP__TDEHTML_MARQUEE_REPETITION 60
#define CSS_PROP__KHTML_MARQUEE_SPEED 61 #define CSS_PROP__TDEHTML_MARQUEE_SPEED 61
#define CSS_PROP__KHTML_MARQUEE_STYLE 62 #define CSS_PROP__TDEHTML_MARQUEE_STYLE 62
#define CSS_PROP_MAX_HEIGHT 63 #define CSS_PROP_MAX_HEIGHT 63
#define CSS_PROP_MAX_WIDTH 64 #define CSS_PROP_MAX_WIDTH 64
#define CSS_PROP_MIN_HEIGHT 65 #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_RIGHT 77
#define CSS_PROP_PADDING_BOTTOM 78 #define CSS_PROP_PADDING_BOTTOM 78
#define CSS_PROP_PADDING_LEFT 79 #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_AFTER 81
#define CSS_PROP_PAGE_BREAK_BEFORE 82 #define CSS_PROP_PAGE_BREAK_BEFORE 82
#define CSS_PROP_PAGE_BREAK_INSIDE 83 #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_DARKSHADOW_COLOR 125
#define CSS_PROP_SCROLLBAR_TRACK_COLOR 126 #define CSS_PROP_SCROLLBAR_TRACK_COLOR 126
#define CSS_PROP_SCROLLBAR_ARROW_COLOR 127 #define CSS_PROP_SCROLLBAR_ARROW_COLOR 127
#define CSS_PROP__KHTML_FLOW_MODE 128 #define CSS_PROP__TDEHTML_FLOW_MODE 128
#define CSS_PROP__KHTML_USER_INPUT 129 #define CSS_PROP__TDEHTML_USER_INPUT 129
#define CSS_PROP_MAX CSS_PROP_Z_INDEX #define CSS_PROP_MAX CSS_PROP_Z_INDEX
#define CSS_PROP_TOTAL 130 #define CSS_PROP_TOTAL 130

@ -211,7 +211,7 @@ static PseudoState pseudoState;
CSSStyleSelector::CSSStyleSelector( DocumentImpl* doc, TQString userStyleSheet, StyleSheetListImpl *styleSheets, CSSStyleSelector::CSSStyleSelector( DocumentImpl* doc, TQString userStyleSheet, StyleSheetListImpl *styleSheets,
const KURL &url, bool _strictParsing ) const KURL &url, bool _strictParsing )
{ {
KHTMLView* view = doc->view(); TDEHTMLView* view = doc->view();
init(view ? view->part()->settings() : 0, doc); init(view ? view->part()->settings() : 0, doc);
@ -273,14 +273,14 @@ CSSStyleSelector::CSSStyleSelector( CSSStyleSheetImpl *sheet )
{ {
init(0L, 0L); init(0L, 0L);
KHTMLView *view = sheet->doc()->view(); TDEHTMLView *view = sheet->doc()->view();
m_medium = view ? view->mediaType() : "screen"; m_medium = view ? view->mediaType() : "screen";
authorStyle = new CSSStyleSelectorList(); authorStyle = new CSSStyleSelectorList();
authorStyle->append( sheet, m_medium ); authorStyle->append( sheet, m_medium );
} }
void CSSStyleSelector::init(const KHTMLSettings* _settings, DocumentImpl* doc) void CSSStyleSelector::init(const TDEHTMLSettings* _settings, DocumentImpl* doc)
{ {
element = 0; element = 0;
settings = _settings; settings = _settings;
@ -308,12 +308,12 @@ CSSStyleSelector::~CSSStyleSelector()
void CSSStyleSelector::addSheet( CSSStyleSheetImpl *sheet ) void CSSStyleSelector::addSheet( CSSStyleSheetImpl *sheet )
{ {
KHTMLView *view = sheet->doc()->view(); TDEHTMLView *view = sheet->doc()->view();
m_medium = view ? view->mediaType() : "screen"; m_medium = view ? view->mediaType() : "screen";
authorStyle->append( sheet, m_medium ); 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; if(s_defaultStyle) return;
@ -883,9 +883,9 @@ static PseudoState checkPseudoState( const CSSStyleSelector::Encodedurl& encoded
cleanpath( u ); cleanpath( u );
} }
//completeURL( attr.string() ); //completeURL( attr.string() );
bool contains = KHTMLFactory::vLinks()->contains( u ); bool contains = TDEHTMLFactory::vLinks()->contains( u );
if ( !contains && u.contains('/')==2 ) if ( !contains && u.contains('/')==2 )
contains = KHTMLFactory::vLinks()->contains( u+'/' ); contains = TDEHTMLFactory::vLinks()->contains( u+'/' );
return contains ? PseudoVisited : PseudoLink; return contains ? PseudoVisited : PseudoLink;
} }
@ -2136,9 +2136,9 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
(!parentNode && value->cssValueType() == CSSValue::CSS_INHERIT); (!parentNode && value->cssValueType() == CSSValue::CSS_INHERIT);
// These properties are used to set the correct margins/padding on RTL lists. // 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; 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; 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 // 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: case CSS_PROP_BACKGROUND_ATTACHMENT:
HANDLE_BACKGROUND_VALUE(backgroundAttachment, BackgroundAttachment, value) HANDLE_BACKGROUND_VALUE(backgroundAttachment, BackgroundAttachment, value)
break; break;
case CSS_PROP__KHTML_BACKGROUND_CLIP: case CSS_PROP__TDEHTML_BACKGROUND_CLIP:
HANDLE_BACKGROUND_VALUE(backgroundClip, BackgroundClip, value) HANDLE_BACKGROUND_VALUE(backgroundClip, BackgroundClip, value)
break; break;
case CSS_PROP__KHTML_BACKGROUND_ORIGIN: case CSS_PROP__TDEHTML_BACKGROUND_ORIGIN:
HANDLE_BACKGROUND_VALUE(backgroundOrigin, BackgroundOrigin, value) HANDLE_BACKGROUND_VALUE(backgroundOrigin, BackgroundOrigin, value)
break; break;
case CSS_PROP_BACKGROUND_REPEAT: case CSS_PROP_BACKGROUND_REPEAT:
HANDLE_BACKGROUND_VALUE(backgroundRepeat, BackgroundRepeat, value) HANDLE_BACKGROUND_VALUE(backgroundRepeat, BackgroundRepeat, value)
break; break;
case CSS_PROP__KHTML_BACKGROUND_SIZE: case CSS_PROP__TDEHTML_BACKGROUND_SIZE:
HANDLE_BACKGROUND_VALUE(backgroundSize, BackgroundSize, value) HANDLE_BACKGROUND_VALUE(backgroundSize, BackgroundSize, value)
break; break;
case CSS_PROP_BORDER_COLLAPSE: case CSS_PROP_BORDER_COLLAPSE:
@ -2181,27 +2181,27 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
case CSS_PROP_BORDER_TOP_STYLE: case CSS_PROP_BORDER_TOP_STYLE:
HANDLE_INHERIT_AND_INITIAL_WITH_VALUE(borderTopStyle, BorderTopStyle, BorderStyle) HANDLE_INHERIT_AND_INITIAL_WITH_VALUE(borderTopStyle, BorderTopStyle, BorderStyle)
if (!primitiveValue) return; if (!primitiveValue) return;
style->setBorderTopStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__KHTML_NATIVE)); style->setBorderTopStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__TDEHTML_NATIVE));
break; break;
case CSS_PROP_BORDER_RIGHT_STYLE: case CSS_PROP_BORDER_RIGHT_STYLE:
HANDLE_INHERIT_AND_INITIAL_WITH_VALUE(borderRightStyle, BorderRightStyle, BorderStyle) HANDLE_INHERIT_AND_INITIAL_WITH_VALUE(borderRightStyle, BorderRightStyle, BorderStyle)
if (!primitiveValue) return; if (!primitiveValue) return;
style->setBorderRightStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__KHTML_NATIVE)); style->setBorderRightStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__TDEHTML_NATIVE));
break; break;
case CSS_PROP_BORDER_BOTTOM_STYLE: case CSS_PROP_BORDER_BOTTOM_STYLE:
HANDLE_INHERIT_AND_INITIAL_WITH_VALUE(borderBottomStyle, BorderBottomStyle, BorderStyle) HANDLE_INHERIT_AND_INITIAL_WITH_VALUE(borderBottomStyle, BorderBottomStyle, BorderStyle)
if (!primitiveValue) return; if (!primitiveValue) return;
style->setBorderBottomStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__KHTML_NATIVE)); style->setBorderBottomStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__TDEHTML_NATIVE));
break; break;
case CSS_PROP_BORDER_LEFT_STYLE: case CSS_PROP_BORDER_LEFT_STYLE:
HANDLE_INHERIT_AND_INITIAL_WITH_VALUE(borderLeftStyle, BorderLeftStyle, BorderStyle) HANDLE_INHERIT_AND_INITIAL_WITH_VALUE(borderLeftStyle, BorderLeftStyle, BorderStyle)
if (!primitiveValue) return; if (!primitiveValue) return;
style->setBorderLeftStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__KHTML_NATIVE)); style->setBorderLeftStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__TDEHTML_NATIVE));
break; break;
case CSS_PROP_OUTLINE_STYLE: case CSS_PROP_OUTLINE_STYLE:
HANDLE_INHERIT_AND_INITIAL_WITH_VALUE(outlineStyle, OutlineStyle, BorderStyle) HANDLE_INHERIT_AND_INITIAL_WITH_VALUE(outlineStyle, OutlineStyle, BorderStyle)
if (!primitiveValue) return; if (!primitiveValue) return;
style->setOutlineStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__KHTML_NATIVE)); style->setOutlineStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__TDEHTML_NATIVE));
break; break;
case CSS_PROP_CAPTION_SIDE: case CSS_PROP_CAPTION_SIDE:
{ {
@ -2279,11 +2279,11 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
EFloat f; EFloat f;
switch(primitiveValue->getIdent()) switch(primitiveValue->getIdent())
{ {
case CSS_VAL__KHTML_LEFT: case CSS_VAL__TDEHTML_LEFT:
f = FLEFT_ALIGN; break; f = FLEFT_ALIGN; break;
case CSS_VAL_LEFT: case CSS_VAL_LEFT:
f = FLEFT; break; f = FLEFT; break;
case CSS_VAL__KHTML_RIGHT: case CSS_VAL__TDEHTML_RIGHT:
f = FRIGHT_ALIGN; break; f = FRIGHT_ALIGN; break;
case CSS_VAL_RIGHT: case CSS_VAL_RIGHT:
f = FRIGHT; break; f = FRIGHT; break;
@ -2659,8 +2659,8 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
EWhiteSpace s; EWhiteSpace s;
switch(primitiveValue->getIdent()) { switch(primitiveValue->getIdent()) {
case CSS_VAL__KHTML_NOWRAP: case CSS_VAL__TDEHTML_NOWRAP:
s = KHTML_NOWRAP; s = TDEHTML_NOWRAP;
break; break;
case CSS_VAL_NOWRAP: case CSS_VAL_NOWRAP:
s = NOWRAP; s = NOWRAP;
@ -2700,14 +2700,14 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
style->setBorderVerticalSpacing(parentStyle->borderVerticalSpacing()); style->setBorderVerticalSpacing(parentStyle->borderVerticalSpacing());
break; break;
} }
case CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING: { case CSS_PROP__TDEHTML_BORDER_HORIZONTAL_SPACING: {
HANDLE_INHERIT_AND_INITIAL(borderHorizontalSpacing, BorderHorizontalSpacing) HANDLE_INHERIT_AND_INITIAL(borderHorizontalSpacing, BorderHorizontalSpacing)
if (!primitiveValue) break; if (!primitiveValue) break;
short spacing = primitiveValue->computeLength(style, paintDeviceMetrics); short spacing = primitiveValue->computeLength(style, paintDeviceMetrics);
style->setBorderHorizontalSpacing(spacing); style->setBorderHorizontalSpacing(spacing);
break; break;
} }
case CSS_PROP__KHTML_BORDER_VERTICAL_SPACING: { case CSS_PROP__TDEHTML_BORDER_VERTICAL_SPACING: {
HANDLE_INHERIT_AND_INITIAL(borderVerticalSpacing, BorderVerticalSpacing) HANDLE_INHERIT_AND_INITIAL(borderVerticalSpacing, BorderVerticalSpacing)
if (!primitiveValue) break; if (!primitiveValue) break;
short spacing = primitiveValue->computeLength(style, paintDeviceMetrics); short spacing = primitiveValue->computeLength(style, paintDeviceMetrics);
@ -2759,7 +2759,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
return; return;
int ident = primitiveValue->getIdent(); int ident = primitiveValue->getIdent();
if ( ident ) { if ( ident ) {
if ( ident == CSS_VAL__KHTML_TEXT ) if ( ident == CSS_VAL__TDEHTML_TEXT )
col = element->getDocument()->textColor(); col = element->getDocument()->textColor();
// ### should be eliminated // ### should be eliminated
else if ( ident == CSS_VAL_TRANSPARENT else if ( ident == CSS_VAL_TRANSPARENT
@ -3152,7 +3152,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
align = SUB; break; align = SUB; break;
case CSS_VAL_SUPER: case CSS_VAL_SUPER:
align = SUPER; break; align = SUPER; break;
case CSS_VAL__KHTML_BASELINE_MIDDLE: case CSS_VAL__TDEHTML_BASELINE_MIDDLE:
align = BASELINE_MIDDLE; break; align = BASELINE_MIDDLE; break;
default: default:
return; 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_LARGE: size = int( fontSizes[4] ); break;
case CSS_VAL_X_LARGE: size = int( fontSizes[5] ); break; case CSS_VAL_X_LARGE: size = int( fontSizes[5] ); break;
case CSS_VAL_XX_LARGE: size = int( fontSizes[6] ); 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: case CSS_VAL_LARGER:
size = nextFontSize(fontSizes, oldSize, false); size = nextFontSize(fontSizes, oldSize, false);
break; break;
@ -3326,7 +3326,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
HANDLE_INHERIT_AND_INITIAL(textAlign, TextAlign) HANDLE_INHERIT_AND_INITIAL(textAlign, TextAlign)
if (!primitiveValue) return; if (!primitiveValue) return;
if (primitiveValue->getIdent()) if (primitiveValue->getIdent())
style->setTextAlign( (ETextAlign) (primitiveValue->getIdent() - CSS_VAL__KHTML_AUTO) ); style->setTextAlign( (ETextAlign) (primitiveValue->getIdent() - CSS_VAL__TDEHTML_AUTO) );
return; return;
} }
@ -3581,15 +3581,15 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
style->setTextDecoration(t); style->setTextDecoration(t);
break; break;
} }
case CSS_PROP__KHTML_FLOW_MODE: case CSS_PROP__TDEHTML_FLOW_MODE:
HANDLE_INHERIT_AND_INITIAL(flowAroundFloats, FlowAroundFloats) HANDLE_INHERIT_AND_INITIAL(flowAroundFloats, FlowAroundFloats)
if (!primitiveValue) return; if (!primitiveValue) return;
if (primitiveValue->getIdent()) { if (primitiveValue->getIdent()) {
style->setFlowAroundFloats( primitiveValue->getIdent() == CSS_VAL__KHTML_AROUND_FLOATS ); style->setFlowAroundFloats( primitiveValue->getIdent() == CSS_VAL__TDEHTML_AROUND_FLOATS );
return; return;
} }
break; break;
case CSS_PROP__KHTML_USER_INPUT: { case CSS_PROP__TDEHTML_USER_INPUT: {
if(value->cssValueType() == CSSValue::CSS_INHERIT) if(value->cssValueType() == CSSValue::CSS_INHERIT)
{ {
if(!parentNode) return; if(!parentNode) return;
@ -3843,7 +3843,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
// Clamp opacity to the range 0-1 // Clamp opacity to the range 0-1
style->setOpacity(kMin(1.0f, kMax(0.0f, (float)primitiveValue->floatValue(CSSPrimitiveValue::CSS_NUMBER)))); style->setOpacity(kMin(1.0f, kMax(0.0f, (float)primitiveValue->floatValue(CSSPrimitiveValue::CSS_NUMBER))));
break; break;
case CSS_PROP__KHTML_MARQUEE: case CSS_PROP__TDEHTML_MARQUEE:
if (value->cssValueType() != CSSValue::CSS_INHERIT || !parentNode) return; if (value->cssValueType() != CSSValue::CSS_INHERIT || !parentNode) return;
style->setMarqueeDirection(parentStyle->marqueeDirection()); style->setMarqueeDirection(parentStyle->marqueeDirection());
style->setMarqueeIncrement(parentStyle->marqueeIncrement()); style->setMarqueeIncrement(parentStyle->marqueeIncrement());
@ -3851,7 +3851,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
style->setMarqueeLoopCount(parentStyle->marqueeLoopCount()); style->setMarqueeLoopCount(parentStyle->marqueeLoopCount());
style->setMarqueeBehavior(parentStyle->marqueeBehavior()); style->setMarqueeBehavior(parentStyle->marqueeBehavior());
break; break;
case CSS_PROP__KHTML_MARQUEE_REPETITION: { case CSS_PROP__TDEHTML_MARQUEE_REPETITION: {
HANDLE_INHERIT_AND_INITIAL(marqueeLoopCount, MarqueeLoopCount) HANDLE_INHERIT_AND_INITIAL(marqueeLoopCount, MarqueeLoopCount)
if (!primitiveValue) return; if (!primitiveValue) return;
if (primitiveValue->getIdent() == CSS_VAL_INFINITE) 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))); style->setMarqueeLoopCount((int)(primitiveValue->floatValue(CSSPrimitiveValue::CSS_NUMBER)));
break; break;
} }
case CSS_PROP__KHTML_MARQUEE_SPEED: { case CSS_PROP__TDEHTML_MARQUEE_SPEED: {
HANDLE_INHERIT_AND_INITIAL(marqueeSpeed, MarqueeSpeed) HANDLE_INHERIT_AND_INITIAL(marqueeSpeed, MarqueeSpeed)
if (!primitiveValue) return; if (!primitiveValue) return;
if (primitiveValue->getIdent()) { if (primitiveValue->getIdent()) {
@ -3885,7 +3885,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
style->setMarqueeSpeed(int(primitiveValue->floatValue(CSSPrimitiveValue::CSS_NUMBER))); style->setMarqueeSpeed(int(primitiveValue->floatValue(CSSPrimitiveValue::CSS_NUMBER)));
break; break;
} }
case CSS_PROP__KHTML_MARQUEE_INCREMENT: { case CSS_PROP__TDEHTML_MARQUEE_INCREMENT: {
HANDLE_INHERIT_AND_INITIAL(marqueeIncrement, MarqueeIncrement) HANDLE_INHERIT_AND_INITIAL(marqueeIncrement, MarqueeIncrement)
if (!primitiveValue) return; if (!primitiveValue) return;
if (primitiveValue->getIdent()) { if (primitiveValue->getIdent()) {
@ -3910,7 +3910,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
} }
break; break;
} }
case CSS_PROP__KHTML_MARQUEE_STYLE: { case CSS_PROP__TDEHTML_MARQUEE_STYLE: {
HANDLE_INHERIT_AND_INITIAL(marqueeBehavior, MarqueeBehavior) HANDLE_INHERIT_AND_INITIAL(marqueeBehavior, MarqueeBehavior)
if (!primitiveValue || !primitiveValue->getIdent()) return; if (!primitiveValue || !primitiveValue->getIdent()) return;
switch (primitiveValue->getIdent()) switch (primitiveValue->getIdent())
@ -3933,7 +3933,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
} }
break; break;
} }
case CSS_PROP__KHTML_MARQUEE_DIRECTION: { case CSS_PROP__TDEHTML_MARQUEE_DIRECTION: {
HANDLE_INHERIT_AND_INITIAL(marqueeDirection, MarqueeDirection) HANDLE_INHERIT_AND_INITIAL(marqueeDirection, MarqueeDirection)
if (!primitiveValue || !primitiveValue->getIdent()) return; if (!primitiveValue || !primitiveValue->getIdent()) return;
switch (primitiveValue->getIdent()) switch (primitiveValue->getIdent())

@ -30,10 +30,10 @@
#include "dom/dom_string.h" #include "dom/dom_string.h"
#include "xml/dom_restyler.h" #include "xml/dom_restyler.h"
class KHTMLSettings; class TDEHTMLSettings;
class KHTMLView; class TDEHTMLView;
class KHTMLPart; class TDEHTMLPart;
class KHTMLFactory; class TDEHTMLFactory;
class KURL; class KURL;
namespace DOM { namespace DOM {
@ -127,7 +127,7 @@ namespace tdehtml
KDE_EXPORT static void clear(); KDE_EXPORT static void clear();
static void reparseConfiguration(); 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); RenderStyle *styleForElement(DOM::ElementImpl *e);
@ -189,7 +189,7 @@ namespace tdehtml
public: public:
private: 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 mapBackgroundAttachment(BackgroundLayer* layer, DOM::CSSValueImpl* value);
void mapBackgroundClip(BackgroundLayer* layer, DOM::CSSValueImpl* value); void mapBackgroundClip(BackgroundLayer* layer, DOM::CSSValueImpl* value);
@ -246,9 +246,9 @@ public:
RenderStyle *parentStyle; RenderStyle *parentStyle;
DOM::ElementImpl *element; DOM::ElementImpl *element;
DOM::NodeImpl *parentNode; DOM::NodeImpl *parentNode;
KHTMLView *view; TDEHTMLView *view;
KHTMLPart *part; TDEHTMLPart *part;
const KHTMLSettings *settings; const TDEHTMLSettings *settings;
TQPaintDeviceMetrics *paintDeviceMetrics; TQPaintDeviceMetrics *paintDeviceMetrics;
TQValueVector<int> m_fontSizes; TQValueVector<int> m_fontSizes;
TQValueVector<int> m_fixedFontSizes; TQValueVector<int> m_fixedFontSizes;

@ -597,9 +597,9 @@ findValue (register const char *str, register unsigned int len)
#line 35 "cssvalues.gperf" #line 35 "cssvalues.gperf"
{"small-caps", CSS_VAL_SMALL_CAPS}, {"small-caps", CSS_VAL_SMALL_CAPS},
#line 122 "cssvalues.gperf" #line 122 "cssvalues.gperf"
{"-tdehtml-text", CSS_VAL__KHTML_TEXT}, {"-tdehtml-text", CSS_VAL__TDEHTML_TEXT},
#line 141 "cssvalues.gperf" #line 141 "cssvalues.gperf"
{"-tdehtml-left", CSS_VAL__KHTML_LEFT}, {"-tdehtml-left", CSS_VAL__TDEHTML_LEFT},
#line 97 "cssvalues.gperf" #line 97 "cssvalues.gperf"
{"background", CSS_VAL_BACKGROUND}, {"background", CSS_VAL_BACKGROUND},
#line 178 "cssvalues.gperf" #line 178 "cssvalues.gperf"
@ -615,9 +615,9 @@ findValue (register const char *str, register unsigned int len)
#line 198 "cssvalues.gperf" #line 198 "cssvalues.gperf"
{"table-caption", CSS_VAL_TABLE_CAPTION}, {"table-caption", CSS_VAL_TABLE_CAPTION},
#line 154 "cssvalues.gperf" #line 154 "cssvalues.gperf"
{"-tdehtml-lao", CSS_VAL__KHTML_LAO}, {"-tdehtml-lao", CSS_VAL__TDEHTML_LAO},
#line 143 "cssvalues.gperf" #line 143 "cssvalues.gperf"
{"-tdehtml-center", CSS_VAL__KHTML_CENTER}, {"-tdehtml-center", CSS_VAL__TDEHTML_CENTER},
#line 54 "cssvalues.gperf" #line 54 "cssvalues.gperf"
{"x-large", CSS_VAL_X_LARGE}, {"x-large", CSS_VAL_X_LARGE},
#line 30 "cssvalues.gperf" #line 30 "cssvalues.gperf"
@ -625,29 +625,29 @@ findValue (register const char *str, register unsigned int len)
#line 203 "cssvalues.gperf" #line 203 "cssvalues.gperf"
{"progress", CSS_VAL_PROGRESS}, {"progress", CSS_VAL_PROGRESS},
#line 16 "cssvalues.gperf" #line 16 "cssvalues.gperf"
{"-tdehtml-native", CSS_VAL__KHTML_NATIVE}, {"-tdehtml-native", CSS_VAL__TDEHTML_NATIVE},
#line 177 "cssvalues.gperf" #line 177 "cssvalues.gperf"
{"hiragana", CSS_VAL_HIRAGANA}, {"hiragana", CSS_VAL_HIRAGANA},
#line 171 "cssvalues.gperf" #line 171 "cssvalues.gperf"
{"lower-greek", CSS_VAL_LOWER_GREEK}, {"lower-greek", CSS_VAL_LOWER_GREEK},
#line 150 "cssvalues.gperf" #line 150 "cssvalues.gperf"
{"-tdehtml-diamond", CSS_VAL__KHTML_DIAMOND}, {"-tdehtml-diamond", CSS_VAL__TDEHTML_DIAMOND},
#line 224 "cssvalues.gperf" #line 224 "cssvalues.gperf"
{"no-close-quote", CSS_VAL_NO_CLOSE_QUOTE}, {"no-close-quote", CSS_VAL_NO_CLOSE_QUOTE},
#line 61 "cssvalues.gperf" #line 61 "cssvalues.gperf"
{"ultra-condensed", CSS_VAL_ULTRA_CONDENSED}, {"ultra-condensed", CSS_VAL_ULTRA_CONDENSED},
#line 158 "cssvalues.gperf" #line 158 "cssvalues.gperf"
{"-tdehtml-tibetan", CSS_VAL__KHTML_TIBETAN}, {"-tdehtml-tibetan", CSS_VAL__TDEHTML_TIBETAN},
#line 124 "cssvalues.gperf" #line 124 "cssvalues.gperf"
{"repeat-x", CSS_VAL_REPEAT_X}, {"repeat-x", CSS_VAL_REPEAT_X},
#line 266 "cssvalues.gperf" #line 266 "cssvalues.gperf"
{"-tdehtml-normal", CSS_VAL__KHTML_NORMAL}, {"-tdehtml-normal", CSS_VAL__TDEHTML_NORMAL},
#line 113 "cssvalues.gperf" #line 113 "cssvalues.gperf"
{"threeddarkshadow", CSS_VAL_THREEDDARKSHADOW}, {"threeddarkshadow", CSS_VAL_THREEDDARKSHADOW},
#line 219 "cssvalues.gperf" #line 219 "cssvalues.gperf"
{"uppercase", CSS_VAL_UPPERCASE}, {"uppercase", CSS_VAL_UPPERCASE},
#line 136 "cssvalues.gperf" #line 136 "cssvalues.gperf"
{"-tdehtml-auto", CSS_VAL__KHTML_AUTO}, {"-tdehtml-auto", CSS_VAL__TDEHTML_AUTO},
#line 163 "cssvalues.gperf" #line 163 "cssvalues.gperf"
{"georgian", CSS_VAL_GEORGIAN}, {"georgian", CSS_VAL_GEORGIAN},
#line 229 "cssvalues.gperf" #line 229 "cssvalues.gperf"
@ -657,13 +657,13 @@ findValue (register const char *str, register unsigned int len)
#line 109 "cssvalues.gperf" #line 109 "cssvalues.gperf"
{"infobackground", CSS_VAL_INFOBACKGROUND}, {"infobackground", CSS_VAL_INFOBACKGROUND},
#line 157 "cssvalues.gperf" #line 157 "cssvalues.gperf"
{"-tdehtml-thai", CSS_VAL__KHTML_THAI}, {"-tdehtml-thai", CSS_VAL__TDEHTML_THAI},
#line 226 "cssvalues.gperf" #line 226 "cssvalues.gperf"
{"open-quote", CSS_VAL_OPEN_QUOTE}, {"open-quote", CSS_VAL_OPEN_QUOTE},
#line 173 "cssvalues.gperf" #line 173 "cssvalues.gperf"
{"lower-alpha", CSS_VAL_LOWER_ALPHA}, {"lower-alpha", CSS_VAL_LOWER_ALPHA},
#line 156 "cssvalues.gperf" #line 156 "cssvalues.gperf"
{"-tdehtml-urdu", CSS_VAL__KHTML_URDU}, {"-tdehtml-urdu", CSS_VAL__TDEHTML_URDU},
#line 223 "cssvalues.gperf" #line 223 "cssvalues.gperf"
{"close-quote", CSS_VAL_CLOSE_QUOTE}, {"close-quote", CSS_VAL_CLOSE_QUOTE},
#line 104 "cssvalues.gperf" #line 104 "cssvalues.gperf"
@ -671,13 +671,13 @@ findValue (register const char *str, register unsigned int len)
#line 225 "cssvalues.gperf" #line 225 "cssvalues.gperf"
{"no-open-quote", CSS_VAL_NO_OPEN_QUOTE}, {"no-open-quote", CSS_VAL_NO_OPEN_QUOTE},
#line 231 "cssvalues.gperf" #line 231 "cssvalues.gperf"
{"-tdehtml-nowrap", CSS_VAL__KHTML_NOWRAP}, {"-tdehtml-nowrap", CSS_VAL__TDEHTML_NOWRAP},
#line 67 "cssvalues.gperf" #line 67 "cssvalues.gperf"
{"extra-expanded", CSS_VAL_EXTRA_EXPANDED}, {"extra-expanded", CSS_VAL_EXTRA_EXPANDED},
#line 105 "cssvalues.gperf" #line 105 "cssvalues.gperf"
{"highlighttext", CSS_VAL_HIGHLIGHTTEXT}, {"highlighttext", CSS_VAL_HIGHLIGHTTEXT},
#line 155 "cssvalues.gperf" #line 155 "cssvalues.gperf"
{"-tdehtml-persian", CSS_VAL__KHTML_PERSIAN}, {"-tdehtml-persian", CSS_VAL__TDEHTML_PERSIAN},
#line 116 "cssvalues.gperf" #line 116 "cssvalues.gperf"
{"threedlightshadow", CSS_VAL_THREEDLIGHTSHADOW}, {"threedlightshadow", CSS_VAL_THREEDLIGHTSHADOW},
#line 96 "cssvalues.gperf" #line 96 "cssvalues.gperf"
@ -691,13 +691,13 @@ findValue (register const char *str, register unsigned int len)
#line 251 "cssvalues.gperf" #line 251 "cssvalues.gperf"
{"line-through", CSS_VAL_LINE_THROUGH}, {"line-through", CSS_VAL_LINE_THROUGH},
#line 142 "cssvalues.gperf" #line 142 "cssvalues.gperf"
{"-tdehtml-right", CSS_VAL__KHTML_RIGHT}, {"-tdehtml-right", CSS_VAL__TDEHTML_RIGHT},
#line 160 "cssvalues.gperf" #line 160 "cssvalues.gperf"
{"upper-roman", CSS_VAL_UPPER_ROMAN}, {"upper-roman", CSS_VAL_UPPER_ROMAN},
#line 135 "cssvalues.gperf" #line 135 "cssvalues.gperf"
{"-tdehtml-baseline-middle", CSS_VAL__KHTML_BASELINE_MIDDLE}, {"-tdehtml-baseline-middle", CSS_VAL__TDEHTML_BASELINE_MIDDLE},
#line 153 "cssvalues.gperf" #line 153 "cssvalues.gperf"
{"-tdehtml-arabic-indic", CSS_VAL__KHTML_ARABIC_INDIC}, {"-tdehtml-arabic-indic", CSS_VAL__TDEHTML_ARABIC_INDIC},
#line 152 "cssvalues.gperf" #line 152 "cssvalues.gperf"
{"decimal-leading-zero", CSS_VAL_DECIMAL_LEADING_ZERO}, {"decimal-leading-zero", CSS_VAL_DECIMAL_LEADING_ZERO},
#line 115 "cssvalues.gperf" #line 115 "cssvalues.gperf"
@ -707,13 +707,13 @@ findValue (register const char *str, register unsigned int len)
#line 99 "cssvalues.gperf" #line 99 "cssvalues.gperf"
{"buttonhighlight", CSS_VAL_BUTTONHIGHLIGHT}, {"buttonhighlight", CSS_VAL_BUTTONHIGHLIGHT},
#line 56 "cssvalues.gperf" #line 56 "cssvalues.gperf"
{"-tdehtml-xxx-large", CSS_VAL__KHTML_XXX_LARGE}, {"-tdehtml-xxx-large", CSS_VAL__TDEHTML_XXX_LARGE},
#line 267 "cssvalues.gperf" #line 267 "cssvalues.gperf"
{"-tdehtml-around-floats", CSS_VAL__KHTML_AROUND_FLOATS}, {"-tdehtml-around-floats", CSS_VAL__TDEHTML_AROUND_FLOATS},
#line 191 "cssvalues.gperf" #line 191 "cssvalues.gperf"
{"table-row-group", CSS_VAL_TABLE_ROW_GROUP}, {"table-row-group", CSS_VAL_TABLE_ROW_GROUP},
#line 182 "cssvalues.gperf" #line 182 "cssvalues.gperf"
{"-tdehtml-close-quote", CSS_VAL__KHTML_CLOSE_QUOTE}, {"-tdehtml-close-quote", CSS_VAL__TDEHTML_CLOSE_QUOTE},
#line 179 "cssvalues.gperf" #line 179 "cssvalues.gperf"
{"hiragana-iroha", CSS_VAL_HIRAGANA_IROHA}, {"hiragana-iroha", CSS_VAL_HIRAGANA_IROHA},
#line 193 "cssvalues.gperf" #line 193 "cssvalues.gperf"
@ -723,23 +723,23 @@ findValue (register const char *str, register unsigned int len)
#line 175 "cssvalues.gperf" #line 175 "cssvalues.gperf"
{"upper-alpha", CSS_VAL_UPPER_ALPHA}, {"upper-alpha", CSS_VAL_UPPER_ALPHA},
#line 181 "cssvalues.gperf" #line 181 "cssvalues.gperf"
{"-tdehtml-open-quote", CSS_VAL__KHTML_OPEN_QUOTE}, {"-tdehtml-open-quote", CSS_VAL__TDEHTML_OPEN_QUOTE},
#line 165 "cssvalues.gperf" #line 165 "cssvalues.gperf"
{"-tdehtml-japanese-formal", CSS_VAL__KHTML_JAPANESE_FORMAL}, {"-tdehtml-japanese-formal", CSS_VAL__TDEHTML_JAPANESE_FORMAL},
#line 166 "cssvalues.gperf" #line 166 "cssvalues.gperf"
{"-tdehtml-japanese-informal", CSS_VAL__KHTML_JAPANESE_INFORMAL}, {"-tdehtml-japanese-informal", CSS_VAL__TDEHTML_JAPANESE_INFORMAL},
#line 192 "cssvalues.gperf" #line 192 "cssvalues.gperf"
{"table-header-group", CSS_VAL_TABLE_HEADER_GROUP}, {"table-header-group", CSS_VAL_TABLE_HEADER_GROUP},
#line 169 "cssvalues.gperf" #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" #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" #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" #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" #line 172 "cssvalues.gperf"
{"-tdehtml-upper-greek", CSS_VAL__KHTML_UPPER_GREEK} {"-tdehtml-upper-greek", CSS_VAL__TDEHTML_UPPER_GREEK}
}; };
static const short lookup[] = static const short lookup[] =

@ -11,7 +11,7 @@ DOM::DOMString getValueName(unsigned short id) KDE_NO_EXPORT;
#define CSS_VAL_MIN 1 #define CSS_VAL_MIN 1
#define CSS_VAL_INHERIT 1 #define CSS_VAL_INHERIT 1
#define CSS_VAL_INITIAL 2 #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_NONE 4
#define CSS_VAL_HIDDEN 5 #define CSS_VAL_HIDDEN 5
#define CSS_VAL_INSET 6 #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_LARGE 40
#define CSS_VAL_X_LARGE 41 #define CSS_VAL_X_LARGE 41
#define CSS_VAL_XX_LARGE 42 #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_SMALLER 44
#define CSS_VAL_LARGER 45 #define CSS_VAL_LARGER 45
#define CSS_VAL_WIDER 46 #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_WINDOWFRAME 106
#define CSS_VAL_WINDOWTEXT 107 #define CSS_VAL_WINDOWTEXT 107
#define CSS_VAL_GREY 108 #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 110
#define CSS_VAL_REPEAT_X 111 #define CSS_VAL_REPEAT_X 111
#define CSS_VAL_REPEAT_Y 112 #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_TEXT_BOTTOM 119
#define CSS_VAL_TOP 120 #define CSS_VAL_TOP 120
#define CSS_VAL_BOTTOM 121 #define CSS_VAL_BOTTOM 121
#define CSS_VAL__KHTML_BASELINE_MIDDLE 122 #define CSS_VAL__TDEHTML_BASELINE_MIDDLE 122
#define CSS_VAL__KHTML_AUTO 123 #define CSS_VAL__TDEHTML_AUTO 123
#define CSS_VAL_LEFT 124 #define CSS_VAL_LEFT 124
#define CSS_VAL_RIGHT 125 #define CSS_VAL_RIGHT 125
#define CSS_VAL_CENTER 126 #define CSS_VAL_CENTER 126
#define CSS_VAL_JUSTIFY 127 #define CSS_VAL_JUSTIFY 127
#define CSS_VAL__KHTML_LEFT 128 #define CSS_VAL__TDEHTML_LEFT 128
#define CSS_VAL__KHTML_RIGHT 129 #define CSS_VAL__TDEHTML_RIGHT 129
#define CSS_VAL__KHTML_CENTER 130 #define CSS_VAL__TDEHTML_CENTER 130
#define CSS_VAL_OUTSIDE 131 #define CSS_VAL_OUTSIDE 131
#define CSS_VAL_INSIDE 132 #define CSS_VAL_INSIDE 132
#define CSS_VAL_DISC 133 #define CSS_VAL_DISC 133
#define CSS_VAL_CIRCLE 134 #define CSS_VAL_CIRCLE 134
#define CSS_VAL_SQUARE 135 #define CSS_VAL_SQUARE 135
#define CSS_VAL_BOX 136 #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 138
#define CSS_VAL_DECIMAL_LEADING_ZERO 139 #define CSS_VAL_DECIMAL_LEADING_ZERO 139
#define CSS_VAL__KHTML_ARABIC_INDIC 140 #define CSS_VAL__TDEHTML_ARABIC_INDIC 140
#define CSS_VAL__KHTML_LAO 141 #define CSS_VAL__TDEHTML_LAO 141
#define CSS_VAL__KHTML_PERSIAN 142 #define CSS_VAL__TDEHTML_PERSIAN 142
#define CSS_VAL__KHTML_URDU 143 #define CSS_VAL__TDEHTML_URDU 143
#define CSS_VAL__KHTML_THAI 144 #define CSS_VAL__TDEHTML_THAI 144
#define CSS_VAL__KHTML_TIBETAN 145 #define CSS_VAL__TDEHTML_TIBETAN 145
#define CSS_VAL_LOWER_ROMAN 146 #define CSS_VAL_LOWER_ROMAN 146
#define CSS_VAL_UPPER_ROMAN 147 #define CSS_VAL_UPPER_ROMAN 147
#define CSS_VAL_HEBREW 148 #define CSS_VAL_HEBREW 148
#define CSS_VAL_ARMENIAN 149 #define CSS_VAL_ARMENIAN 149
#define CSS_VAL_GEORGIAN 150 #define CSS_VAL_GEORGIAN 150
#define CSS_VAL_CJK_IDEOGRAPHIC 151 #define CSS_VAL_CJK_IDEOGRAPHIC 151
#define CSS_VAL__KHTML_JAPANESE_FORMAL 152 #define CSS_VAL__TDEHTML_JAPANESE_FORMAL 152
#define CSS_VAL__KHTML_JAPANESE_INFORMAL 153 #define CSS_VAL__TDEHTML_JAPANESE_INFORMAL 153
#define CSS_VAL__KHTML_SIMP_CHINESE_FORMAL 154 #define CSS_VAL__TDEHTML_SIMP_CHINESE_FORMAL 154
#define CSS_VAL__KHTML_SIMP_CHINESE_INFORMAL 155 #define CSS_VAL__TDEHTML_SIMP_CHINESE_INFORMAL 155
#define CSS_VAL__KHTML_TRAD_CHINESE_FORMAL 156 #define CSS_VAL__TDEHTML_TRAD_CHINESE_FORMAL 156
#define CSS_VAL__KHTML_TRAD_CHINESE_INFORMAL 157 #define CSS_VAL__TDEHTML_TRAD_CHINESE_INFORMAL 157
#define CSS_VAL_LOWER_GREEK 158 #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_ALPHA 160
#define CSS_VAL_LOWER_LATIN 161 #define CSS_VAL_LOWER_LATIN 161
#define CSS_VAL_UPPER_ALPHA 162 #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_KATAKANA 165
#define CSS_VAL_HIRAGANA_IROHA 166 #define CSS_VAL_HIRAGANA_IROHA 166
#define CSS_VAL_KATAKANA_IROHA 167 #define CSS_VAL_KATAKANA_IROHA 167
#define CSS_VAL__KHTML_OPEN_QUOTE 168 #define CSS_VAL__TDEHTML_OPEN_QUOTE 168
#define CSS_VAL__KHTML_CLOSE_QUOTE 169 #define CSS_VAL__TDEHTML_CLOSE_QUOTE 169
#define CSS_VAL_INLINE 170 #define CSS_VAL_INLINE 170
#define CSS_VAL_BLOCK 171 #define CSS_VAL_BLOCK 171
#define CSS_VAL_LIST_ITEM 172 #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 215
#define CSS_VAL_PRE_WRAP 216 #define CSS_VAL_PRE_WRAP 216
#define CSS_VAL_PRE_LINE 217 #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_BREAK_WORD 219
#define CSS_VAL_ABOVE 220 #define CSS_VAL_ABOVE 220
#define CSS_VAL_ABSOLUTE 221 #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_THICK 250
#define CSS_VAL_THIN 251 #define CSS_VAL_THIN 251
#define CSS_VAL_UNDERLINE 252 #define CSS_VAL_UNDERLINE 252
#define CSS_VAL__KHTML_NORMAL 253 #define CSS_VAL__TDEHTML_NORMAL 253
#define CSS_VAL__KHTML_AROUND_FLOATS 254 #define CSS_VAL__TDEHTML_AROUND_FLOATS 254
#define CSS_VAL_BORDER_BOX 255 #define CSS_VAL_BORDER_BOX 255
#define CSS_VAL_CONTENT_BOX 256 #define CSS_VAL_CONTENT_BOX 256
#define CSS_VAL_ENABLED 257 #define CSS_VAL_ENABLED 257

@ -350,16 +350,16 @@ thick
thin thin
underline underline
# #
# CSS_PROP__KHTML_FLOW_MODE # CSS_PROP__TDEHTML_FLOW_MODE
-tdehtml-normal -tdehtml-normal
-tdehtml-around-floats -tdehtml-around-floats
# CSS3 Values # CSS3 Values
# CSS_PROP__KHTML_BOX_SIZING # CSS_PROP__TDEHTML_BOX_SIZING
border-box border-box
content-box content-box
# CSS_PROP__KHTML_USER_INPUT # CSS_PROP__TDEHTML_USER_INPUT
enabled enabled
disabled disabled
#none #none

@ -81,9 +81,9 @@
FONT_FACE_SYM = 273, FONT_FACE_SYM = 273,
CHARSET_SYM = 274, CHARSET_SYM = 274,
NAMESPACE_SYM = 275, NAMESPACE_SYM = 275,
KHTML_RULE_SYM = 276, TDEHTML_RULE_SYM = 276,
KHTML_DECLS_SYM = 277, TDEHTML_DECLS_SYM = 277,
KHTML_VALUE_SYM = 278, TDEHTML_VALUE_SYM = 278,
IMPORTANT_SYM = 279, IMPORTANT_SYM = 279,
QEMS = 280, QEMS = 280,
EMS = 281, EMS = 281,
@ -129,9 +129,9 @@
#define FONT_FACE_SYM 273 #define FONT_FACE_SYM 273
#define CHARSET_SYM 274 #define CHARSET_SYM 274
#define NAMESPACE_SYM 275 #define NAMESPACE_SYM 275
#define KHTML_RULE_SYM 276 #define TDEHTML_RULE_SYM 276
#define KHTML_DECLS_SYM 277 #define TDEHTML_DECLS_SYM 277
#define KHTML_VALUE_SYM 278 #define TDEHTML_VALUE_SYM 278
#define IMPORTANT_SYM 279 #define IMPORTANT_SYM 279
#define QEMS 280 #define QEMS 280
#define EMS 281 #define EMS 281
@ -589,7 +589,7 @@ static const char *const yytname[] =
"INCLUDES", "DASHMATCH", "BEGINSWITH", "ENDSWITH", "CONTAINS", "STRING", "INCLUDES", "DASHMATCH", "BEGINSWITH", "ENDSWITH", "CONTAINS", "STRING",
"IDENT", "NTH", "HASH", "':'", "'.'", "'['", "'*'", "'|'", "IMPORT_SYM", "IDENT", "NTH", "HASH", "':'", "'.'", "'['", "'*'", "'|'", "IMPORT_SYM",
"PAGE_SYM", "MEDIA_SYM", "FONT_FACE_SYM", "CHARSET_SYM", "NAMESPACE_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", "QEMS", "EMS", "EXS", "PXS", "CMS", "MMS", "INS", "PTS", "PCS", "DEGS",
"RADS", "GRADS", "MSECS", "SECS", "HERZ", "KHERZ", "DIMEN", "PERCENTAGE", "RADS", "GRADS", "MSECS", "SECS", "HERZ", "KHERZ", "DIMEN", "PERCENTAGE",
"FLOAT", "INTEGER", "URI", "FUNCTION", "NOTFUNCTION", "UNICODERANGE", "FLOAT", "INTEGER", "URI", "FUNCTION", "NOTFUNCTION", "UNICODERANGE",

@ -48,9 +48,9 @@
FONT_FACE_SYM = 273, FONT_FACE_SYM = 273,
CHARSET_SYM = 274, CHARSET_SYM = 274,
NAMESPACE_SYM = 275, NAMESPACE_SYM = 275,
KHTML_RULE_SYM = 276, TDEHTML_RULE_SYM = 276,
KHTML_DECLS_SYM = 277, TDEHTML_DECLS_SYM = 277,
KHTML_VALUE_SYM = 278, TDEHTML_VALUE_SYM = 278,
IMPORTANT_SYM = 279, IMPORTANT_SYM = 279,
QEMS = 280, QEMS = 280,
EMS = 281, EMS = 281,
@ -96,9 +96,9 @@
#define FONT_FACE_SYM 273 #define FONT_FACE_SYM 273
#define CHARSET_SYM 274 #define CHARSET_SYM 274
#define NAMESPACE_SYM 275 #define NAMESPACE_SYM 275
#define KHTML_RULE_SYM 276 #define TDEHTML_RULE_SYM 276
#define KHTML_DECLS_SYM 277 #define TDEHTML_DECLS_SYM 277
#define KHTML_VALUE_SYM 278 #define TDEHTML_VALUE_SYM 278
#define IMPORTANT_SYM 279 #define IMPORTANT_SYM 279
#define QEMS 280 #define QEMS 280
#define EMS 281 #define EMS 281

@ -164,9 +164,9 @@ static int cssyylex( YYSTYPE *yylval ) {
%token FONT_FACE_SYM %token FONT_FACE_SYM
%token CHARSET_SYM %token CHARSET_SYM
%token NAMESPACE_SYM %token NAMESPACE_SYM
%token KHTML_RULE_SYM %token TDEHTML_RULE_SYM
%token KHTML_DECLS_SYM %token TDEHTML_DECLS_SYM
%token KHTML_VALUE_SYM %token TDEHTML_VALUE_SYM
%token IMPORTANT_SYM %token IMPORTANT_SYM
@ -261,20 +261,20 @@ stylesheet:
; ;
tdehtml_rule: tdehtml_rule:
KHTML_RULE_SYM '{' maybe_space ruleset maybe_space '}' { TDEHTML_RULE_SYM '{' maybe_space ruleset maybe_space '}' {
CSSParser *p = static_cast<CSSParser *>(parser); CSSParser *p = static_cast<CSSParser *>(parser);
p->rule = $4; p->rule = $4;
} }
; ;
tdehtml_decls: tdehtml_decls:
KHTML_DECLS_SYM declaration_block { TDEHTML_DECLS_SYM declaration_block {
/* can be empty */ /* can be empty */
} }
; ;
tdehtml_value: tdehtml_value:
KHTML_VALUE_SYM '{' maybe_space expr '}' { TDEHTML_VALUE_SYM '{' maybe_space expr '}' {
CSSParser *p = static_cast<CSSParser *>(parser); CSSParser *p = static_cast<CSSParser *>(parser);
if ( $4 ) { if ( $4 ) {
p->valueList = $4; p->valueList = $4;

@ -756,17 +756,17 @@ YY_RULE_SETUP
case 20: case 20:
YY_RULE_SETUP YY_RULE_SETUP
#line 53 "tokenizer.flex" #line 53 "tokenizer.flex"
{yyTok = KHTML_RULE_SYM; return yyTok; } {yyTok = TDEHTML_RULE_SYM; return yyTok; }
YY_BREAK YY_BREAK
case 21: case 21:
YY_RULE_SETUP YY_RULE_SETUP
#line 54 "tokenizer.flex" #line 54 "tokenizer.flex"
{yyTok = KHTML_DECLS_SYM; return yyTok; } {yyTok = TDEHTML_DECLS_SYM; return yyTok; }
YY_BREAK YY_BREAK
case 22: case 22:
YY_RULE_SETUP YY_RULE_SETUP
#line 55 "tokenizer.flex" #line 55 "tokenizer.flex"
{yyTok = KHTML_VALUE_SYM; return yyTok; } {yyTok = TDEHTML_VALUE_SYM; return yyTok; }
YY_BREAK YY_BREAK
case 23: case 23:
YY_RULE_SETUP YY_RULE_SETUP

@ -50,9 +50,9 @@ nth (-?[0-9]*n[\+-][0-9]+)|(-?[0-9]*n)
"@font-face" {yyTok = FONT_FACE_SYM; return yyTok;} "@font-face" {yyTok = FONT_FACE_SYM; return yyTok;}
"@charset" {yyTok = CHARSET_SYM; return yyTok;} "@charset" {yyTok = CHARSET_SYM; return yyTok;}
"@namespace" {yyTok = NAMESPACE_SYM; return yyTok; } "@namespace" {yyTok = NAMESPACE_SYM; return yyTok; }
"@-tdehtml-rule" {yyTok = KHTML_RULE_SYM; return yyTok; } "@-tdehtml-rule" {yyTok = TDEHTML_RULE_SYM; return yyTok; }
"@-tdehtml-decls" {yyTok = KHTML_DECLS_SYM; return yyTok; } "@-tdehtml-decls" {yyTok = TDEHTML_DECLS_SYM; return yyTok; }
"@-tdehtml-value" {yyTok = KHTML_VALUE_SYM; return yyTok; } "@-tdehtml-value" {yyTok = TDEHTML_VALUE_SYM; return yyTok; }
"!"{w}"important" {yyTok = IMPORTANT_SYM; return yyTok;} "!"{w}"important" {yyTok = IMPORTANT_SYM; return yyTok;}

@ -36,7 +36,7 @@
* If you want to add to your application a widget that only needs simple text * 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. * browsing, you can also use the KTextBrowser widget in tdeui.
* *
* KHTMLPart : * TDEHTMLPart :
* The main part/widget for using tdehtml. * The main part/widget for using tdehtml.
* *
* DOM : * DOM :

@ -49,7 +49,7 @@ class CSSRuleImpl;
* interface. * interface.
* *
*/ */
class KHTML_EXPORT CSSRule class TDEHTML_EXPORT CSSRule
{ {
public: public:
CSSRule(); CSSRule();
@ -72,7 +72,7 @@ public:
MEDIA_RULE = 4, MEDIA_RULE = 4,
FONT_FACE_RULE = 5, FONT_FACE_RULE = 5,
PAGE_RULE = 6, 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. * be used to define the encoding of the style sheet.
* *
*/ */
class KHTML_EXPORT CSSCharsetRule : public CSSRule class TDEHTML_EXPORT CSSCharsetRule : public CSSRule
{ {
public: public:
CSSCharsetRule(); CSSCharsetRule();
@ -190,7 +190,7 @@ class CSSFontFaceRuleImpl;
* rule is used to hold a set of font descriptions. * rule is used to hold a set of font descriptions.
* *
*/ */
class KHTML_EXPORT CSSFontFaceRule : public CSSRule class TDEHTML_EXPORT CSSFontFaceRule : public CSSRule
{ {
public: public:
CSSFontFaceRule(); CSSFontFaceRule();
@ -220,7 +220,7 @@ class CSSImportRuleImpl;
* rule is used to import style rules from other style sheets. * rule is used to import style rules from other style sheets.
* *
*/ */
class KHTML_EXPORT CSSImportRule : public CSSRule class TDEHTML_EXPORT CSSImportRule : public CSSRule
{ {
public: public:
CSSImportRule(); CSSImportRule();
@ -267,7 +267,7 @@ class CSSMediaRuleImpl;
* can be used to delimit style rules for specific media types. * can be used to delimit style rules for specific media types.
* *
*/ */
class KHTML_EXPORT CSSMediaRule : public CSSRule class TDEHTML_EXPORT CSSMediaRule : public CSSRule
{ {
public: public:
CSSMediaRule(); CSSMediaRule();
@ -359,7 +359,7 @@ class CSSPageRuleImpl;
* page box for paged media. * page box for paged media.
* *
*/ */
class KHTML_EXPORT CSSPageRule : public CSSRule class TDEHTML_EXPORT CSSPageRule : public CSSRule
{ {
public: public:
CSSPageRule(); CSSPageRule();
@ -408,7 +408,7 @@ class CSSStyleRuleImpl;
* in a CSS style sheet. * in a CSS style sheet.
* *
*/ */
class KHTML_EXPORT CSSStyleRule : public CSSRule class TDEHTML_EXPORT CSSStyleRule : public CSSRule
{ {
public: public:
CSSStyleRule(); CSSStyleRule();
@ -458,7 +458,7 @@ class CSSUnknownRuleImpl;
* not supported by this user agent. * not supported by this user agent.
* *
*/ */
class KHTML_EXPORT CSSUnknownRule : public CSSRule class TDEHTML_EXPORT CSSUnknownRule : public CSSRule
{ {
public: public:
CSSUnknownRule(); CSSUnknownRule();
@ -481,7 +481,7 @@ class StyleListImpl;
* of an ordered collection of CSS rules. * of an ordered collection of CSS rules.
* *
*/ */
class KHTML_EXPORT CSSRuleList class TDEHTML_EXPORT CSSRuleList
{ {
public: public:
CSSRuleList(); CSSRuleList();

@ -55,7 +55,7 @@ class DocumentImpl;
* instruction </a> . * instruction </a> .
* *
*/ */
class KHTML_EXPORT StyleSheet class TDEHTML_EXPORT StyleSheet
{ {
public: public:
StyleSheet(); StyleSheet();
@ -170,7 +170,7 @@ protected:
* This exception is raised when a specific CSS operation is impossible * This exception is raised when a specific CSS operation is impossible
* to perform. * to perform.
*/ */
class KHTML_EXPORT CSSException class TDEHTML_EXPORT CSSException
{ {
public: public:
CSSException(unsigned short _code) { code = _code; } CSSException(unsigned short _code) { code = _code; }
@ -204,7 +204,7 @@ class CSSRuleList;
* content type is "text/css". * content type is "text/css".
* *
*/ */
class KHTML_EXPORT CSSStyleSheet : public StyleSheet class TDEHTML_EXPORT CSSStyleSheet : public StyleSheet
{ {
public: public:
CSSStyleSheet(); CSSStyleSheet();
@ -306,7 +306,7 @@ class StyleSheet;
* abstraction of an ordered collection of style sheets. * abstraction of an ordered collection of style sheets.
* *
*/ */
class KHTML_EXPORT StyleSheetList class TDEHTML_EXPORT StyleSheetList
{ {
public: public:
StyleSheetList(); StyleSheetList();
@ -360,7 +360,7 @@ class CSSStyleSheet;
* strings. * strings.
* *
*/ */
class KHTML_EXPORT MediaList class TDEHTML_EXPORT MediaList
{ {
public: public:
MediaList(); MediaList();
@ -444,7 +444,7 @@ protected:
class LinkStyleImpl; class LinkStyleImpl;
class KHTML_EXPORT LinkStyle class TDEHTML_EXPORT LinkStyle
{ {
public: public:
LinkStyle(); LinkStyle();
@ -466,7 +466,7 @@ protected:
class DocumentStyleImpl; class DocumentStyleImpl;
class KHTML_EXPORT DocumentStyle class TDEHTML_EXPORT DocumentStyle
{ {
public: public:
DocumentStyle(); DocumentStyle();

@ -57,7 +57,7 @@ class CSSValue;
* interface. * interface.
* *
*/ */
class KHTML_EXPORT CSSStyleDeclaration class TDEHTML_EXPORT CSSStyleDeclaration
{ {
public: public:
CSSStyleDeclaration(); CSSStyleDeclaration();
@ -240,7 +240,7 @@ class CSSValueImpl;
* complexe value. * complexe value.
* *
*/ */
class KHTML_EXPORT CSSValue class TDEHTML_EXPORT CSSValue
{ {
public: public:
CSSValue(); CSSValue();
@ -313,7 +313,7 @@ class CSSValue;
* of an ordered collection of CSS values. * of an ordered collection of CSS values.
* *
*/ */
class KHTML_EXPORT CSSValueList : public CSSValue class TDEHTML_EXPORT CSSValueList : public CSSValue
{ {
public: public:
CSSValueList(); CSSValueList();
@ -370,7 +370,7 @@ class Rect;
* \c CSSStyleDeclaration interface. * \c CSSStyleDeclaration interface.
* *
*/ */
class KHTML_EXPORT CSSPrimitiveValue : public CSSValue class TDEHTML_EXPORT CSSPrimitiveValue : public CSSValue
{ {
public: public:
CSSPrimitiveValue(); CSSPrimitiveValue();
@ -588,7 +588,7 @@ public:
* interface modify the style property. * interface modify the style property.
* *
*/ */
class KHTML_EXPORT RGBColor class TDEHTML_EXPORT RGBColor
{ {
public: public:
RGBColor(); RGBColor();
@ -639,7 +639,7 @@ class RectImpl;
* interface modify the style property. * interface modify the style property.
* *
*/ */
class KHTML_EXPORT Rect class TDEHTML_EXPORT Rect
{ {
friend class CSSPrimitiveValue; friend class CSSPrimitiveValue;
public: public:
@ -696,7 +696,7 @@ class CounterImpl;
* made through this interface modify the style property. * made through this interface modify the style property.
* *
*/ */
class KHTML_EXPORT Counter class TDEHTML_EXPORT Counter
{ {
friend class CSSPrimitiveValue; friend class CSSPrimitiveValue;
public: public:

@ -61,7 +61,7 @@ class MutationEventImpl;
* add them manually. * add them manually.
* *
*/ */
class KHTML_EXPORT EventListener : public DomShared { class TDEHTML_EXPORT EventListener : public DomShared {
public: public:
EventListener(); EventListener();
virtual ~EventListener(); virtual ~EventListener();
@ -108,7 +108,7 @@ protected:
* implemented by the object passed to the event listener. * implemented by the object passed to the event listener.
* *
*/ */
class KHTML_EXPORT Event { class TDEHTML_EXPORT Event {
friend class Document; friend class Document;
friend class NodeImpl; friend class NodeImpl;
friend class DocumentImpl; friend class DocumentImpl;
@ -259,7 +259,7 @@ protected:
* descriptions. * descriptions.
* *
*/ */
class KHTML_EXPORT EventException class TDEHTML_EXPORT EventException
{ {
public: public:
EventException(unsigned short _code); EventException(unsigned short _code);
@ -291,7 +291,7 @@ public:
* with User Interface events. * with User Interface events.
* *
*/ */
class KHTML_EXPORT UIEvent : public Event { class TDEHTML_EXPORT UIEvent : public Event {
public: public:
UIEvent(); UIEvent();
UIEvent(const UIEvent &other); UIEvent(const UIEvent &other);
@ -396,7 +396,7 @@ protected:
* obtain notification of mouse events which occur within its descendent elements. * obtain notification of mouse events which occur within its descendent elements.
* *
*/ */
class KHTML_EXPORT MouseEvent : public UIEvent { class TDEHTML_EXPORT MouseEvent : public UIEvent {
public: public:
MouseEvent(); MouseEvent();
MouseEvent(const MouseEvent &other); MouseEvent(const MouseEvent &other);
@ -552,7 +552,7 @@ protected:
* as specified in current DOM3 Events revision. This is doing heavy emulation * as specified in current DOM3 Events revision. This is doing heavy emulation
* at the moment * at the moment
*/ */
class KHTML_EXPORT TextEvent : public UIEvent { class TDEHTML_EXPORT TextEvent : public UIEvent {
public: public:
TextEvent(); TextEvent();
TextEvent(const TextEvent &other); TextEvent(const TextEvent &other);
@ -735,7 +735,7 @@ protected:
* associated with Mutation events. * associated with Mutation events.
* *
*/ */
class KHTML_EXPORT MutationEvent : public Event { class TDEHTML_EXPORT MutationEvent : public Event {
public: public:
MutationEvent(); MutationEvent();
MutationEvent(const MutationEvent &other); MutationEvent(const MutationEvent &other);

@ -44,7 +44,7 @@ class RangeImpl;
class DOMException; class DOMException;
// Introduced in DOM Level 2: // Introduced in DOM Level 2:
class KHTML_EXPORT RangeException { class TDEHTML_EXPORT RangeException {
public: public:
RangeException(unsigned short _code) { code = _code; } RangeException(unsigned short _code) { code = _code; }
RangeException(const RangeException &other) { code = other.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 DocumentImpl;
friend class Document; friend class Document;

@ -57,7 +57,7 @@ class CustomNodeFilterImpl;
* interface. * interface.
* *
*/ */
class KHTML_EXPORT NodeIterator class TDEHTML_EXPORT NodeIterator
{ {
friend class NodeIteratorImpl; friend class NodeIteratorImpl;
friend class Document; friend class Document;
@ -181,7 +181,7 @@ protected:
* an instance of it to the NodeFilter. For more details see the * an instance of it to the NodeFilter. For more details see the
* CustomNodeFilter class * CustomNodeFilter class
*/ */
class KHTML_EXPORT NodeFilter class TDEHTML_EXPORT NodeFilter
{ {
friend class NodeIterator; friend class NodeIterator;
friend class NodeIteratorImpl; friend class NodeIteratorImpl;
@ -292,7 +292,7 @@ protected:
* *
*/ */
class KHTML_EXPORT CustomNodeFilter : public DomShared { class TDEHTML_EXPORT CustomNodeFilter : public DomShared {
public: public:
CustomNodeFilter(); CustomNodeFilter();
virtual ~CustomNodeFilter(); virtual ~CustomNodeFilter();
@ -336,7 +336,7 @@ protected:
* how deeply nested the structure of the original document. * how deeply nested the structure of the original document.
* *
*/ */
class KHTML_EXPORT TreeWalker class TDEHTML_EXPORT TreeWalker
{ {
friend class Document; friend class Document;
friend class TreeWalkerImpl; friend class TreeWalkerImpl;

@ -38,7 +38,7 @@ class DOMString;
* A base interface that all views shall derive from. * A base interface that all views shall derive from.
* *
*/ */
class KHTML_EXPORT AbstractView { class TDEHTML_EXPORT AbstractView {
friend class Event; friend class Event;
friend class UIEvent; friend class UIEvent;
friend class MouseEvent; friend class MouseEvent;

@ -438,7 +438,7 @@ void Document::setSelectedStylesheetSet(const DOMString& s)
} }
KHTMLView *Document::view() const TDEHTMLView *Document::view() const
{ {
if (!impl) return 0; if (!impl) return 0;

@ -32,8 +32,8 @@
#include <dom/dom_node.h> #include <dom/dom_node.h>
#include <dom/css_stylesheet.h> #include <dom/css_stylesheet.h>
class KHTMLView; class TDEHTMLView;
class KHTMLPart; class TDEHTMLPart;
namespace DOM { namespace DOM {
@ -74,7 +74,7 @@ class HTMLDocument;
* DOM Level 2 and newer provide means for creating documents directly, * DOM Level 2 and newer provide means for creating documents directly,
* which was not possible with DOM Level 1. * which was not possible with DOM Level 1.
*/ */
class KHTML_EXPORT DOMImplementation class TDEHTML_EXPORT DOMImplementation
{ {
friend class Document; friend class Document;
public: public:
@ -242,10 +242,10 @@ protected:
* context they were created. * context they were created.
* *
*/ */
class KHTML_EXPORT Document : public Node class TDEHTML_EXPORT Document : public Node
{ {
friend class ::KHTMLView; friend class ::TDEHTMLView;
friend class ::KHTMLPart; friend class ::TDEHTMLPart;
friend class AbstractView; friend class AbstractView;
friend class DOMImplementation; friend class DOMImplementation;
friend class HTMLFrameElement; friend class HTMLFrameElement;
@ -786,9 +786,9 @@ public:
void removeStyleSheet(const StyleSheet &sheet); 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 * Introduced in DOM Level 2
@ -988,7 +988,7 @@ class DocumentFragmentImpl;
* \c insertBefore() and \c appendChild() . * \c insertBefore() and \c appendChild() .
* *
*/ */
class KHTML_EXPORT DocumentFragment : public Node class TDEHTML_EXPORT DocumentFragment : public Node
{ {
friend class Document; friend class Document;
friend class HTMLElementImpl; friend class HTMLElementImpl;
@ -1025,7 +1025,7 @@ class DOMString;
* nodes. * nodes.
* *
*/ */
class KHTML_EXPORT DocumentType : public Node class TDEHTML_EXPORT DocumentType : public Node
{ {
friend class Document; friend class Document;
friend class DOMImplementation; friend class DOMImplementation;

@ -86,7 +86,7 @@ class DocumentImpl;
* unknown, there are no tokenized attribute values. * unknown, there are no tokenized attribute values.
* *
*/ */
class KHTML_EXPORT Attr : public Node class TDEHTML_EXPORT Attr : public Node
{ {
friend class Element; friend class Element;
friend class Document; friend class Document;
@ -207,7 +207,7 @@ class DOMString;
* access an attribute value can safely be used as a convenience. * 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 Document;
friend class HTMLDocument; friend class HTMLDocument;
@ -579,7 +579,7 @@ public:
bool isHTMLElement() const; bool isHTMLElement() const;
/** /**
* KHTML extension to DOM * TDEHTML extension to DOM
* This method returns the associated form element. * This method returns the associated form element.
* returns null if this element is not a form-like 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. * or if this elment is not in the scope of a form element.

@ -54,7 +54,7 @@ namespace DOM {
* the corresponding method descriptions. * the corresponding method descriptions.
* *
*/ */
class KHTML_EXPORT DOMException class TDEHTML_EXPORT DOMException
{ {
public: public:
DOMException(unsigned short _code) { code = _code; } DOMException(unsigned short _code) { code = _code; }

@ -33,7 +33,7 @@ namespace DOM {
* Other objects should overload deleteMe() to fit their needs. The default * Other objects should overload deleteMe() to fit their needs. The default
* implementation deletes the object if the ref count drops to 0. * implementation deletes the object if the ref count drops to 0.
*/ */
class KHTML_EXPORT DomShared class TDEHTML_EXPORT DomShared
{ {
public: public:
DomShared() : _ref( 0 ) {} DomShared() : _ref( 0 ) {}

@ -63,7 +63,7 @@ class Event;
* imply that the DOM specifies an order to these Nodes. * imply that the DOM specifies an order to these Nodes.
* *
*/ */
class KHTML_EXPORT NamedNodeMap class TDEHTML_EXPORT NamedNodeMap
{ {
public: public:
NamedNodeMap(); NamedNodeMap();
@ -271,7 +271,7 @@ class NodeImpl;
* mechanisms to get and set the relevant information. * mechanisms to get and set the relevant information.
* *
*/ */
class KHTML_EXPORT Node class TDEHTML_EXPORT Node
{ {
friend class NamedNodeMap; friend class NamedNodeMap;
friend class NodeList; friend class NodeList;
@ -775,7 +775,7 @@ public:
* *
* @exception DOMException * @exception DOMException
* NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly. * 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. * that do not have child nodes.
* *
* @since 3.5.7 * @since 3.5.7
@ -928,7 +928,7 @@ class NodeListImpl;
* integral index, starting from 0. * integral index, starting from 0.
* *
*/ */
class KHTML_EXPORT NodeList class TDEHTML_EXPORT NodeList
{ {
friend class Element; friend class Element;
friend class Node; friend class Node;

@ -40,10 +40,10 @@ class DOMStringImpl;
* that modifications to one instance will also modify all others. If you * that modifications to one instance will also modify all others. If you
* wish to get a DOMString that is independent, use copy(). * wish to get a DOMString that is independent, use copy().
*/ */
class KHTML_EXPORT DOMString class TDEHTML_EXPORT DOMString
{ {
friend class CharacterDataImpl; 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: public:
/** /**
* default constructor. Gives an empty DOMString * default constructor. Gives an empty DOMString
@ -128,17 +128,17 @@ inline kndbgstream &operator<<(kndbgstream &stream, const DOMString &) {
} }
#endif #endif
KHTML_EXPORT bool operator==( const DOMString &a, const DOMString &b ); TDEHTML_EXPORT bool operator==( const DOMString &a, const DOMString &b );
KHTML_EXPORT bool operator==( const DOMString &a, const TQString &b ); TDEHTML_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 char *b );
inline bool operator!=( const DOMString &a, const DOMString &b ) { return !(a==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 TQString &b ) { return !(a==b); }
inline bool operator!=( const DOMString &a, const char *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; } inline bool strcmp( const DOMString &a, const DOMString &b ) { return a != b; }
// returns false when equal, true otherwise (ignoring case) // returns false when equal, true otherwise (ignoring case)
KHTML_EXPORT bool strcasecmp( const DOMString &a, const DOMString &b ); TDEHTML_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 char* b );
} }
#endif #endif

@ -46,7 +46,7 @@ class CharacterDataImpl;
* <code>offset</code>s in this interface start from 0. * <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; friend class CharacterDataImpl;
@ -220,7 +220,7 @@ class CommentImpl;
* the full SGML comment structure. * the full SGML comment structure.
* *
*/ */
class KHTML_EXPORT Comment : public CharacterData class TDEHTML_EXPORT Comment : public CharacterData
{ {
friend class Document; friend class Document;
friend class TextImpl; friend class TextImpl;
@ -266,7 +266,7 @@ class TextImpl;
* \c XPointers. * \c XPointers.
* *
*/ */
class KHTML_EXPORT Text : public CharacterData class TDEHTML_EXPORT Text : public CharacterData
{ {
friend class Document; friend class Document;
friend class TextImpl; friend class TextImpl;

@ -63,7 +63,7 @@ class ProcessingInstructionImpl;
* merged by use of the Element.normalize() method. * merged by use of the Element.normalize() method.
* *
*/ */
class KHTML_EXPORT CDATASection : public Text class TDEHTML_EXPORT CDATASection : public Text
{ {
friend class Document; friend class Document;
public: public:
@ -121,7 +121,7 @@ class DOMString;
* An \c Entity node does not have any parent. * An \c Entity node does not have any parent.
* *
*/ */
class KHTML_EXPORT Entity : public Node class TDEHTML_EXPORT Entity : public Node
{ {
public: public:
Entity(); Entity();
@ -185,7 +185,7 @@ protected:
* evaluation. * evaluation.
* *
*/ */
class KHTML_EXPORT EntityReference : public Node class TDEHTML_EXPORT EntityReference : public Node
{ {
friend class Document; friend class Document;
public: public:
@ -219,7 +219,7 @@ class DOMString;
* A \c Notation node does not have any parent. * A \c Notation node does not have any parent.
* *
*/ */
class KHTML_EXPORT Notation : public Node class TDEHTML_EXPORT Notation : public Node
{ {
public: public:
Notation(); Notation();
@ -256,7 +256,7 @@ protected:
* processor-specific information in the text of the document. * processor-specific information in the text of the document.
* *
*/ */
class KHTML_EXPORT ProcessingInstruction : public Node class TDEHTML_EXPORT ProcessingInstruction : public Node
{ {
friend class Document; friend class Document;
public: public:

@ -47,7 +47,7 @@ class DOMString;
* BODY element definition </a> in HTML 4.0. * BODY element definition </a> in HTML 4.0.
* *
*/ */
class KHTML_EXPORT HTMLBodyElement : public HTMLElement class TDEHTML_EXPORT HTMLBodyElement : public HTMLElement
{ {
public: public:
HTMLBodyElement(); HTMLBodyElement();
@ -160,7 +160,7 @@ class DOMString;
* FRAME element definition </a> in HTML 4.0. * FRAME element definition </a> in HTML 4.0.
* *
*/ */
class KHTML_EXPORT HTMLFrameElement : public HTMLElement class TDEHTML_EXPORT HTMLFrameElement : public HTMLElement
{ {
public: public:
HTMLFrameElement(); HTMLFrameElement();
@ -306,7 +306,7 @@ class DOMString;
* FRAMESET element definition </a> in HTML 4.0. * FRAMESET element definition </a> in HTML 4.0.
* *
*/ */
class KHTML_EXPORT HTMLFrameSetElement : public HTMLElement class TDEHTML_EXPORT HTMLFrameSetElement : public HTMLElement
{ {
public: public:
HTMLFrameSetElement(); HTMLFrameSetElement();
@ -359,7 +359,7 @@ class HTMLIFrameElementImpl;
* IFRAME element definition </a> in HTML 4.0. * IFRAME element definition </a> in HTML 4.0.
* *
*/ */
class KHTML_EXPORT HTMLIFrameElement : public HTMLElement class TDEHTML_EXPORT HTMLIFrameElement : public HTMLElement
{ {
public: public:
HTMLIFrameElement(); HTMLIFrameElement();
@ -533,7 +533,7 @@ class DOMString;
* HEAD element definition </a> in HTML 4.0. * HEAD element definition </a> in HTML 4.0.
* *
*/ */
class KHTML_EXPORT HTMLHeadElement : public HTMLElement class TDEHTML_EXPORT HTMLHeadElement : public HTMLElement
{ {
public: public:
HTMLHeadElement(); HTMLHeadElement();
@ -574,7 +574,7 @@ class DOMString;
* HTML element definition </a> in HTML 4.0. * HTML element definition </a> in HTML 4.0.
* *
*/ */
class KHTML_EXPORT HTMLHtmlElement : public HTMLElement class TDEHTML_EXPORT HTMLHtmlElement : public HTMLElement
{ {
public: public:
HTMLHtmlElement(); HTMLHtmlElement();

@ -47,7 +47,7 @@ class DOMString;
* BLOCKQUOTE element definition </a> in HTML 4.0. * BLOCKQUOTE element definition </a> in HTML 4.0.
* *
*/ */
class KHTML_EXPORT HTMLBlockquoteElement : public HTMLElement class TDEHTML_EXPORT HTMLBlockquoteElement : public HTMLElement
{ {
public: public:
HTMLBlockquoteElement(); HTMLBlockquoteElement();
@ -88,7 +88,7 @@ class DOMString;
* DIV element definition </a> in HTML 4.0. * DIV element definition </a> in HTML 4.0.
* *
*/ */
class KHTML_EXPORT HTMLDivElement : public HTMLElement class TDEHTML_EXPORT HTMLDivElement : public HTMLElement
{ {
public: public:
HTMLDivElement(); HTMLDivElement();
@ -130,7 +130,7 @@ class DOMString;
* HR element definition </a> in HTML 4.0. * HR element definition </a> in HTML 4.0.
* *
*/ */
class KHTML_EXPORT HTMLHRElement : public HTMLElement class TDEHTML_EXPORT HTMLHRElement : public HTMLElement
{ {
public: public:
HTMLHRElement(); HTMLHRElement();
@ -214,7 +214,7 @@ class DOMString;
* H1 element definition </a> in HTML 4.0. * H1 element definition </a> in HTML 4.0.
* *
*/ */
class KHTML_EXPORT HTMLHeadingElement : public HTMLElement class TDEHTML_EXPORT HTMLHeadingElement : public HTMLElement
{ {
public: public:
HTMLHeadingElement(); HTMLHeadingElement();
@ -255,7 +255,7 @@ class DOMString;
* element definition </a> in HTML 4.0. * element definition </a> in HTML 4.0.
* *
*/ */
class KHTML_EXPORT HTMLParagraphElement : public HTMLElement class TDEHTML_EXPORT HTMLParagraphElement : public HTMLElement
{ {
public: public:
HTMLParagraphElement(); HTMLParagraphElement();
@ -296,7 +296,7 @@ class HTMLPreElementImpl;
* PRE element definition </a> in HTML 4.0. * PRE element definition </a> in HTML 4.0.
* *
*/ */
class KHTML_EXPORT HTMLPreElement : public HTMLElement class TDEHTML_EXPORT HTMLPreElement : public HTMLElement
{ {
public: public:
HTMLPreElement(); HTMLPreElement();
@ -334,7 +334,7 @@ class HTMLLayerElementImpl;
* Behaves mostly like absolute positioned DIV-blocks. * Behaves mostly like absolute positioned DIV-blocks.
* *
*/ */
class KHTML_EXPORT HTMLLayerElement : public HTMLElement class TDEHTML_EXPORT HTMLLayerElement : public HTMLElement
{ {
public: public:
HTMLLayerElement(); HTMLLayerElement();

@ -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 : Document(false) // create the impl here
{ {
impl = DOMImplementationImpl::instance()->createHTMLDocument(parent); impl = DOMImplementationImpl::instance()->createHTMLDocument(parent);

@ -35,8 +35,8 @@
#include <tdelibs_export.h> #include <tdelibs_export.h>
class KHTMLView; class TDEHTMLView;
class KHTMLPart; class TDEHTMLPart;
namespace DOM { 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 ::TDEHTMLView;
friend class ::KHTMLPart; friend class ::TDEHTMLPart;
friend class DOMImplementation; friend class DOMImplementation;
public: public:
HTMLDocument(); HTMLDocument();
@ -82,7 +82,7 @@ public:
* Rendering information (like sizes, etc...) is only created if * Rendering information (like sizes, etc...) is only created if
* parent != 0 * parent != 0
*/ */
HTMLDocument(KHTMLView *parent); HTMLDocument(TDEHTMLView *parent);
HTMLDocument(const HTMLDocument &other); HTMLDocument(const HTMLDocument &other);
HTMLDocument(const Node &other) : Document(false) HTMLDocument(const Node &other) : Document(false)
{(*this)=other;} {(*this)=other;}

@ -32,7 +32,7 @@
#include <dom/dom_element.h> #include <dom/dom_element.h>
#include <tdelibs_export.h> #include <tdelibs_export.h>
class KHTMLView; class TDEHTMLView;
namespace DOM { namespace DOM {
@ -66,10 +66,10 @@ class HTMLCollection;
* interface is reserved for future usage. * interface is reserved for future usage.
* *
*/ */
class KHTML_EXPORT HTMLElement : public Element class TDEHTML_EXPORT HTMLElement : public Element
{ {
friend class HTMLDocument; friend class HTMLDocument;
friend class ::KHTMLView; friend class ::TDEHTMLView;
friend class HTMLTableElement; friend class HTMLTableElement;
friend class HTMLTableRowElement; friend class HTMLTableRowElement;
friend class HTMLTableSectionElement; friend class HTMLTableSectionElement;

@ -47,7 +47,7 @@ class DOMString;
* BUTTON element definition </a> in HTML 4.0. * BUTTON element definition </a> in HTML 4.0.
* *
*/ */
class KHTML_EXPORT HTMLButtonElement : public HTMLElement class TDEHTML_EXPORT HTMLButtonElement : public HTMLElement
{ {
public: public:
HTMLButtonElement(); HTMLButtonElement();
@ -169,7 +169,7 @@ class HTMLFieldSetElementImpl;
* FIELDSET element definition </a> in HTML 4.0. * FIELDSET element definition </a> in HTML 4.0.
* *
*/ */
class KHTML_EXPORT HTMLFieldSetElement : public HTMLElement class TDEHTML_EXPORT HTMLFieldSetElement : public HTMLElement
{ {
public: public:
HTMLFieldSetElement(); HTMLFieldSetElement();
@ -203,7 +203,7 @@ class HTMLFormElementImpl;
* FORM element definition </a> in HTML 4.0. * 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 HTMLButtonElement;
friend class HTMLFieldSetElement; friend class HTMLFieldSetElement;
@ -346,7 +346,7 @@ class HTMLInputElementImpl;
* INPUT element definition </a> in HTML 4.0. * INPUT element definition </a> in HTML 4.0.
* *
*/ */
class KHTML_EXPORT HTMLInputElement : public HTMLElement class TDEHTML_EXPORT HTMLInputElement : public HTMLElement
{ {
public: public:
HTMLInputElement(); HTMLInputElement();
@ -707,7 +707,7 @@ class HTMLLabelElementImpl;
* LABEL element definition </a> in HTML 4.0. * LABEL element definition </a> in HTML 4.0.
* *
*/ */
class KHTML_EXPORT HTMLLabelElement : public HTMLElement class TDEHTML_EXPORT HTMLLabelElement : public HTMLElement
{ {
public: public:
HTMLLabelElement(); HTMLLabelElement();
@ -762,7 +762,7 @@ class HTMLLegendElementImpl;
* LEGEND element definition </a> in HTML 4.0. * LEGEND element definition </a> in HTML 4.0.
* *
*/ */
class KHTML_EXPORT HTMLLegendElement : public HTMLElement class TDEHTML_EXPORT HTMLLegendElement : public HTMLElement
{ {
public: public:
HTMLLegendElement(); HTMLLegendElement();
@ -821,7 +821,7 @@ class HTMLOptGroupElementImpl;
* OPTGROUP element definition </a> in HTML 4.0. * OPTGROUP element definition </a> in HTML 4.0.
* *
*/ */
class KHTML_EXPORT HTMLOptGroupElement : public HTMLElement class TDEHTML_EXPORT HTMLOptGroupElement : public HTMLElement
{ {
public: public:
HTMLOptGroupElement(); HTMLOptGroupElement();
@ -875,7 +875,7 @@ class HTMLSelectElementImpl;
* SELECT element definition </a> in HTML 4.0. * SELECT element definition </a> in HTML 4.0.
* *
*/ */
class KHTML_EXPORT HTMLSelectElement : public HTMLElement class TDEHTML_EXPORT HTMLSelectElement : public HTMLElement
{ {
public: public:
HTMLSelectElement(); HTMLSelectElement();
@ -1051,7 +1051,7 @@ class HTMLTextAreaElementImpl;
* TEXTAREA element definition </a> in HTML 4.0. * TEXTAREA element definition </a> in HTML 4.0.
* *
*/ */
class KHTML_EXPORT HTMLTextAreaElement : public HTMLElement class TDEHTML_EXPORT HTMLTextAreaElement : public HTMLElement
{ {
public: public:
HTMLTextAreaElement(); HTMLTextAreaElement();
@ -1266,7 +1266,7 @@ class HTMLOptionElementImpl;
* OPTION element definition </a> in HTML 4.0. * OPTION element definition </a> in HTML 4.0.
* *
*/ */
class KHTML_EXPORT HTMLOptionElement : public HTMLElement class TDEHTML_EXPORT HTMLOptionElement : public HTMLElement
{ {
public: public:
HTMLOptionElement(); HTMLOptionElement();
@ -1386,7 +1386,7 @@ class HTMLFormElement;
* deprecated in HTML 4.0. * deprecated in HTML 4.0.
* *
*/ */
class KHTML_EXPORT HTMLIsIndexElement : public HTMLElement class TDEHTML_EXPORT HTMLIsIndexElement : public HTMLElement
{ {
public: public:
HTMLIsIndexElement(); HTMLIsIndexElement();

@ -43,7 +43,7 @@ class DOMString;
* BASE element definition </a> in HTML 4.0. * BASE element definition </a> in HTML 4.0.
* *
*/ */
class KHTML_EXPORT HTMLBaseElement : public HTMLElement class TDEHTML_EXPORT HTMLBaseElement : public HTMLElement
{ {
public: public:
HTMLBaseElement(); HTMLBaseElement();
@ -98,7 +98,7 @@ class HTMLLinkElementImpl;
* LINK element definition </a> in HTML 4.0. * LINK element definition </a> in HTML 4.0.
* *
*/ */
class KHTML_EXPORT HTMLLinkElement : public HTMLElement class TDEHTML_EXPORT HTMLLinkElement : public HTMLElement
{ {
public: public:
HTMLLinkElement(); HTMLLinkElement();
@ -253,7 +253,7 @@ class HTMLMetaElementImpl;
* META element definition </a> in HTML 4.0. * META element definition </a> in HTML 4.0.
* *
*/ */
class KHTML_EXPORT HTMLMetaElement : public HTMLElement class TDEHTML_EXPORT HTMLMetaElement : public HTMLElement
{ {
public: public:
HTMLMetaElement(); HTMLMetaElement();
@ -332,7 +332,7 @@ class HTMLScriptElementImpl;
* SCRIPT element definition </a> in HTML 4.0. * SCRIPT element definition </a> in HTML 4.0.
* *
*/ */
class KHTML_EXPORT HTMLScriptElement : public HTMLElement class TDEHTML_EXPORT HTMLScriptElement : public HTMLElement
{ {
public: public:
HTMLScriptElement(); HTMLScriptElement();
@ -446,7 +446,7 @@ class HTMLStyleElementImpl;
* STYLE element definition </a> in HTML 4.0. * STYLE element definition </a> in HTML 4.0.
* *
*/ */
class KHTML_EXPORT HTMLStyleElement : public HTMLElement class TDEHTML_EXPORT HTMLStyleElement : public HTMLElement
{ {
public: public:
HTMLStyleElement(); HTMLStyleElement();
@ -519,7 +519,7 @@ class HTMLTitleElementImpl;
* TITLE element definition </a> in HTML 4.0. * TITLE element definition </a> in HTML 4.0.
* *
*/ */
class KHTML_EXPORT HTMLTitleElement : public HTMLElement class TDEHTML_EXPORT HTMLTitleElement : public HTMLElement
{ {
public: public:
HTMLTitleElement(); HTMLTitleElement();

@ -44,7 +44,7 @@ class DOMString;
* AREA element definition </a> in HTML 4.0. * AREA element definition </a> in HTML 4.0.
* *
*/ */
class KHTML_EXPORT HTMLAreaElement : public HTMLElement class TDEHTML_EXPORT HTMLAreaElement : public HTMLElement
{ {
public: public:
HTMLAreaElement(); HTMLAreaElement();
@ -182,7 +182,7 @@ class HTMLImageElementImpl;
* IMG element definition </a> in HTML 4.0. * IMG element definition </a> in HTML 4.0.
* *
*/ */
class KHTML_EXPORT HTMLImageElement : public HTMLElement class TDEHTML_EXPORT HTMLImageElement : public HTMLElement
{ {
public: public:
HTMLImageElement(); HTMLImageElement();
@ -390,7 +390,7 @@ class DOMString;
* MAP element definition </a> in HTML 4.0. * MAP element definition </a> in HTML 4.0.
* *
*/ */
class KHTML_EXPORT HTMLMapElement : public HTMLElement class TDEHTML_EXPORT HTMLMapElement : public HTMLElement
{ {
public: public:
HTMLMapElement(); HTMLMapElement();

@ -44,7 +44,7 @@ class DOMString;
* element definition </a> in HTML 4.0. * element definition </a> in HTML 4.0.
* *
*/ */
class KHTML_EXPORT HTMLAnchorElement : public HTMLElement class TDEHTML_EXPORT HTMLAnchorElement : public HTMLElement
{ {
public: public:
HTMLAnchorElement(); HTMLAnchorElement();
@ -256,7 +256,7 @@ class HTMLBRElementImpl;
* element definition </a> in HTML 4.0. * element definition </a> in HTML 4.0.
* *
*/ */
class KHTML_EXPORT HTMLBRElement : public HTMLElement class TDEHTML_EXPORT HTMLBRElement : public HTMLElement
{ {
public: public:
HTMLBRElement(); HTMLBRElement();
@ -299,7 +299,7 @@ class DOMString;
* deprecated in HTML 4.0. * deprecated in HTML 4.0.
* *
*/ */
class KHTML_EXPORT HTMLFontElement : public HTMLElement class TDEHTML_EXPORT HTMLFontElement : public HTMLElement
{ {
public: public:
HTMLFontElement(); HTMLFontElement();
@ -369,7 +369,7 @@ class DOMString;
* DEL </a> element definitions in HTML 4.0. * DEL </a> element definitions in HTML 4.0.
* *
*/ */
class KHTML_EXPORT HTMLModElement : public HTMLElement class TDEHTML_EXPORT HTMLModElement : public HTMLElement
{ {
public: public:
HTMLModElement(); HTMLModElement();
@ -427,7 +427,7 @@ class HTMLQuoteElementImpl;
* element. To resolve ambiquities, we use this one for the \c Q * element. To resolve ambiquities, we use this one for the \c Q
* element only. * element only.
*/ */
class KHTML_EXPORT HTMLQuoteElement : public HTMLElement class TDEHTML_EXPORT HTMLQuoteElement : public HTMLElement
{ {
public: public:
HTMLQuoteElement(); HTMLQuoteElement();

@ -49,7 +49,7 @@ class DOMString;
* DL element definition </a> in HTML 4.0. * DL element definition </a> in HTML 4.0.
* *
*/ */
class KHTML_EXPORT HTMLDListElement : public HTMLElement class TDEHTML_EXPORT HTMLDListElement : public HTMLElement
{ {
public: public:
HTMLDListElement(); HTMLDListElement();
@ -89,7 +89,7 @@ public:
* in HTML 4.0. * in HTML 4.0.
* *
*/ */
class KHTML_EXPORT HTMLDirectoryElement : public HTMLElement class TDEHTML_EXPORT HTMLDirectoryElement : public HTMLElement
{ {
public: public:
HTMLDirectoryElement(); HTMLDirectoryElement();
@ -128,7 +128,7 @@ public:
* LI element definition </a> in HTML 4.0. * LI element definition </a> in HTML 4.0.
* *
*/ */
class KHTML_EXPORT HTMLLIElement : public HTMLElement class TDEHTML_EXPORT HTMLLIElement : public HTMLElement
{ {
public: public:
HTMLLIElement(); HTMLLIElement();
@ -183,7 +183,7 @@ public:
* deprecated in HTML 4.0. * deprecated in HTML 4.0.
* *
*/ */
class KHTML_EXPORT HTMLMenuElement : public HTMLElement class TDEHTML_EXPORT HTMLMenuElement : public HTMLElement
{ {
public: public:
HTMLMenuElement(); HTMLMenuElement();
@ -223,7 +223,7 @@ public:
* OL element definition </a> in HTML 4.0. * OL element definition </a> in HTML 4.0.
* *
*/ */
class KHTML_EXPORT HTMLOListElement : public HTMLElement class TDEHTML_EXPORT HTMLOListElement : public HTMLElement
{ {
public: public:
HTMLOListElement(); HTMLOListElement();
@ -291,7 +291,7 @@ public:
* UL element definition </a> in HTML 4.0. * UL element definition </a> in HTML 4.0.
* *
*/ */
class KHTML_EXPORT HTMLUListElement : public HTMLElement class TDEHTML_EXPORT HTMLUListElement : public HTMLElement
{ {
public: public:
HTMLUListElement(); HTMLUListElement();

@ -45,7 +45,7 @@ class HTMLCollectionImpl;
* deprecated in HTML 4.0. * deprecated in HTML 4.0.
* *
*/ */
class KHTML_EXPORT HTMLBaseFontElement : public HTMLElement class TDEHTML_EXPORT HTMLBaseFontElement : public HTMLElement
{ {
public: public:
HTMLBaseFontElement(); HTMLBaseFontElement();
@ -123,7 +123,7 @@ public:
* automatically updated when the underlying document is changed. * automatically updated when the underlying document is changed.
* *
*/ */
class KHTML_EXPORT HTMLCollection class TDEHTML_EXPORT HTMLCollection
{ {
friend class HTMLDocument; friend class HTMLDocument;
friend class HTMLSelectElement; friend class HTMLSelectElement;
@ -201,7 +201,7 @@ protected:
HTMLCollectionImpl *impl; HTMLCollectionImpl *impl;
}; };
class KHTML_EXPORT HTMLFormCollection : public HTMLCollection class TDEHTML_EXPORT HTMLFormCollection : public HTMLCollection
{ {
friend class HTMLFormElement; friend class HTMLFormElement;
protected: protected:
@ -211,7 +211,7 @@ protected:
/** /**
@internal. Not part of the public API @internal. Not part of the public API
*/ */
class KHTML_EXPORT HTMLMappedNameCollection : public HTMLCollection class TDEHTML_EXPORT HTMLMappedNameCollection : public HTMLCollection
{ {
public: public:
HTMLMappedNameCollection(NodeImpl *base, int type, const DOMString &name ); HTMLMappedNameCollection(NodeImpl *base, int type, const DOMString &name );

@ -47,7 +47,7 @@ class HTMLAppletElementImpl;
* deprecated in HTML 4.0. * deprecated in HTML 4.0.
* *
*/ */
class KHTML_EXPORT HTMLAppletElement : public HTMLElement class TDEHTML_EXPORT HTMLAppletElement : public HTMLElement
{ {
public: public:
HTMLAppletElement(); HTMLAppletElement();
@ -255,7 +255,7 @@ class HTMLObjectElementImpl;
* OBJECT element definition </a> in HTML 4.0. * OBJECT element definition </a> in HTML 4.0.
* *
*/ */
class KHTML_EXPORT HTMLObjectElement : public HTMLElement class TDEHTML_EXPORT HTMLObjectElement : public HTMLElement
{ {
public: public:
HTMLObjectElement(); HTMLObjectElement();
@ -554,7 +554,7 @@ class HTMLParamElementImpl;
* PARAM element definition </a> in HTML 4.0. * PARAM element definition </a> in HTML 4.0.
* *
*/ */
class KHTML_EXPORT HTMLParamElement : public HTMLElement class TDEHTML_EXPORT HTMLParamElement : public HTMLElement
{ {
public: public:
HTMLParamElement(); HTMLParamElement();

@ -44,7 +44,7 @@ class DOMString;
* CAPTION element definition </a> in HTML 4.0. * CAPTION element definition </a> in HTML 4.0.
* *
*/ */
class KHTML_EXPORT HTMLTableCaptionElement : public HTMLElement class TDEHTML_EXPORT HTMLTableCaptionElement : public HTMLElement
{ {
friend class HTMLTableElement; friend class HTMLTableElement;
@ -88,7 +88,7 @@ class HTMLTableCellElementImpl;
* TD element definition </a> in HTML 4.0. * TD element definition </a> in HTML 4.0.
* *
*/ */
class KHTML_EXPORT HTMLTableCellElement : public HTMLElement class TDEHTML_EXPORT HTMLTableCellElement : public HTMLElement
{ {
friend class HTMLTableElement; friend class HTMLTableElement;
@ -319,7 +319,7 @@ class HTMLTableColElementImpl;
* COL element definition </a> in HTML 4.0. * COL element definition </a> in HTML 4.0.
* *
*/ */
class KHTML_EXPORT HTMLTableColElement : public HTMLElement class TDEHTML_EXPORT HTMLTableColElement : public HTMLElement
{ {
friend class HTMLTableElement; friend class HTMLTableElement;
@ -438,7 +438,7 @@ class DOMString;
* TABLE element definition </a> in HTML 4.0. * TABLE element definition </a> in HTML 4.0.
* *
*/ */
class KHTML_EXPORT HTMLTableElement : public HTMLElement class TDEHTML_EXPORT HTMLTableElement : public HTMLElement
{ {
public: public:
HTMLTableElement(); HTMLTableElement();
@ -722,7 +722,7 @@ class DOMString;
* TR element definition </a> in HTML 4.0. * TR element definition </a> in HTML 4.0.
* *
*/ */
class KHTML_EXPORT HTMLTableRowElement : public HTMLElement class TDEHTML_EXPORT HTMLTableRowElement : public HTMLElement
{ {
friend class HTMLTableElement; friend class HTMLTableElement;
@ -892,7 +892,7 @@ class DOMString;
* elements. * elements.
* *
*/ */
class KHTML_EXPORT HTMLTableSectionElement : public HTMLElement class TDEHTML_EXPORT HTMLTableSectionElement : public HTMLElement
{ {
friend class HTMLTableElement; friend class HTMLTableElement;

@ -19,7 +19,7 @@
#include "domtreeview.moc" #include "domtreeview.moc"
#include "xml/dom_nodeimpl.h" #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); setCaption(name);
setRootIsDecorated(true); setRootIsDecorated(true);

@ -28,7 +28,7 @@ class DOMTreeView : public KListView
{ {
Q_OBJECT Q_OBJECT
public: public:
DOMTreeView(TQWidget *parent, KHTMLPart *part, const char * name = 0); DOMTreeView(TQWidget *parent, TDEHTMLPart *part, const char * name = 0);
~DOMTreeView(); ~DOMTreeView();
void recursive(const DOM::Node &pNode, const DOM::Node &node); void recursive(const DOM::Node &pNode, const DOM::Node &node);
@ -47,7 +47,7 @@ class DOMTreeView : public KListView
TQPtrDict<DOM::Node> m_nodedict; TQPtrDict<DOM::Node> m_nodedict;
DOM::Node document; DOM::Node document;
KHTMLPart *part; TDEHTMLPart *part;
}; };

@ -1,7 +1,7 @@
This module contains the ECMAScript a.k.a. JavaScript language bindings for 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 To test the non-HTML DOM functions you may compile a little interactive
interpreter called 'testecma' with 'make check' (see testecma.cpp for interpreter called 'testecma' with 'make check' (see testecma.cpp for

@ -232,7 +232,7 @@ bool ScriptInterpreter::isWindowOpenAllowed() const
bool eventOk = ( // mouse events bool eventOk = ( // mouse events
id == DOM::EventImpl::CLICK_EVENT || id == DOM::EventImpl::CLICK_EVENT ||
id == DOM::EventImpl::MOUSEUP_EVENT || id == DOM::EventImpl::MOUSEDOWN_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 // keyboard events
id == DOM::EventImpl::KEYDOWN_EVENT || id == DOM::EventImpl::KEYPRESS_EVENT || id == DOM::EventImpl::KEYDOWN_EVENT || id == DOM::EventImpl::KEYPRESS_EVENT ||
id == DOM::EventImpl::KEYUP_EVENT || id == DOM::EventImpl::KEYUP_EVENT ||

@ -249,12 +249,12 @@ KJSDebugWin * KJSDebugWin::kjs_html_debugger = 0;
TQString SourceFile::getCode() TQString SourceFile::getCode()
{ {
if (interpreter) { if (interpreter) {
KHTMLPart *part = ::tqqt_cast<KHTMLPart*>(static_cast<ScriptInterpreter*>(interpreter)->part()); TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart*>(static_cast<ScriptInterpreter*>(interpreter)->part());
if (part && url == part->url().url() && KHTMLPageCache::self()->isValid(part->cacheId())) { if (part && url == part->url().url() && TDEHTMLPageCache::self()->isValid(part->cacheId())) {
Decoder *decoder = part->createDecoder(); Decoder *decoder = part->createDecoder();
TQByteArray data; TQByteArray data;
TQDataStream stream(data,IO_WriteOnly); TQDataStream stream(data,IO_WriteOnly);
KHTMLPageCache::self()->saveData(part->cacheId(),&stream); TDEHTMLPageCache::self()->saveData(part->cacheId(),&stream);
TQString str; TQString str;
if (data.size() == 0) if (data.size() == 0)
str = ""; str = "";
@ -721,7 +721,7 @@ bool KJSDebugWin::sourceParsed(KJS::ExecState *exec, int sourceId,
KParts::ReadOnlyPart *part = static_cast<ScriptInterpreter*>(exec->interpreter())->part(); KParts::ReadOnlyPart *part = static_cast<ScriptInterpreter*>(exec->interpreter())->part();
if (m_nextSourceUrl == part->url().url()) { if (m_nextSourceUrl == part->url().url()) {
// Only store the code here if it's not from the part's html page... in that // 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; code = TQString::null;
} }
@ -805,7 +805,7 @@ bool KJSDebugWin::exception(ExecState *exec, const Value &value, bool inTryCatch
return true; return true;
KParts::ReadOnlyPart *part = static_cast<ScriptInterpreter*>(exec->interpreter())->part(); 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()) if (tdehtmlpart && !tdehtmlpart->settings()->isJavaScriptErrorReportingEnabled())
return true; return true;

@ -265,11 +265,11 @@ Value DOMNode::getValueProperty(ExecState *exec, int token) const
case OnChange: case OnChange:
return getListener(DOM::EventImpl::CHANGE_EVENT); return getListener(DOM::EventImpl::CHANGE_EVENT);
case OnClick: case OnClick:
return getListener(DOM::EventImpl::KHTML_ECMA_CLICK_EVENT); return getListener(DOM::EventImpl::TDEHTML_ECMA_CLICK_EVENT);
case OnDblClick: case OnDblClick:
return getListener(DOM::EventImpl::KHTML_ECMA_DBLCLICK_EVENT); return getListener(DOM::EventImpl::TDEHTML_ECMA_DBLCLICK_EVENT);
case OnDragDrop: case OnDragDrop:
return getListener(DOM::EventImpl::KHTML_DRAGDROP_EVENT); return getListener(DOM::EventImpl::TDEHTML_DRAGDROP_EVENT);
case OnError: case OnError:
return getListener(DOM::EventImpl::ERROR_EVENT); return getListener(DOM::EventImpl::ERROR_EVENT);
case OnFocus: case OnFocus:
@ -293,7 +293,7 @@ Value DOMNode::getValueProperty(ExecState *exec, int token) const
case OnMouseUp: case OnMouseUp:
return getListener(DOM::EventImpl::MOUSEUP_EVENT); return getListener(DOM::EventImpl::MOUSEUP_EVENT);
case OnMove: case OnMove:
return getListener(DOM::EventImpl::KHTML_MOVE_EVENT); return getListener(DOM::EventImpl::TDEHTML_MOVE_EVENT);
case OnReset: case OnReset:
return getListener(DOM::EventImpl::RESET_EVENT); return getListener(DOM::EventImpl::RESET_EVENT);
case OnResize: case OnResize:
@ -409,13 +409,13 @@ void DOMNode::putValueProperty(ExecState *exec, int token, const Value& value, i
setListener(exec,DOM::EventImpl::CHANGE_EVENT,value); setListener(exec,DOM::EventImpl::CHANGE_EVENT,value);
break; break;
case OnClick: case OnClick:
setListener(exec,DOM::EventImpl::KHTML_ECMA_CLICK_EVENT,value); setListener(exec,DOM::EventImpl::TDEHTML_ECMA_CLICK_EVENT,value);
break; break;
case OnDblClick: case OnDblClick:
setListener(exec,DOM::EventImpl::KHTML_ECMA_DBLCLICK_EVENT,value); setListener(exec,DOM::EventImpl::TDEHTML_ECMA_DBLCLICK_EVENT,value);
break; break;
case OnDragDrop: case OnDragDrop:
setListener(exec,DOM::EventImpl::KHTML_DRAGDROP_EVENT,value); setListener(exec,DOM::EventImpl::TDEHTML_DRAGDROP_EVENT,value);
break; break;
case OnError: case OnError:
setListener(exec,DOM::EventImpl::ERROR_EVENT,value); 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); setListener(exec,DOM::EventImpl::MOUSEUP_EVENT,value);
break; break;
case OnMove: case OnMove:
setListener(exec,DOM::EventImpl::KHTML_MOVE_EVENT,value); setListener(exec,DOM::EventImpl::TDEHTML_MOVE_EVENT,value);
break; break;
case OnReset: case OnReset:
setListener(exec,DOM::EventImpl::RESET_EVENT,value); 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); return getDOMStyleSheetList(exec, doc.styleSheets(), doc);
case DOMDocument::DefaultView: // DOM2 case DOMDocument::DefaultView: // DOM2
{ {
KHTMLView *view = node.handle()->getDocument()->view(); TDEHTMLView *view = node.handle()->getDocument()->view();
if (view) if (view)
return Window::retrieve(view->part()); return Window::retrieve(view->part());
return getDOMAbstractView(exec, doc.defaultView()); return getDOMAbstractView(exec, doc.defaultView());
@ -963,7 +963,7 @@ Value DOMDocument::getValueProperty(ExecState *exec, int token) const
DOM::DocumentImpl* docimpl = node.handle()->getDocument(); DOM::DocumentImpl* docimpl = node.handle()->getDocument();
if ( docimpl && docimpl->view() ) if ( docimpl && docimpl->view() )
{ {
KHTMLPart* part = docimpl->view()->part(); TDEHTMLPart* part = docimpl->view()->part();
if ( part ) { if ( part ) {
if (part->d->m_bComplete) return String("complete"); if (part->d->m_bComplete) return String("complete");
if (docimpl->parsing()) return String("loading"); if (docimpl->parsing()) return String("loading");
@ -1088,7 +1088,7 @@ Value DOMDocumentProtoFunc::tryCall(ExecState *exec, Object &thisObj, const List
Window* active = Window::retrieveActive(exec); Window* active = Window::retrieveActive(exec);
// Complete the URL using the "active part" (running interpreter). We do this for the security // 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 // 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) { if (tdehtmlpart) {
// Security: only allow documents to be loaded from the same host // Security: only allow documents to be loaded from the same host
TQString dstUrl = tdehtmlpart->htmlDocument().completeURL(s).string(); TQString dstUrl = tdehtmlpart->htmlDocument().completeURL(s).string();
@ -1274,7 +1274,7 @@ Value DOMDOMImplementationProtoFunc::tryCall(ExecState *exec, Object &thisObj, c
case DOMDOMImplementation::CreateDocument: { // DOM2 case DOMDOMImplementation::CreateDocument: { // DOM2
// Initially set the URL to document of the creator... this is so that it resides in the same // 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. // 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) { if (part) {
Document doc = implementation.createDocument(args[0].toString(exec).string(),args[1].toString(exec).string(),toNode(args[2])); 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(); 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 // Check to see if the currently executing interpreter is allowed to access the specified node
if (n.isNull()) if (n.isNull())
return true; return true;
KHTMLView *view = n.handle()->getDocument()->view(); TDEHTMLView *view = n.handle()->getDocument()->view();
Window* win = view && view->part() ? Window::retrieveWindow(view->part()) : 0L; Window* win = view && view->part() ? Window::retrieveWindow(view->part()) : 0L;
if ( !win || !win->isSafeScript(exec) ) if ( !win || !win->isSafeScript(exec) )
return false; return false;

@ -63,7 +63,7 @@ void JSEventListener::handleEvent(DOM::Event &evt)
if (KJSDebugWin::debugWindow() && KJSDebugWin::debugWindow()->inSession()) if (KJSDebugWin::debugWindow() && KJSDebugWin::debugWindow()->inSession())
return; return;
#endif #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; KJSProxy *proxy = 0L;
if (part) if (part)
proxy = part->jScript(); proxy = part->jScript();
@ -163,7 +163,7 @@ Object JSLazyEventListener::listenerObj() const
void JSLazyEventListener::parseCode() const void JSLazyEventListener::parseCode() const
{ {
if (!parsed) { 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; KJSProxy *proxy = 0L;
if (part) if (part)
proxy = part->jScript(); proxy = part->jScript();

@ -98,7 +98,7 @@ Value KJS::HTMLDocFunction::tryCall(ExecState *exec, Object &thisObj, const List
case HTMLDocument::Open: case HTMLDocument::Open:
if (args.size() >= 3) // IE extension for document.open: it means window.open if it has 3 args or more 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() ) { if ( view && view->part() ) {
Window* win = Window::retrieveWindow(view->part()); Window* win = Window::retrieveWindow(view->part());
if( win ) { if( win ) {
@ -133,7 +133,7 @@ Value KJS::HTMLDocFunction::tryCall(ExecState *exec, Object &thisObj, const List
case HTMLDocument::GetSelection: { case HTMLDocument::GetSelection: {
// NS4 and Mozilla specific. IE uses document.selection.createRange() // NS4 and Mozilla specific. IE uses document.selection.createRange()
// http://docs.sun.com/source/816-6408-10/document.htm#1195981 // 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() ) if ( view && view->part() )
return String(view->part()->selectedText()); return String(view->part()->selectedText());
else else
@ -199,7 +199,7 @@ bool KJS::HTMLDocument::hasProperty(ExecState *exec, const Identifier &p) const
#endif #endif
DOM::HTMLDocument doc = static_cast<DOM::HTMLDocument>(node); DOM::HTMLDocument doc = static_cast<DOM::HTMLDocument>(node);
DOM::DocumentImpl* docImpl = static_cast<DOM::DocumentImpl*>(doc.handle()); 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; Window* win = view && view->part() ? Window::retrieveWindow(view->part()) : 0L;
if ( !win || !win->isSafeScript(exec) ) if ( !win || !win->isSafeScript(exec) )
return false; return false;
@ -210,7 +210,7 @@ bool KJS::HTMLDocument::hasProperty(ExecState *exec, const Identifier &p) const
if ( view && view->part() ) if ( view && view->part() )
{ {
KHTMLPart *kp = view->part()->findFrame( p.qstring() ); TDEHTMLPart *kp = view->part()->findFrame( p.qstring() );
if (kp) if (kp)
return true; return true;
} }
@ -226,7 +226,7 @@ Value KJS::HTMLDocument::tryGet(ExecState *exec, const Identifier &propertyName)
DOM::HTMLDocument doc = static_cast<DOM::HTMLDocument>(node); DOM::HTMLDocument doc = static_cast<DOM::HTMLDocument>(node);
DOM::DocumentImpl* docImpl = static_cast<DOM::DocumentImpl*>(doc.handle()); 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; Window* win = view && view->part() ? Window::retrieveWindow(view->part()) : 0L;
if ( !win || !win->isSafeScript(exec) ) 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 // ###### TODO return a collection in case several frames have the same name
// (IE does that). Hard to do with findFrame :} // (IE does that). Hard to do with findFrame :}
KHTMLPart *kp = view->part()->findFrame( propertyName.qstring() ); TDEHTMLPart *kp = view->part()->findFrame( propertyName.qstring() );
if (kp) if (kp)
return Window::retrieve(kp); return Window::retrieve(kp);
} }
@ -356,7 +356,7 @@ void KJS::HTMLDocument::tryPut(ExecState *exec, const Identifier &propertyName,
#ifdef KJS_VERBOSE #ifdef KJS_VERBOSE
kdDebug(6070) << "KJS::HTMLDocument::tryPut " << propertyName.qstring() << endl; kdDebug(6070) << "KJS::HTMLDocument::tryPut " << propertyName.qstring() << endl;
#endif #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; Window* win = view && view->part() ? Window::retrieveWindow(view->part()) : 0L;
if ( !win || !win->isSafeScript(exec) ) if ( !win || !win->isSafeScript(exec) )
@ -394,7 +394,7 @@ void KJS::HTMLDocument::putValueProperty(ExecState *exec, int token, const Value
break; break;
case Location: case Location:
{ {
KHTMLView *view = static_cast<DOM::DocumentImpl*>(doc.handle())->view(); TDEHTMLView *view = static_cast<DOM::DocumentImpl*>(doc.handle())->view();
if ( view ) if ( view )
Window::retrieveWindow(view->part())->goURL(exec, value.toString(exec).qstring(), false /*don't lock history*/); Window::retrieveWindow(view->part())->goURL(exec, value.toString(exec).qstring(), false /*don't lock history*/);
break; break;
@ -1127,7 +1127,7 @@ const ClassInfo* KJS::HTMLElement::classInfo() const
static KParts::LiveConnectExtension *getLiveConnectExtension(const DOM::HTMLElement & element) static KParts::LiveConnectExtension *getLiveConnectExtension(const DOM::HTMLElement & element)
{ {
DOM::HTMLDocument doc = element.ownerDocument(); 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()) if (view && element.handle())
return view->part()->liveConnectExtension(static_cast<tdehtml::RenderPart*>(element.handle()->renderer())); return view->part()->liveConnectExtension(static_cast<tdehtml::RenderPart*>(element.handle()->renderer()));
return 0L; return 0L;
@ -1870,7 +1870,7 @@ Value KJS::HTMLElement::getValueProperty(ExecState *exec, int token) const
case FrameContentDocument: return checkNodeSecurity(exec,frameElement.contentDocument()) ? case FrameContentDocument: return checkNodeSecurity(exec,frameElement.contentDocument()) ?
getDOMNode(exec, frameElement.contentDocument()) : Undefined(); getDOMNode(exec, frameElement.contentDocument()) : Undefined();
case FrameContentWindow: { case FrameContentWindow: {
KHTMLPart* part = static_cast<DOM::HTMLFrameElementImpl*>(frameElement.handle())->contentPart(); TDEHTMLPart* part = static_cast<DOM::HTMLFrameElementImpl*>(frameElement.handle())->contentPart();
if (part) { if (part) {
Window *w = Window::retrieveWindow(part); Window *w = Window::retrieveWindow(part);
if (w) if (w)
@ -1905,7 +1905,7 @@ Value KJS::HTMLElement::getValueProperty(ExecState *exec, int token) const
case IFrameContentDocument: return checkNodeSecurity(exec,iFrame.contentDocument()) ? case IFrameContentDocument: return checkNodeSecurity(exec,iFrame.contentDocument()) ?
getDOMNode(exec, iFrame.contentDocument()) : Undefined(); getDOMNode(exec, iFrame.contentDocument()) : Undefined();
case IFrameContentWindow: { case IFrameContentWindow: {
KHTMLPart* part = static_cast<DOM::HTMLIFrameElementImpl*>(iFrame.handle())->contentPart(); TDEHTMLPart* part = static_cast<DOM::HTMLIFrameElementImpl*>(iFrame.handle())->contentPart();
if (part) { if (part) {
Window *w = Window::retrieveWindow(part); Window *w = Window::retrieveWindow(part);
if (w) if (w)
@ -2123,14 +2123,14 @@ Value KJS::HTMLElementFunction::tryCall(ExecState *exec, Object &thisObj, const
DOM::HTMLDocument doc = element.ownerDocument(); DOM::HTMLDocument doc = element.ownerDocument();
KHTMLView *view = static_cast<DOM::DocumentImpl*>(doc.handle())->view(); TDEHTMLView *view = static_cast<DOM::DocumentImpl*>(doc.handle())->view();
KHTMLSettings::KJSWindowOpenPolicy policy = KHTMLSettings::KJSWindowOpenAllow; TDEHTMLSettings::KJSWindowOpenPolicy policy = TDEHTMLSettings::KJSWindowOpenAllow;
if (view) if (view)
policy = view->part()->settings()->windowOpenPolicy(view->part()->url().host()); policy = view->part()->settings()->windowOpenPolicy(view->part()->url().host());
bool block = false; bool block = false;
if ( policy != KHTMLSettings::KJSWindowOpenAllow ) { if ( policy != TDEHTMLSettings::KJSWindowOpenAllow ) {
block = true; block = true;
// if this is a form without a target, or a special target, don't block // 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()) if (!view->part()->url().host().isEmpty())
caption = view->part()->url().host() + " - "; caption = view->part()->url().host() + " - ";
// search all (possibly nested) framesets // search all (possibly nested) framesets
KHTMLPart *currentPart = view->part()->parentPart(); TDEHTMLPart *currentPart = view->part()->parentPart();
while( currentPart != 0L ) { while( currentPart != 0L ) {
if( currentPart->frameExists( form.target().string() ) ) if( currentPart->frameExists( form.target().string() ) )
block = false; 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()) if (view && view->part())
emit view->part()->browserExtension()->requestFocus(view->part()); emit view->part()->browserExtension()->requestFocus(view->part());
caption += i18n( "Confirmation: JavaScript Popup" ); 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 ) caption, i18n("Allow"), i18n("Do Not Allow") ) == KMessageBox::Yes )
block = false; block = false;
} else if ( block && policy == KHTMLSettings::KJSWindowOpenSmart ) { } else if ( block && policy == TDEHTMLSettings::KJSWindowOpenSmart ) {
if( static_cast<KJS::ScriptInterpreter *>(exec->interpreter())->isWindowOpenAllowed() ) { if( static_cast<KJS::ScriptInterpreter *>(exec->interpreter())->isWindowOpenAllowed() ) {
// This submission has been triggered by the user // This submission has been triggered by the user
block = false; block = false;

@ -40,7 +40,7 @@ const ClassInfo MozillaSidebarExtension::info = { "sidebar", 0, &MozillaSidebarE
} }
IMPLEMENT_PROTOFUNC_DOM(MozillaSidebarExtensionFunc) IMPLEMENT_PROTOFUNC_DOM(MozillaSidebarExtensionFunc)
MozillaSidebarExtension::MozillaSidebarExtension(ExecState *exec, KHTMLPart *p) MozillaSidebarExtension::MozillaSidebarExtension(ExecState *exec, TDEHTMLPart *p)
: ObjectImp(exec->interpreter()->builtinObjectPrototype()), m_part(p) { } : ObjectImp(exec->interpreter()->builtinObjectPrototype()), m_part(p) { }
Value MozillaSidebarExtension::get(ExecState *exec, const Identifier &propertyName) const 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 ); KJS_CHECK_THIS( KJS::MozillaSidebarExtension, thisObj );
MozillaSidebarExtension *mse = static_cast<MozillaSidebarExtension*>(thisObj.imp()); MozillaSidebarExtension *mse = static_cast<MozillaSidebarExtension*>(thisObj.imp());
KHTMLPart *part = mse->part(); TDEHTMLPart *part = mse->part();
if (!part) if (!part)
return Undefined(); return Undefined();

@ -23,21 +23,21 @@
#include <kjs/object.h> #include <kjs/object.h>
class KHTMLPart; class TDEHTMLPart;
namespace KJS { namespace KJS {
class MozillaSidebarExtension : public ObjectImp { class MozillaSidebarExtension : public ObjectImp {
public: public:
MozillaSidebarExtension(ExecState *exec, KHTMLPart *p); MozillaSidebarExtension(ExecState *exec, TDEHTMLPart *p);
virtual Value get(ExecState *exec, const Identifier &propertyName) const; virtual Value get(ExecState *exec, const Identifier &propertyName) const;
Value getValueProperty(ExecState *exec, int token) const; Value getValueProperty(ExecState *exec, int token) const;
virtual const ClassInfo* classInfo() const { return &info; } virtual const ClassInfo* classInfo() const { return &info; }
static const ClassInfo info; static const ClassInfo info;
enum { addPanel }; enum { addPanel };
KHTMLPart *part() const { return m_part; } TDEHTMLPart *part() const { return m_part; }
private: private:
KHTMLPart *m_part; TDEHTMLPart *m_part;
}; };
} // namespace } // namespace

@ -165,7 +165,7 @@ const ClassInfo Navigator::info = { "Navigator", 0, &NavigatorTable, 0 };
*/ */
IMPLEMENT_PROTOFUNC_DOM(NavigatorFunc) IMPLEMENT_PROTOFUNC_DOM(NavigatorFunc)
Navigator::Navigator(ExecState *exec, KHTMLPart *p) Navigator::Navigator(ExecState *exec, TDEHTMLPart *p)
: ObjectImp(exec->interpreter()->builtinObjectPrototype()), m_part(p) { } : ObjectImp(exec->interpreter()->builtinObjectPrototype()), m_part(p) { }
Value Navigator::get(ExecState *exec, const Identifier &propertyName) const Value Navigator::get(ExecState *exec, const Identifier &propertyName) const

@ -23,13 +23,13 @@
#include <kjs/object.h> #include <kjs/object.h>
class KHTMLPart; class TDEHTMLPart;
namespace KJS { namespace KJS {
class Navigator : public ObjectImp { class Navigator : public ObjectImp {
public: public:
Navigator(ExecState *exec, KHTMLPart *p); Navigator(ExecState *exec, TDEHTMLPart *p);
virtual Value get(ExecState *exec, const Identifier &propertyName) const; virtual Value get(ExecState *exec, const Identifier &propertyName) const;
Value getValueProperty(ExecState *exec, int token) const; Value getValueProperty(ExecState *exec, int token) const;
virtual const ClassInfo* classInfo() const { return &info; } virtual const ClassInfo* classInfo() const { return &info; }
@ -37,9 +37,9 @@ namespace KJS {
enum { AppCodeName, AppName, AppVersion, Language, UserAgent, UserLanguage, Platform, enum { AppCodeName, AppName, AppVersion, Language, UserAgent, UserLanguage, Platform,
_Plugins, _MimeTypes, Product, ProductSub, Vendor, CookieEnabled, JavaEnabled, _Plugins, _MimeTypes, Product, ProductSub, Vendor, CookieEnabled, JavaEnabled,
BrowserLanguage, CpuClass }; BrowserLanguage, CpuClass };
KHTMLPart *part() const { return m_part; } TDEHTMLPart *part() const { return m_part; }
private: private:
KHTMLPart *m_part; TDEHTMLPart *m_part;
}; };
// Hashtable enums // Hashtable enums

@ -355,7 +355,7 @@ void KJSProxyImpl::applyUserAgent()
// If we find "Mozilla" but not "(compatible, ...)" we are a real Netscape // If we find "Mozilla" but not "(compatible, ...)" we are a real Netscape
if (userAgent.find(TQString::fromLatin1("Mozilla")) >= 0 && if (userAgent.find(TQString::fromLatin1("Mozilla")) >= 0 &&
userAgent.find(TQString::fromLatin1("compatible")) == -1 && userAgent.find(TQString::fromLatin1("compatible")) == -1 &&
userAgent.find(TQString::fromLatin1("KHTML")) == -1) userAgent.find(TQString::fromLatin1("TDEHTML")) == -1)
{ {
m_script->setCompatMode(Interpreter::NetscapeCompat); m_script->setCompatMode(Interpreter::NetscapeCompat);
#ifdef KJS_VERBOSE #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 // Helper method, so that all classes which need jScript() don't need to be added
// as friend to KHTMLPart // as friend to TDEHTMLPart
KJSProxy * KJSProxy::proxy( KHTMLPart *part ) KJSProxy * KJSProxy::proxy( TDEHTMLPart *part )
{ {
return part->jScript(); return part->jScript();
} }
@ -402,7 +402,7 @@ void KJSCPUGuard::stop()
bool KJSCPUGuard::confirmTerminate() { bool KJSCPUGuard::confirmTerminate() {
kdDebug(6070) << "alarmhandler" << endl; 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) { void KJSCPUGuard::alarmHandler(int) {

@ -26,7 +26,7 @@
#include <tqstring.h> #include <tqstring.h>
#include <sys/time.h> #include <sys/time.h>
class KHTMLPart; class TDEHTMLPart;
namespace DOM { namespace DOM {
class Node; class Node;
@ -72,8 +72,8 @@ public:
tdehtml::ChildFrame *m_frame; tdehtml::ChildFrame *m_frame;
int m_handlerLineno; int m_handlerLineno;
// Helper method, to access the private KHTMLPart::jScript() // Helper method, to access the private TDEHTMLPart::jScript()
static KJSProxy *proxy( KHTMLPart *part ); static KJSProxy *proxy( TDEHTMLPart *part );
}; };
class KJSCPUGuard { class KJSCPUGuard {

@ -302,11 +302,11 @@ JSNodeFilter::~JSNodeFilter()
short JSNodeFilter::acceptNode(const DOM::Node &n) 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) if (!view)
return DOM::NodeFilter::FILTER_REJECT; return DOM::NodeFilter::FILTER_REJECT;
KHTMLPart *part = view->part(); TDEHTMLPart *part = view->part();
KJSProxy *proxy = part->jScript(); KJSProxy *proxy = part->jScript();
if (proxy) { if (proxy) {
ExecState *exec = proxy->interpreter()->globalExec(); ExecState *exec = proxy->interpreter()->globalExec();

@ -77,7 +77,7 @@ namespace KJS {
class History : public ObjectImp { class History : public ObjectImp {
friend class HistoryFunc; friend class HistoryFunc;
public: public:
History(ExecState *exec, KHTMLPart *p) History(ExecState *exec, TDEHTMLPart *p)
: ObjectImp(exec->interpreter()->builtinObjectPrototype()), part(p) { } : ObjectImp(exec->interpreter()->builtinObjectPrototype()), part(p) { }
virtual Value get(ExecState *exec, const Identifier &propertyName) const; virtual Value get(ExecState *exec, const Identifier &propertyName) const;
Value getValueProperty(ExecState *exec, int token) const; Value getValueProperty(ExecState *exec, int token) const;
@ -85,31 +85,31 @@ namespace KJS {
static const ClassInfo info; static const ClassInfo info;
enum { Back, Forward, Go, Length }; enum { Back, Forward, Go, Length };
private: private:
TQGuardedPtr<KHTMLPart> part; TQGuardedPtr<TDEHTMLPart> part;
}; };
class External : public ObjectImp { class External : public ObjectImp {
friend class ExternalFunc; friend class ExternalFunc;
public: public:
External(ExecState *exec, KHTMLPart *p) External(ExecState *exec, TDEHTMLPart *p)
: ObjectImp(exec->interpreter()->builtinObjectPrototype()), part(p) { } : ObjectImp(exec->interpreter()->builtinObjectPrototype()), part(p) { }
virtual Value get(ExecState *exec, const Identifier &propertyName) const; virtual Value get(ExecState *exec, const Identifier &propertyName) const;
virtual const ClassInfo* classInfo() const { return &info; } virtual const ClassInfo* classInfo() const { return &info; }
static const ClassInfo info; static const ClassInfo info;
enum { AddFavorite }; enum { AddFavorite };
private: private:
TQGuardedPtr<KHTMLPart> part; TQGuardedPtr<TDEHTMLPart> part;
}; };
class FrameArray : public ObjectImp { class FrameArray : public ObjectImp {
public: public:
FrameArray(ExecState *exec, KHTMLPart *p) FrameArray(ExecState *exec, TDEHTMLPart *p)
: ObjectImp(exec->interpreter()->builtinObjectPrototype()), part(p) { } : ObjectImp(exec->interpreter()->builtinObjectPrototype()), part(p) { }
virtual Value get(ExecState *exec, const Identifier &propertyName) const; virtual Value get(ExecState *exec, const Identifier &propertyName) const;
virtual Value call(ExecState *exec, Object &thisObj, const List &args); virtual Value call(ExecState *exec, Object &thisObj, const List &args);
virtual bool implementsCall() const { return true; } virtual bool implementsCall() const { return true; }
private: private:
TQGuardedPtr<KHTMLPart> part; TQGuardedPtr<TDEHTMLPart> part;
}; };
#ifdef Q_WS_QWS #ifdef Q_WS_QWS
@ -421,7 +421,7 @@ Window *Window::retrieveWindow(KParts::ReadOnlyPart *p)
Object obj = Object::dynamicCast( retrieve( p ) ); Object obj = Object::dynamicCast( retrieve( p ) );
#ifndef NDEBUG #ifndef NDEBUG
// obj should never be null, except when javascript has been disabled in that part. // 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() ) if ( part && part->jScriptEnabled() )
{ {
assert( obj.isValid() ); assert( obj.isValid() );
@ -448,10 +448,10 @@ Window *Window::retrieveActive(ExecState *exec)
Value Window::retrieve(KParts::ReadOnlyPart *p) Value Window::retrieve(KParts::ReadOnlyPart *p)
{ {
assert(p); assert(p);
KHTMLPart * part = ::tqqt_cast<KHTMLPart *>(p); TDEHTMLPart * part = ::tqqt_cast<TDEHTMLPart *>(p);
KJSProxy *proxy = 0L; KJSProxy *proxy = 0L;
if (!part) { if (!part) {
part = ::tqqt_cast<KHTMLPart *>(p->parent()); part = ::tqqt_cast<TDEHTMLPart *>(p->parent());
if (part) if (part)
proxy = part->framejScript(p); proxy = part->framejScript(p);
} else } else
@ -478,7 +478,7 @@ Location *Window::location() const
ObjectImp* Window::frames( ExecState* exec ) 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) if (part)
return m_frames ? m_frames : return m_frames ? m_frames :
(const_cast<Window*>(this)->m_frames = new FrameArray(exec, part)); (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)) if (Lookup::findEntry(&WindowTable, p))
return true; return true;
KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(m_frame->m_part); TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part);
if (!part) if (!part)
return false; return false;
@ -585,7 +585,7 @@ Value Window::get(ExecState *exec, const Identifier &p) const
} }
const HashEntry* entry = Lookup::findEntry(&WindowTable, p); 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 // properties that work on all windows
if (entry) { if (entry) {
@ -604,7 +604,7 @@ Value Window::get(ExecState *exec, const Identifier &p) const
} }
if (!part) if (!part)
return Undefined(); return Undefined();
// KHTMLPart next // TDEHTMLPart next
switch(entry->value) { switch(entry->value) {
case Frames: case Frames:
return Value(frames(exec)); return Value(frames(exec));
@ -614,9 +614,9 @@ Value Window::get(ExecState *exec, const Identifier &p) const
else // doesn't work yet else // doesn't work yet
return retrieve(part->opener()); return retrieve(part->opener());
case Parent: case Parent:
return retrieve(part->parentPart() ? part->parentPart() : (KHTMLPart*)part); return retrieve(part->parentPart() ? part->parentPart() : (TDEHTMLPart*)part);
case Top: { case Top: {
KHTMLPart *p = part; TDEHTMLPart *p = part;
while (p->parentPart()) while (p->parentPart())
p = p->parentPart(); p = p->parentPart();
return retrieve(p); return retrieve(p);
@ -638,7 +638,7 @@ Value Window::get(ExecState *exec, const Identifier &p) const
break; break;
} }
} else if (!part) { } else if (!part) {
// not a KHTMLPart // not a TDEHTMLPart
TQString rvalue; TQString rvalue;
KParts::LiveConnectExtension::Type rtype; KParts::LiveConnectExtension::Type rtype;
unsigned long robjid; unsigned long robjid;
@ -948,11 +948,11 @@ Value Window::get(ExecState *exec, const Identifier &p) const
case Onchange: case Onchange:
return getListener(exec,DOM::EventImpl::CHANGE_EVENT); return getListener(exec,DOM::EventImpl::CHANGE_EVENT);
case Onclick: case Onclick:
return getListener(exec,DOM::EventImpl::KHTML_ECMA_CLICK_EVENT); return getListener(exec,DOM::EventImpl::TDEHTML_ECMA_CLICK_EVENT);
case Ondblclick: case Ondblclick:
return getListener(exec,DOM::EventImpl::KHTML_ECMA_DBLCLICK_EVENT); return getListener(exec,DOM::EventImpl::TDEHTML_ECMA_DBLCLICK_EVENT);
case Ondragdrop: case Ondragdrop:
return getListener(exec,DOM::EventImpl::KHTML_DRAGDROP_EVENT); return getListener(exec,DOM::EventImpl::TDEHTML_DRAGDROP_EVENT);
case Onerror: case Onerror:
return getListener(exec,DOM::EventImpl::ERROR_EVENT); return getListener(exec,DOM::EventImpl::ERROR_EVENT);
case Onfocus: case Onfocus:
@ -976,7 +976,7 @@ Value Window::get(ExecState *exec, const Identifier &p) const
case Onmouseup: case Onmouseup:
return getListener(exec,DOM::EventImpl::MOUSEUP_EVENT); return getListener(exec,DOM::EventImpl::MOUSEUP_EVENT);
case Onmove: case Onmove:
return getListener(exec,DOM::EventImpl::KHTML_MOVE_EVENT); return getListener(exec,DOM::EventImpl::TDEHTML_MOVE_EVENT);
case Onreset: case Onreset:
return getListener(exec,DOM::EventImpl::RESET_EVENT); return getListener(exec,DOM::EventImpl::RESET_EVENT);
case Onresize: case Onresize:
@ -1085,12 +1085,12 @@ void Window::put(ExecState* exec, const Identifier &propertyName, const Value &v
default: default:
break; break;
} }
KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(m_frame->m_part); TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part);
if (part) { if (part) {
switch( entry->value ) { switch( entry->value ) {
case Status: { case Status: {
if (isSafeScript(exec) && part->settings()->windowStatusPolicy(part->url().host()) if (isSafeScript(exec) && part->settings()->windowStatusPolicy(part->url().host())
== KHTMLSettings::KJSWindowStatusAllow) { == TDEHTMLSettings::KJSWindowStatusAllow) {
String s = value.toString(exec); String s = value.toString(exec);
part->setJSStatusBarText(s.value().qstring()); part->setJSStatusBarText(s.value().qstring());
} }
@ -1098,7 +1098,7 @@ void Window::put(ExecState* exec, const Identifier &propertyName, const Value &v
} }
case DefaultStatus: { case DefaultStatus: {
if (isSafeScript(exec) && part->settings()->windowStatusPolicy(part->url().host()) if (isSafeScript(exec) && part->settings()->windowStatusPolicy(part->url().host())
== KHTMLSettings::KJSWindowStatusAllow) { == TDEHTMLSettings::KJSWindowStatusAllow) {
String s = value.toString(exec); String s = value.toString(exec);
part->setJSDefaultStatusBarText(s.value().qstring()); part->setJSDefaultStatusBarText(s.value().qstring());
} }
@ -1118,15 +1118,15 @@ void Window::put(ExecState* exec, const Identifier &propertyName, const Value &v
return; return;
case Onclick: case Onclick:
if (isSafeScript(exec)) if (isSafeScript(exec))
setListener(exec,DOM::EventImpl::KHTML_ECMA_CLICK_EVENT,value); setListener(exec,DOM::EventImpl::TDEHTML_ECMA_CLICK_EVENT,value);
return; return;
case Ondblclick: case Ondblclick:
if (isSafeScript(exec)) if (isSafeScript(exec))
setListener(exec,DOM::EventImpl::KHTML_ECMA_DBLCLICK_EVENT,value); setListener(exec,DOM::EventImpl::TDEHTML_ECMA_DBLCLICK_EVENT,value);
return; return;
case Ondragdrop: case Ondragdrop:
if (isSafeScript(exec)) if (isSafeScript(exec))
setListener(exec,DOM::EventImpl::KHTML_DRAGDROP_EVENT,value); setListener(exec,DOM::EventImpl::TDEHTML_DRAGDROP_EVENT,value);
return; return;
case Onerror: case Onerror:
if (isSafeScript(exec)) if (isSafeScript(exec))
@ -1174,7 +1174,7 @@ void Window::put(ExecState* exec, const Identifier &propertyName, const Value &v
return; return;
case Onmove: case Onmove:
if (isSafeScript(exec)) if (isSafeScript(exec))
setListener(exec,DOM::EventImpl::KHTML_MOVE_EVENT,value); setListener(exec,DOM::EventImpl::TDEHTML_MOVE_EVENT,value);
return; return;
case Onreset: case Onreset:
if (isSafeScript(exec)) if (isSafeScript(exec))
@ -1222,7 +1222,7 @@ bool Window::toBoolean(ExecState *) const
DOM::AbstractView Window::toAbstractView() 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) if (!part)
return DOM::AbstractView(); return DOM::AbstractView();
return part->document().defaultView(); return part->document().defaultView();
@ -1240,9 +1240,9 @@ void Window::closeNow()
if (m_frame.isNull() || m_frame->m_part.isNull()) { if (m_frame.isNull() || m_frame->m_part.isNull()) {
kdDebug(6070) << k_funcinfo << "part is deleted already" << endl; kdDebug(6070) << k_funcinfo << "part is deleted already" << endl;
} else { } else {
KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(m_frame->m_part); TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part);
if (!part) { if (!part) {
kdDebug(6070) << "closeNow on non KHTML part" << endl; kdDebug(6070) << "closeNow on non TDEHTML part" << endl;
} else { } else {
//kdDebug(6070) << k_funcinfo << " -> closing window" << endl; //kdDebug(6070) << k_funcinfo << " -> closing window" << endl;
// We want to make sure that window.open won't find this part by name. // 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. if ( activePart == m_frame->m_part ) // Not calling from another frame, no problem.
return true; return true;
KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(m_frame->m_part); TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part);
if (!part) if (!part)
return true; // not a KHTMLPart return true; // not a TDEHTMLPart
if ( part->document().isNull() ) if ( part->document().isNull() )
return true; // allow to access a window that was just created (e.g. with window.open("about:blank")) 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; return false;
} }
KHTMLPart *activeKHTMLPart = ::tqqt_cast<KHTMLPart *>(activePart); TDEHTMLPart *activeTDEHTMLPart = ::tqqt_cast<TDEHTMLPart *>(activePart);
if (!activeKHTMLPart) if (!activeTDEHTMLPart)
return true; // not a KHTMLPart return true; // not a TDEHTMLPart
DOM::HTMLDocument actDocument = activeKHTMLPart->htmlDocument(); DOM::HTMLDocument actDocument = activeTDEHTMLPart->htmlDocument();
if ( actDocument.isNull() ) { if ( actDocument.isNull() ) {
kdDebug(6070) << "Window::isSafeScript: active part has no document!" << endl; kdDebug(6070) << "Window::isSafeScript: active part has no document!" << endl;
return false; return false;
@ -1327,7 +1327,7 @@ bool Window::checkIsSafeScript(KParts::ReadOnlyPart *activePart) const
void Window::setListener(ExecState *exec, int eventId, Value func) 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)) if (!part || !isSafeScript(exec))
return; return;
DOM::DocumentImpl *doc = static_cast<DOM::DocumentImpl*>(part->htmlDocument().handle()); 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 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)) if (!part || !isSafeScript(exec))
return Undefined(); return Undefined();
DOM::DocumentImpl *doc = static_cast<DOM::DocumentImpl*>(part->htmlDocument().handle()); 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) JSEventListener *Window::getJSEventListener(const Value& val, bool html)
{ {
// This function is so hot that it's worth coding it directly with imps. // 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) if (!part || val.type() != ObjectType)
return 0; return 0;
@ -1433,8 +1433,8 @@ void Window::setCurrentEvent( DOM::Event *evt )
void Window::goURL(ExecState* exec, const TQString& url, bool lockHistory) void Window::goURL(ExecState* exec, const TQString& url, bool lockHistory)
{ {
Window* active = Window::retrieveActive(exec); Window* active = Window::retrieveActive(exec);
KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(m_frame->m_part); TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part);
KHTMLPart *active_part = ::tqqt_cast<KHTMLPart *>(active->part()); TDEHTMLPart *active_part = ::tqqt_cast<TDEHTMLPart *>(active->part());
// Complete the URL using the "active part" (running interpreter) // Complete the URL using the "active part" (running interpreter)
if (active_part && part) { if (active_part && part) {
if (url[0] == TQChar('#')) { if (url[0] == TQChar('#')) {
@ -1470,7 +1470,7 @@ void Window::delayedGoHistory( int steps )
void Window::goHistory( 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) if(!part)
// TODO history readonlypart // TODO history readonlypart
return; return;
@ -1488,7 +1488,7 @@ void Window::goHistory( int steps )
void KJS::Window::resizeTo(TQWidget* tl, int width, int height) 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) if(!part)
// TODO resizeTo readonlypart // TODO resizeTo readonlypart
return; return;
@ -1531,10 +1531,10 @@ void KJS::Window::resizeTo(TQWidget* tl, int width, int height)
Value Window::openWindow(ExecState *exec, const List& args) 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) if (!part)
return Undefined(); return Undefined();
KHTMLView *widget = part->view(); TDEHTMLView *widget = part->view();
Value v = args[0]; Value v = args[0];
TQString str; TQString str;
if (v.isValid() && !v.isA(UndefinedType)) if (v.isValid() && !v.isA(UndefinedType))
@ -1544,7 +1544,7 @@ Value Window::openWindow(ExecState *exec, const List& args)
KURL url; KURL url;
if (!str.isEmpty()) 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 ) if ( p )
url = p->htmlDocument().completeURL(str).string(); url = p->htmlDocument().completeURL(str).string();
if ( !p || if ( !p ||
@ -1552,9 +1552,9 @@ Value Window::openWindow(ExecState *exec, const List& args)
return Undefined(); return Undefined();
} }
KHTMLSettings::KJSWindowOpenPolicy policy = TDEHTMLSettings::KJSWindowOpenPolicy policy =
part->settings()->windowOpenPolicy(part->url().host()); part->settings()->windowOpenPolicy(part->url().host());
if ( policy == KHTMLSettings::KJSWindowOpenAsk ) { if ( policy == TDEHTMLSettings::KJSWindowOpenAsk ) {
emit part->browserExtension()->requestFocus(part); emit part->browserExtension()->requestFocus(part);
TQString caption; TQString caption;
if (!part->url().host().isEmpty()) 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 />" 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)), "Do you want to allow this?</qt>").arg(KStringHandler::csqueeze(url.htmlURL(), 100)),
caption, i18n("Allow"), i18n("Do Not Allow") ) == KMessageBox::Yes ) caption, i18n("Allow"), i18n("Do Not Allow") ) == KMessageBox::Yes )
policy = KHTMLSettings::KJSWindowOpenAllow; policy = TDEHTMLSettings::KJSWindowOpenAllow;
} else if ( policy == KHTMLSettings::KJSWindowOpenSmart ) } else if ( policy == TDEHTMLSettings::KJSWindowOpenSmart )
{ {
// window.open disabled unless from a key/mouse event // window.open disabled unless from a key/mouse event
if (static_cast<ScriptInterpreter *>(exec->interpreter())->isWindowOpenAllowed()) 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"); 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); features = features.mid(1, features.length()-2);
} }
if ( policy != KHTMLSettings::KJSWindowOpenAllow ) { if ( policy != TDEHTMLSettings::KJSWindowOpenAllow ) {
if ( url.isEmpty() ) if ( url.isEmpty() )
part->setSuppressedPopupIndicator(true, 0); part->setSuppressedPopupIndicator(true, 0);
else { 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) Value Window::executeOpenWindow(ExecState *exec, const KURL& url, const TQString& frameName, const TQString& features)
{ {
KHTMLPart *p = ::tqqt_cast<KHTMLPart *>(m_frame->m_part); TDEHTMLPart *p = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part);
KHTMLView *widget = p->view(); TDEHTMLView *widget = p->view();
KParts::WindowArgs winargs; KParts::WindowArgs winargs;
// scan feature argument // 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) // request window (new or existing if framename is set)
KParts::ReadOnlyPart *newPart = 0L; KParts::ReadOnlyPart *newPart = 0L;
emit p->browserExtension()->createNewWindow(KURL(), uargs,winargs,newPart); emit p->browserExtension()->createNewWindow(KURL(), uargs,winargs,newPart);
if (newPart && ::tqqt_cast<KHTMLPart*>(newPart)) { if (newPart && ::tqqt_cast<TDEHTMLPart*>(newPart)) {
KHTMLPart *tdehtmlpart = static_cast<KHTMLPart*>(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); //tqDebug("opener set to %p (this Window's part) in new Window %p (this Window=%p)",part,win,window);
tdehtmlpart->setOpener(p); tdehtmlpart->setOpener(p);
tdehtmlpart->setOpenedByJS(true); tdehtmlpart->setOpenedByJS(true);
@ -1735,7 +1735,7 @@ void Window::forgetSuppressedWindows()
void Window::showSuppressedWindows() 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(); KJS::Interpreter *interpreter = part->jScript()->interpreter();
ExecState *exec = interpreter->globalExec(); 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()); Window *window = static_cast<Window *>(thisObj.imp());
TQString str, str2; 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) if (!part)
return Undefined(); return Undefined();
KHTMLView *widget = part->view(); TDEHTMLView *widget = part->view();
Value v = args[0]; Value v = args[0];
UString s; UString s;
if (v.isValid() && !v.isA(UndefinedType)) { 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*/); window->goURL(exec, args[0].toString(exec).qstring(), false /*don't lock history*/);
return Undefined(); return Undefined();
case Window::Focus: { case Window::Focus: {
KHTMLSettings::KJSWindowFocusPolicy policy = TDEHTMLSettings::KJSWindowFocusPolicy policy =
part->settings()->windowFocusPolicy(part->url().host()); part->settings()->windowFocusPolicy(part->url().host());
if(policy == KHTMLSettings::KJSWindowFocusAllow && widget) { if(policy == TDEHTMLSettings::KJSWindowFocusAllow && widget) {
widget->topLevelWidget()->raise(); widget->topLevelWidget()->raise();
KWin::deIconifyWindow( widget->topLevelWidget()->winId() ); KWin::deIconifyWindow( widget->topLevelWidget()->winId() );
widget->setActiveWindow(); 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)); widget->setContentsPos(args[0].toInt32(exec), args[1].toInt32(exec));
return Undefined(); return Undefined();
case Window::MoveBy: { case Window::MoveBy: {
KHTMLSettings::KJSWindowMovePolicy policy = TDEHTMLSettings::KJSWindowMovePolicy policy =
part->settings()->windowMovePolicy(part->url().host()); 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(); KParts::BrowserExtension *ext = part->browserExtension();
if (ext) { if (ext) {
@ -1964,9 +1964,9 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
return Undefined(); return Undefined();
} }
case Window::MoveTo: { case Window::MoveTo: {
KHTMLSettings::KJSWindowMovePolicy policy = TDEHTMLSettings::KJSWindowMovePolicy policy =
part->settings()->windowMovePolicy(part->url().host()); 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(); KParts::BrowserExtension *ext = part->browserExtension();
if (ext) { if (ext) {
@ -1984,9 +1984,9 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
return Undefined(); return Undefined();
} }
case Window::ResizeBy: { case Window::ResizeBy: {
KHTMLSettings::KJSWindowResizePolicy policy = TDEHTMLSettings::KJSWindowResizePolicy policy =
part->settings()->windowResizePolicy(part->url().host()); part->settings()->windowResizePolicy(part->url().host());
if(policy == KHTMLSettings::KJSWindowResizeAllow if(policy == TDEHTMLSettings::KJSWindowResizeAllow
&& args.size() == 2 && widget) && args.size() == 2 && widget)
{ {
TQWidget * tl = widget->topLevelWidget(); TQWidget * tl = widget->topLevelWidget();
@ -1998,9 +1998,9 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
return Undefined(); return Undefined();
} }
case Window::ResizeTo: { case Window::ResizeTo: {
KHTMLSettings::KJSWindowResizePolicy policy = TDEHTMLSettings::KJSWindowResizePolicy policy =
part->settings()->windowResizePolicy(part->url().host()); part->settings()->windowResizePolicy(part->url().host());
if(policy == KHTMLSettings::KJSWindowResizeAllow if(policy == TDEHTMLSettings::KJSWindowResizeAllow
&& args.size() == 2 && widget) && args.size() == 2 && widget)
{ {
TQWidget * tl = widget->topLevelWidget(); TQWidget * tl = widget->topLevelWidget();
@ -2114,7 +2114,7 @@ ScheduledAction::ScheduledAction(TQString _code, DateTimeMS _nextTime, int _inte
bool ScheduledAction::execute(Window *window) 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()) if (!part || !part->jScriptEnabled())
return false; return false;
ScriptInterpreter *interpreter = static_cast<ScriptInterpreter *>(part->jScript()->interpreter()); 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) {
if (node->id() == ID_FRAME || node->id() == ID_IFRAME) { if (node->id() == ID_FRAME || node->id() == ID_IFRAME) {
//Return the Window object. //Return the Window object.
KHTMLPart* part = static_cast<DOM::HTMLFrameElementImpl*>(node)->contentPart(); TDEHTMLPart* part = static_cast<DOM::HTMLFrameElementImpl*>(node)->contentPart();
if (part) if (part)
return Value(Window::retrieveWindow(part)); return Value(Window::retrieveWindow(part));
else else
@ -2590,7 +2590,7 @@ void Location::put(ExecState *exec, const Identifier &p, const Value &v, int att
TQString str = v.toString(exec).qstring(); TQString str = v.toString(exec).qstring();
switch (entry->value) { switch (entry->value) {
case Href: { case Href: {
KHTMLPart* p =::tqqt_cast<KHTMLPart*>(Window::retrieveActive(exec)->part()); TDEHTMLPart* p =::tqqt_cast<TDEHTMLPart*>(Window::retrieveActive(exec)->part());
if ( p ) if ( p )
url = p->htmlDocument().completeURL( str ).string(); url = p->htmlDocument().completeURL( str ).string();
else else
@ -2681,7 +2681,7 @@ Value LocationFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
id == Location::Replace); id == Location::Replace);
break; break;
case Location::Reload: { case Location::Reload: {
KHTMLPart *tdehtmlpart = ::tqqt_cast<KHTMLPart *>(part); TDEHTMLPart *tdehtmlpart = ::tqqt_cast<TDEHTMLPart *>(part);
if (tdehtmlpart) if (tdehtmlpart)
tdehtmlpart->scheduleRedirection(-1, part->url().url(), true/*lock history*/); tdehtmlpart->scheduleRedirection(-1, part->url().url(), true/*lock history*/);
else else
@ -2714,11 +2714,11 @@ Value ExternalFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
KJS_CHECK_THIS( External, thisObj ); KJS_CHECK_THIS( External, thisObj );
External *external = static_cast<External *>(thisObj.imp()); External *external = static_cast<External *>(thisObj.imp());
KHTMLPart *part = external->part; TDEHTMLPart *part = external->part;
if (!part) if (!part)
return Undefined(); return Undefined();
KHTMLView *widget = part->view(); TDEHTMLView *widget = part->view();
switch (id) { switch (id) {
case External::AddFavorite: case External::AddFavorite:

@ -32,8 +32,8 @@
#include "kjs_views.h" #include "kjs_views.h"
class TQTimer; class TQTimer;
class KHTMLView; class TDEHTMLView;
class KHTMLPart; class TDEHTMLPart;
namespace KParts { namespace KParts {
class ReadOnlyPart; class ReadOnlyPart;
@ -64,13 +64,13 @@ namespace KJS {
virtual Value get(ExecState *exec, const Identifier &propertyName) const; virtual Value get(ExecState *exec, const Identifier &propertyName) const;
Value getValueProperty(ExecState *exec, int token) const; Value getValueProperty(ExecState *exec, int token) const;
private: private:
KHTMLView *view; TDEHTMLView *view;
virtual const ClassInfo* classInfo() const { return &info; } virtual const ClassInfo* classInfo() const { return &info; }
static const ClassInfo info; static const ClassInfo info;
}; };
class KDE_EXPORT Window : public ObjectImp { class KDE_EXPORT Window : public ObjectImp {
friend TQGuardedPtr<KHTMLPart> getInstance(); friend TQGuardedPtr<TDEHTMLPart> getInstance();
friend class Location; friend class Location;
friend class WindowFunc; friend class WindowFunc;
friend class WindowQObject; friend class WindowQObject;
@ -293,14 +293,14 @@ namespace KJS {
class Konqueror : public ObjectImp { class Konqueror : public ObjectImp {
friend class KonquerorFunc; friend class KonquerorFunc;
public: public:
Konqueror(KHTMLPart *p) : part(p) { } Konqueror(TDEHTMLPart *p) : part(p) { }
virtual Value get(ExecState *exec, const Identifier &propertyName) const; virtual Value get(ExecState *exec, const Identifier &propertyName) const;
virtual bool hasProperty(ExecState *exec, const Identifier &p) const; virtual bool hasProperty(ExecState *exec, const Identifier &p) const;
virtual UString toString(ExecState *exec) const; virtual UString toString(ExecState *exec) const;
virtual const ClassInfo* classInfo() const { return &info; } virtual const ClassInfo* classInfo() const { return &info; }
static const ClassInfo info; static const ClassInfo info;
private: private:
KHTMLPart *part; TDEHTMLPart *part;
}; };
#endif #endif

@ -19,7 +19,7 @@
/** /**
* An interactive interpreter to test the ECMA Script language bindings * 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 * The 'document' property is preset to an instance of Document and serves
* as an entrypoint. * as an entrypoint.
* *

@ -725,7 +725,7 @@ Value XMLHttpRequestProtoFunc::tryCall(ExecState *exec, Object &thisObj, const L
} }
TQString method = args[0].toString(exec).qstring(); 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) if (!part)
return Undefined(); return Undefined();
KURL url = KURL(part->document().completeURL(args[1].toString(exec).qstring()).string()); KURL url = KURL(part->document().completeURL(args[1].toString(exec).qstring()).string());

@ -85,7 +85,7 @@ void HTMLBodyElementImpl::parseAttribute(AttributeImpl *attr)
break; break;
} }
case ATTR_MARGINWIDTH: { case ATTR_MARGINWIDTH: {
KHTMLView* w = getDocument()->view(); TDEHTMLView* w = getDocument()->view();
if (w) if (w)
w->setMarginWidth( -1 ); // unset this, so it doesn't override the setting here w->setMarginWidth( -1 ); // unset this, so it doesn't override the setting here
addCSSLength(CSS_PROP_MARGIN_RIGHT, attr->value() ); addCSSLength(CSS_PROP_MARGIN_RIGHT, attr->value() );
@ -95,7 +95,7 @@ void HTMLBodyElementImpl::parseAttribute(AttributeImpl *attr)
addCSSLength(CSS_PROP_MARGIN_LEFT, attr->value() ); addCSSLength(CSS_PROP_MARGIN_LEFT, attr->value() );
break; break;
case ATTR_MARGINHEIGHT: { case ATTR_MARGINHEIGHT: {
KHTMLView* w = getDocument()->view(); TDEHTMLView* w = getDocument()->view();
if (w) if (w)
w->setMarginHeight( -1 ); // unset this, so it doesn't override the setting here w->setMarginHeight( -1 ); // unset this, so it doesn't override the setting here
addCSSLength(CSS_PROP_MARGIN_BOTTOM, attr->value()); addCSSLength(CSS_PROP_MARGIN_BOTTOM, attr->value());
@ -185,7 +185,7 @@ void HTMLBodyElementImpl::insertedIntoDocument()
{ {
HTMLElementImpl::insertedIntoDocument(); HTMLElementImpl::insertedIntoDocument();
KHTMLView* w = getDocument()->view(); TDEHTMLView* w = getDocument()->view();
if(w && w->marginWidth() != -1) { if(w && w->marginWidth() != -1) {
TQString s; TQString s;
s.sprintf( "%d", w->marginWidth() ); s.sprintf( "%d", w->marginWidth() );
@ -351,7 +351,7 @@ void HTMLFrameElementImpl::attach()
if (!m_render) if (!m_render)
return; return;
KHTMLView* w = getDocument()->view(); TDEHTMLView* w = getDocument()->view();
if (w) { if (w) {
// we need a unique name for every frame in the frameset. Hope that's unique enough. // we need a unique name for every frame in the frameset. Hope that's unique enough.
if(name.isEmpty() || w->part()->frameExists( name.string() ) ) if(name.isEmpty() || w->part()->frameExists( name.string() ) )
@ -380,9 +380,9 @@ void HTMLFrameElementImpl::setLocation( const DOMString& str )
return; return;
// load the frame contents // load the frame contents
KHTMLView *w = getDocument()->view(); TDEHTMLView *w = getDocument()->view();
if (w) { if (w) {
KHTMLPart *part = w->part()->findFrame( name.string() ); TDEHTMLPart *part = w->part()->findFrame( name.string() );
if ( part ) { if ( part ) {
part->openURL( KURL( getDocument()->completeURL( url.string() ) ) ); part->openURL( KURL( getDocument()->completeURL( url.string() ) ) );
} else { } else {
@ -414,20 +414,20 @@ DocumentImpl* HTMLFrameElementImpl::contentDocument() const
RenderPart* render = static_cast<RenderPart*>( m_render ); RenderPart* render = static_cast<RenderPart*>( m_render );
if(render->widget() && ::tqqt_cast<KHTMLView*>( render->widget()) ) if(render->widget() && ::tqqt_cast<TDEHTMLView*>( render->widget()) )
return static_cast<KHTMLView*>( render->widget() )->part()->xmlDocImpl(); return static_cast<TDEHTMLView*>( render->widget() )->part()->xmlDocImpl();
return 0; return 0;
} }
KHTMLPart* HTMLFrameElementImpl::contentPart() const TDEHTMLPart* HTMLFrameElementImpl::contentPart() const
{ {
if ( !m_render ) return 0; if ( !m_render ) return 0;
RenderPart* render = static_cast<RenderPart*>( m_render ); RenderPart* render = static_cast<RenderPart*>( m_render );
if(render->widget() && ::tqqt_cast<KHTMLView*>( render->widget()) ) if(render->widget() && ::tqqt_cast<TDEHTMLView*>( render->widget()) )
return static_cast<KHTMLView*>( render->widget() )->part(); return static_cast<TDEHTMLView*>( render->widget() )->part();
return 0; return 0;
} }
@ -688,7 +688,7 @@ void HTMLIFrameElementImpl::attach()
if (m_render) { if (m_render) {
// we need a unique name for every frame in the frameset. Hope that's unique enough. // 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() ))) if(w && (name.isEmpty() || w->part()->frameExists( name.string() )))
name = DOMString(w->part()->requestFrameName()); name = DOMString(w->part()->requestFrameName());

@ -33,8 +33,8 @@
#include <tqscrollview.h> #include <tqscrollview.h>
class KHTMLView; class TDEHTMLView;
class KHTMLPart; class TDEHTMLPart;
namespace tdehtml { namespace tdehtml {
class RenderFrameSet; class RenderFrameSet;
@ -96,7 +96,7 @@ public:
virtual void setFocus(bool); virtual void setFocus(bool);
DocumentImpl* contentDocument() const; DocumentImpl* contentDocument() const;
KHTMLPart* contentPart() const; TDEHTMLPart* contentPart() const;
DOMString url; DOMString url;
DOMString name; DOMString name;

@ -45,11 +45,11 @@ void HTMLDivElementImpl::parseAttribute(AttributeImpl *attr)
{ {
DOMString v = attr->value().lower(); DOMString v = attr->value().lower();
if ( strcmp( v, "middle" ) == 0 || strcmp( v, "center" ) == 0 ) 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) 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) 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 else
addCSSProperty(CSS_PROP_TEXT_ALIGN, v); addCSSProperty(CSS_PROP_TEXT_ALIGN, v);
break; break;
@ -214,37 +214,37 @@ void HTMLMarqueeElementImpl::parseAttribute(AttributeImpl *attr)
break; break;
case ATTR_SCROLLAMOUNT: case ATTR_SCROLLAMOUNT:
if (!attr->value().isEmpty()) if (!attr->value().isEmpty())
addCSSLength(CSS_PROP__KHTML_MARQUEE_INCREMENT, attr->value()); addCSSLength(CSS_PROP__TDEHTML_MARQUEE_INCREMENT, attr->value());
else else
removeCSSProperty(CSS_PROP__KHTML_MARQUEE_INCREMENT); removeCSSProperty(CSS_PROP__TDEHTML_MARQUEE_INCREMENT);
break; break;
case ATTR_SCROLLDELAY: case ATTR_SCROLLDELAY:
if (!attr->value().isEmpty()) if (!attr->value().isEmpty())
addCSSLength(CSS_PROP__KHTML_MARQUEE_SPEED, attr->value(), true); addCSSLength(CSS_PROP__TDEHTML_MARQUEE_SPEED, attr->value(), true);
else else
removeCSSProperty(CSS_PROP__KHTML_MARQUEE_SPEED); removeCSSProperty(CSS_PROP__TDEHTML_MARQUEE_SPEED);
break; break;
case ATTR_LOOP: case ATTR_LOOP:
if (!attr->value().isEmpty()) { if (!attr->value().isEmpty()) {
if (attr->value() == "-1" || strcasecmp(attr->value(), "infinite") == 0) 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 else
addCSSLength(CSS_PROP__KHTML_MARQUEE_REPETITION, attr->value().lower(), true); addCSSLength(CSS_PROP__TDEHTML_MARQUEE_REPETITION, attr->value().lower(), true);
} }
else else
removeCSSProperty(CSS_PROP__KHTML_MARQUEE_REPETITION); removeCSSProperty(CSS_PROP__TDEHTML_MARQUEE_REPETITION);
break; break;
case ATTR_BEHAVIOR: case ATTR_BEHAVIOR:
if (!attr->value().isEmpty()) if (!attr->value().isEmpty())
addCSSProperty(CSS_PROP__KHTML_MARQUEE_STYLE, attr->value().lower()); addCSSProperty(CSS_PROP__TDEHTML_MARQUEE_STYLE, attr->value().lower());
else else
removeCSSProperty(CSS_PROP__KHTML_MARQUEE_STYLE); removeCSSProperty(CSS_PROP__TDEHTML_MARQUEE_STYLE);
break; break;
case ATTR_DIRECTION: case ATTR_DIRECTION:
if (!attr->value().isEmpty()) if (!attr->value().isEmpty())
addCSSProperty(CSS_PROP__KHTML_MARQUEE_DIRECTION, attr->value().lower()); addCSSProperty(CSS_PROP__TDEHTML_MARQUEE_DIRECTION, attr->value().lower());
else else
removeCSSProperty(CSS_PROP__KHTML_MARQUEE_DIRECTION); removeCSSProperty(CSS_PROP__TDEHTML_MARQUEE_DIRECTION);
break; break;
case ATTR_TRUESPEED: case ATTR_TRUESPEED:
m_minimumDelay = attr->val() ? 0 : defaultMinimumDelay; m_minimumDelay = attr->val() ? 0 : defaultMinimumDelay;

@ -69,7 +69,7 @@ using namespace DOM;
using namespace tdehtml; using namespace tdehtml;
HTMLDocumentImpl::HTMLDocumentImpl(DOMImplementationImpl *_implementation, KHTMLView *v) HTMLDocumentImpl::HTMLDocumentImpl(DOMImplementationImpl *_implementation, TDEHTMLView *v)
: DocumentImpl(_implementation, v) : DocumentImpl(_implementation, v)
{ {
// kdDebug( 6090 ) << "HTMLDocumentImpl constructor this = " << this << endl; // kdDebug( 6090 ) << "HTMLDocumentImpl constructor this = " << this << endl;
@ -78,12 +78,12 @@ HTMLDocumentImpl::HTMLDocumentImpl(DOMImplementationImpl *_implementation, KHTML
m_doAutoFill = false; m_doAutoFill = false;
/* dynamic history stuff to be fixed later (pfeiffer) /* 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() )); TQT_SLOT( slotHistoryChanged() ));
*/ */
connect( KHTMLFactory::vLinks(), TQT_SIGNAL( inserted( const TQString& ) ), connect( TDEHTMLFactory::vLinks(), TQT_SIGNAL( inserted( const TQString& ) ),
TQT_SLOT( slotHistoryChanged() )); TQT_SLOT( slotHistoryChanged() ));
connect( KHTMLFactory::vLinks(), TQT_SIGNAL( cleared()), connect( TDEHTMLFactory::vLinks(), TQT_SIGNAL( cleared()),
TQT_SLOT( slotHistoryChanged() )); TQT_SLOT( slotHistoryChanged() ));
} }
@ -108,7 +108,7 @@ DOMString HTMLDocumentImpl::lastModified() const
DOMString HTMLDocumentImpl::cookie() const DOMString HTMLDocumentImpl::cookie() const
{ {
long windowId = 0; long windowId = 0;
KHTMLView *v = view (); TDEHTMLView *v = view ();
if ( v && v->topLevelWidget() ) if ( v && v->topLevelWidget() )
windowId = v->topLevelWidget()->winId(); windowId = v->topLevelWidget()->winId();
@ -140,7 +140,7 @@ DOMString HTMLDocumentImpl::cookie() const
void HTMLDocumentImpl::setCookie( const DOMString & value ) void HTMLDocumentImpl::setCookie( const DOMString & value )
{ {
long windowId = 0; long windowId = 0;
KHTMLView *v = view (); TDEHTMLView *v = view ();
if ( v && v->topLevelWidget() ) if ( v && v->topLevelWidget() )
windowId = v->topLevelWidget()->winId(); windowId = v->topLevelWidget()->winId();

@ -29,7 +29,7 @@
#include <tqmap.h> #include <tqmap.h>
class KHTMLView; class TDEHTMLView;
class TQString; class TQString;
namespace DOM { namespace DOM {
@ -45,7 +45,7 @@ class HTMLDocumentImpl : public DOM::DocumentImpl
{ {
Q_OBJECT Q_OBJECT
public: public:
HTMLDocumentImpl(DOMImplementationImpl *_implementation, KHTMLView *v = 0); HTMLDocumentImpl(DOMImplementationImpl *_implementation, TDEHTMLView *v = 0);
~HTMLDocumentImpl(); ~HTMLDocumentImpl();
virtual bool isHTMLDocument() const { return true; } virtual bool isHTMLDocument() const { return true; }

@ -212,11 +212,11 @@ void HTMLElementImpl::parseAttribute(AttributeImpl *attr)
break; break;
// standard events // standard events
case ATTR_ONCLICK: case ATTR_ONCLICK:
setHTMLEventListener(EventImpl::KHTML_ECMA_CLICK_EVENT, setHTMLEventListener(EventImpl::TDEHTML_ECMA_CLICK_EVENT,
getDocument()->createHTMLEventListener(attr->value().string(), "onclick", this)); getDocument()->createHTMLEventListener(attr->value().string(), "onclick", this));
break; break;
case ATTR_ONDBLCLICK: case ATTR_ONDBLCLICK:
setHTMLEventListener(EventImpl::KHTML_ECMA_DBLCLICK_EVENT, setHTMLEventListener(EventImpl::TDEHTML_ECMA_DBLCLICK_EVENT,
getDocument()->createHTMLEventListener(attr->value().string(), "ondblclick", this)); getDocument()->createHTMLEventListener(attr->value().string(), "ondblclick", this));
break; break;
case ATTR_ONMOUSEDOWN: case ATTR_ONMOUSEDOWN:
@ -640,7 +640,7 @@ void HTMLElementImpl::addHTMLAlignment( DOMString alignment )
} else if ( strcasecmp( alignment, "top" ) == 0 ) { } else if ( strcasecmp( alignment, "top" ) == 0 ) {
propvalign = CSS_VAL_TOP; propvalign = CSS_VAL_TOP;
} else if ( strcasecmp( alignment, "middle" ) == 0 ) { } else if ( strcasecmp( alignment, "middle" ) == 0 ) {
propvalign = CSS_VAL__KHTML_BASELINE_MIDDLE; propvalign = CSS_VAL__TDEHTML_BASELINE_MIDDLE;
} else if ( strcasecmp( alignment, "center" ) == 0 ) { } else if ( strcasecmp( alignment, "center" ) == 0 ) {
propvalign = CSS_VAL_MIDDLE; propvalign = CSS_VAL_MIDDLE;
} else if ( strcasecmp( alignment, "bottom" ) == 0 ) { } else if ( strcasecmp( alignment, "bottom" ) == 0 ) {

@ -53,7 +53,7 @@
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kapplication.h> #include <kapplication.h>
#include <klocale.h> #include <klocale.h>
#ifndef KHTML_NO_WALLET #ifndef TDEHTML_NO_WALLET
#include <tdewallet.h> #include <tdewallet.h>
#endif #endif
#include <netaccess.h> #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; for(unsigned int i=0; i < strLength; ++i) if(str[i].latin1() == ',') str[i] = space;
const TQStringList charsets = TQStringList::split(' ', str); const TQStringList charsets = TQStringList::split(' ', str);
TQTextCodec* codec = 0; TQTextCodec* codec = 0;
KHTMLView *view = getDocument()->view(); TDEHTMLView *view = getDocument()->view();
{ {
TQStringList::ConstIterator it = charsets.begin(); TQStringList::ConstIterator it = charsets.begin();
const TQStringList::ConstIterator itEnd = charsets.end(); const TQStringList::ConstIterator itEnd = charsets.end();
@ -425,7 +425,7 @@ static TQString calculateAutoFillKey(const HTMLFormElementImpl& e)
void HTMLFormElementImpl::doAutoFill() void HTMLFormElementImpl::doAutoFill()
{ {
#ifndef KHTML_NO_WALLET #ifndef TDEHTML_NO_WALLET
const TQString key = calculateAutoFillKey(*this); const TQString key = calculateAutoFillKey(*this);
if (KWallet::Wallet::keyDoesNotExist(KWallet::Wallet::NetworkWallet(), if (KWallet::Wallet::keyDoesNotExist(KWallet::Wallet::NetworkWallet(),
@ -435,12 +435,12 @@ void HTMLFormElementImpl::doAutoFill()
// assert(view()) // assert(view())
getDocument()->view()->part()->openWallet(this); getDocument()->view()->part()->openWallet(this);
#endif // KHTML_NO_WALLET #endif // TDEHTML_NO_WALLET
} }
void HTMLFormElementImpl::walletOpened(KWallet::Wallet *w) { void HTMLFormElementImpl::walletOpened(KWallet::Wallet *w) {
#ifndef KHTML_NO_WALLET #ifndef TDEHTML_NO_WALLET
assert(w); assert(w);
const TQString key = calculateAutoFillKey(*this); const TQString key = calculateAutoFillKey(*this);
if (!w->hasFolder(KWallet::Wallet::FormDataFolder())) { 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() void HTMLFormElementImpl::submitFromKeyboard()
@ -505,8 +505,8 @@ void HTMLFormElementImpl::submitFromKeyboard()
void HTMLFormElementImpl::gatherWalletData() void HTMLFormElementImpl::gatherWalletData()
{ {
#ifndef KHTML_NO_WALLET #ifndef TDEHTML_NO_WALLET
KHTMLView* const view = getDocument()->view(); TDEHTMLView* const view = getDocument()->view();
// check if we have any password input's // check if we have any password input's
m_walletMap.clear(); m_walletMap.clear();
m_havePassword = false; m_havePassword = false;
@ -529,13 +529,13 @@ void HTMLFormElementImpl::gatherWalletData()
m_haveTextarea = true; m_haveTextarea = true;
} }
} }
#endif // KHTML_NO_WALLET #endif // TDEHTML_NO_WALLET
} }
bool HTMLFormElementImpl::prepareSubmit() bool HTMLFormElementImpl::prepareSubmit()
{ {
KHTMLView* const view = getDocument()->view(); TDEHTMLView* const view = getDocument()->view();
if(m_insubmit || !view || !view->part() || view->part()->onlyLocalReferences()) if(m_insubmit || !view || !view->part() || view->part()->onlyLocalReferences())
return m_insubmit; return m_insubmit;
@ -569,7 +569,7 @@ void HTMLFormElementImpl::submit( )
#endif #endif
bool ok; bool ok;
KHTMLView* const view = getDocument()->view(); TDEHTMLView* const view = getDocument()->view();
const TQByteArray form_data = formData(ok); const TQByteArray form_data = formData(ok);
const KURL formUrl(getDocument()->URL()); const KURL formUrl(getDocument()->URL());
@ -577,7 +577,7 @@ void HTMLFormElementImpl::submit( )
if (m_walletMap.isEmpty()) { if (m_walletMap.isEmpty()) {
gatherWalletData(); gatherWalletData();
} }
#ifndef KHTML_NO_WALLET #ifndef TDEHTML_NO_WALLET
if (m_havePassword && !m_haveTextarea && KWallet::Wallet::isEnabled()) { if (m_havePassword && !m_haveTextarea && KWallet::Wallet::isEnabled()) {
const TQString key = calculateAutoFillKey(*this); const TQString key = calculateAutoFillKey(*this);
const bool doesnotexist = KWallet::Wallet::keyDoesNotExist(KWallet::Wallet::NetworkWallet(), KWallet::Wallet::FormDataFolder(), key); 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))); const DOMString url(tdehtml::parseURL(getAttribute(ATTR_ACTION)));
if(m_post) { if(m_post) {
@ -652,7 +652,7 @@ void HTMLFormElementImpl::submit( )
void HTMLFormElementImpl::reset( ) void HTMLFormElementImpl::reset( )
{ {
KHTMLView* const view = getDocument()->view(); TDEHTMLView* const view = getDocument()->view();
if(m_inreset || !view || !view->part()) return; if(m_inreset || !view || !view->part()) return;
m_inreset = true; m_inreset = true;
@ -991,9 +991,9 @@ void HTMLGenericFormElementImpl::defaultEventHandler(EventImpl *evt)
if (evt->target()==this && !m_disabled) if (evt->target()==this && !m_disabled)
{ {
// Report focus in/out changes to the browser extension (editable widgets only) // 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()) { 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(); TQWidget* const widget = static_cast<RenderWidget*>(m_render)->widget();
if (ext) if (ext)
ext->editableWidgetFocused(widget); 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()) { 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(); TQWidget* const widget = static_cast<RenderWidget*>(m_render)->widget();
if (ext) if (ext)
ext->editableWidgetBlurred(widget); ext->editableWidgetBlurred(widget);
@ -1772,7 +1772,7 @@ void HTMLInputElementImpl::defaultEventHandler(EventImpl *evt)
m_render->absolutePosition(offsetX,offsetY); m_render->absolutePosition(offsetX,offsetY);
xPos = me->clientX()-offsetX; xPos = me->clientX()-offsetX;
yPos = me->clientY()-offsetY; yPos = me->clientY()-offsetY;
KHTMLView* v = getDocument()->view(); TDEHTMLView* v = getDocument()->view();
if ( v ) { if ( v ) {
xPos += v->contentsX(); xPos += v->contentsX();
yPos += v->contentsY(); yPos += v->contentsY();

@ -34,7 +34,7 @@
#include <tqcstring.h> #include <tqcstring.h>
#include <tqmemarray.h> #include <tqmemarray.h>
class KHTMLView; class TDEHTMLView;
class TQTextCodec; class TQTextCodec;
namespace tdehtml namespace tdehtml

@ -175,7 +175,7 @@ void HTMLLinkElementImpl::process()
TQString type = getAttribute(ATTR_TYPE).string().lower(); TQString type = getAttribute(ATTR_TYPE).string().lower();
TQString rel = getAttribute(ATTR_REL).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 // IE extension: location of small icon for locationbar / bookmarks
// Uses both "shortcut icon" and "icon" // Uses both "shortcut icon" and "icon"
@ -408,7 +408,7 @@ void HTMLScriptElementImpl::evaluateScript(const TQString &URL, const DOMString
if (m_evaluated) if (m_evaluated)
return; return;
KHTMLPart *part = getDocument()->part(); TDEHTMLPart *part = getDocument()->part();
if (part) { if (part) {
KJSProxy *proxy = KJSProxy::proxy(part); KJSProxy *proxy = KJSProxy::proxy(part);
if (proxy) { if (proxy) {

@ -28,7 +28,7 @@
#include "misc/loader_client.h" #include "misc/loader_client.h"
#include "css/css_stylesheetimpl.h" #include "css/css_stylesheetimpl.h"
class KHTMLView; class TDEHTMLView;
namespace tdehtml { namespace tdehtml {
class CachedCSSStyleSheet; class CachedCSSStyleSheet;

@ -98,7 +98,7 @@ void HTMLAnchorElementImpl::defaultEventHandler(EventImpl *evt)
tdehtml::RenderImage *r = static_cast<tdehtml::RenderImage *>(img->renderer()); tdehtml::RenderImage *r = static_cast<tdehtml::RenderImage *>(img->renderer());
if(r && e) if(r && e)
{ {
KHTMLView* v = getDocument()->view(); TDEHTMLView* v = getDocument()->view();
int x = e->clientX(); int x = e->clientX();
int y = e->clientY(); int y = e->clientY();
int absx = 0; int absx = 0;
@ -276,7 +276,7 @@ void HTMLFontElementImpl::parseAttribute(AttributeImpl *attr)
case 6: size = CSS_VAL_XX_LARGE; break; case 6: size = CSS_VAL_XX_LARGE; break;
default: default:
if (num > 6) if (num > 6)
size = CSS_VAL__KHTML_XXX_LARGE; size = CSS_VAL__TDEHTML_XXX_LARGE;
else else
size = CSS_VAL_XX_SMALL; size = CSS_VAL_XX_SMALL;
} }

@ -265,7 +265,7 @@ void HTMLAppletElementImpl::parseAttribute(AttributeImpl *attr)
void HTMLAppletElementImpl::attach() void HTMLAppletElementImpl::attach()
{ {
KHTMLView* w = getDocument()->view(); TDEHTMLView* w = getDocument()->view();
#ifndef Q_WS_QWS // FIXME? #ifndef Q_WS_QWS // FIXME?
DOMString codeBase = getAttribute( ATTR_CODEBASE ); DOMString codeBase = getAttribute( ATTR_CODEBASE );
@ -346,7 +346,7 @@ void HTMLEmbedElementImpl::parseAttribute(AttributeImpl *attr)
void HTMLEmbedElementImpl::attach() void HTMLEmbedElementImpl::attach()
{ {
KHTMLView* w = getDocument()->view(); TDEHTMLView* w = getDocument()->view();
if (!w || !w->part()->pluginsEnabled()) if (!w || !w->part()->pluginsEnabled())
m_renderAlternative = true; m_renderAlternative = true;
@ -422,14 +422,14 @@ DocumentImpl* HTMLObjectElementImpl::contentDocument() const
if ( !m_render ) return 0; if ( !m_render ) return 0;
if ( !m_render->isWidget() ) return 0; if ( !m_render->isWidget() ) return 0;
TQWidget* widget = static_cast<RenderWidget*>( m_render )->widget(); TQWidget* widget = static_cast<RenderWidget*>( m_render )->widget();
if( widget && ::tqqt_cast<KHTMLView*>( widget ) ) if( widget && ::tqqt_cast<TDEHTMLView*>( widget ) )
return static_cast<KHTMLView*>( widget )->part()->xmlDocImpl(); return static_cast<TDEHTMLView*>( widget )->part()->xmlDocImpl();
return 0; return 0;
} }
void HTMLObjectElementImpl::attach() void HTMLObjectElementImpl::attach()
{ {
KHTMLView* w = getDocument()->view(); TDEHTMLView* w = getDocument()->view();
if (!w || !w->part()->pluginsEnabled()) if (!w || !w->part()->pluginsEnabled())
m_renderAlternative = true; m_renderAlternative = true;

@ -28,7 +28,7 @@
#include <tqobject.h> #include <tqobject.h>
#include <tqstringlist.h> #include <tqstringlist.h>
class KHTMLView; class TDEHTMLView;
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
namespace DOM { namespace DOM {

@ -63,7 +63,7 @@ HTMLTableElementImpl::HTMLTableElementImpl(DocumentImpl *doc)
// only difference to 100% correct is that in strict mode <font> elements are propagated into tables. // only difference to 100% correct is that in strict mode <font> elements are propagated into tables.
if ( getDocument()->parseMode() < DocumentImpl::Transitional ) { if ( getDocument()->parseMode() < DocumentImpl::Transitional ) {
addCSSProperty( CSS_PROP_FONT_SIZE, CSS_VAL_MEDIUM ); 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(); DOMString v = attr->value();
if ( strcasecmp( attr->value(), "middle" ) == 0 || strcasecmp( attr->value(), "center" ) == 0 ) 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) else if (strcasecmp(attr->value(), "absmiddle") == 0)
addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL_CENTER); addCSSProperty(CSS_PROP_TEXT_ALIGN, CSS_VAL_CENTER);
else if (strcasecmp(attr->value(), "left") == 0) 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) 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 else
addCSSProperty(CSS_PROP_TEXT_ALIGN, v); addCSSProperty(CSS_PROP_TEXT_ALIGN, v);
break; break;
@ -881,7 +881,7 @@ void HTMLTableCellElementImpl::parseAttribute(AttributeImpl *attr)
break; break;
case ATTR_NOWRAP: case ATTR_NOWRAP:
if (attr->val() != 0) if (attr->val() != 0)
addCSSProperty(CSS_PROP_WHITE_SPACE, CSS_VAL__KHTML_NOWRAP); addCSSProperty(CSS_PROP_WHITE_SPACE, CSS_VAL__TDEHTML_NOWRAP);
else else
removeCSSProperty(CSS_PROP_WHITE_SPACE); removeCSSProperty(CSS_PROP_WHITE_SPACE);
break; break;

@ -125,7 +125,7 @@ public:
* *
*/ */
KHTMLParser::KHTMLParser( KHTMLView *_parent, DocumentImpl *doc) TDEHTMLParser::TDEHTMLParser( TDEHTMLView *_parent, DocumentImpl *doc)
{ {
//kdDebug( 6035 ) << "parser constructor" << endl; //kdDebug( 6035 ) << "parser constructor" << endl;
#if SPEED_DEBUG > 0 #if SPEED_DEBUG > 0
@ -144,7 +144,7 @@ KHTMLParser::KHTMLParser( KHTMLView *_parent, DocumentImpl *doc)
reset(); reset();
} }
KHTMLParser::KHTMLParser( DOM::DocumentFragmentImpl *i, DocumentImpl *doc ) TDEHTMLParser::TDEHTMLParser( DOM::DocumentFragmentImpl *i, DocumentImpl *doc )
{ {
HTMLWidget = 0; HTMLWidget = 0;
document = doc; document = doc;
@ -161,7 +161,7 @@ KHTMLParser::KHTMLParser( DOM::DocumentFragmentImpl *i, DocumentImpl *doc )
inBody = true; inBody = true;
} }
KHTMLParser::~KHTMLParser() TDEHTMLParser::~TDEHTMLParser()
{ {
#if SPEED_DEBUG > 0 #if SPEED_DEBUG > 0
kdDebug( ) << "TIME: parsing time was = " << qt.elapsed() << endl; kdDebug( ) << "TIME: parsing time was = " << qt.elapsed() << endl;
@ -175,7 +175,7 @@ KHTMLParser::~KHTMLParser()
delete isindex; delete isindex;
} }
void KHTMLParser::reset() void TDEHTMLParser::reset()
{ {
setCurrent ( document ); setCurrent ( document );
@ -201,7 +201,7 @@ void KHTMLParser::reset()
discard_until = 0; discard_until = 0;
} }
void KHTMLParser::parseToken(Token *t) void TDEHTMLParser::parseToken(Token *t)
{ {
if (t->tid > 2*ID_CLOSE_TAG) if (t->tid > 2*ID_CLOSE_TAG)
{ {
@ -310,7 +310,7 @@ static bool isTableRelatedTag(int id)
id == ID_TH); id == ID_TH);
} }
bool KHTMLParser::insertNode(NodeImpl *n, bool flat) bool TDEHTMLParser::insertNode(NodeImpl *n, bool flat)
{ {
int id = n->id(); 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; NodeImpl *n = 0;
@ -911,11 +911,11 @@ NodeImpl *KHTMLParser::getElement(Token* t)
break; break;
case ID_INPUT: case ID_INPUT:
if ( t->attrs && if ( t->attrs &&
KHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled() && TDEHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled() &&
KHTMLFactory::defaultHTMLSettings()->isHideAdsEnabled() && TDEHTMLFactory::defaultHTMLSettings()->isHideAdsEnabled() &&
!strcasecmp( t->attrs->getValue( ATTR_TYPE ), "image" ) ) !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; return 0;
} }
n = new HTMLInputElementImpl(document, form); n = new HTMLInputElementImpl(document, form);
@ -1038,11 +1038,11 @@ NodeImpl *KHTMLParser::getElement(Token* t)
// images // images
case ID_IMG: case ID_IMG:
if (t->attrs&& if (t->attrs&&
KHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled()&& TDEHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled()&&
KHTMLFactory::defaultHTMLSettings()->isHideAdsEnabled()) TDEHTMLFactory::defaultHTMLSettings()->isHideAdsEnabled())
{ {
TQString url = doc()->completeURL( tdehtml::parseURL(t->attrs->getValue(ATTR_SRC)).string() ); TQString url = doc()->completeURL( tdehtml::parseURL(t->attrs->getValue(ATTR_SRC)).string() );
if (KHTMLFactory::defaultHTMLSettings()->isAdFiltered(url)) if (TDEHTMLFactory::defaultHTMLSettings()->isAdFiltered(url))
return 0; return 0;
} }
n = new HTMLImageElementImpl(document, form); n = new HTMLImageElementImpl(document, form);
@ -1200,7 +1200,7 @@ NodeImpl *KHTMLParser::getElement(Token* t)
return n; 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) // support for really broken html. Can't believe I'm supporting such crap (lars)
switch(t->tid) switch(t->tid)
@ -1244,7 +1244,7 @@ void KHTMLParser::processCloseTag(Token *t)
#endif #endif
} }
bool KHTMLParser::isResidualStyleTag(int _id) bool TDEHTMLParser::isResidualStyleTag(int _id)
{ {
switch (_id) { switch (_id) {
case ID_A: 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)) if (isResidualStyleTag(_id))
return true; 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. // 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. // ### 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. // 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. // Loop for each tag that needs to be reopened.
while (elem) { 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); HTMLStackElem *Elem = new HTMLStackElem(_id, _level, current, m_inline, blockStack);
@ -1533,7 +1533,7 @@ void KHTMLParser::pushBlock(int _id, int _level)
addForbidden(_id, forbiddenTag); addForbidden(_id, forbiddenTag);
} }
void KHTMLParser::popBlock( int _id ) void TDEHTMLParser::popBlock( int _id )
{ {
HTMLStackElem *Elem = blockStack; HTMLStackElem *Elem = blockStack;
int maxLevel = 0; int maxLevel = 0;
@ -1619,7 +1619,7 @@ void KHTMLParser::popBlock( int _id )
reopenResidualStyleTags(residualStyleStack, malformedTableParent); reopenResidualStyleTags(residualStyleStack, malformedTableParent);
} }
void KHTMLParser::popOneBlock(bool delBlock) void TDEHTMLParser::popOneBlock(bool delBlock)
{ {
HTMLStackElem *Elem = blockStack; HTMLStackElem *Elem = blockStack;
@ -1661,20 +1661,20 @@ void KHTMLParser::popOneBlock(bool delBlock)
delete Elem; delete Elem;
} }
void KHTMLParser::popInlineBlocks() void TDEHTMLParser::popInlineBlocks()
{ {
while(blockStack && current->isInline() && current->id() != ID_FONT) while(blockStack && current->isInline() && current->id() != ID_FONT)
popOneBlock(); popOneBlock();
} }
void KHTMLParser::freeBlock() void TDEHTMLParser::freeBlock()
{ {
while (blockStack) while (blockStack)
popOneBlock(); popOneBlock();
blockStack = 0; blockStack = 0;
} }
void KHTMLParser::createHead() void TDEHTMLParser::createHead()
{ {
if(head || !doc()->firstChild()) if(head || !doc()->firstChild())
return; return;
@ -1692,7 +1692,7 @@ void KHTMLParser::createHead()
} }
} }
NodeImpl *KHTMLParser::handleIsindex( Token *t ) NodeImpl *TDEHTMLParser::handleIsindex( Token *t )
{ {
NodeImpl *n; NodeImpl *n;
HTMLFormElementImpl *myform = form; HTMLFormElementImpl *myform = form;
@ -1718,7 +1718,7 @@ NodeImpl *KHTMLParser::handleIsindex( Token *t )
return n; return n;
} }
void KHTMLParser::startBody() void TDEHTMLParser::startBody()
{ {
if(inBody) return; if(inBody) return;

@ -44,7 +44,7 @@
#include "html/html_documentimpl.h" #include "html/html_documentimpl.h"
#include "html/RefPtr.h" #include "html/RefPtr.h"
class KHTMLView; class TDEHTMLView;
class HTMLStackElem; class HTMLStackElem;
namespace DOM { namespace DOM {
@ -66,12 +66,12 @@ class Token;
* The parser for html. It receives a stream of tokens from the HTMLTokenizer, and * The parser for html. It receives a stream of tokens from the HTMLTokenizer, and
* builds up the Document structure form it. * builds up the Document structure form it.
*/ */
class KHTMLParser class TDEHTMLParser
{ {
public: public:
KHTMLParser( KHTMLView *w, DOM::DocumentImpl *i ); TDEHTMLParser( TDEHTMLView *w, DOM::DocumentImpl *i );
KHTMLParser( DOM::DocumentFragmentImpl *frag, DOM::DocumentImpl *doc ); TDEHTMLParser( DOM::DocumentFragmentImpl *frag, DOM::DocumentImpl *doc );
virtual ~KHTMLParser(); virtual ~TDEHTMLParser();
/** /**
* parses one token delivered by the tokenizer * parses one token delivered by the tokenizer
@ -92,7 +92,7 @@ public:
protected: protected:
KHTMLView *HTMLWidget; TDEHTMLView *HTMLWidget;
DOM::DocumentImpl *document; DOM::DocumentImpl *document;
/* /*

@ -69,9 +69,9 @@ static const char styleEnd [] = "</style";
static const char textareaEnd [] = "</textarea"; static const char textareaEnd [] = "</textarea";
static const char titleEnd [] = "</title"; static const char titleEnd [] = "</title";
#define KHTML_ALLOC_QCHAR_VEC( N ) (TQChar*) malloc( sizeof(TQChar)*( N ) ) #define TDEHTML_ALLOC_QCHAR_VEC( N ) (TQChar*) malloc( sizeof(TQChar)*( N ) )
#define KHTML_REALLOC_QCHAR_VEC(P, N ) (TQChar*) realloc(P, sizeof(TQChar)*( N )) #define TDEHTML_REALLOC_QCHAR_VEC(P, N ) (TQChar*) realloc(P, sizeof(TQChar)*( N ))
#define KHTML_DELETE_QCHAR_VEC( P ) free((char*)( P )) #define TDEHTML_DELETE_QCHAR_VEC( P ) free((char*)( P ))
// Full support for MS Windows extensions to Latin-1. // Full support for MS Windows extensions to Latin-1.
// Technically these extensions should only be activated for pages // Technically these extensions should only be activated for pages
@ -123,14 +123,14 @@ static const char titleEnd [] = "</title";
#endif #endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
HTMLTokenizer::HTMLTokenizer(DOM::DocumentImpl *_doc, KHTMLView *_view) HTMLTokenizer::HTMLTokenizer(DOM::DocumentImpl *_doc, TDEHTMLView *_view)
{ {
view = _view; view = _view;
buffer = 0; buffer = 0;
scriptCode = 0; scriptCode = 0;
scriptCodeSize = scriptCodeMaxSize = scriptCodeResync = 0; scriptCodeSize = scriptCodeMaxSize = scriptCodeResync = 0;
charsets = TDEGlobal::charsets(); charsets = TDEGlobal::charsets();
parser = new KHTMLParser(_view, _doc); parser = new TDEHTMLParser(_view, _doc);
m_executingScript = 0; m_executingScript = 0;
m_autoCloseTimer = 0; m_autoCloseTimer = 0;
onHold = false; onHold = false;
@ -145,7 +145,7 @@ HTMLTokenizer::HTMLTokenizer(DOM::DocumentImpl *_doc, DOM::DocumentFragmentImpl
scriptCode = 0; scriptCode = 0;
scriptCodeSize = scriptCodeMaxSize = scriptCodeResync = 0; scriptCodeSize = scriptCodeMaxSize = scriptCodeResync = 0;
charsets = TDEGlobal::charsets(); charsets = TDEGlobal::charsets();
parser = new KHTMLParser( i, _doc ); parser = new TDEHTMLParser( i, _doc );
m_executingScript = 0; m_executingScript = 0;
m_autoCloseTimer = 0; m_autoCloseTimer = 0;
onHold = false; onHold = false;
@ -163,12 +163,12 @@ void HTMLTokenizer::reset()
cachedScript.dequeue()->deref(this); cachedScript.dequeue()->deref(this);
if ( buffer ) if ( buffer )
KHTML_DELETE_QCHAR_VEC(buffer); TDEHTML_DELETE_QCHAR_VEC(buffer);
buffer = dest = 0; buffer = dest = 0;
size = 0; size = 0;
if ( scriptCode ) if ( scriptCode )
KHTML_DELETE_QCHAR_VEC(scriptCode); TDEHTML_DELETE_QCHAR_VEC(scriptCode);
scriptCode = 0; scriptCode = 0;
scriptCodeSize = scriptCodeMaxSize = scriptCodeResync = 0; scriptCodeSize = scriptCodeMaxSize = scriptCodeResync = 0;
@ -186,7 +186,7 @@ void HTMLTokenizer::begin()
onHold = false; onHold = false;
reset(); reset();
size = 254; size = 254;
buffer = KHTML_ALLOC_QCHAR_VEC( 255 ); buffer = TDEHTML_ALLOC_QCHAR_VEC( 255 );
dest = buffer; dest = buffer;
tag = NoTag; tag = NoTag;
pending = NonePending; pending = NonePending;
@ -1578,10 +1578,10 @@ void HTMLTokenizer::end()
processToken(); processToken();
if(buffer) if(buffer)
KHTML_DELETE_QCHAR_VEC(buffer); TDEHTML_DELETE_QCHAR_VEC(buffer);
if(scriptCode) if(scriptCode)
KHTML_DELETE_QCHAR_VEC(scriptCode); TDEHTML_DELETE_QCHAR_VEC(scriptCode);
scriptCode = 0; scriptCode = 0;
scriptCodeSize = scriptCodeMaxSize = scriptCodeResync = 0; scriptCodeSize = scriptCodeMaxSize = scriptCodeResync = 0;
@ -1621,7 +1621,7 @@ void HTMLTokenizer::finish()
pos = TQConstString(scriptCode, scriptCodeSize).string().find('>'); pos = TQConstString(scriptCode, scriptCodeSize).string().find('>');
food.setUnicode(scriptCode+pos+1, scriptCodeSize-pos-1); // deep copy food.setUnicode(scriptCode+pos+1, scriptCodeSize-pos-1); // deep copy
} }
KHTML_DELETE_QCHAR_VEC(scriptCode); TDEHTML_DELETE_QCHAR_VEC(scriptCode);
scriptCode = 0; scriptCode = 0;
scriptCodeSize = scriptCodeMaxSize = scriptCodeResync = 0; scriptCodeSize = scriptCodeMaxSize = scriptCodeResync = 0;
if (script) if (script)
@ -1720,7 +1720,7 @@ void HTMLTokenizer::enlargeBuffer(int len)
int newsize = kMax(size*2, size+len); int newsize = kMax(size*2, size+len);
int oldoffs = (dest - buffer); int oldoffs = (dest - buffer);
buffer = KHTML_REALLOC_QCHAR_VEC(buffer, newsize); buffer = TDEHTML_REALLOC_QCHAR_VEC(buffer, newsize);
dest = buffer + oldoffs; dest = buffer + oldoffs;
size = newsize; size = newsize;
} }
@ -1728,7 +1728,7 @@ void HTMLTokenizer::enlargeBuffer(int len)
void HTMLTokenizer::enlargeScriptBuffer(int len) void HTMLTokenizer::enlargeScriptBuffer(int len)
{ {
int newsize = kMax(scriptCodeMaxSize*2, scriptCodeMaxSize+len); int newsize = kMax(scriptCodeMaxSize*2, scriptCodeMaxSize+len);
scriptCode = KHTML_REALLOC_QCHAR_VEC(scriptCode, newsize); scriptCode = TDEHTML_REALLOC_QCHAR_VEC(scriptCode, newsize);
scriptCodeMaxSize = newsize; scriptCodeMaxSize = newsize;
} }

@ -41,7 +41,7 @@
#include "xml/dom_docimpl.h" #include "xml/dom_docimpl.h"
class KCharsets; class KCharsets;
class KHTMLView; class TDEHTMLView;
namespace DOM { namespace DOM {
class DocumentImpl; class DocumentImpl;
@ -50,7 +50,7 @@ namespace DOM {
namespace tdehtml { namespace tdehtml {
class CachedScript; class CachedScript;
class KHTMLParser; class TDEHTMLParser;
/** /**
* @internal * @internal
@ -120,9 +120,9 @@ namespace tdehtml {
class HTMLTokenizer : public Tokenizer, public CachedObjectClient class HTMLTokenizer : public Tokenizer, public CachedObjectClient
{ {
friend class KHTMLParser; friend class TDEHTMLParser;
public: public:
HTMLTokenizer(DOM::DocumentImpl *, KHTMLView * = 0); HTMLTokenizer(DOM::DocumentImpl *, TDEHTMLView * = 0);
HTMLTokenizer(DOM::DocumentImpl *, DOM::DocumentFragmentImpl *frag); HTMLTokenizer(DOM::DocumentImpl *, DOM::DocumentFragmentImpl *frag);
virtual ~HTMLTokenizer(); virtual ~HTMLTokenizer();
@ -347,9 +347,9 @@ protected:
tdehtml::TokenizerString src; tdehtml::TokenizerString src;
KCharsets *charsets; KCharsets *charsets;
KHTMLParser *parser; TDEHTMLParser *parser;
KHTMLView *view; TDEHTMLView *view;
}; };
} // namespace } // namespace

@ -1,5 +1,5 @@
<!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <!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> <comment>A dialog to display the HTTP headers for a given page.</comment>
<author>George Staikos &lt;staikos@kde.org&gt;</author> <author>George Staikos &lt;staikos@kde.org&gt;</author>
<widget class="TQDialog"> <widget class="TQDialog">

@ -30,7 +30,7 @@
* @short Provides a context for KJavaAppletWidgets * @short Provides a context for KJavaAppletWidgets
* *
* Applets run in a context- (see the Java documentation for more information * 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. * which multiple applets can run.
* *
* @author Richard J. Moore, rich@kde.org * @author Richard J. Moore, rich@kde.org
@ -112,12 +112,12 @@ signals:
void showStatus ( const TQString& txt ); 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 ); 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(); void appletLoaded();

@ -241,15 +241,15 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *,
kdDebug(6100) << "name=" << name << " value=" << value << endl; kdDebug(6100) << "name=" << name << " value=" << value << endl;
if (!name.isEmpty()) { if (!name.isEmpty()) {
const TQString name_lower = name.lower (); const TQString name_lower = name.lower ();
if (name == "__KHTML__PLUGINBASEURL") { if (name == "__TDEHTML__PLUGINBASEURL") {
baseurl = KURL (KURL (value), TQString (".")).url (); baseurl = KURL (KURL (value), TQString (".")).url ();
} else if (name == "__KHTML__CODEBASE") } else if (name == "__TDEHTML__CODEBASE")
tdehtml_codebase = value; tdehtml_codebase = value;
else if (name_lower == TQString::fromLatin1("codebase") || else if (name_lower == TQString::fromLatin1("codebase") ||
name_lower == TQString::fromLatin1("java_codebase")) { name_lower == TQString::fromLatin1("java_codebase")) {
if (!value.isEmpty ()) if (!value.isEmpty ())
codebase = value; codebase = value;
} else if (name == "__KHTML__CLASSID") } else if (name == "__TDEHTML__CLASSID")
//else if (name.lower()==TQString::fromLatin1("classid")) //else if (name.lower()==TQString::fromLatin1("classid"))
classid = value; classid = value;
else if (name_lower == TQString::fromLatin1("code") || else if (name_lower == TQString::fromLatin1("code") ||
@ -267,7 +267,7 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *,
width = value.toInt(); width = value.toInt();
else if (name_lower == TQString::fromLatin1("height")) else if (name_lower == TQString::fromLatin1("height"))
height = value.toInt(); height = value.toInt();
if (!name.startsWith ("__KHTML__")) { if (!name.startsWith ("__TDEHTML__")) {
applet->setParameter (name, value); applet->setParameter (name, value);
} }
} }

@ -19,8 +19,8 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#ifndef KHTMLDECODER_H #ifndef TDEHTMLDECODER_H
#define KHTMLDECODER_H #define TDEHTMLDECODER_H
#include <tqstring.h> #include <tqstring.h>
class TQTextCodec; class TQTextCodec;

@ -1,8 +1,8 @@
/* This file is automatically generated from htmltags.in by maketags, do not edit */ /* This file is automatically generated from htmltags.in by maketags, do not edit */
/* Copyright 1999 Lars Knoll */ /* Copyright 1999 Lars Knoll */
#ifndef KHTML_TAGS_H #ifndef TDEHTML_TAGS_H
#define KHTML_TAGS_H #define TDEHTML_TAGS_H
#include "dom/dom_string.h" #include "dom/dom_string.h"
#include <kglobal.h> #include <kglobal.h>

@ -486,7 +486,7 @@ CachedImage::CachedImage(DocLoader* dl, const DOMString &url, TDEIO::CacheContro
setAccept( acceptHeader ); setAccept( acceptHeader );
m_showAnimations = dl->showAnimations(); m_showAnimations = dl->showAnimations();
if ( KHTMLFactory::defaultHTMLSettings()->isAdFiltered( url.string() ) ) { if ( TDEHTMLFactory::defaultHTMLSettings()->isAdFiltered( url.string() ) ) {
m_wasBlocked = true; m_wasBlocked = true;
CachedObject::finish(); CachedObject::finish();
} }
@ -735,13 +735,13 @@ void CachedImage::movieStatus(int status)
} }
if((status == TQMovie::EndOfMovie && (!m || m->frameNumber() <= 1)) || if((status == TQMovie::EndOfMovie && (!m || m->frameNumber() <= 1)) ||
((status == TQMovie::EndOfLoop) && (m_showAnimations == KHTMLSettings::KAnimationLoopOnce)) || ((status == TQMovie::EndOfLoop) && (m_showAnimations == TDEHTMLSettings::KAnimationLoopOnce)) ||
((status == TQMovie::EndOfFrame) && (m_showAnimations == KHTMLSettings::KAnimationDisabled)) ((status == TQMovie::EndOfFrame) && (m_showAnimations == TDEHTMLSettings::KAnimationDisabled))
) )
{ {
if(imgSource) if(imgSource)
{ {
setShowAnimations( KHTMLSettings::KAnimationDisabled ); setShowAnimations( TDEHTMLSettings::KAnimationDisabled );
// monochrome alphamasked images are usually about 10000 times // monochrome alphamasked images are usually about 10000 times
// faster to draw, so this is worth the hack // faster to draw, so this is worth the hack
@ -779,10 +779,10 @@ void CachedImage::movieResize(const TQSize& /*s*/)
do_notify(m->framePixmap(), TQRect()); do_notify(m->framePixmap(), TQRect());
} }
void CachedImage::setShowAnimations( KHTMLSettings::KAnimationAdvice showAnimations ) void CachedImage::setShowAnimations( TDEHTMLSettings::KAnimationAdvice showAnimations )
{ {
m_showAnimations = showAnimations; m_showAnimations = showAnimations;
if ( (m_showAnimations == KHTMLSettings::KAnimationDisabled) && imgSource ) { if ( (m_showAnimations == TDEHTMLSettings::KAnimationDisabled) && imgSource ) {
imgSource->cleanBuffer(); imgSource->cleanBuffer();
delete p; delete p;
p = new TQPixmap(m->framePixmap()); 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_cachePolicy = TDEIO::CC_Verify;
m_expireDate = 0; m_expireDate = 0;
m_creationDate = time(0); m_creationDate = time(0);
m_bautoloadImages = true; m_bautoloadImages = true;
m_showAnimations = KHTMLSettings::KAnimationEnabled; m_showAnimations = TDEHTMLSettings::KAnimationEnabled;
m_part = part; m_part = part;
m_doc = doc; 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) CachedScript *DocLoader::requestScript( const DOM::DOMString &url, const TQString& charset)
{ {
DOCLOADER_SECCHECK(true); DOCLOADER_SECCHECK(true);
if ( ! KHTMLFactory::defaultHTMLSettings()->isJavaScriptEnabled(fullURL.host()) || if ( ! TDEHTMLFactory::defaultHTMLSettings()->isJavaScriptEnabled(fullURL.host()) ||
KHTMLFactory::defaultHTMLSettings()->isAdFiltered(fullURL.url())) TDEHTMLFactory::defaultHTMLSettings()->isAdFiltered(fullURL.url()))
return 0L; return 0L;
CachedScript* s = Cache::requestObject<CachedScript, CachedObject::Script>( this, fullURL, 0 ); 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; if ( showAnimations == m_showAnimations ) return;
m_showAnimations = showAnimations; m_showAnimations = showAnimations;
@ -1162,7 +1162,7 @@ void Loader::servePendingRequests()
{ {
job->addMetaData( "referrer", req->m_docLoader->doc()->URL().url() ); job->addMetaData( "referrer", req->m_docLoader->doc()->URL().url() );
KHTMLPart *part = req->m_docLoader->part(); TDEHTMLPart *part = req->m_docLoader->part();
if (part ) if (part )
{ {
job->addMetaData( "cross-domain", part->toplevelURL().url() ); job->addMetaData( "cross-domain", part->toplevelURL().url() );
@ -1356,7 +1356,7 @@ void Cache::init()
nullPixmap = new TQPixmap; nullPixmap = new TQPixmap;
if ( !brokenPixmap ) 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 ) { if ( !blockedPixmap ) {
blockedPixmap = new TQPixmap(); blockedPixmap = new TQPixmap();

@ -55,7 +55,7 @@
#include <dom/dom_string.h> #include <dom/dom_string.h>
class TQMovie; class TQMovie;
class KHTMLPart; class TDEHTMLPart;
namespace TDEIO { namespace TDEIO {
class Job; class Job;
@ -183,7 +183,7 @@ namespace tdehtml
CachedObject* m_next; CachedObject* m_next;
CachedObject* m_prev; CachedObject* m_prev;
friend class Cache; friend class Cache;
friend class ::KHTMLPart; friend class ::TDEHTMLPart;
}; };
@ -286,7 +286,7 @@ namespace tdehtml
const TQString& suggestedTitle() const { return m_suggestedFilename; } const TQString& suggestedTitle() const { return m_suggestedFilename; }
#endif #endif
void setShowAnimations( KHTMLSettings::KAnimationAdvice ); void setShowAnimations( TDEHTMLSettings::KAnimationAdvice );
void pauseAnimations(); void pauseAnimations();
void resumeAnimations(); void resumeAnimations();
@ -331,10 +331,10 @@ namespace tdehtml
bool typeChecked : 1; bool typeChecked : 1;
bool isFullyTransparent : 1; bool isFullyTransparent : 1;
bool monochrome : 1; bool monochrome : 1;
KHTMLSettings::KAnimationAdvice m_showAnimations : 2; TDEHTMLSettings::KAnimationAdvice m_showAnimations : 2;
friend class Cache; friend class Cache;
friend class ::KHTMLPart; friend class ::TDEHTMLPart;
}; };
/** /**
@ -345,7 +345,7 @@ namespace tdehtml
class DocLoader class DocLoader
{ {
public: public:
DocLoader(KHTMLPart*, DOM::DocumentImpl*); DocLoader(TDEHTMLPart*, DOM::DocumentImpl*);
~DocLoader(); ~DocLoader();
CachedImage *requestImage( const DOM::DOMString &url); CachedImage *requestImage( const DOM::DOMString &url);
@ -355,16 +355,16 @@ namespace tdehtml
bool autoloadImages() const { return m_bautoloadImages; } bool autoloadImages() const { return m_bautoloadImages; }
TDEIO::CacheControl cachePolicy() const { return m_cachePolicy; } 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; } 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; } DOM::DocumentImpl* doc() const { return m_doc; }
void setCacheCreationDate( time_t ); void setCacheCreationDate( time_t );
void setExpireDate( time_t, bool relative ); void setExpireDate( time_t, bool relative );
void setAutoloadImages( bool ); void setAutoloadImages( bool );
void setCachePolicy( TDEIO::CacheControl cachePolicy ) { m_cachePolicy = cachePolicy; } void setCachePolicy( TDEIO::CacheControl cachePolicy ) { m_cachePolicy = cachePolicy; }
void setShowAnimations( KHTMLSettings::KAnimationAdvice ); void setShowAnimations( TDEHTMLSettings::KAnimationAdvice );
void pauseAnimations(); void pauseAnimations();
void resumeAnimations(); void resumeAnimations();
void insertCachedObject( CachedObject* o ) const; void insertCachedObject( CachedObject* o ) const;
@ -375,7 +375,7 @@ namespace tdehtml
friend class Cache; friend class Cache;
friend class DOM::DocumentImpl; friend class DOM::DocumentImpl;
friend class ::KHTMLPart; friend class ::TDEHTMLPart;
TQStringList m_reloadedURLs; TQStringList m_reloadedURLs;
mutable TQPtrDict<CachedObject> m_docObjects; mutable TQPtrDict<CachedObject> m_docObjects;
@ -383,8 +383,8 @@ namespace tdehtml
time_t m_creationDate; time_t m_creationDate;
TDEIO::CacheControl m_cachePolicy; TDEIO::CacheControl m_cachePolicy;
bool m_bautoloadImages : 1; bool m_bautoloadImages : 1;
KHTMLSettings::KAnimationAdvice m_showAnimations : 2; TDEHTMLSettings::KAnimationAdvice m_showAnimations : 2;
KHTMLPart* m_part; TDEHTMLPart* m_part;
DOM::DocumentImpl* m_doc; DOM::DocumentImpl* m_doc;
}; };

@ -37,8 +37,8 @@ print header <<EOF;
/* This file is automatically generated from htmltags.in by maketags, do not edit */ /* This file is automatically generated from htmltags.in by maketags, do not edit */
/* Copyright 1999 Lars Knoll */ /* Copyright 1999 Lars Knoll */
#ifndef KHTML_TAGS_H #ifndef TDEHTML_TAGS_H
#define KHTML_TAGS_H #define TDEHTML_TAGS_H
#include "dom/dom_string.h" #include "dom/dom_string.h"
#include <kglobal.h> #include <kglobal.h>

@ -23,8 +23,8 @@
// //
// KDE HTML Widget -- String class // KDE HTML Widget -- String class
#ifndef KHTMLSTRING_H #ifndef TDEHTMLSTRING_H
#define KHTMLSTRING_H #define TDEHTMLSTRING_H
#include "dom/dom_string.h" #include "dom/dom_string.h"

@ -618,7 +618,7 @@ InlineFlowBox* RenderBlock::createLineBoxes(RenderObject* obj)
{ {
// See if we have an unconstructed line box for this object that is also // See if we have an unconstructed line box for this object that is also
// the last item on the line. // the last item on the line.
KHTMLAssert(obj->isInlineFlow() || obj == this); TDEHTMLAssert(obj->isInlineFlow() || obj == this);
RenderFlow* flow = static_cast<RenderFlow*>(obj); RenderFlow* flow = static_cast<RenderFlow*>(obj);
// Get the last box we made for this render object. // 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 // 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. // made, we need to place it at the end of the current line.
InlineBox* newBox = obj->createInlineBox(false, obj == this); InlineBox* newBox = obj->createInlineBox(false, obj == this);
KHTMLAssert(newBox->isInlineFlowBox()); TDEHTMLAssert(newBox->isInlineFlowBox());
box = static_cast<InlineFlowBox*>(newBox); box = static_cast<InlineFlowBox*>(newBox);
box->setFirstLineStyleBit(m_firstLine); 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 // We should have a root inline box. It should be unconstructed and
// be the last continuation of our line list. // 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 // Set bits on our inline flow boxes that indicate which sides should
// paint borders/margins/padding. This knowledge will ultimately be used when // 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); int availableWidth = lineWidth(m_height);
switch(style()->textAlign()) { switch(style()->textAlign()) {
case LEFT: case LEFT:
case KHTML_LEFT: case TDEHTML_LEFT:
numSpaces = 0; numSpaces = 0;
break; break;
case JUSTIFY: case JUSTIFY:
@ -732,12 +732,12 @@ void RenderBlock::computeHorizontalPositionsForLine(InlineFlowBox* lineBox, Bidi
if (bidi.context->basicDir == TQChar::DirL) if (bidi.context->basicDir == TQChar::DirL)
break; break;
case RIGHT: case RIGHT:
case KHTML_RIGHT: case TDEHTML_RIGHT:
x += availableWidth - totWidth; x += availableWidth - totWidth;
numSpaces = 0; numSpaces = 0;
break; break;
case CENTER: case CENTER:
case KHTML_CENTER: case TDEHTML_CENTER:
int xd = (availableWidth - totWidth)/2; int xd = (availableWidth - totWidth)/2;
x += xd >0 ? xd : 0; x += xd >0 ? xd : 0;
numSpaces = 0; numSpaces = 0;
@ -756,7 +756,7 @@ void RenderBlock::computeHorizontalPositionsForLine(InlineFlowBox* lineBox, Bidi
spaces++; spaces++;
} }
KHTMLAssert(spaces <= numSpaces); TDEHTMLAssert(spaces <= numSpaces);
// Only justify text with white-space: normal. // Only justify text with white-space: normal.
if (r->obj->style()->whiteSpace() == NORMAL) { if (r->obj->style()->whiteSpace() == NORMAL) {
@ -1986,7 +1986,7 @@ BidiIterator RenderBlock::findNextLineBreak(BidiIterator &start, BidiState &bidi
} }
} }
} else } else
KHTMLAssert( false ); TDEHTMLAssert( false );
InlineMinMaxIterator savedIt = lastIt; InlineMinMaxIterator savedIt = lastIt;
lastIt = it; lastIt = it;

@ -417,7 +417,7 @@ bool Font::isFontScalable(TQFontDatabase& db, const TQFont& font)
void Font::update( TQPaintDeviceMetrics* devMetrics ) const 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.setItalic( fontDef.italic );
f.setWeight( fontDef.weight ); f.setWeight( fontDef.weight );

@ -22,8 +22,8 @@
* *
*/ */
#ifndef KHTMLFONT_H #ifndef TDEHTMLFONT_H
#define KHTMLFONT_H #define TDEHTMLFONT_H
#include <tqfont.h> #include <tqfont.h>
#include <tqfontmetrics.h> #include <tqfontmetrics.h>

@ -48,9 +48,9 @@ RenderApplet::RenderApplet(HTMLElementImpl *applet, const TQMap<TQString, TQStri
setInline(true); setInline(true);
KJavaAppletContext *context = 0; KJavaAppletContext *context = 0;
KHTMLView *_view = applet->getDocument()->view(); TDEHTMLView *_view = applet->getDocument()->view();
if ( _view ) { if ( _view ) {
KHTMLPart *part = _view->part(); TDEHTMLPart *part = _view->part();
context = part->createJavaContext(); context = part->createJavaContext();
} }
@ -89,8 +89,8 @@ void RenderApplet::layout()
{ {
//kdDebug(6100) << "RenderApplet::layout" << endl; //kdDebug(6100) << "RenderApplet::layout" << endl;
KHTMLAssert( needsLayout() ); TDEHTMLAssert( needsLayout() );
KHTMLAssert( minMaxKnown() ); TDEHTMLAssert( minMaxKnown() );
calcWidth(); calcWidth();
calcHeight(); calcHeight();

@ -28,7 +28,7 @@
#include <tqwidget.h> #include <tqwidget.h>
#include <tqmap.h> #include <tqmap.h>
class KHTMLView; class TDEHTMLView;
namespace DOM { namespace DOM {
class HTMLElementImpl; class HTMLElementImpl;

@ -43,7 +43,7 @@ using namespace tdehtml;
namespace tdehtml { namespace tdehtml {
//#ifdef NDEBUG //#ifdef NDEBUG
#define KHTML_USE_ARENA_ALLOCATOR #define TDEHTML_USE_ARENA_ALLOCATOR
//#endif //#endif
typedef struct { typedef struct {
@ -78,7 +78,7 @@ RenderArena::~RenderArena()
void* RenderArena::allocate(size_t size) 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. // Use standard malloc so that memory debugging tools work.
void *block = ::malloc(sizeof(RenderArenaDebugHeader) + size); void *block = ::malloc(sizeof(RenderArenaDebugHeader) + size);
RenderArenaDebugHeader *header = (RenderArenaDebugHeader *)block; RenderArenaDebugHeader *header = (RenderArenaDebugHeader *)block;
@ -89,10 +89,10 @@ void* RenderArena::allocate(size_t size)
void* result = 0; void* result = 0;
// Ensure we have correct alignment for pointers. Important for Tru64 // 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 // Check recyclers first
if (size < KHTML_MAX_RECYCLED_SIZE) { if (size < TDEHTML_MAX_RECYCLED_SIZE) {
const int index = size >> 2; const int index = size >> 2;
result = m_recyclers[index]; result = m_recyclers[index];
@ -117,7 +117,7 @@ void* RenderArena::allocate(size_t size)
void RenderArena::free(size_t size, void* ptr) 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. // Use standard free so that memory debugging tools work.
assert(this); assert(this);
RenderArenaDebugHeader *header = (RenderArenaDebugHeader *)ptr - 1; RenderArenaDebugHeader *header = (RenderArenaDebugHeader *)ptr - 1;
@ -131,10 +131,10 @@ void RenderArena::free(size_t size, void* ptr)
#endif #endif
// Ensure we have correct alignment for pointers. Important for Tru64 // 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 // 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; const int index = size >> 2;
void* currentTop = m_recyclers[index]; void* currentTop = m_recyclers[index];
m_recyclers[index] = ptr; m_recyclers[index] = ptr;

@ -43,8 +43,8 @@
namespace tdehtml { namespace tdehtml {
#define KHTML_MAX_RECYCLED_SIZE 400 #define TDEHTML_MAX_RECYCLED_SIZE 400
#define KHTML_ROUNDUP(x,y) ((((x)+((y)-1))/(y))*(y)) #define TDEHTML_ROUNDUP(x,y) ((((x)+((y)-1))/(y))*(y))
class RenderArena: public Shared<RenderArena> { class RenderArena: public Shared<RenderArena> {
public: public:
@ -61,7 +61,7 @@ private:
// The recycler array is sparse with the indices being multiples of 4, // The recycler array is sparse with the indices being multiples of 4,
// i.e., 0, 4, 8, 12, 16, 20, ... // i.e., 0, 4, 8, 12, 16, 20, ...
void* m_recyclers[KHTML_MAX_RECYCLED_SIZE >> 2]; void* m_recyclers[TDEHTML_MAX_RECYCLED_SIZE >> 2];
}; };

@ -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 (knoll@kde.org) * Copyright (C) 1999-2003 Lars Knoll (knoll@kde.org)
* (C) 1999-2003 Antti Koivisto (koivisto@kde.org) * (C) 1999-2003 Antti Koivisto (koivisto@kde.org)
@ -279,7 +279,7 @@ void RenderBlock::addChildToFlow(RenderObject* newChild, RenderObject* beforeChi
// needed in cases of things like anonymous tables. // needed in cases of things like anonymous tables.
if (beforeChild && beforeChild->parent() != this) { if (beforeChild && beforeChild->parent() != this) {
KHTMLAssert(beforeChild->parent()); TDEHTMLAssert(beforeChild->parent());
// In the special case where we are prepending a block-level element before // 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 // 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) { if (beforeChild && beforeChild->parent() != this) {
beforeChild = beforeChild->parent(); beforeChild = beforeChild->parent();
KHTMLAssert(beforeChild->isAnonymousBlock()); TDEHTMLAssert(beforeChild->isAnonymousBlock());
KHTMLAssert(beforeChild->parent() == this); TDEHTMLAssert(beforeChild->parent() == this);
} }
} }
else if (!m_childrenInline && !newChild->isFloatingOrPositioned()) 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 // 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, // |insertionPoint|, because the new child is going to be inserted in between the inlines,
// splitting them. // splitting them.
KHTMLAssert(isReplacedBlock() || !isInline()); TDEHTMLAssert(isReplacedBlock() || !isInline());
KHTMLAssert(!insertionPoint || insertionPoint->parent() == this); TDEHTMLAssert(!insertionPoint || insertionPoint->parent() == this);
m_childrenInline = false; m_childrenInline = false;
@ -454,8 +454,8 @@ void RenderBlock::makeChildrenNonInline(RenderObject *insertionPoint)
void RenderBlock::makePageBreakAvoidBlocks() void RenderBlock::makePageBreakAvoidBlocks()
{ {
KHTMLAssert(!childrenInline()); TDEHTMLAssert(!childrenInline());
KHTMLAssert(canvas()->pagedMode()); TDEHTMLAssert(canvas()->pagedMode());
RenderObject *breakAfter = firstChild(); RenderObject *breakAfter = firstChild();
RenderObject *breakBefore = breakAfter ? breakAfter->nextSibling() : 0; RenderObject *breakBefore = breakAfter ? breakAfter->nextSibling() : 0;
@ -620,8 +620,8 @@ void RenderBlock::layoutBlock(bool relayoutChildren)
// kdDebug( 6040 ) << renderName() << " " << this << "::layoutBlock() start" << endl; // kdDebug( 6040 ) << renderName() << " " << this << "::layoutBlock() start" << endl;
// TQTime t; // TQTime t;
// t.start(); // t.start();
KHTMLAssert( needsLayout() ); TDEHTMLAssert( needsLayout() );
KHTMLAssert( minMaxKnown() ); TDEHTMLAssert( minMaxKnown() );
if (canvas()->pagedMode()) relayoutChildren = true; if (canvas()->pagedMode()) relayoutChildren = true;
@ -737,7 +737,7 @@ void RenderBlock::layoutBlock(bool relayoutChildren)
// Check for an overhanging float first. // Check for an overhanging float first.
// FIXME: This needs to look at the last flow, not the last child. // FIXME: This needs to look at the last flow, not the last child.
if (lastChild() && lastChild()->hasOverhangingFloats() && !lastChild()->hasOverflowClip()) { if (lastChild() && lastChild()->hasOverhangingFloats() && !lastChild()->hasOverflowClip()) {
KHTMLAssert(lastChild()->isRenderBlock()); TDEHTMLAssert(lastChild()->isRenderBlock());
m_height = lastChild()->yPos() + static_cast<RenderBlock*>(lastChild())->floatBottom(); m_height = lastChild()->yPos() + static_cast<RenderBlock*>(lastChild())->floatBottom();
m_height += borderBottom() + paddingBottom(); m_height += borderBottom() + paddingBottom();
} }
@ -950,7 +950,7 @@ void RenderBlock::insertCompactIfNeeded(RenderObject* child, CompactInfo& compac
int compactYPos = child->yPos() + child->borderTop() + child->paddingTop() int compactYPos = child->yPos() + child->borderTop() + child->paddingTop()
- compactChild->paddingTop() - compactChild->borderTop(); - compactChild->paddingTop() - compactChild->borderTop();
int adj = 0; int adj = 0;
KHTMLAssert(child->isRenderBlock()); TDEHTMLAssert(child->isRenderBlock());
InlineRunBox *b = static_cast<RenderBlock*>(child)->firstLineBox(); InlineRunBox *b = static_cast<RenderBlock*>(child)->firstLineBox();
InlineRunBox *c = static_cast<RenderBlock*>(compactChild)->firstLineBox(); InlineRunBox *c = static_cast<RenderBlock*>(compactChild)->firstLineBox();
if (b && c) { if (b && c) {
@ -1162,8 +1162,8 @@ void RenderBlock::clearFloatsIfNeeded(RenderObject* child, MarginInfo& marginInf
bool RenderBlock::canClear(RenderObject *child, PageBreakLevel level) bool RenderBlock::canClear(RenderObject *child, PageBreakLevel level)
{ {
KHTMLAssert(child->parent() && child->parent() == this); TDEHTMLAssert(child->parent() && child->parent() == this);
KHTMLAssert(canvas()->pagedMode()); TDEHTMLAssert(canvas()->pagedMode());
// Positioned elements cannot be moved. Only normal flow and floating. // Positioned elements cannot be moved. Only normal flow and floating.
if (child->isPositioned() || child->isRelPositioned()) return false; 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) void RenderBlock::clearPageBreak(RenderObject* child, int pageBottom)
{ {
KHTMLAssert(child->parent() && child->parent() == this); TDEHTMLAssert(child->parent() && child->parent() == this);
KHTMLAssert(canvas()->pagedMode()); TDEHTMLAssert(canvas()->pagedMode());
if (child->yPos() >= pageBottom) return; 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. // to shift over as necessary to dodge any floats that might get in the way.
if (child->flowAroundFloats()) { if (child->flowAroundFloats()) {
int leftOff = leftOffset(m_height); 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) if (child->marginLeft() < 0)
leftOff += child->marginLeft(); leftOff += child->marginLeft();
chPos = kMax(chPos, leftOff); // Let the float sit in the child's margin if it can fit. 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()); int chPos = xPos - (child->width() + child->marginRight());
if (child->flowAroundFloats()) { if (child->flowAroundFloats()) {
int rightOff = rightOffset(m_height); 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) if (child->marginRight() < 0)
rightOff -= child->marginRight(); rightOff -= child->marginRight();
chPos = kMin(chPos, rightOff - child->width()); // Let the float sit in the child's margin if it can fit. 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 { else {
// We should never get here, as insertFloatingObject() should only ever be called with floating // We should never get here, as insertFloatingObject() should only ever be called with floating
// objects. // objects.
KHTMLAssert(false); TDEHTMLAssert(false);
newObj = 0; // keep gcc's uninitialized variable warnings happy 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() void RenderBlock::calcMinMaxWidth()
{ {
KHTMLAssert( !minMaxKnown() ); TDEHTMLAssert( !minMaxKnown() );
#ifdef DEBUG_LAYOUT #ifdef DEBUG_LAYOUT
kdDebug( 6040 ) << renderName() << "(RenderBlock)::calcMinMaxWidth() this=" << this << endl; kdDebug( 6040 ) << renderName() << "(RenderBlock)::calcMinMaxWidth() this=" << this << endl;

@ -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 (knoll@kde.org) * Copyright (C) 1999-2003 Lars Knoll (knoll@kde.org)
* (C) 1999-2003 Antti Koivisto (koivisto@kde.org) * (C) 1999-2003 Antti Koivisto (koivisto@kde.org)

@ -119,7 +119,7 @@ static inline bool overflowAppliesTo(RenderObject* o)
// css 2.1-11.1.1 // css 2.1-11.1.1
// 1) overflow only applies to non-replaced block-level elements, table cells, and inline-block elements // 1) overflow only applies to non-replaced block-level elements, table cells, and inline-block elements
if (o->isRenderBlock() || o->isTableRow() || o->isTableSection()) 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()) if (!o->isRoot())
// 3) overflow on body may apply to the viewport... // 3) overflow on body may apply to the viewport...
if (!o->isBody() 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) || if ( (ml.isVariable() && mr.isVariable() && m_width<cw) ||
(!ml.isVariable() && !mr.isVariable() && (!ml.isVariable() && !mr.isVariable() &&
containingBlock()->style()->textAlign() == KHTML_CENTER) ) containingBlock()->style()->textAlign() == TDEHTML_CENTER) )
{ {
m_marginLeft = (cw - m_width)/2; m_marginLeft = (cw - m_width)/2;
if (m_marginLeft<0) m_marginLeft=0; 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) || else if ( (mr.isVariable() && m_width<cw) ||
(!ml.isVariable() && containingBlock()->style()->direction() == RTL && (!ml.isVariable() && containingBlock()->style()->direction() == RTL &&
containingBlock()->style()->textAlign() == KHTML_LEFT)) containingBlock()->style()->textAlign() == TDEHTML_LEFT))
{ {
m_marginLeft = ml.width(cw); m_marginLeft = ml.width(cw);
m_marginRight = cw - m_width - m_marginLeft; m_marginRight = cw - m_width - m_marginLeft;
} }
else if ( (ml.isVariable() && m_width<cw) || else if ( (ml.isVariable() && m_width<cw) ||
(!mr.isVariable() && containingBlock()->style()->direction() == LTR && (!mr.isVariable() && containingBlock()->style()->direction() == LTR &&
containingBlock()->style()->textAlign() == KHTML_RIGHT)) containingBlock()->style()->textAlign() == TDEHTML_RIGHT))
{ {
m_marginRight = mr.width(cw); m_marginRight = mr.width(cw);
m_marginLeft = cw - m_width - m_marginRight; 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 // ### regard direction
switch (s->textAlign()) { switch (s->textAlign()) {
case LEFT: case LEFT:
case KHTML_LEFT: case TDEHTML_LEFT:
case TAAUTO: // ### find out what this does case TAAUTO: // ### find out what this does
case JUSTIFY: case JUSTIFY:
break; break;
case CENTER: case CENTER:
case KHTML_CENTER: case TDEHTML_CENTER:
_x += contentWidth() / 2; _x += contentWidth() / 2;
break; break;
case KHTML_RIGHT: case TDEHTML_RIGHT:
case RIGHT: case RIGHT:
_x += contentWidth(); _x += contentWidth();
break; break;

@ -36,7 +36,7 @@ using namespace tdehtml;
//#define BOX_DEBUG //#define BOX_DEBUG
//#define SPEED_DEBUG //#define SPEED_DEBUG
RenderCanvas::RenderCanvas(DOM::NodeImpl* node, KHTMLView *view) RenderCanvas::RenderCanvas(DOM::NodeImpl* node, TDEHTMLView *view)
: RenderBlock(node) : RenderBlock(node)
{ {
// init RenderObject attributes // init RenderObject attributes
@ -103,7 +103,7 @@ void RenderCanvas::calcHeight()
void RenderCanvas::calcWidth() 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) if(m_pagedMode || !m_view)
{ {
m_width = m_rootWidth; m_width = m_rootWidth;
@ -125,7 +125,7 @@ void RenderCanvas::calcWidth()
void RenderCanvas::calcMinMaxWidth() void RenderCanvas::calcMinMaxWidth()
{ {
KHTMLAssert( !minMaxKnown() ); TDEHTMLAssert( !minMaxKnown() );
RenderBlock::calcMinMaxWidth(); RenderBlock::calcMinMaxWidth();
@ -271,7 +271,7 @@ bool RenderCanvas::needsFullRepaint() const
void RenderCanvas::repaintViewRectangle(int x, int y, int w, int h, bool asap) void RenderCanvas::repaintViewRectangle(int x, int y, int w, int h, bool asap)
{ {
KHTMLAssert( view() ); TDEHTMLAssert( view() );
view()->scheduleRepaint( x, y, w, h, asap ); view()->scheduleRepaint( x, y, w, h, asap );
} }

@ -25,7 +25,7 @@
#include "render_block.h" #include "render_block.h"
class KHTMLView; class TDEHTMLView;
class TQScrollView; class TQScrollView;
namespace tdehtml { namespace tdehtml {
@ -42,7 +42,7 @@ enum CanvasMode {
class RenderCanvas : public RenderBlock class RenderCanvas : public RenderBlock
{ {
public: public:
RenderCanvas(DOM::NodeImpl* node, KHTMLView *view); RenderCanvas(DOM::NodeImpl* node, TDEHTMLView *view);
~RenderCanvas(); ~RenderCanvas();
virtual const char *renderName() const { return "RenderCanvas"; } virtual const char *renderName() const { return "RenderCanvas"; }
@ -59,7 +59,7 @@ public:
int docHeight() const; int docHeight() const;
int docWidth() const; int docWidth() const;
KHTMLView *view() const { return m_view; } TDEHTMLView *view() const { return m_view; }
virtual void repaint(Priority p=NormalPriority); virtual void repaint(Priority p=NormalPriority);
virtual void repaintRectangle(int x, int y, int w, int h, Priority p=NormalPriority, bool f=false); 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; virtual TQRect viewRect() const;
KHTMLView *m_view; TDEHTMLView *m_view;
RenderObject* m_selectionStart; RenderObject* m_selectionStart;
RenderObject* m_selectionEnd; RenderObject* m_selectionEnd;

@ -127,7 +127,7 @@ void RenderContainer::addChild(RenderObject *newChild, RenderObject *beforeChild
break; break;
case NONE: case NONE:
// RenderHtml and some others can have display:none // RenderHtml and some others can have display:none
// KHTMLAssert(false); // TDEHTMLAssert(false);
break; break;
} }
} }
@ -167,7 +167,7 @@ void RenderContainer::addChild(RenderObject *newChild, RenderObject *beforeChild
RenderObject* RenderContainer::removeChildNode(RenderObject* oldChild) 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 // 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 // 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) void RenderContainer::appendChildNode(RenderObject* newChild)
{ {
KHTMLAssert(newChild->parent() == 0); TDEHTMLAssert(newChild->parent() == 0);
newChild->setParent(this); newChild->setParent(this);
RenderObject* lChild = lastChild(); RenderObject* lChild = lastChild();
@ -499,10 +499,10 @@ void RenderContainer::insertChildNode(RenderObject* child, RenderObject* beforeC
return; return;
} }
KHTMLAssert(!child->parent()); TDEHTMLAssert(!child->parent());
while ( beforeChild->parent() != this && beforeChild->parent()->isAnonymousBlock() ) while ( beforeChild->parent() != this && beforeChild->parent()->isAnonymousBlock() )
beforeChild = beforeChild->parent(); beforeChild = beforeChild->parent();
KHTMLAssert(beforeChild->parent() == this); TDEHTMLAssert(beforeChild->parent() == this);
if(beforeChild == firstChild()) if(beforeChild == firstChild())
setFirstChild(child); setFirstChild(child);
@ -526,8 +526,8 @@ void RenderContainer::insertChildNode(RenderObject* child, RenderObject* beforeC
void RenderContainer::layout() void RenderContainer::layout()
{ {
KHTMLAssert( needsLayout() ); TDEHTMLAssert( needsLayout() );
KHTMLAssert( minMaxKnown() ); TDEHTMLAssert( minMaxKnown() );
const bool pagedMode = canvas()->pagedMode(); const bool pagedMode = canvas()->pagedMode();
RenderObject *child = firstChild(); RenderObject *child = firstChild();
while( child ) { while( child ) {

@ -289,7 +289,7 @@ void RenderFlow::repaint(Priority prior)
for (RenderObject* inlineFlow = this; inlineFlow && inlineFlow->isInlineFlow() && inlineFlow != cb; for (RenderObject* inlineFlow = this; inlineFlow && inlineFlow->isInlineFlow() && inlineFlow != cb;
inlineFlow = inlineFlow->parent()) { inlineFlow = inlineFlow->parent()) {
if (inlineFlow->style() && inlineFlow->style()->position() == RELATIVE && inlineFlow->layer()) { if (inlineFlow->style() && inlineFlow->style()->position() == RELATIVE && inlineFlow->layer()) {
KHTMLAssert(inlineFlow->isBox()); TDEHTMLAssert(inlineFlow->isBox());
static_cast<RenderBox*>(inlineFlow)->relativePositionOffset(left, top); static_cast<RenderBox*>(inlineFlow)->relativePositionOffset(left, top);
} }
} }

@ -83,8 +83,8 @@ void RenderFormElement::updateFromElement()
void RenderFormElement::layout() void RenderFormElement::layout()
{ {
KHTMLAssert( needsLayout() ); TDEHTMLAssert( needsLayout() );
KHTMLAssert( minMaxKnown() ); TDEHTMLAssert( minMaxKnown() );
// minimum height // minimum height
m_height = 0; m_height = 0;
@ -103,13 +103,13 @@ TQ_Alignment RenderFormElement::textAlignment() const
{ {
switch (style()->textAlign()) { switch (style()->textAlign()) {
case LEFT: case LEFT:
case KHTML_LEFT: case TDEHTML_LEFT:
return Qt::AlignLeft; return Qt::AlignLeft;
case RIGHT: case RIGHT:
case KHTML_RIGHT: case TDEHTML_RIGHT:
return Qt::AlignRight; return Qt::AlignRight;
case CENTER: case CENTER:
case KHTML_CENTER: case TDEHTML_CENTER:
return Qt::AlignHCenter; return Qt::AlignHCenter;
case JUSTIFY: case JUSTIFY:
// Just fall into the auto code for justify. // Just fall into the auto code for justify.
@ -152,7 +152,7 @@ RenderCheckBox::RenderCheckBox(HTMLInputElementImpl *element)
void RenderCheckBox::calcMinMaxWidth() void RenderCheckBox::calcMinMaxWidth()
{ {
KHTMLAssert( !minMaxKnown() ); TDEHTMLAssert( !minMaxKnown() );
TQCheckBox *cb = static_cast<TQCheckBox *>( m_widget ); TQCheckBox *cb = static_cast<TQCheckBox *>( m_widget );
TQSize s( cb->style().pixelMetric( TQStyle::PM_IndicatorWidth ), TQSize s( cb->style().pixelMetric( TQStyle::PM_IndicatorWidth ),
@ -204,7 +204,7 @@ void RenderRadioButton::updateFromElement()
void RenderRadioButton::calcMinMaxWidth() void RenderRadioButton::calcMinMaxWidth()
{ {
KHTMLAssert( !minMaxKnown() ); TDEHTMLAssert( !minMaxKnown() );
TQRadioButton *rb = static_cast<TQRadioButton *>( m_widget ); TQRadioButton *rb = static_cast<TQRadioButton *>( m_widget );
TQSize s( rb->style().pixelMetric( TQStyle::PM_ExclusiveIndicatorWidth ), TQSize s( rb->style().pixelMetric( TQStyle::PM_ExclusiveIndicatorWidth ),
@ -251,7 +251,7 @@ TQString RenderSubmitButton::rawText()
void RenderSubmitButton::calcMinMaxWidth() void RenderSubmitButton::calcMinMaxWidth()
{ {
KHTMLAssert( !minMaxKnown() ); TDEHTMLAssert( !minMaxKnown() );
TQString raw = rawText(); TQString raw = rawText();
TQPushButton* pb = static_cast<TQPushButton*>(m_widget); 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) : KLineEdit(parent, "__tdehtml"), m_input(input), m_view(view), m_spell(0)
{ {
setMouseTracking(true); setMouseTracking(true);
@ -532,7 +532,7 @@ void RenderLineEdit::handleFocusOut()
void RenderLineEdit::calcMinMaxWidth() void RenderLineEdit::calcMinMaxWidth()
{ {
KHTMLAssert( !minMaxKnown() ); TDEHTMLAssert( !minMaxKnown() );
const TQFontMetrics &fm = style()->fontMetrics(); const TQFontMetrics &fm = style()->fontMetrics();
TQSize s; TQSize s;
@ -797,7 +797,7 @@ RenderFileButton::RenderFileButton(HTMLInputElementImpl *element)
void RenderFileButton::calcMinMaxWidth() void RenderFileButton::calcMinMaxWidth()
{ {
KHTMLAssert( !minMaxKnown() ); TDEHTMLAssert( !minMaxKnown() );
const TQFontMetrics &fm = style()->fontMetrics(); const TQFontMetrics &fm = style()->fontMetrics();
int size = element()->size(); int size = element()->size();
@ -1032,7 +1032,7 @@ void RenderSelect::updateFromElement()
static_cast<KComboBox*>(m_widget)->insertItem(text, listIndex); static_cast<KComboBox*>(m_widget)->insertItem(text, listIndex);
} }
else else
KHTMLAssert(false); TDEHTMLAssert(false);
m_selectionChanged = true; m_selectionChanged = true;
} }
@ -1058,7 +1058,7 @@ void RenderSelect::updateFromElement()
void RenderSelect::calcMinMaxWidth() void RenderSelect::calcMinMaxWidth()
{ {
KHTMLAssert( !minMaxKnown() ); TDEHTMLAssert( !minMaxKnown() );
if (m_optionsChanged) if (m_optionsChanged)
updateFromElement(); updateFromElement();
@ -1074,8 +1074,8 @@ void RenderSelect::calcMinMaxWidth()
void RenderSelect::layout( ) void RenderSelect::layout( )
{ {
KHTMLAssert(needsLayout()); TDEHTMLAssert(needsLayout());
KHTMLAssert(minMaxKnown()); TDEHTMLAssert(minMaxKnown());
// ### maintain selection properly between type/size changes, and work // ### maintain selection properly between type/size changes, and work
// out how to handle multiselect->singleselect (probably just select // 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; if ( m_ignoreSelectEvents ) return;
KHTMLAssert( !m_useListBox ); TDEHTMLAssert( !m_useListBox );
TQMemArray<HTMLGenericFormElementImpl*> listItems = element()->listItems(); TQMemArray<HTMLGenericFormElementImpl*> listItems = element()->listItems();
if(index >= 0 && index < int(listItems.size())) if(index >= 0 && index < int(listItems.size()))
@ -1561,7 +1561,7 @@ void TextAreaWidget::slotFind()
if ( m_findDlg ) { if ( m_findDlg ) {
KWin::activateWindow( m_findDlg->winId() ); KWin::activateWindow( m_findDlg->winId() );
} else { } 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()) ); connect( m_findDlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotDoFind()) );
} }
m_findDlg->show(); m_findDlg->show();
@ -1576,7 +1576,7 @@ void TextAreaWidget::slotReplace()
if ( m_repDlg ) { if ( m_repDlg ) {
KWin::activateWindow( m_repDlg->winId() ); KWin::activateWindow( m_repDlg->winId() );
} else { } else {
m_repDlg = new KReplaceDialog(this, "KHTMLText Area Replace Dialog", 0, m_repDlg = new KReplaceDialog(this, "TDEHTMLText Area Replace Dialog", 0,
TQStringList(), TQStringList(), false); TQStringList(), TQStringList(), false);
connect( m_repDlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotDoReplace()) ); 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()); TextAreaWidget *edit = new TextAreaWidget(element->wrap(), view());
setQWidget(edit); setQWidget(edit);
const KHTMLSettings *settings = view()->part()->settings(); const TDEHTMLSettings *settings = view()->part()->settings();
edit->setCheckSpellingEnabled( settings->autoSpellCheck() ); edit->setCheckSpellingEnabled( settings->autoSpellCheck() );
edit->setTabChangesFocus( ! settings->allowTabulation() ); edit->setTabChangesFocus( ! settings->allowTabulation() );
@ -1645,7 +1645,7 @@ void RenderTextArea::handleFocusOut()
void RenderTextArea::calcMinMaxWidth() void RenderTextArea::calcMinMaxWidth()
{ {
KHTMLAssert( !minMaxKnown() ); TDEHTMLAssert( !minMaxKnown() );
TextAreaWidget* w = static_cast<TextAreaWidget*>(m_widget); TextAreaWidget* w = static_cast<TextAreaWidget*>(m_widget);
const TQFontMetrics &m = style()->fontMetrics(); const TQFontMetrics &m = style()->fontMetrics();
@ -1680,7 +1680,7 @@ void RenderTextArea::setStyle(RenderStyle* _style)
void RenderTextArea::layout() void RenderTextArea::layout()
{ {
KHTMLAssert( needsLayout() ); TDEHTMLAssert( needsLayout() );
RenderFormElement::layout(); RenderFormElement::layout();

@ -45,7 +45,7 @@ class QListboxItem;
#include <kcombobox.h> #include <kcombobox.h>
#include "dom/dom_misc.h" #include "dom/dom_misc.h"
class KHTMLPartBrowserExtension; class TDEHTMLPartBrowserExtension;
class KSpell; class KSpell;
class KFindDialog; class KFindDialog;
class KReplaceDialog; class KReplaceDialog;
@ -256,7 +256,7 @@ class LineEditWidget : public KLineEdit
Q_OBJECT Q_OBJECT
public: public:
LineEditWidget(DOM::HTMLInputElementImpl* input, LineEditWidget(DOM::HTMLInputElementImpl* input,
KHTMLView* view, TQWidget* parent); TDEHTMLView* view, TQWidget* parent);
~LineEditWidget(); ~LineEditWidget();
void highLightWord( unsigned int length, unsigned int pos ); void highLightWord( unsigned int length, unsigned int pos );
@ -280,7 +280,7 @@ private:
EditHistory EditHistory
}; };
DOM::HTMLInputElementImpl* m_input; DOM::HTMLInputElementImpl* m_input;
KHTMLView* m_view; TDEHTMLView* m_view;
KSpell *m_spell; KSpell *m_spell;
KAction *m_spellAction; KAction *m_spellAction;
}; };

@ -101,11 +101,11 @@ bool RenderFrameSet::nodeAtPoint(NodeInfo& info, int _x, int _y, int _tx, int _t
void RenderFrameSet::layout( ) void RenderFrameSet::layout( )
{ {
KHTMLAssert( needsLayout() ); TDEHTMLAssert( needsLayout() );
KHTMLAssert( minMaxKnown() ); TDEHTMLAssert( minMaxKnown() );
if ( !parent()->isFrameSet() ) { if ( !parent()->isFrameSet() ) {
KHTMLView* view = canvas()->view(); TDEHTMLView* view = canvas()->view();
m_width = view ? view->visibleWidth() : 0; m_width = view ? view->visibleWidth() : 0;
m_height = view ? view->visibleHeight() : 0; m_height = view ? view->visibleHeight() : 0;
} }
@ -545,7 +545,7 @@ bool RenderFrameSet::userResize( MouseEventImpl *evt )
setNeedsLayout(true); setNeedsLayout(true);
} }
KHTMLView *view = canvas()->view(); TDEHTMLView *view = canvas()->view();
if ((m_resizing || evt->id() == EventImpl::MOUSEUP_EVENT) && view) { if ((m_resizing || evt->id() == EventImpl::MOUSEUP_EVENT) && view) {
TQPainter paint( view ); TQPainter paint( view );
paint.setPen( Qt::gray ); paint.setPen( Qt::gray );
@ -635,7 +635,7 @@ void RenderPart::setWidget( TQWidget *widget )
setQWidget( widget ); setQWidget( widget );
widget->setFocusPolicy(TQ_WheelFocus); widget->setFocusPolicy(TQ_WheelFocus);
if(widget->inherits("KHTMLView")) if(widget->inherits("TDEHTMLView"))
connect( widget, TQT_SIGNAL( cleared() ), this, TQT_SLOT( slotViewCleared() ) ); connect( widget, TQT_SIGNAL( cleared() ), this, TQT_SLOT( slotViewCleared() ) );
setNeedsLayoutAndMinMaxRecalc(); setNeedsLayoutAndMinMaxRecalc();
@ -683,11 +683,11 @@ void RenderFrame::slotViewCleared()
view->setFrameStyle(TQFrame::NoFrame); view->setFrameStyle(TQFrame::NoFrame);
view->setVScrollBarMode(element()->scrolling ); view->setVScrollBarMode(element()->scrolling );
view->setHScrollBarMode(element()->scrolling ); view->setHScrollBarMode(element()->scrolling );
if(view->inherits("KHTMLView")) { if(view->inherits("TDEHTMLView")) {
#ifdef DEBUG_LAYOUT #ifdef DEBUG_LAYOUT
kdDebug(6031) << "frame is a KHTMLview!" << endl; kdDebug(6031) << "frame is a TDEHTMLview!" << endl;
#endif #endif
KHTMLView *htmlView = static_cast<KHTMLView *>(view); TDEHTMLView *htmlView = static_cast<TDEHTMLView *>(view);
if(element()->marginWidth != -1) htmlView->setMarginWidth(element()->marginWidth); if(element()->marginWidth != -1) htmlView->setMarginWidth(element()->marginWidth);
if(element()->marginHeight != -1) htmlView->setMarginHeight(element()->marginHeight); if(element()->marginHeight != -1) htmlView->setMarginHeight(element()->marginHeight);
} }
@ -706,7 +706,7 @@ RenderPartObject::RenderPartObject( DOM::HTMLElementImpl* element )
void RenderPartObject::updateWidget() void RenderPartObject::updateWidget()
{ {
TQString url; TQString url;
KHTMLPart *part = m_view->part(); TDEHTMLPart *part = m_view->part();
setNeedsLayoutAndMinMaxRecalc(); setNeedsLayoutAndMinMaxRecalc();
@ -754,8 +754,8 @@ void RenderPartObject::updateWidget()
} }
} }
} }
params.append( TQString::fromLatin1("__KHTML__PLUGINEMBED=\"YES\"") ); params.append( TQString::fromLatin1("__TDEHTML__PLUGINEMBED=\"YES\"") );
params.append( TQString::fromLatin1("__KHTML__PLUGINBASEURL=\"%1\"").arg(element()->getDocument()->baseURL().url())); params.append( TQString::fromLatin1("__TDEHTML__PLUGINBASEURL=\"%1\"").arg(element()->getDocument()->baseURL().url()));
HTMLEmbedElementImpl *embed = 0; HTMLEmbedElementImpl *embed = 0;
TQString classId; TQString classId;
@ -775,8 +775,8 @@ void RenderPartObject::updateWidget()
} }
classId = objbase->classId; classId = objbase->classId;
params.append( TQString::fromLatin1("__KHTML__CLASSID=\"%1\"").arg( classId ) ); params.append( TQString::fromLatin1("__TDEHTML__CLASSID=\"%1\"").arg( classId ) );
params.append( TQString::fromLatin1("__KHTML__CODEBASE=\"%1\"").arg( objbase->getAttribute(ATTR_CODEBASE).string() ) ); params.append( TQString::fromLatin1("__TDEHTML__CODEBASE=\"%1\"").arg( objbase->getAttribute(ATTR_CODEBASE).string() ) );
if (!objbase->getAttribute(ATTR_WIDTH).isEmpty()) if (!objbase->getAttribute(ATTR_WIDTH).isEmpty())
params.append( TQString::fromLatin1("WIDTH=\"%1\"").arg( objbase->getAttribute(ATTR_WIDTH).string() ) ); params.append( TQString::fromLatin1("WIDTH=\"%1\"").arg( objbase->getAttribute(ATTR_WIDTH).string() ) );
else if (embed && !embed->getAttribute(ATTR_WIDTH).isEmpty()) { 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 ) 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; kdDebug(6031) << "RenderPartObject::partLoadingErrorNotify serviceType=" << serviceType << endl;
// Check if we just tried with e.g. nsplugin // Check if we just tried with e.g. nsplugin
// and fallback to the activexhandler if there is a classid // and fallback to the activexhandler if there is a classid
@ -925,7 +925,7 @@ void RenderPartObject::slotPartLoadingErrorNotify()
// prepare for the local eventloop in KMessageBox // prepare for the local eventloop in KMessageBox
ref(); ref();
KHTMLPart *part = static_cast<KHTMLView *>(m_view)->part(); TDEHTMLPart *part = static_cast<TDEHTMLView *>(m_view)->part();
KParts::BrowserExtension *ext = part->browserExtension(); KParts::BrowserExtension *ext = part->browserExtension();
if( embed && !embed->pluginPage.isEmpty() && ext ) { if( embed && !embed->pluginPage.isEmpty() && ext ) {
// Prepare the mimetype to show in the question (comment if available, name as fallback) // Prepare the mimetype to show in the question (comment if available, name as fallback)
@ -976,8 +976,8 @@ void RenderPartObject::slotPartLoadingErrorNotify()
void RenderPartObject::layout( ) void RenderPartObject::layout( )
{ {
KHTMLAssert( needsLayout() ); TDEHTMLAssert( needsLayout() );
KHTMLAssert( minMaxKnown() ); TDEHTMLAssert( minMaxKnown() );
calcWidth(); calcWidth();
calcHeight(); calcHeight();
@ -1009,11 +1009,11 @@ void RenderPartObject::slotViewCleared()
view->setFrameStyle(frameStyle); view->setFrameStyle(frameStyle);
view->setVScrollBarMode(scroll ); view->setVScrollBarMode(scroll );
view->setHScrollBarMode(scroll ); view->setHScrollBarMode(scroll );
if(view->inherits("KHTMLView")) { if(view->inherits("TDEHTMLView")) {
#ifdef DEBUG_LAYOUT #ifdef DEBUG_LAYOUT
kdDebug(6031) << "frame is a KHTMLview!" << endl; kdDebug(6031) << "frame is a TDEHTMLview!" << endl;
#endif #endif
KHTMLView *htmlView = static_cast<KHTMLView *>(view); TDEHTMLView *htmlView = static_cast<TDEHTMLView *>(view);
htmlView->setIgnoreWheelEvents( element()->id() == ID_IFRAME ); htmlView->setIgnoreWheelEvents( element()->id() == ID_IFRAME );
if(marginw != -1) htmlView->setMarginWidth(marginw); if(marginw != -1) htmlView->setMarginWidth(marginw);
if(marginh != -1) htmlView->setMarginHeight(marginh); if(marginh != -1) htmlView->setMarginHeight(marginh);

@ -26,7 +26,7 @@
#include "rendering/render_replaced.h" #include "rendering/render_replaced.h"
#include "xml/dom_nodeimpl.h" #include "xml/dom_nodeimpl.h"
#include "html/html_baseimpl.h" #include "html/html_baseimpl.h"
class KHTMLView; class TDEHTMLView;
namespace DOM namespace DOM
{ {
@ -102,7 +102,7 @@ public:
virtual void setWidget( TQWidget *widget ); 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 * part was not successfuly. (called either asyncroniously after a
* after the servicetype of the given url (the one passed with requestObject) * after the servicetype of the given url (the one passed with requestObject)
* has been determined or syncroniously from within requestObject) * has been determined or syncroniously from within requestObject)

@ -38,7 +38,7 @@ RenderCounterBase::RenderCounterBase(DOM::NodeImpl* node)
void RenderCounterBase::layout() void RenderCounterBase::layout()
{ {
KHTMLAssert( needsLayout() ); TDEHTMLAssert( needsLayout() );
if ( !minMaxKnown() ) if ( !minMaxKnown() )
calcMinMaxWidth(); calcMinMaxWidth();
@ -48,7 +48,7 @@ void RenderCounterBase::layout()
void RenderCounterBase::calcMinMaxWidth() void RenderCounterBase::calcMinMaxWidth()
{ {
KHTMLAssert( !minMaxKnown() ); TDEHTMLAssert( !minMaxKnown() );
generateContent(); generateContent();

@ -64,7 +64,7 @@ RenderImage::RenderImage(NodeImpl *_element)
m_selectionState = SelectionNone; m_selectionState = SelectionNone;
berrorPic = false; berrorPic = false;
const KHTMLSettings *settings = _element->getDocument()->view()->part()->settings(); const TDEHTMLSettings *settings = _element->getDocument()->view()->part()->settings();
bUnfinishedImageFrame = settings->unfinishedImageFrame(); bUnfinishedImageFrame = settings->unfinishedImageFrame();
setIntrinsicWidth( 0 ); setIntrinsicWidth( 0 );
@ -378,8 +378,8 @@ void RenderImage::paint(PaintInfo& paintInfo, int _tx, int _ty)
void RenderImage::layout() void RenderImage::layout()
{ {
KHTMLAssert( needsLayout()); TDEHTMLAssert( needsLayout());
KHTMLAssert( minMaxKnown() ); TDEHTMLAssert( minMaxKnown() );
short oldwidth = m_width; short oldwidth = m_width;
int oldheight = m_height; int oldheight = m_height;

@ -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 (knoll@kde.org) * Copyright (C) 1999-2003 Lars Knoll (knoll@kde.org)
* (C) 1999-2003 Antti Koivisto (koivisto@kde.org) * (C) 1999-2003 Antti Koivisto (koivisto@kde.org)
@ -760,7 +760,7 @@ void RenderInline::paintOutlinePath(TQPainter *p, int tx, int ty, const TQPoint
void RenderInline::calcMinMaxWidth() void RenderInline::calcMinMaxWidth()
{ {
KHTMLAssert( !minMaxKnown() ); TDEHTMLAssert( !minMaxKnown() );
#ifdef DEBUG_LAYOUT #ifdef DEBUG_LAYOUT
kdDebug( 6040 ) << renderName() << "(RenderInline)::calcMinMaxWidth() this=" << this << endl; kdDebug( 6040 ) << renderName() << "(RenderInline)::calcMinMaxWidth() this=" << this << endl;

@ -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 (knoll@kde.org) * Copyright (C) 1999-2003 Lars Knoll (knoll@kde.org)
* (C) 1999-2003 Antti Koivisto (koivisto@kde.org) * (C) 1999-2003 Antti Koivisto (koivisto@kde.org)

@ -180,8 +180,8 @@ short RenderListItem::marginRight() const
void RenderListItem::layout( ) void RenderListItem::layout( )
{ {
KHTMLAssert( needsLayout() ); TDEHTMLAssert( needsLayout() );
KHTMLAssert( minMaxKnown() ); TDEHTMLAssert( minMaxKnown() );
updateMarkerLocation(); updateMarkerLocation();
RenderBlock::layout(); RenderBlock::layout();
@ -369,7 +369,7 @@ void RenderListMarker::paint(PaintInfo& paintInfo, int _tx, int _ty)
void RenderListMarker::layout() void RenderListMarker::layout()
{ {
KHTMLAssert( needsLayout() ); TDEHTMLAssert( needsLayout() );
if ( !minMaxKnown() ) if ( !minMaxKnown() )
calcMinMaxWidth(); calcMinMaxWidth();
@ -392,7 +392,7 @@ void RenderListMarker::setPixmap( const TQPixmap &p, const TQRect& r, CachedImag
void RenderListMarker::calcMinMaxWidth() void RenderListMarker::calcMinMaxWidth()
{ {
KHTMLAssert( !minMaxKnown() ); TDEHTMLAssert( !minMaxKnown() );
m_markerWidth = m_width = 0; m_markerWidth = m_width = 0;
@ -541,7 +541,7 @@ void RenderListMarker::calcMinMaxWidth()
case LNONE: case LNONE:
break; break;
default: default:
KHTMLAssert(false); TDEHTMLAssert(false);
} }
m_markerWidth = fm.width(m_item) + fm.width(TQString::fromLatin1(". ")); m_markerWidth = fm.width(m_item) + fm.width(TQString::fromLatin1(". "));
} }

@ -256,12 +256,12 @@ bool RenderObject::isHTMLMarquee() const
void RenderObject::addChild(RenderObject* , RenderObject *) void RenderObject::addChild(RenderObject* , RenderObject *)
{ {
KHTMLAssert(0); TDEHTMLAssert(0);
} }
RenderObject* RenderObject::removeChildNode(RenderObject* ) RenderObject* RenderObject::removeChildNode(RenderObject* )
{ {
KHTMLAssert(0); TDEHTMLAssert(0);
return 0; return 0;
} }
@ -273,12 +273,12 @@ void RenderObject::removeChild(RenderObject *o )
void RenderObject::appendChildNode(RenderObject*) void RenderObject::appendChildNode(RenderObject*)
{ {
KHTMLAssert(0); TDEHTMLAssert(0);
} }
void RenderObject::insertChildNode(RenderObject*, RenderObject*) void RenderObject::insertChildNode(RenderObject*, RenderObject*)
{ {
KHTMLAssert(0); TDEHTMLAssert(0);
} }
RenderObject *RenderObject::nextRenderer() const RenderObject *RenderObject::nextRenderer() const
@ -1369,7 +1369,7 @@ bool RenderObject::attemptDirectLayerTranslation()
// When the difference between two successive styles is only 'Position' // When the difference between two successive styles is only 'Position'
// we may attempt to save a layout by directly updating the object 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()) if (!layer())
return false; return false;
setInline(m_style->isDisplayInlineType()); setInline(m_style->isDisplayInlineType());
@ -1444,7 +1444,7 @@ void RenderObject::setOverhangingContents(bool p)
if (p) if (p)
{ {
m_overhangingContents = true; m_overhangingContents = true;
KHTMLAssert( cb != this || isCanvas()); TDEHTMLAssert( cb != this || isCanvas());
if (cb && cb != this) if (cb && cb != this)
cb->setOverhangingContents(); cb->setOverhangingContents();
} }
@ -1464,7 +1464,7 @@ void RenderObject::setOverhangingContents(bool p)
else else
{ {
m_overhangingContents = false; m_overhangingContents = false;
KHTMLAssert( cb != this ); TDEHTMLAssert( cb != this );
if (cb && cb != this) if (cb && cb != this)
cb->setOverhangingContents(false); cb->setOverhangingContents(false);
} }
@ -1935,7 +1935,7 @@ void RenderObject::invalidateVerticalPositions()
void RenderObject::recalcMinMaxWidths() void RenderObject::recalcMinMaxWidths()
{ {
KHTMLAssert( m_recalcMinMax ); TDEHTMLAssert( m_recalcMinMax );
#ifdef DEBUG_LAYOUT #ifdef DEBUG_LAYOUT
kdDebug( 6040 ) << renderName() << " recalcMinMaxWidths() this=" << this <<endl; kdDebug( 6040 ) << renderName() << " recalcMinMaxWidths() this=" << this <<endl;
@ -1974,7 +1974,7 @@ void RenderObject::recalcMinMaxWidths()
void RenderObject::scheduleRelayout(RenderObject *clippedObj) void RenderObject::scheduleRelayout(RenderObject *clippedObj)
{ {
if (!isCanvas()) return; if (!isCanvas()) return;
KHTMLView *view = static_cast<RenderCanvas *>(this)->view(); TDEHTMLView *view = static_cast<RenderCanvas *>(this)->view();
if ( view ) if ( view )
view->scheduleRelayout(clippedObj); view->scheduleRelayout(clippedObj);
} }
@ -1986,7 +1986,7 @@ void RenderObject::removeLeftoverAnonymousBoxes()
InlineBox* RenderObject::createInlineBox(bool /*makePlaceHolderBox*/, bool /*isRootLineBox*/) InlineBox* RenderObject::createInlineBox(bool /*makePlaceHolderBox*/, bool /*isRootLineBox*/)
{ {
KHTMLAssert(false); TDEHTMLAssert(false);
return 0; return 0;
} }

@ -43,17 +43,17 @@
class TQPainter; class TQPainter;
class TQTextStream; class TQTextStream;
class CSSStyle; class CSSStyle;
class KHTMLView; class TDEHTMLView;
#ifndef NDEBUG #ifndef NDEBUG
#define KHTMLAssert( x ) if( !(x) ) { \ #define TDEHTMLAssert( x ) if( !(x) ) { \
const RenderObject *o = this; while( o->parent() ) o = o->parent(); \ const RenderObject *o = this; while( o->parent() ) o = o->parent(); \
o->printTree(); \ o->printTree(); \
tqDebug(" this object = %p, %s", (void*) this, kdBacktrace().latin1() ); \ tqDebug(" this object = %p, %s", (void*) this, kdBacktrace().latin1() ); \
assert( x ); \ assert( x ); \
} }
#else #else
#define KHTMLAssert( x ) #define TDEHTMLAssert( x )
#endif #endif
/* /*

@ -64,7 +64,7 @@ RenderReplaced::RenderReplaced(DOM::NodeImpl* node)
void RenderReplaced::calcMinMaxWidth() void RenderReplaced::calcMinMaxWidth()
{ {
KHTMLAssert( !minMaxKnown()); TDEHTMLAssert( !minMaxKnown());
#ifdef DEBUG_LAYOUT #ifdef DEBUG_LAYOUT
kdDebug( 6040 ) << "RenderReplaced::calcMinMaxWidth() known=" << minMaxKnown() << endl; kdDebug( 6040 ) << "RenderReplaced::calcMinMaxWidth() known=" << minMaxKnown() << endl;
@ -102,7 +102,7 @@ RenderWidget::RenderWidget(DOM::NodeImpl* node)
m_arena.reset(renderArena()); m_arena.reset(renderArena());
m_resizePending = false; m_resizePending = false;
m_discardResizes = false; m_discardResizes = false;
m_isKHTMLWidget = false; m_isTDEHTMLWidget = false;
m_needsMask = false; m_needsMask = false;
// this is no real reference counting, its just there // this is no real reference counting, its just there
@ -131,7 +131,7 @@ void RenderWidget::detach()
RenderWidget::~RenderWidget() RenderWidget::~RenderWidget()
{ {
KHTMLAssert( refCount() <= 0 ); TDEHTMLAssert( refCount() <= 0 );
if(m_widget) { if(m_widget) {
m_widget->hide(); m_widget->hide();
@ -157,7 +157,7 @@ void RenderWidget::resizeWidget( int w, int h )
w = kMin( w, 2000 ); w = kMin( w, 2000 );
if (m_widget->width() != w || m_widget->height() != h) { if (m_widget->width() != w || m_widget->height() != h) {
m_resizePending = isKHTMLWidget(); m_resizePending = isTDEHTMLWidget();
ref(); ref();
element()->ref(); element()->ref();
TQApplication::postEvent( this, new TQWidgetResizeEvent( w, h ) ); TQApplication::postEvent( this, new TQWidgetResizeEvent( w, h ) );
@ -185,8 +185,8 @@ bool RenderWidget::event( TQEvent *e )
m_widget->resize( re->w, re->h ); m_widget->resize( re->w, re->h );
repaint(); repaint();
} }
// eat all events - except if this is a frame (in which case KHTMLView handles it all) // eat all events - except if this is a frame (in which case TDEHTMLView handles it all)
if ( ::tqqt_cast<KHTMLView *>( m_widget ) ) if ( ::tqqt_cast<TDEHTMLView *>( m_widget ) )
return TQObject::event( e ); return TQObject::event( e );
return true; return true;
} }
@ -212,7 +212,7 @@ void RenderWidget::setQWidget(TQWidget *widget)
connect( m_widget, TQT_SIGNAL( destroyed()), this, TQT_SLOT( slotWidgetDestructed())); connect( m_widget, TQT_SIGNAL( destroyed()), this, TQT_SLOT( slotWidgetDestructed()));
m_widget->installEventFilter(this); 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 ); m_widget->setBackgroundMode( TQWidget::NoBackground );
if (m_widget->focusPolicy() > TQ_StrongFocus) if (m_widget->focusPolicy() > TQ_StrongFocus)
@ -236,12 +236,12 @@ void RenderWidget::setQWidget(TQWidget *widget)
void RenderWidget::layout( ) void RenderWidget::layout( )
{ {
KHTMLAssert( needsLayout() ); TDEHTMLAssert( needsLayout() );
KHTMLAssert( minMaxKnown() ); TDEHTMLAssert( minMaxKnown() );
if ( m_widget ) { if ( m_widget ) {
resizeWidget( m_width-borderLeft()-borderRight()-paddingLeft()-paddingRight(), resizeWidget( m_width-borderLeft()-borderRight()-paddingLeft()-paddingRight(),
m_height-borderTop()-borderBottom()-paddingTop()-paddingBottom() ); m_height-borderTop()-borderBottom()-paddingTop()-paddingBottom() );
if (!isKHTMLWidget() && !isFrame() && !m_needsMask) { if (!isTDEHTMLWidget() && !isFrame() && !m_needsMask) {
m_needsMask = true; m_needsMask = true;
RenderLayer* rl = enclosingStackingContext(); RenderLayer* rl = enclosingStackingContext();
RenderLayer* el = enclosingLayer(); RenderLayer* el = enclosingLayer();
@ -277,7 +277,7 @@ void RenderWidget::updateFromElement()
int lowlightVal = 100 + (2*contrast_+4)*10; int lowlightVal = 100 + (2*contrast_+4)*10;
if (backgroundColor.isValid()) { if (backgroundColor.isValid()) {
if (!isKHTMLWidget()) if (!isTDEHTMLWidget())
widget()->setEraseColor(backgroundColor ); widget()->setEraseColor(backgroundColor );
for ( int i = 0; i < TQPalette::NColorGroups; ++i ) { for ( int i = 0; i < TQPalette::NColorGroups; ++i ) {
pal.setColor( (TQPalette::ColorGroup)i, TQColorGroup::Background, backgroundColor ); 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 xPos = _tx+borderLeft()+paddingLeft();
int yPos = _ty+borderTop()+paddingTop(); int yPos = _ty+borderTop()+paddingTop();
bool tdehtmlw = isKHTMLWidget(); bool tdehtmlw = isTDEHTMLWidget();
int childw = m_widget->width(); int childw = m_widget->width();
int childh = m_widget->height(); int childh = m_widget->height();
if ( (childw == 2000 || childh == 3072) && m_widget->inherits( "KHTMLView" ) ) { if ( (childw == 2000 || childh == 3072) && m_widget->inherits( "TDEHTMLView" ) ) {
KHTMLView *vw = static_cast<KHTMLView *>(m_widget); TDEHTMLView *vw = static_cast<TDEHTMLView *>(m_widget);
int cy = m_view->contentsY(); int cy = m_view->contentsY();
int ch = m_view->visibleHeight(); 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) bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e)
{ {
// no special event processing if this is a frame (in which case KHTMLView handles it all) // no special event processing if this is a frame (in which case TDEHTMLView handles it all)
if ( ::tqqt_cast<KHTMLView *>( m_widget ) ) if ( ::tqqt_cast<TDEHTMLView *>( m_widget ) )
return false; return false;
if ( !element() ) return true; if ( !element() ) return true;
@ -655,14 +655,14 @@ bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e)
//kdDebug(6000) << "RenderWidget::eventFilter captures FocusIn" << endl; //kdDebug(6000) << "RenderWidget::eventFilter captures FocusIn" << endl;
element()->getDocument()->setFocusNode(element()); element()->getDocument()->setFocusNode(element());
// if ( isEditable() ) { // 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 ); // if ( ext ) ext->editableWidgetFocused( m_widget );
// } // }
break; break;
case TQEvent::KeyPress: case TQEvent::KeyPress:
case TQEvent::KeyRelease: case TQEvent::KeyRelease:
// TODO this seems wrong - Qt events are not correctly translated to DOM ones, // 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)) if (element()->dispatchKeyEvent(TQT_TQKEYEVENT(e),false))
filtered = true; filtered = true;
break; break;
@ -837,13 +837,13 @@ bool RenderWidget::handleEvent(const DOM::EventImpl& ev)
const KeyEventBaseImpl& domKeyEv = static_cast<const KeyEventBaseImpl &>(ev); const KeyEventBaseImpl& domKeyEv = static_cast<const KeyEventBaseImpl &>(ev);
if (domKeyEv.isSynthetic() && !acceptsSyntheticEvents()) break; 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 // 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, // 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. // 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 // DOM: Down Press | Press | Up
// Qt: (nothing) Press | Release(autorepeat) + Press(autorepeat) | Release // Qt: (nothing) Press | Release(autorepeat) + Press(autorepeat) | Release
// //

@ -26,7 +26,7 @@
#include <tqobject.h> #include <tqobject.h>
#include <tqscrollview.h> #include <tqscrollview.h>
class KHTMLView; class TDEHTMLView;
class TQWidget; class TQWidget;
namespace DOM namespace DOM
@ -100,7 +100,7 @@ public:
virtual void updateFromElement(); virtual void updateFromElement();
TQWidget *widget() const { return m_widget; } TQWidget *widget() const { return m_widget; }
KHTMLView* view() const { return m_view; } TDEHTMLView* view() const { return m_view; }
void deref(); void deref();
@ -119,7 +119,7 @@ public:
public slots: public slots:
void slotWidgetDestructed(); void slotWidgetDestructed();
bool isKHTMLWidget() const { return m_isKHTMLWidget; } bool isTDEHTMLWidget() const { return m_isTDEHTMLWidget; }
protected: protected:
virtual bool canHaveBorder() const { return false; } virtual bool canHaveBorder() const { return false; }
@ -134,7 +134,7 @@ protected:
void resizeWidget( int w, int h ); void resizeWidget( int w, int h );
TQWidget *m_widget; TQWidget *m_widget;
KHTMLView* m_view; TDEHTMLView* m_view;
//Because we mess with normal detach due to ref/deref, //Because we mess with normal detach due to ref/deref,
//we need to keep track of the arena ourselves //we need to keep track of the arena ourselves
@ -143,7 +143,7 @@ protected:
bool m_resizePending; bool m_resizePending;
bool m_discardResizes; bool m_discardResizes;
bool m_isKHTMLWidget; bool m_isTDEHTMLWidget;
bool m_needsMask; bool m_needsMask;
public: public:

@ -719,11 +719,11 @@ class StyleCSS3InheritedData : public Shared<StyleCSS3InheritedData>
// //
enum EWhiteSpace { enum EWhiteSpace {
NORMAL, PRE, NOWRAP, PRE_WRAP, PRE_LINE, KHTML_NOWRAP NORMAL, PRE, NOWRAP, PRE_WRAP, PRE_LINE, TDEHTML_NOWRAP
}; };
enum ETextAlign { 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 { enum ETextTransform {

@ -265,9 +265,9 @@ void RenderTable::calcWidth()
void RenderTable::layout() void RenderTable::layout()
{ {
KHTMLAssert( needsLayout() ); TDEHTMLAssert( needsLayout() );
KHTMLAssert( minMaxKnown() ); TDEHTMLAssert( minMaxKnown() );
KHTMLAssert( !needSectionRecalc ); TDEHTMLAssert( !needSectionRecalc );
if (posChildNeedsLayout() && !normalChildNeedsLayout() && !selfNeedsLayout()) { if (posChildNeedsLayout() && !normalChildNeedsLayout() && !selfNeedsLayout()) {
// All we have to is lay out our positioned objects. // 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() void RenderTable::calcMinMaxWidth()
{ {
KHTMLAssert( !minMaxKnown() ); TDEHTMLAssert( !minMaxKnown() );
if ( needSectionRecalc ) if ( needSectionRecalc )
recalcSections(); recalcSections();
@ -567,7 +567,7 @@ void RenderTable::splitColumn( int pos, int firstSpan )
columns.resize( oldSize + 1 ); columns.resize( oldSize + 1 );
int oldSpan = columns[pos].span; int oldSpan = columns[pos].span;
// tqDebug("splitColumn( %d,%d ), oldSize=%d, oldSpan=%d", pos, firstSpan, oldSize, oldSpan ); // tqDebug("splitColumn( %d,%d ), oldSize=%d, oldSpan=%d", pos, firstSpan, oldSize, oldSpan );
KHTMLAssert( oldSpan > firstSpan ); TDEHTMLAssert( oldSpan > firstSpan );
columns[pos].span = firstSpan; columns[pos].span = firstSpan;
memmove( columns.data()+pos+1, columns.data()+pos, (oldSize-pos)*sizeof(ColumnStruct) ); memmove( columns.data()+pos+1, columns.data()+pos, (oldSize-pos)*sizeof(ColumnStruct) );
columns[pos+1].span = oldSpan - firstSpan; columns[pos+1].span = oldSpan - firstSpan;
@ -1040,7 +1040,7 @@ void RenderTableSection::addChild(RenderObject *child, RenderObject *beforeChild
cCol = 0; cCol = 0;
ensureRows( cRow+1 ); ensureRows( cRow+1 );
KHTMLAssert( child->isTableRow() ); TDEHTMLAssert( child->isTableRow() );
grid[cRow].rowRenderer = static_cast<RenderTableRow*>(child); grid[cRow].rowRenderer = static_cast<RenderTableRow*>(child);
if (!beforeChild) { if (!beforeChild) {
@ -2084,8 +2084,8 @@ void RenderTableRow::addChild(RenderObject *child, RenderObject *beforeChild)
void RenderTableRow::layout() void RenderTableRow::layout()
{ {
KHTMLAssert( needsLayout() ); TDEHTMLAssert( needsLayout() );
KHTMLAssert( minMaxKnown() ); TDEHTMLAssert( minMaxKnown() );
RenderObject *child = firstChild(); RenderObject *child = firstChild();
const bool pagedMode = canvas()->pagedMode(); 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) void RenderTableRow::paint(PaintInfo& i, int tx, int ty)
{ {
KHTMLAssert(layer()); TDEHTMLAssert(layer());
if (!layer()) if (!layer())
return; return;
@ -2260,7 +2260,7 @@ Length RenderTableCell::styleOrColWidth()
void RenderTableCell::calcMinMaxWidth() void RenderTableCell::calcMinMaxWidth()
{ {
KHTMLAssert( !minMaxKnown() ); TDEHTMLAssert( !minMaxKnown() );
#ifdef DEBUG_LAYOUT #ifdef DEBUG_LAYOUT
kdDebug( 6040 ) << renderName() << "(TableCell)::calcMinMaxWidth() known=" << minMaxKnown() << endl; kdDebug( 6040 ) << renderName() << "(TableCell)::calcMinMaxWidth() known=" << minMaxKnown() << endl;
#endif #endif
@ -2365,7 +2365,7 @@ void RenderTableCell::setStyle( RenderStyle *newStyle )
RenderBlock::setStyle( newStyle ); RenderBlock::setStyle( newStyle );
setShouldPaintBackgroundOrBorder(true); setShouldPaintBackgroundOrBorder(true);
if (newStyle->whiteSpace() == KHTML_NOWRAP) { if (newStyle->whiteSpace() == TDEHTML_NOWRAP) {
// Figure out if we are really nowrapping or if we should just // Figure out if we are really nowrapping or if we should just
// use normal instead. If the width of the cell is fixed, then // use normal instead. If the width of the cell is fixed, then
// we don't actually use NOWRAP. // we don't actually use NOWRAP.

@ -691,7 +691,7 @@ RenderText::RenderText(DOM::NodeImpl* node, DOMStringImpl *_str)
m_maxWidth = -1; m_maxWidth = -1;
str = _str; str = _str;
if(str) str->ref(); if(str) str->ref();
KHTMLAssert(!str || !str->l || str->s); TDEHTMLAssert(!str || !str->l || str->s);
m_selectionState = SelectionNone; m_selectionState = SelectionNone;
m_hasReturn = true; m_hasReturn = true;
@ -723,7 +723,7 @@ void RenderText::setStyle(RenderStyle *_style)
RenderText::~RenderText() RenderText::~RenderText()
{ {
KHTMLAssert(m_lines.count() == 0); TDEHTMLAssert(m_lines.count() == 0);
if(str) str->deref(); 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 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*/) void RenderText::paint( PaintInfo& /*pI*/, int /*tx*/, int /*ty*/)
{ {
KHTMLAssert( false ); TDEHTMLAssert( false );
} }
void RenderText::calcMinMaxWidth() void RenderText::calcMinMaxWidth()
{ {
KHTMLAssert( !minMaxKnown() ); TDEHTMLAssert( !minMaxKnown() );
// ### calc Min and Max width... // ### calc Min and Max width...
m_minWidth = m_beginMinWidth = m_endMinWidth = 0; 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 // ### what should happen if we change the text of a
// RenderBR object ? // RenderBR object ?
KHTMLAssert(!isBR() || (str->l == 1 && (*str->s) == '\n')); TDEHTMLAssert(!isBR() || (str->l == 1 && (*str->s) == '\n'));
KHTMLAssert(!str->l || str->s); TDEHTMLAssert(!str->l || str->s);
setNeedsLayoutAndMinMaxRecalc(); setNeedsLayoutAndMinMaxRecalc();
#ifdef BIDI_DEBUG #ifdef BIDI_DEBUG
@ -1251,7 +1251,7 @@ short RenderText::baselinePosition( bool firstLine ) const
InlineBox* RenderText::createInlineBox(bool, bool isRootLineBox) InlineBox* RenderText::createInlineBox(bool, bool isRootLineBox)
{ {
KHTMLAssert( !isRootLineBox ); TDEHTMLAssert( !isRootLineBox );
return new (renderArena()) InlineTextBox(this); 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; //kdDebug(6040) << "position: from="<<from<<" len="<<len<<endl;
// ### should not be needed!!! // ### should not be needed!!!
// asserts sometimes with pre (that unibw-hamburg testcase). ### find out why // 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 // It is now needed. BRs need text boxes too otherwise caret navigation
// gets stuck (LS) // gets stuck (LS)
// if (len == 0 || (str->l && len == 1 && *(str->s+from) == '\n') ) return; // 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); TQConstString cstr(ch, len);
#endif #endif
KHTMLAssert(box->isInlineTextBox()); TDEHTMLAssert(box->isInlineTextBox());
InlineTextBox *s = static_cast<InlineTextBox *>(box); InlineTextBox *s = static_cast<InlineTextBox *>(box);
s->m_start = from; s->m_start = from;
s->m_len = len; s->m_len = len;

@ -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 : # To use it, add this line to your ~/.gdbinit :
# source /path/to/kde/sources/tdelibs/tdehtml/tdehtml-devel-gdb # source /path/to/kde/sources/tdelibs/tdehtml/tdehtml-devel-gdb
@ -6,7 +6,7 @@ define printdomstring
printdomstringimpl $arg0.impl printdomstringimpl $arg0.impl
end end
document printdomstring document printdomstring
Prints the contents of a KHTML DOMString. Prints the contents of a TDEHTML DOMString.
end end
define printdomstringimpl define printdomstringimpl
set $i=0 set $i=0
@ -17,6 +17,6 @@ define printdomstringimpl
printf "\n" printf "\n"
end end
document printdomstringimpl document printdomstringimpl
Prints the contents of a KHTML DOMStringImpl. Prints the contents of a TDEHTML DOMStringImpl.
end end

@ -85,8 +85,8 @@ Comment[zh_TW]=可嵌入的 HTML 檢視元件
Comment[zu]= Ilunga lokubuka le-HTML Eshuthekiwe Comment[zu]= Ilunga lokubuka le-HTML Eshuthekiwe
MimeType=text/html;text/xml;application/xhtml+xml; MimeType=text/html;text/xml;application/xhtml+xml;
Icon=konqueror Icon=konqueror
Name=KHTML Name=TDEHTML
Name[hi]=केएचटीएमएल (KHTML) Name[hi]=केएचटीएमएल (TDEHTML)
Name[te]=కెహెచ్ టి ఎమ్ ఎల్ Name[te]=కెహెచ్ టి ఎమ్ ఎల్
ServiceTypes=KParts/ReadOnlyPart,Browser/View ServiceTypes=KParts/ReadOnlyPart,Browser/View
X-TDE-Library=libtdehtmlpart X-TDE-Library=libtdehtmlpart

@ -884,15 +884,15 @@ CaretBoxLine *CaretBoxLine::constructCaretBoxLine(CaretBoxLineDeleter *deleter,
// ### regard direction // ### regard direction
switch (s->textAlign()) { switch (s->textAlign()) {
case LEFT: case LEFT:
case KHTML_LEFT: case TDEHTML_LEFT:
case TAAUTO: // ### find out what this does case TAAUTO: // ### find out what this does
case JUSTIFY: case JUSTIFY:
break; break;
case CENTER: case CENTER:
case KHTML_CENTER: case TDEHTML_CENTER:
_x += cb->contentWidth() / 2; _x += cb->contentWidth() / 2;
break; break;
case KHTML_RIGHT: case TDEHTML_RIGHT:
case RIGHT: case RIGHT:
_x += cb->contentWidth(); _x += cb->contentWidth();
break; break;
@ -1128,7 +1128,7 @@ static inline bool isDescendant(RenderObject *r, RenderObject *cb)
* or at the end. * or at the end.
* @param fromEnd begin search from end (default: begin from beginning) * @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) RenderTable *&table, bool fromEnd = false)
{ {
RenderObject *r = cb; 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 fromEnd begin search from end (default: begin from beginning)
* @param start object after which to begin search. * @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) RenderTable *&table, bool fromEnd, RenderObject *start)
{ {
int state = 0; int state = 0;
@ -1242,7 +1242,7 @@ static bool containsEditableChildElement(KHTMLPart *part, RenderBlock *cb,
// == class LinearDocument implementation // == class LinearDocument implementation
LinearDocument::LinearDocument(KHTMLPart *part, NodeImpl *node, long offset, LinearDocument::LinearDocument(TDEHTMLPart *part, NodeImpl *node, long offset,
CaretAdvancePolicy advancePolicy, ElementImpl *baseElem) CaretAdvancePolicy advancePolicy, ElementImpl *baseElem)
: node(node), offset(offset), m_part(part), : node(node), offset(offset), m_part(part),
advPol(advancePolicy), base(0) advPol(advancePolicy), base(0)
@ -2052,7 +2052,7 @@ TableRowIterator &TableRowIterator::operator --()
// == class ErgonomicEditableLineIterator implementation // == class ErgonomicEditableLineIterator implementation
// some decls // some decls
static RenderTableCell *findNearestTableCellInRow(KHTMLPart *part, int x, static RenderTableCell *findNearestTableCellInRow(TDEHTMLPart *part, int x,
RenderTableSection::RowStruct *row, bool fromEnd); RenderTableSection::RowStruct *row, bool fromEnd);
/** finds the cell corresponding to absolute x-coordinate @p x in the given /** 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 * beginning
* @return the cell, or 0 if no editable cell was found. * @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) TableRowIterator &it, bool fromEnd)
{ {
RenderTableCell *result = 0; 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) * @param fromEnd @p true, begin from end (applies only to nested tables)
* @return the found cell or 0 if no editable cell was found * @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) RenderTableSection::RowStruct *row, bool fromEnd)
{ {
// First pass. Find spatially nearest cell. // First pass. Find spatially nearest cell.

@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#ifndef KHTML_CARET_P_H #ifndef TDEHTML_CARET_P_H
#define KHTML_CARET_P_H #define TDEHTML_CARET_P_H
#include "rendering/render_table.h" #include "rendering/render_table.h"
@ -68,7 +68,7 @@ struct CaretViewContext {
bool displayed; // true if caret is to be displayed at all. bool displayed; // true if caret is to be displayed at all.
bool caretMoved; // set to true once caret has been moved in page bool caretMoved; // set to true once caret has been moved in page
// how to display the caret when view is not focused // 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 /** 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 * the actual x is set to the first character whose x position is
@ -83,7 +83,7 @@ struct CaretViewContext {
// corresponding release event // corresponding release event
CaretViewContext() : freqTimerId(-1), x(0), y(0), width(1), height(16), CaretViewContext() : freqTimerId(-1), x(0), y(0), width(1), height(16),
visible(true), displayed(false), caretMoved(false), visible(true), displayed(false), caretMoved(false),
displayNonFocused(KHTMLPart::CaretInvisible), origX(0), displayNonFocused(TDEHTMLPart::CaretInvisible), origX(0),
keyReleasePending(false) keyReleasePending(false)
{} {}
}; };
@ -650,7 +650,7 @@ public:
* cannot serve as a base (to see if this is the case, check whether * cannot serve as a base (to see if this is the case, check whether
* LinearDocument::baseFlow()->element() != base) * 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); CaretAdvancePolicy advancePolicy, DOM::ElementImpl *baseElem);
virtual ~LinearDocument(); virtual ~LinearDocument();
@ -730,7 +730,7 @@ protected:
Iterator _preBegin; Iterator _preBegin;
Iterator _end; Iterator _end;
KHTMLPart *m_part; TDEHTMLPart *m_part;
CaretAdvancePolicy advPol; CaretAdvancePolicy advPol;
RenderObject *base; RenderObject *base;
@ -754,7 +754,7 @@ protected:
* @since 3.3 * @since 3.3
*/ */
class EditableCaretBoxIterator : public CaretBoxIterator { class EditableCaretBoxIterator : public CaretBoxIterator {
KHTMLPart *m_part; TDEHTMLPart *m_part;
bool adjacent; bool adjacent;
CaretAdvancePolicy advpol; // caret advance policy CaretAdvancePolicy advpol; // caret advance policy

@ -70,7 +70,7 @@
#include "tdehtmlpart_p.h" #include "tdehtmlpart_p.h"
KHTMLPartBrowserExtension::KHTMLPartBrowserExtension( KHTMLPart *parent, const char *name ) TDEHTMLPartBrowserExtension::TDEHTMLPartBrowserExtension( TDEHTMLPart *parent, const char *name )
: KParts::BrowserExtension( parent, name ) : KParts::BrowserExtension( parent, name )
{ {
m_part = parent; m_part = parent;
@ -83,29 +83,29 @@ KHTMLPartBrowserExtension::KHTMLPartBrowserExtension( KHTMLPart *parent, const c
m_connectedToClipboard = false; m_connectedToClipboard = false;
} }
int KHTMLPartBrowserExtension::xOffset() int TDEHTMLPartBrowserExtension::xOffset()
{ {
return m_part->view()->contentsX(); return m_part->view()->contentsX();
} }
int KHTMLPartBrowserExtension::yOffset() int TDEHTMLPartBrowserExtension::yOffset()
{ {
return m_part->view()->contentsY(); return m_part->view()->contentsY();
} }
void KHTMLPartBrowserExtension::saveState( TQDataStream &stream ) void TDEHTMLPartBrowserExtension::saveState( TQDataStream &stream )
{ {
//kdDebug( 6050 ) << "saveState!" << endl; //kdDebug( 6050 ) << "saveState!" << endl;
m_part->saveState( stream ); m_part->saveState( stream );
} }
void KHTMLPartBrowserExtension::restoreState( TQDataStream &stream ) void TDEHTMLPartBrowserExtension::restoreState( TQDataStream &stream )
{ {
//kdDebug( 6050 ) << "restoreState!" << endl; //kdDebug( 6050 ) << "restoreState!" << endl;
m_part->restoreState( stream ); m_part->restoreState( stream );
} }
void KHTMLPartBrowserExtension::editableWidgetFocused( TQWidget *widget ) void TDEHTMLPartBrowserExtension::editableWidgetFocused( TQWidget *widget )
{ {
m_editableFormWidget = widget; m_editableFormWidget = widget;
updateEditActions(); updateEditActions();
@ -124,7 +124,7 @@ void KHTMLPartBrowserExtension::editableWidgetFocused( TQWidget *widget )
editableWidgetFocused(); editableWidgetFocused();
} }
void KHTMLPartBrowserExtension::editableWidgetBlurred( TQWidget * /*widget*/ ) void TDEHTMLPartBrowserExtension::editableWidgetBlurred( TQWidget * /*widget*/ )
{ {
TQWidget *oldWidget = m_editableFormWidget; TQWidget *oldWidget = m_editableFormWidget;
@ -150,13 +150,13 @@ void KHTMLPartBrowserExtension::editableWidgetBlurred( TQWidget * /*widget*/ )
editableWidgetBlurred(); editableWidgetBlurred();
} }
void KHTMLPartBrowserExtension::setExtensionProxy( KParts::BrowserExtension *proxy ) void TDEHTMLPartBrowserExtension::setExtensionProxy( KParts::BrowserExtension *proxy )
{ {
if ( m_extensionProxy ) if ( m_extensionProxy )
{ {
disconnect( m_extensionProxy, TQT_SIGNAL( enableAction( const char *, bool ) ), disconnect( m_extensionProxy, TQT_SIGNAL( enableAction( const char *, bool ) ),
this, TQT_SLOT( extensionProxyActionEnabled( 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() ), disconnect( m_extensionProxy, TQT_SIGNAL( editableWidgetFocused() ),
this, TQT_SLOT( extensionProxyEditableWidgetFocused() ) ); this, TQT_SLOT( extensionProxyEditableWidgetFocused() ) );
@ -171,7 +171,7 @@ void KHTMLPartBrowserExtension::setExtensionProxy( KParts::BrowserExtension *pro
{ {
connect( m_extensionProxy, TQT_SIGNAL( enableAction( const char *, bool ) ), connect( m_extensionProxy, TQT_SIGNAL( enableAction( const char *, bool ) ),
this, TQT_SLOT( extensionProxyActionEnabled( 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() ), connect( m_extensionProxy, TQT_SIGNAL( editableWidgetFocused() ),
this, TQT_SLOT( extensionProxyEditableWidgetFocused() ) ); this, TQT_SLOT( extensionProxyEditableWidgetFocused() ) );
@ -190,7 +190,7 @@ void KHTMLPartBrowserExtension::setExtensionProxy( KParts::BrowserExtension *pro
} }
} }
void KHTMLPartBrowserExtension::cut() void TDEHTMLPartBrowserExtension::cut()
{ {
if ( m_extensionProxy ) if ( m_extensionProxy )
{ {
@ -207,7 +207,7 @@ void KHTMLPartBrowserExtension::cut()
static_cast<TQTextEdit *>( &(*m_editableFormWidget) )->cut(); static_cast<TQTextEdit *>( &(*m_editableFormWidget) )->cut();
} }
void KHTMLPartBrowserExtension::copy() void TDEHTMLPartBrowserExtension::copy()
{ {
if ( m_extensionProxy ) if ( m_extensionProxy )
{ {
@ -215,7 +215,7 @@ void KHTMLPartBrowserExtension::copy()
return; return;
} }
kdDebug( 6050 ) << "************! KHTMLPartBrowserExtension::copy()" << endl; kdDebug( 6050 ) << "************! TDEHTMLPartBrowserExtension::copy()" << endl;
if ( !m_editableFormWidget ) if ( !m_editableFormWidget )
{ {
// get selected text and paste to the clipboard // 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>:]" // action name is of form "previewProvider[<searchproviderprefix>:]"
const TQString searchProviderPrefix = TQString( TQT_TQOBJECT_CONST(sender())->name() ).mid( 14 ); 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 ); emit m_part->browserExtension()->openURLRequest( data.uri(), args );
} }
void KHTMLPartBrowserExtension::openSelection() void TDEHTMLPartBrowserExtension::openSelection()
{ {
KParts::URLArgs args; KParts::URLArgs args;
args.frameName = "_blank"; args.frameName = "_blank";
@ -293,7 +293,7 @@ void KHTMLPartBrowserExtension::openSelection()
emit m_part->browserExtension()->openURLRequest( m_part->selectedText(), args ); emit m_part->browserExtension()->openURLRequest( m_part->selectedText(), args );
} }
void KHTMLPartBrowserExtension::paste() void TDEHTMLPartBrowserExtension::paste()
{ {
if ( m_extensionProxy ) if ( m_extensionProxy )
{ {
@ -310,7 +310,7 @@ void KHTMLPartBrowserExtension::paste()
static_cast<TQTextEdit *>( &(*m_editableFormWidget) )->paste(); static_cast<TQTextEdit *>( &(*m_editableFormWidget) )->paste();
} }
void KHTMLPartBrowserExtension::callExtensionProxyMethod( const char *method ) void TDEHTMLPartBrowserExtension::callExtensionProxyMethod( const char *method )
{ {
if ( !m_extensionProxy ) if ( !m_extensionProxy )
return; return;
@ -323,7 +323,7 @@ void KHTMLPartBrowserExtension::callExtensionProxyMethod( const char *method )
m_extensionProxy->tqt_invoke( slot, o ); m_extensionProxy->tqt_invoke( slot, o );
} }
void KHTMLPartBrowserExtension::updateEditActions() void TDEHTMLPartBrowserExtension::updateEditActions()
{ {
if ( !m_editableFormWidget ) if ( !m_editableFormWidget )
{ {
@ -354,15 +354,15 @@ void KHTMLPartBrowserExtension::updateEditActions()
enableAction( "cut", hasSelection ); enableAction( "cut", hasSelection );
} }
void KHTMLPartBrowserExtension::extensionProxyEditableWidgetFocused() { void TDEHTMLPartBrowserExtension::extensionProxyEditableWidgetFocused() {
editableWidgetFocused(); editableWidgetFocused();
} }
void KHTMLPartBrowserExtension::extensionProxyEditableWidgetBlurred() { void TDEHTMLPartBrowserExtension::extensionProxyEditableWidgetBlurred() {
editableWidgetBlurred(); 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 // only forward enableAction calls for actions we actually do forward
if ( strcmp( action, "cut" ) == 0 || if ( strcmp( action, "cut" ) == 0 ||
@ -372,17 +372,17 @@ void KHTMLPartBrowserExtension::extensionProxyActionEnabled( const char *action,
} }
} }
void KHTMLPartBrowserExtension::reparseConfiguration() void TDEHTMLPartBrowserExtension::reparseConfiguration()
{ {
m_part->reparseConfiguration(); m_part->reparseConfiguration();
} }
void KHTMLPartBrowserExtension::print() void TDEHTMLPartBrowserExtension::print()
{ {
m_part->view()->print(); m_part->view()->print();
} }
void KHTMLPartBrowserExtension::disableScrolling() void TDEHTMLPartBrowserExtension::disableScrolling()
{ {
TQScrollView *scrollView = m_part->view(); TQScrollView *scrollView = m_part->view();
if (scrollView) { if (scrollView) {
@ -391,10 +391,10 @@ void KHTMLPartBrowserExtension::disableScrolling()
} }
} }
class KHTMLPopupGUIClient::KHTMLPopupGUIClientPrivate class TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClientPrivate
{ {
public: public:
KHTMLPart *m_tdehtml; TDEHTMLPart *m_tdehtml;
KURL m_url; KURL m_url;
KURL m_imageURL; KURL m_imageURL;
TQPixmap m_pixmap; 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 ) : TQObject( tdehtml )
{ {
d = new KHTMLPopupGUIClientPrivate; d = new TDEHTMLPopupGUIClientPrivate;
d->m_tdehtml = tdehtml; d->m_tdehtml = tdehtml;
d->m_url = url; d->m_url = url;
bool isImage = false; bool isImage = false;
@ -556,7 +556,7 @@ KHTMLPopupGUIClient::KHTMLPopupGUIClient( KHTMLPart *tdehtml, const TQString &do
new KAction( i18n( "Reload Frame" ), 0, this, TQT_SLOT( slotReloadFrame() ), new KAction( i18n( "Reload Frame" ), 0, this, TQT_SLOT( slotReloadFrame() ),
actionCollection(), "reloadframe" ); actionCollection(), "reloadframe" );
if ( KHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled() ) { if ( TDEHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled() ) {
if ( tdehtml->d->m_frame->m_type == tdehtml::ChildFrame::IFrame ) if ( tdehtml->d->m_frame->m_type == tdehtml::ChildFrame::IFrame )
new KAction( i18n( "Block IFrame..." ), 0, this, TQT_SLOT( slotBlockIFrame() ), actionCollection(), "blockiframe" ); 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() ), new KAction( i18n( "View Image (%1)" ).arg(d->m_suggestedFilename.isEmpty() ? name.replace("&", "&&") : d->m_suggestedFilename.replace("&", "&&")), 0, this, TQT_SLOT( slotViewImage() ),
actionCollection(), "viewimage" ); actionCollection(), "viewimage" );
if (KHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled()) if (TDEHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled())
{ {
new KAction( i18n( "Block Image..." ), 0, this, TQT_SLOT( slotBlockImage() ), new KAction( i18n( "Block Image..." ), 0, this, TQT_SLOT( slotBlockImage() ),
actionCollection(), "blockimage" ); actionCollection(), "blockimage" );
@ -641,19 +641,19 @@ KHTMLPopupGUIClient::KHTMLPopupGUIClient( KHTMLPart *tdehtml, const TQString &do
menu.insertBefore( domDocument().createElement( "separator" ), menu.firstChild() ); menu.insertBefore( domDocument().createElement( "separator" ), menu.firstChild() );
} }
KHTMLPopupGUIClient::~KHTMLPopupGUIClient() TDEHTMLPopupGUIClient::~TDEHTMLPopupGUIClient()
{ {
delete d; delete d;
} }
void KHTMLPopupGUIClient::slotSaveLinkAs() void TDEHTMLPopupGUIClient::slotSaveLinkAs()
{ {
TDEIO::MetaData metaData; TDEIO::MetaData metaData;
metaData["referrer"] = d->m_tdehtml->referrer(); metaData["referrer"] = d->m_tdehtml->referrer();
saveURL( d->m_tdehtml->widget(), i18n( "Save Link As" ), d->m_url, metaData ); saveURL( d->m_tdehtml->widget(), i18n( "Save Link As" ), d->m_url, metaData );
} }
void KHTMLPopupGUIClient::slotSendImage() void TDEHTMLPopupGUIClient::slotSendImage()
{ {
TQStringList urls; TQStringList urls;
urls.append( d->m_imageURL.url()); urls.append( d->m_imageURL.url());
@ -666,21 +666,21 @@ void KHTMLPopupGUIClient::slotSendImage()
} }
void KHTMLPopupGUIClient::slotSaveImageAs() void TDEHTMLPopupGUIClient::slotSaveImageAs()
{ {
TDEIO::MetaData metaData; TDEIO::MetaData metaData;
metaData["referrer"] = d->m_tdehtml->referrer(); 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 ); 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()+"/*"; TQString name=d->m_imageURL.protocol()+"://"+d->m_imageURL.host()+"/*";
KHTMLFactory::defaultHTMLSettings()->addAdFilter( name ); TDEHTMLFactory::defaultHTMLSettings()->addAdFilter( name );
d->m_tdehtml->reparseConfiguration(); d->m_tdehtml->reparseConfiguration();
} }
void KHTMLPopupGUIClient::slotBlockImage() void TDEHTMLPopupGUIClient::slotBlockImage()
{ {
bool ok = false; bool ok = false;
@ -689,12 +689,12 @@ void KHTMLPopupGUIClient::slotBlockImage()
d->m_imageURL.url(), d->m_imageURL.url(),
&ok); &ok);
if ( ok ) { if ( ok ) {
KHTMLFactory::defaultHTMLSettings()->addAdFilter( url ); TDEHTMLFactory::defaultHTMLSettings()->addAdFilter( url );
d->m_tdehtml->reparseConfiguration(); d->m_tdehtml->reparseConfiguration();
} }
} }
void KHTMLPopupGUIClient::slotBlockIFrame() void TDEHTMLPopupGUIClient::slotBlockIFrame()
{ {
bool ok = false; bool ok = false;
TQString url = KInputDialog::getText( i18n( "Add URL to Filter"), TQString url = KInputDialog::getText( i18n( "Add URL to Filter"),
@ -702,12 +702,12 @@ void KHTMLPopupGUIClient::slotBlockIFrame()
d->m_tdehtml->url().url(), d->m_tdehtml->url().url(),
&ok ); &ok );
if ( ok ) { if ( ok ) {
KHTMLFactory::defaultHTMLSettings()->addAdFilter( url ); TDEHTMLFactory::defaultHTMLSettings()->addAdFilter( url );
d->m_tdehtml->reparseConfiguration(); d->m_tdehtml->reparseConfiguration();
} }
} }
void KHTMLPopupGUIClient::slotCopyLinkLocation() void TDEHTMLPopupGUIClient::slotCopyLinkLocation()
{ {
KURL safeURL(d->m_url); KURL safeURL(d->m_url);
safeURL.setPass(TQString::null); safeURL.setPass(TQString::null);
@ -722,12 +722,12 @@ void KHTMLPopupGUIClient::slotCopyLinkLocation()
#endif #endif
} }
void KHTMLPopupGUIClient::slotStopAnimations() void TDEHTMLPopupGUIClient::slotStopAnimations()
{ {
d->m_tdehtml->stopAnimations(); d->m_tdehtml->stopAnimations();
} }
void KHTMLPopupGUIClient::slotCopyImage() void TDEHTMLPopupGUIClient::slotCopyImage()
{ {
#ifndef QT_NO_MIMECLIPBOARD #ifndef QT_NO_MIMECLIPBOARD
KURL safeURL(d->m_imageURL); KURL safeURL(d->m_imageURL);
@ -748,7 +748,7 @@ void KHTMLPopupGUIClient::slotCopyImage()
#endif #endif
} }
void KHTMLPopupGUIClient::slotCopyImageLocation() void TDEHTMLPopupGUIClient::slotCopyImageLocation()
{ {
KURL safeURL(d->m_imageURL); KURL safeURL(d->m_imageURL);
safeURL.setPass(TQString::null); safeURL.setPass(TQString::null);
@ -763,12 +763,12 @@ void KHTMLPopupGUIClient::slotCopyImageLocation()
#endif #endif
} }
void KHTMLPopupGUIClient::slotViewImage() void TDEHTMLPopupGUIClient::slotViewImage()
{ {
d->m_tdehtml->browserExtension()->createNewWindow(d->m_imageURL); d->m_tdehtml->browserExtension()->createNewWindow(d->m_imageURL);
} }
void KHTMLPopupGUIClient::slotReloadFrame() void TDEHTMLPopupGUIClient::slotReloadFrame()
{ {
KParts::URLArgs args( d->m_tdehtml->browserExtension()->urlArgs() ); KParts::URLArgs args( d->m_tdehtml->browserExtension()->urlArgs() );
args.reload = true; args.reload = true;
@ -779,7 +779,7 @@ void KHTMLPopupGUIClient::slotReloadFrame()
d->m_tdehtml->openURL( d->m_tdehtml->url() ); d->m_tdehtml->openURL( d->m_tdehtml->url() );
} }
void KHTMLPopupGUIClient::slotFrameInWindow() void TDEHTMLPopupGUIClient::slotFrameInWindow()
{ {
KParts::URLArgs args( d->m_tdehtml->browserExtension()->urlArgs() ); KParts::URLArgs args( d->m_tdehtml->browserExtension()->urlArgs() );
args.metaData()["referrer"] = d->m_tdehtml->pageReferrer(); 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 ); 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() ); KParts::URLArgs args( d->m_tdehtml->browserExtension()->urlArgs() );
args.metaData()["referrer"] = d->m_tdehtml->pageReferrer(); 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 ); 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() ); KParts::URLArgs args( d->m_tdehtml->browserExtension()->urlArgs() );
args.metaData()["referrer"] = d->m_tdehtml->pageReferrer(); 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 ); 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 KURL &url,
const TQMap<TQString, TQString> &metadata, const TQMap<TQString, TQString> &metadata,
const TQString &filter, long cacheId, const TQString &filter, long cacheId,
@ -834,21 +834,21 @@ void KHTMLPopupGUIClient::saveURL( TQWidget *parent, const TQString &caption,
saveURL(url, destURL, metadata, cacheId); 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, const TQMap<TQString, TQString> &metadata,
long cacheId ) long cacheId )
{ {
if ( destURL.isValid() ) if ( destURL.isValid() )
{ {
bool saved = false; bool saved = false;
if (KHTMLPageCache::self()->isComplete(cacheId)) if (TDEHTMLPageCache::self()->isComplete(cacheId))
{ {
if (destURL.isLocalFile()) if (destURL.isLocalFile())
{ {
KSaveFile destFile(destURL.path()); KSaveFile destFile(destURL.path());
if (destFile.status() == 0) if (destFile.status() == 0)
{ {
KHTMLPageCache::self()->saveData(cacheId, destFile.dataStream()); TDEHTMLPageCache::self()->saveData(cacheId, destFile.dataStream());
saved = true; saved = true;
} }
} }
@ -858,7 +858,7 @@ void KHTMLPopupGUIClient::saveURL( const KURL &url, const KURL &destURL,
KTempFile destFile; KTempFile destFile;
if (destFile.status() == 0) if (destFile.status() == 0)
{ {
KHTMLPageCache::self()->saveData(cacheId, destFile.dataStream()); TDEHTMLPageCache::self()->saveData(cacheId, destFile.dataStream());
destFile.close(); destFile.close();
KURL url2 = KURL(); KURL url2 = KURL();
url2.setPath(destFile.name()); 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 ) : KParts::BrowserHostExtension( part )
{ {
m_part = part; m_part = part;
} }
KHTMLPartBrowserHostExtension::~KHTMLPartBrowserHostExtension() TDEHTMLPartBrowserHostExtension::~TDEHTMLPartBrowserHostExtension()
{ {
} }
TQStringList KHTMLPartBrowserHostExtension::frameNames() const TQStringList TDEHTMLPartBrowserHostExtension::frameNames() const
{ {
return m_part->frameNames(); return m_part->frameNames();
} }
const TQPtrList<KParts::ReadOnlyPart> KHTMLPartBrowserHostExtension::frames() const const TQPtrList<KParts::ReadOnlyPart> TDEHTMLPartBrowserHostExtension::frames() const
{ {
return m_part->frames(); 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 ); 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) if (id == VIRTUAL_FIND_FRAME_PARENT)
{ {
FindFrameParentParams *param = static_cast<FindFrameParentParams*>(data); 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) if (parentPart)
param->parent = parentPart->browserHostExtension(); param->parent = parentPart->browserHostExtension();
return; return;
@ -961,19 +961,19 @@ extern const int KDE_NO_EXPORT fastZoomSizes[];
extern const int KDE_NO_EXPORT fastZoomSizeCount; extern const int KDE_NO_EXPORT fastZoomSizeCount;
// BCI: remove in KDE 4 // 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 ) : KAction( text, icon, 0, receiver, slot, parent, name )
{ {
init(part, direction); 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 ) : KAction( text, icon, cut, receiver, slot, parent, name )
{ {
init(part, direction); init(part, direction);
} }
void KHTMLZoomFactorAction::init(KHTMLPart *part, bool direction) void TDEHTMLZoomFactorAction::init(TDEHTMLPart *part, bool direction)
{ {
m_direction = direction; m_direction = direction;
m_part = part; 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 ) ) ); connect( m_popup, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotActivated( int ) ) );
} }
KHTMLZoomFactorAction::~KHTMLZoomFactorAction() TDEHTMLZoomFactorAction::~TDEHTMLZoomFactorAction()
{ {
delete m_popup; delete m_popup;
} }
int KHTMLZoomFactorAction::plug( TQWidget *w, int index ) int TDEHTMLZoomFactorAction::plug( TQWidget *w, int index )
{ {
int containerId = KAction::plug( w, index ); int containerId = KAction::plug( w, index );
if ( containerId == -1 || !w->inherits( "KToolBar" ) ) if ( containerId == -1 || !w->inherits( "KToolBar" ) )
@ -1018,7 +1018,7 @@ int KHTMLZoomFactorAction::plug( TQWidget *w, int index )
return containerId; return containerId;
} }
void KHTMLZoomFactorAction::slotActivated( int id ) void TDEHTMLZoomFactorAction::slotActivated( int id )
{ {
int idx = m_popup->indexOf( id ); int idx = m_popup->indexOf( id );

@ -35,16 +35,16 @@
#include <tdeio/global.h> #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. * more information about the BrowserExtension.
*/ */
class KHTMLPartBrowserExtension : public KParts::BrowserExtension class TDEHTMLPartBrowserExtension : public KParts::BrowserExtension
{ {
Q_OBJECT Q_OBJECT
friend class KHTMLPart; friend class TDEHTMLPart;
friend class KHTMLView; friend class TDEHTMLView;
public: public:
KHTMLPartBrowserExtension( KHTMLPart *parent, const char *name = 0L ); TDEHTMLPartBrowserExtension( TDEHTMLPart *parent, const char *name = 0L );
virtual int xOffset(); virtual int xOffset();
virtual int yOffset(); virtual int yOffset();
@ -84,17 +84,17 @@ signals:
private: private:
void callExtensionProxyMethod( const char *method ); void callExtensionProxyMethod( const char *method );
KHTMLPart *m_part; TDEHTMLPart *m_part;
TQGuardedPtr<TQWidget> m_editableFormWidget; TQGuardedPtr<TQWidget> m_editableFormWidget;
TQGuardedPtr<KParts::BrowserExtension> m_extensionProxy; TQGuardedPtr<KParts::BrowserExtension> m_extensionProxy;
bool m_connectedToClipboard; bool m_connectedToClipboard;
}; };
class KHTMLPartBrowserHostExtension : public KParts::BrowserHostExtension class TDEHTMLPartBrowserHostExtension : public KParts::BrowserHostExtension
{ {
public: public:
KHTMLPartBrowserHostExtension( KHTMLPart *part ); TDEHTMLPartBrowserHostExtension( TDEHTMLPart *part );
virtual ~KHTMLPartBrowserHostExtension(); virtual ~TDEHTMLPartBrowserHostExtension();
virtual TQStringList frameNames() const; virtual TQStringList frameNames() const;
@ -105,19 +105,19 @@ public:
protected: protected:
virtual void virtual_hook( int id, void* data ); virtual void virtual_hook( int id, void* data );
private: private:
KHTMLPart *m_part; TDEHTMLPart *m_part;
}; };
/** /**
* @internal * @internal
* INTERNAL class. *NOT* part of the public API. * INTERNAL class. *NOT* part of the public API.
*/ */
class KHTMLPopupGUIClient : public TQObject, public KXMLGUIClient class TDEHTMLPopupGUIClient : public TQObject, public KXMLGUIClient
{ {
Q_OBJECT Q_OBJECT
public: public:
KHTMLPopupGUIClient( KHTMLPart *tdehtml, const TQString &doc, const KURL &url ); TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQString &doc, const KURL &url );
virtual ~KHTMLPopupGUIClient(); virtual ~TDEHTMLPopupGUIClient();
static void saveURL( TQWidget *parent, const TQString &caption, const KURL &url, static void saveURL( TQWidget *parent, const TQString &caption, const KURL &url,
const TQMap<TQString, TQString> &metaData = TDEIO::MetaData(), const TQMap<TQString, TQString> &metaData = TDEIO::MetaData(),
@ -145,20 +145,20 @@ private slots:
void slotBlockIFrame(); void slotBlockIFrame();
private: private:
class KHTMLPopupGUIClientPrivate; class TDEHTMLPopupGUIClientPrivate;
KHTMLPopupGUIClientPrivate *d; TDEHTMLPopupGUIClientPrivate *d;
}; };
class KHTMLZoomFactorAction : public KAction class TDEHTMLZoomFactorAction : public KAction
{ {
Q_OBJECT Q_OBJECT
public: public:
//BCI: remove in KDE 4 //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 ); TDEHTMLZoomFactorAction( TDEHTMLPart *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 KShortcut& cut, const TQObject *receiver, const TQString &icon, const KShortcut& cut, const TQObject *receiver,
const char *slot, TQObject *parent, const char *name ); const char *slot, TQObject *parent, const char *name );
virtual ~KHTMLZoomFactorAction(); virtual ~TDEHTMLZoomFactorAction();
virtual int plug( TQWidget *widget, int index ); virtual int plug( TQWidget *widget, int index );
@ -167,11 +167,11 @@ private slots:
protected slots: protected slots:
void slotActivated() { KAction::slotActivated(); } void slotActivated() { KAction::slotActivated(); }
private: private:
void init(KHTMLPart *part, bool direction); void init(TDEHTMLPart *part, bool direction);
private: private:
TQPopupMenu *m_popup; TQPopupMenu *m_popup;
bool m_direction; bool m_direction;
KHTMLPart *m_part; TDEHTMLPart *m_part;
}; };
#endif #endif

@ -37,40 +37,40 @@
#include <kdebug.h> #include <kdebug.h>
template class TQPtrList<KHTMLPart>; template class TQPtrList<TDEHTMLPart>;
extern "C" KDE_EXPORT void *init_libtdehtml() extern "C" KDE_EXPORT void *init_libtdehtml()
{ {
// We can't use a plain self() here, because that would // We can't use a plain self() here, because that would
// return the global factory, which might already exist // return the global factory, which might already exist
// at the time init_libtdehtml is called! As soon as someone // 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 // 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 // as html frame, then we cannot return self(), as
// what we return here is what the KLibLoader deletes // what we return here is what the KLibLoader deletes
// in the end, and we don't want the libloader to // in the end, and we don't want the libloader to
// delete our global instance. Anyway, the new // delete our global instance. Anyway, the new
// KHTMLFactory we create here is very cheap :) // TDEHTMLFactory we create here is very cheap :)
// (Simon) // (Simon)
return new KHTMLFactory( true ); return new TDEHTMLFactory( true );
} }
KHTMLFactory *KHTMLFactory::s_self = 0; TDEHTMLFactory *TDEHTMLFactory::s_self = 0;
unsigned long int KHTMLFactory::s_refcnt = 0; unsigned long int TDEHTMLFactory::s_refcnt = 0;
TDEInstance *KHTMLFactory::s_instance = 0; TDEInstance *TDEHTMLFactory::s_instance = 0;
TDEAboutData *KHTMLFactory::s_about = 0; TDEAboutData *TDEHTMLFactory::s_about = 0;
KHTMLSettings *KHTMLFactory::s_settings = 0; TDEHTMLSettings *TDEHTMLFactory::s_settings = 0;
TQPtrList<KHTMLPart> *KHTMLFactory::s_parts = 0; TQPtrList<TDEHTMLPart> *TDEHTMLFactory::s_parts = 0;
TQString *KHTMLSettings::avFamilies = 0; TQString *TDEHTMLSettings::avFamilies = 0;
KHTMLFactory::KHTMLFactory( bool clone ) TDEHTMLFactory::TDEHTMLFactory( bool clone )
{ {
if ( clone ) if ( clone )
ref(); ref();
} }
KHTMLFactory::~KHTMLFactory() TDEHTMLFactory::~TDEHTMLFactory()
{ {
if ( s_self == this ) if ( s_self == this )
{ {
@ -79,7 +79,7 @@ KHTMLFactory::~KHTMLFactory()
delete s_instance; delete s_instance;
delete s_about; delete s_about;
delete s_settings; delete s_settings;
delete KHTMLSettings::avFamilies; delete TDEHTMLSettings::avFamilies;
if ( s_parts ) if ( s_parts )
{ {
assert( s_parts->isEmpty() ); assert( s_parts->isEmpty() );
@ -90,7 +90,7 @@ KHTMLFactory::~KHTMLFactory()
s_about = 0; s_about = 0;
s_settings = 0; s_settings = 0;
s_parts = 0; s_parts = 0;
KHTMLSettings::avFamilies = 0; TDEHTMLSettings::avFamilies = 0;
// clean up static data // clean up static data
tdehtml::CSSStyleSelector::clear(); tdehtml::CSSStyleSelector::clear();
@ -103,16 +103,16 @@ KHTMLFactory::~KHTMLFactory()
deref(); 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 ) 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 ) 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 // 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 // safe side ;-) -> let's use a simple reference counting scheme
// (Simon) // (Simon)
s_self = new KHTMLFactory; s_self = new TDEHTMLFactory;
tdehtml::Cache::init(); tdehtml::Cache::init();
} }
s_refcnt++; s_refcnt++;
} }
void KHTMLFactory::deref() void TDEHTMLFactory::deref()
{ {
if ( !--s_refcnt && s_self ) 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 ) if ( !s_parts )
s_parts = new TQPtrList<KHTMLPart>; s_parts = new TQPtrList<TDEHTMLPart>;
if ( !s_parts->containsRef( part ) ) 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 ); assert( s_parts );
@ -168,13 +168,13 @@ void KHTMLFactory::deregisterPart( KHTMLPart *part )
} }
} }
TDEInstance *KHTMLFactory::instance() TDEInstance *TDEHTMLFactory::instance()
{ {
assert( s_self ); assert( s_self );
if ( !s_instance ) 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" ), I18N_NOOP( "Embeddable HTML component" ),
TDEAboutData::License_LGPL ); TDEAboutData::License_LGPL );
s_about->addAuthor( "Lars Knoll", 0, "knoll@kde.org" ); s_about->addAuthor( "Lars Knoll", 0, "knoll@kde.org" );
@ -193,11 +193,11 @@ TDEInstance *KHTMLFactory::instance()
return s_instance; return s_instance;
} }
KHTMLSettings *KHTMLFactory::defaultHTMLSettings() TDEHTMLSettings *TDEHTMLFactory::defaultHTMLSettings()
{ {
assert( s_self ); assert( s_self );
if ( !s_settings ) if ( !s_settings )
s_settings = new KHTMLSettings(); s_settings = new TDEHTMLSettings();
return s_settings; return s_settings;
} }

@ -28,33 +28,33 @@
class TDEInstance; class TDEInstance;
class TDEAboutData; class TDEAboutData;
class HistoryProvider; class HistoryProvider;
class KHTMLSettings; class TDEHTMLSettings;
class KHTMLPart; class TDEHTMLPart;
namespace DOM namespace DOM
{ {
class DocumentImpl; class DocumentImpl;
} }
class KDE_EXPORT KHTMLFactory : public KParts::Factory class KDE_EXPORT TDEHTMLFactory : public KParts::Factory
{ {
Q_OBJECT Q_OBJECT
friend class DOM::DocumentImpl; friend class DOM::DocumentImpl;
friend class KHTMLViewPrivate; friend class TDEHTMLViewPrivate;
public: public:
KHTMLFactory( bool clone = false ); TDEHTMLFactory( bool clone = false );
virtual ~KHTMLFactory(); virtual ~TDEHTMLFactory();
virtual KParts::Part *createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList &args ); 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 registerPart( TDEHTMLPart *part );
static void deregisterPart( KHTMLPart *part ); static void deregisterPart( TDEHTMLPart *part );
static TQPtrList<KHTMLPart> *partList() { return s_parts; } static TQPtrList<TDEHTMLPart> *partList() { return s_parts; }
static TDEInstance *instance(); static TDEInstance *instance();
static KHTMLSettings *defaultHTMLSettings(); static TDEHTMLSettings *defaultHTMLSettings();
// list of visited URLs // list of visited URLs
static KParts::HistoryProvider *vLinks() { static KParts::HistoryProvider *vLinks() {
@ -66,11 +66,11 @@ protected:
static void deref(); static void deref();
private: private:
static unsigned long s_refcnt; static unsigned long s_refcnt;
static KHTMLFactory *s_self; static TDEHTMLFactory *s_self;
static TDEInstance *s_instance; static TDEInstance *s_instance;
static TDEAboutData *s_about; static TDEAboutData *s_about;
static KHTMLSettings *s_settings; static TDEHTMLSettings *s_settings;
static TQPtrList<KHTMLPart> *s_parts; static TQPtrList<TDEHTMLPart> *s_parts;
}; };
#endif #endif

@ -26,127 +26,127 @@
#include <tqapplication.h> #include <tqapplication.h>
#include <tqvariant.h> #include <tqvariant.h>
KHTMLPartIface::KHTMLPartIface( KHTMLPart *_part ) TDEHTMLPartIface::TDEHTMLPartIface( TDEHTMLPart *_part )
: DCOPObject( _part->dcopObjectId() ), part(_part) : DCOPObject( _part->dcopObjectId() ), part(_part)
{ {
} }
KHTMLPartIface::~KHTMLPartIface() TDEHTMLPartIface::~TDEHTMLPartIface()
{ {
} }
KURL KHTMLPartIface::url() const KURL TDEHTMLPartIface::url() const
{ {
return part->url(); return part->url();
} }
void KHTMLPartIface::setJScriptEnabled( bool enable ) void TDEHTMLPartIface::setJScriptEnabled( bool enable )
{ {
part->setJScriptEnabled(enable); part->setJScriptEnabled(enable);
} }
bool KHTMLPartIface::jScriptEnabled() const bool TDEHTMLPartIface::jScriptEnabled() const
{ {
return part->jScriptEnabled(); return part->jScriptEnabled();
} }
bool KHTMLPartIface::closeURL() bool TDEHTMLPartIface::closeURL()
{ {
return part->closeURL(); return part->closeURL();
} }
bool KHTMLPartIface::metaRefreshEnabled() const bool TDEHTMLPartIface::metaRefreshEnabled() const
{ {
return part->metaRefreshEnabled(); return part->metaRefreshEnabled();
} }
void KHTMLPartIface::setDNDEnabled( bool b ) void TDEHTMLPartIface::setDNDEnabled( bool b )
{ {
part->setDNDEnabled(b); part->setDNDEnabled(b);
} }
bool KHTMLPartIface::dndEnabled() const bool TDEHTMLPartIface::dndEnabled() const
{ {
return part->dndEnabled(); return part->dndEnabled();
} }
void KHTMLPartIface::setJavaEnabled( bool enable ) void TDEHTMLPartIface::setJavaEnabled( bool enable )
{ {
part->setJavaEnabled( enable ); part->setJavaEnabled( enable );
} }
bool KHTMLPartIface::javaEnabled() const bool TDEHTMLPartIface::javaEnabled() const
{ {
return part->javaEnabled(); return part->javaEnabled();
} }
void KHTMLPartIface::setPluginsEnabled( bool enable ) void TDEHTMLPartIface::setPluginsEnabled( bool enable )
{ {
part->setPluginsEnabled( enable ); part->setPluginsEnabled( enable );
} }
bool KHTMLPartIface::pluginsEnabled() const bool TDEHTMLPartIface::pluginsEnabled() const
{ {
return part->pluginsEnabled(); return part->pluginsEnabled();
} }
void KHTMLPartIface::setAutoloadImages( bool enable ) void TDEHTMLPartIface::setAutoloadImages( bool enable )
{ {
part->setAutoloadImages( enable ); part->setAutoloadImages( enable );
} }
bool KHTMLPartIface::autoloadImages() const bool TDEHTMLPartIface::autoloadImages() const
{ {
return part->autoloadImages(); return part->autoloadImages();
} }
void KHTMLPartIface::setOnlyLocalReferences(bool enable) void TDEHTMLPartIface::setOnlyLocalReferences(bool enable)
{ {
part->setOnlyLocalReferences(enable); part->setOnlyLocalReferences(enable);
} }
void KHTMLPartIface::setMetaRefreshEnabled( bool enable ) void TDEHTMLPartIface::setMetaRefreshEnabled( bool enable )
{ {
part->setMetaRefreshEnabled(enable); part->setMetaRefreshEnabled(enable);
} }
bool KHTMLPartIface::onlyLocalReferences() const bool TDEHTMLPartIface::onlyLocalReferences() const
{ {
return part->onlyLocalReferences(); return part->onlyLocalReferences();
} }
bool KHTMLPartIface::setEncoding( const TQString &name ) bool TDEHTMLPartIface::setEncoding( const TQString &name )
{ {
return part->setEncoding(name); return part->setEncoding(name);
} }
TQString KHTMLPartIface::encoding() const TQString TDEHTMLPartIface::encoding() const
{ {
return part->encoding(); return part->encoding();
} }
void KHTMLPartIface::setFixedFont( const TQString &name ) void TDEHTMLPartIface::setFixedFont( const TQString &name )
{ {
part->setFixedFont(name); part->setFixedFont(name);
} }
bool KHTMLPartIface::gotoAnchor( const TQString &name ) bool TDEHTMLPartIface::gotoAnchor( const TQString &name )
{ {
return part->gotoAnchor(name); return part->gotoAnchor(name);
} }
bool KHTMLPartIface::nextAnchor() bool TDEHTMLPartIface::nextAnchor()
{ {
return part->nextAnchor(); return part->nextAnchor();
} }
bool KHTMLPartIface::prevAnchor() bool TDEHTMLPartIface::prevAnchor()
{ {
return part->prevAnchor(); return part->prevAnchor();
} }
void KHTMLPartIface::activateNode() void TDEHTMLPartIface::activateNode()
{ {
KParts::ReadOnlyPart* p = part->currentFrame(); KParts::ReadOnlyPart* p = part->currentFrame();
if ( p && p->widget() ) { if ( p && p->widget() ) {
@ -155,37 +155,37 @@ void KHTMLPartIface::activateNode()
} }
} }
void KHTMLPartIface::selectAll() void TDEHTMLPartIface::selectAll()
{ {
part->selectAll(); part->selectAll();
} }
TQString KHTMLPartIface::lastModified() const TQString TDEHTMLPartIface::lastModified() const
{ {
return part->lastModified(); return part->lastModified();
} }
void KHTMLPartIface::debugRenderTree() void TDEHTMLPartIface::debugRenderTree()
{ {
part->slotDebugRenderTree(); part->slotDebugRenderTree();
} }
void KHTMLPartIface::debugDOMTree() void TDEHTMLPartIface::debugDOMTree()
{ {
part->slotDebugDOMTree(); part->slotDebugDOMTree();
} }
void KHTMLPartIface::stopAnimations() void TDEHTMLPartIface::stopAnimations()
{ {
part->slotStopAnimations(); part->slotStopAnimations();
} }
void KHTMLPartIface::viewDocumentSource() void TDEHTMLPartIface::viewDocumentSource()
{ {
part->slotViewDocumentSource(); part->slotViewDocumentSource();
} }
void KHTMLPartIface::saveBackground(const TQString &destination) void TDEHTMLPartIface::saveBackground(const TQString &destination)
{ {
KURL back = part->backgroundURL(); KURL back = part->backgroundURL();
if (back.isEmpty()) if (back.isEmpty())
@ -193,10 +193,10 @@ void KHTMLPartIface::saveBackground(const TQString &destination)
TDEIO::MetaData metaData; TDEIO::MetaData metaData;
metaData["referrer"] = part->referrer(); 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() ); KURL srcURL( part->url() );
@ -205,29 +205,29 @@ void KHTMLPartIface::saveDocument(const TQString &destination)
TDEIO::MetaData metaData; TDEIO::MetaData metaData;
// Referrer unknown? // 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); part->setUserStyleSheet(styleSheet);
} }
TQString KHTMLPartIface::selectedText() const TQString TDEHTMLPartIface::selectedText() const
{ {
return part->selectedText(); return part->selectedText();
} }
void KHTMLPartIface::viewFrameSource() void TDEHTMLPartIface::viewFrameSource()
{ {
part->slotViewFrameSource(); part->slotViewFrameSource();
} }
TQString KHTMLPartIface::evalJS(const TQString &script) TQString TDEHTMLPartIface::evalJS(const TQString &script)
{ {
return part->executeScript(DOM::Node(), script).toString(); return part->executeScript(DOM::Node(), script).toString();
} }
void KHTMLPartIface::print( bool quick ) { void TDEHTMLPartIface::print( bool quick ) {
part->view()->print( quick ); part->view()->print( quick );
} }

@ -24,19 +24,19 @@
#include <dcopref.h> #include <dcopref.h>
#include <kurl.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 K_DCOP
public: public:
KHTMLPartIface( KHTMLPart * ); TDEHTMLPartIface( TDEHTMLPart * );
virtual ~KHTMLPartIface(); virtual ~TDEHTMLPartIface();
k_dcop: k_dcop:
/** /**
@ -235,7 +235,7 @@ k_dcop:
void stopAnimations(); void stopAnimations();
private: private:
KHTMLPart *part; TDEHTMLPart *part;
}; };
#endif #endif

@ -32,18 +32,18 @@
#include <assert.h> #include <assert.h>
// We keep 12 pages in memory. // We keep 12 pages in memory.
#ifndef KHTML_PAGE_CACHE_SIZE #ifndef TDEHTML_PAGE_CACHE_SIZE
#define KHTML_PAGE_CACHE_SIZE 12 #define TDEHTML_PAGE_CACHE_SIZE 12
#endif #endif
template class TQPtrList<KHTMLPageCacheDelivery>; template class TQPtrList<TDEHTMLPageCacheDelivery>;
class KHTMLPageCacheEntry class TDEHTMLPageCacheEntry
{ {
friend class KHTMLPageCache; friend class TDEHTMLPageCache;
public: public:
KHTMLPageCacheEntry(long id); TDEHTMLPageCacheEntry(long id);
~KHTMLPageCacheEntry(); ~TDEHTMLPageCacheEntry();
void addData(const TQByteArray &data); void addData(const TQByteArray &data);
@ -52,7 +52,7 @@ public:
bool isComplete() bool isComplete()
{ return m_complete; } { return m_complete; }
KHTMLPageCacheDelivery *fetchData(TQObject *recvObj, const char *recvSlot); TDEHTMLPageCacheDelivery *fetchData(TQObject *recvObj, const char *recvSlot);
private: private:
long m_id; long m_id;
bool m_complete; bool m_complete;
@ -60,38 +60,38 @@ private:
KTempFile *m_file; KTempFile *m_file;
}; };
class KHTMLPageCachePrivate class TDEHTMLPageCachePrivate
{ {
public: public:
long newId; long newId;
TQIntDict<KHTMLPageCacheEntry> dict; TQIntDict<TDEHTMLPageCacheEntry> dict;
TQPtrList<KHTMLPageCacheDelivery> delivery; TQPtrList<TDEHTMLPageCacheDelivery> delivery;
TQPtrList<KHTMLPageCacheEntry> expireQueue; TQPtrList<TDEHTMLPageCacheEntry> expireQueue;
bool deliveryActive; 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"); TQString path = locateLocal("tmp", "tdehtmlcache");
m_file = new KTempFile(path); m_file = new KTempFile(path);
m_file->unlink(); m_file->unlink();
} }
KHTMLPageCacheEntry::~KHTMLPageCacheEntry() TDEHTMLPageCacheEntry::~TDEHTMLPageCacheEntry()
{ {
delete m_file; delete m_file;
} }
void void
KHTMLPageCacheEntry::addData(const TQByteArray &data) TDEHTMLPageCacheEntry::addData(const TQByteArray &data)
{ {
if (m_file->status() == 0) if (m_file->status() == 0)
m_file->dataStream()->writeRawBytes(data.data(), data.size()); m_file->dataStream()->writeRawBytes(data.data(), data.size());
} }
void void
KHTMLPageCacheEntry::endData() TDEHTMLPageCacheEntry::endData()
{ {
m_complete = true; m_complete = true;
if ( m_file->status() == 0) { if ( m_file->status() == 0) {
@ -101,38 +101,38 @@ KHTMLPageCacheEntry::endData()
} }
KHTMLPageCacheDelivery * TDEHTMLPageCacheDelivery *
KHTMLPageCacheEntry::fetchData(TQObject *recvObj, const char *recvSlot) TDEHTMLPageCacheEntry::fetchData(TQObject *recvObj, const char *recvSlot)
{ {
// Duplicate fd so that entry can be safely deleted while delivering the data. // Duplicate fd so that entry can be safely deleted while delivering the data.
int fd = dup(m_file->handle()); int fd = dup(m_file->handle());
lseek(fd, 0, SEEK_SET); lseek(fd, 0, SEEK_SET);
KHTMLPageCacheDelivery *delivery = new KHTMLPageCacheDelivery(fd); TDEHTMLPageCacheDelivery *delivery = new TDEHTMLPageCacheDelivery(fd);
recvObj->connect(delivery, TQT_SIGNAL(emitData(const TQByteArray&)), recvSlot); recvObj->connect(delivery, TQT_SIGNAL(emitData(const TQByteArray&)), recvSlot);
delivery->recvObj = recvObj; delivery->recvObj = recvObj;
return delivery; return delivery;
} }
static KStaticDeleter<KHTMLPageCache> pageCacheDeleter; static KStaticDeleter<TDEHTMLPageCache> pageCacheDeleter;
KHTMLPageCache *KHTMLPageCache::_self = 0; TDEHTMLPageCache *TDEHTMLPageCache::_self = 0;
KHTMLPageCache * TDEHTMLPageCache *
KHTMLPageCache::self() TDEHTMLPageCache::self()
{ {
if (!_self) if (!_self)
_self = pageCacheDeleter.setObject(_self, new KHTMLPageCache); _self = pageCacheDeleter.setObject(_self, new TDEHTMLPageCache);
return _self; return _self;
} }
KHTMLPageCache::KHTMLPageCache() TDEHTMLPageCache::TDEHTMLPageCache()
{ {
d = new KHTMLPageCachePrivate; d = new TDEHTMLPageCachePrivate;
d->newId = 1; d->newId = 1;
d->deliveryActive = false; d->deliveryActive = false;
} }
KHTMLPageCache::~KHTMLPageCache() TDEHTMLPageCache::~TDEHTMLPageCache()
{ {
d->delivery.setAutoDelete(true); d->delivery.setAutoDelete(true);
d->dict.setAutoDelete(true); d->dict.setAutoDelete(true);
@ -140,14 +140,14 @@ KHTMLPageCache::~KHTMLPageCache()
} }
long long
KHTMLPageCache::createCacheEntry() TDEHTMLPageCache::createCacheEntry()
{ {
KHTMLPageCacheEntry *entry = new KHTMLPageCacheEntry(d->newId); TDEHTMLPageCacheEntry *entry = new TDEHTMLPageCacheEntry(d->newId);
d->dict.insert(d->newId, entry); d->dict.insert(d->newId, entry);
d->expireQueue.append(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); d->dict.remove(entry->m_id);
delete entry; delete entry;
} }
@ -155,25 +155,25 @@ KHTMLPageCache::createCacheEntry()
} }
void 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) if (entry)
entry->addData(data); entry->addData(data);
} }
void void
KHTMLPageCache::endData(long id) TDEHTMLPageCache::endData(long id)
{ {
KHTMLPageCacheEntry *entry = d->dict.find(id); TDEHTMLPageCacheEntry *entry = d->dict.find(id);
if (entry) if (entry)
entry->endData(); entry->endData();
} }
void void
KHTMLPageCache::cancelEntry(long id) TDEHTMLPageCache::cancelEntry(long id)
{ {
KHTMLPageCacheEntry *entry = d->dict.take(id); TDEHTMLPageCacheEntry *entry = d->dict.take(id);
if (entry) if (entry)
{ {
d->expireQueue.removeRef(entry); d->expireQueue.removeRef(entry);
@ -182,24 +182,24 @@ KHTMLPageCache::cancelEntry(long id)
} }
bool bool
KHTMLPageCache::isValid(long id) TDEHTMLPageCache::isValid(long id)
{ {
return (d->dict.find(id) != 0); return (d->dict.find(id) != 0);
} }
bool bool
KHTMLPageCache::isComplete(long id) TDEHTMLPageCache::isComplete(long id)
{ {
KHTMLPageCacheEntry *entry = d->dict.find(id); TDEHTMLPageCacheEntry *entry = d->dict.find(id);
if (entry) if (entry)
return entry->isComplete(); return entry->isComplete();
return false; return false;
} }
void 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; if (!entry || !entry->isComplete()) return;
// Make this entry the most recent entry. // Make this entry the most recent entry.
@ -215,10 +215,10 @@ KHTMLPageCache::fetchData(long id, TQObject *recvObj, const char *recvSlot)
} }
void void
KHTMLPageCache::cancelFetch(TQObject *recvObj) TDEHTMLPageCache::cancelFetch(TQObject *recvObj)
{ {
KHTMLPageCacheDelivery *next; TDEHTMLPageCacheDelivery *next;
for(KHTMLPageCacheDelivery* delivery = d->delivery.first(); for(TDEHTMLPageCacheDelivery* delivery = d->delivery.first();
delivery; delivery;
delivery = next) delivery = next)
{ {
@ -232,14 +232,14 @@ KHTMLPageCache::cancelFetch(TQObject *recvObj)
} }
void void
KHTMLPageCache::sendData() TDEHTMLPageCache::sendData()
{ {
if (d->delivery.isEmpty()) if (d->delivery.isEmpty())
{ {
d->deliveryActive = false; d->deliveryActive = false;
return; return;
} }
KHTMLPageCacheDelivery *delivery = d->delivery.take(0); TDEHTMLPageCacheDelivery *delivery = d->delivery.take(0);
assert(delivery); assert(delivery);
char buf[8192]; char buf[8192];
@ -269,9 +269,9 @@ KHTMLPageCache::sendData()
} }
void 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); assert(entry);
int fd = entry->m_file->handle(); int fd = entry->m_file->handle();
@ -305,7 +305,7 @@ KHTMLPageCache::saveData(long id, TQDataStream *str)
lseek(fd, pos, SEEK_SET); lseek(fd, pos, SEEK_SET);
} }
KHTMLPageCacheDelivery::~KHTMLPageCacheDelivery() TDEHTMLPageCacheDelivery::~TDEHTMLPageCacheDelivery()
{ {
close(fd); close(fd);
} }

@ -25,7 +25,7 @@
#include <tqvaluelist.h> #include <tqvaluelist.h>
#include <tqptrlist.h> #include <tqptrlist.h>
class KHTMLPageCachePrivate; class TDEHTMLPageCachePrivate;
/** /**
* Singleton Object that handles a binary cache on top of * 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. * It operates completely independent from the kio_http cache.
*/ */
class KHTMLPageCache : public TQObject class TDEHTMLPageCache : public TQObject
{ {
Q_OBJECT Q_OBJECT
public: public:
@ -47,8 +47,8 @@ public:
* @return returns a pointer to the cache, if it exists. * @return returns a pointer to the cache, if it exists.
* creates a new cache otherwise. * creates a new cache otherwise.
*/ */
static KHTMLPageCache *self(); static TDEHTMLPageCache *self();
~KHTMLPageCache(); ~TDEHTMLPageCache();
/** /**
* Create a new cache entry. * Create a new cache entry.
@ -106,21 +106,21 @@ private slots:
void sendData(); void sendData();
private: 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 Q_OBJECT
public: public:
KHTMLPageCacheDelivery(int _fd) TDEHTMLPageCacheDelivery(int _fd)
: fd(_fd) { } : fd(_fd) { }
~KHTMLPageCacheDelivery(); ~TDEHTMLPageCacheDelivery();
signals: signals:
void emitData(const TQByteArray &data); void emitData(const TQByteArray &data);

File diff suppressed because it is too large Load Diff

@ -36,11 +36,11 @@
#include <tqregexp.h> #include <tqregexp.h>
class KHTMLPartPrivate; class TDEHTMLPartPrivate;
class KHTMLPartBrowserExtension; class TDEHTMLPartBrowserExtension;
class KJSProxy; class KJSProxy;
class KHTMLView; class TDEHTMLView;
class KHTMLSettings; class TDEHTMLSettings;
class KJavaAppletContext; class KJavaAppletContext;
class KJSErrorDlg; class KJSErrorDlg;
@ -120,7 +120,7 @@ namespace KWallet
* *
* \code * \code
* KURL url = "http://www.kde.org"; * KURL url = "http://www.kde.org";
* KHTMLPart *w = new KHTMLPart(); * TDEHTMLPart *w = new TDEHTMLPart();
* w->openURL(url); * w->openURL(url);
* w->view()->resize(500, 400); * w->view()->resize(500, 400);
* w->show(); * w->show();
@ -139,7 +139,7 @@ namespace KWallet
* w->setPluginsEnabled(false); * w->setPluginsEnabled(false);
* \endcode * \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. * from loading images, frames, etc, or redirecting to external sites.
* *
* \code * \code
@ -151,7 +151,7 @@ namespace KWallet
* *
* \code * \code
* TQString myHTMLCode = ...; * TQString myHTMLCode = ...;
* KHTMLPart *w = new KHTMLPart(); * TDEHTMLPart *w = new TDEHTMLPart();
* w->begin(); * w->begin();
* w->write(myHTMLCode); * w->write(myHTMLCode);
* ... * ...
@ -171,9 +171,9 @@ namespace KWallet
* described above as the following example shows: * described above as the following example shows:
* *
* \code * \code
* KHTMLPart *doc = new KHTMLPart(); * TDEHTMLPart *doc = new TDEHTMLPart();
* doc->openStream( "text/html", KURL() ); * 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(); * doc->closeStream();
* \endcode * \endcode
* *
@ -181,10 +181,10 @@ namespace KWallet
* @author Lars Knoll (knoll@kde.org) * @author Lars Knoll (knoll@kde.org)
* *
*/ */
class KHTML_EXPORT KHTMLPart : public KParts::ReadOnlyPart class TDEHTML_EXPORT TDEHTMLPart : public KParts::ReadOnlyPart
{ {
Q_OBJECT Q_OBJECT
friend class KHTMLView; friend class TDEHTMLView;
friend class DOM::HTMLTitleElementImpl; friend class DOM::HTMLTitleElementImpl;
friend class DOM::HTMLFrameElementImpl; friend class DOM::HTMLFrameElementImpl;
friend class DOM::HTMLIFrameElementImpl; friend class DOM::HTMLIFrameElementImpl;
@ -192,7 +192,7 @@ class KHTML_EXPORT KHTMLPart : public KParts::ReadOnlyPart
friend class DOM::HTMLAnchorElementImpl; friend class DOM::HTMLAnchorElementImpl;
friend class DOM::HTMLMetaElementImpl; friend class DOM::HTMLMetaElementImpl;
friend class DOM::NodeImpl; friend class DOM::NodeImpl;
friend class KHTMLRun; friend class TDEHTMLRun;
friend class DOM::HTMLFormElementImpl; friend class DOM::HTMLFormElementImpl;
friend class tdehtml::RenderPartObject; friend class tdehtml::RenderPartObject;
friend class KJS::Window; friend class KJS::Window;
@ -205,17 +205,17 @@ class KHTML_EXPORT KHTMLPart : public KParts::ReadOnlyPart
friend class KJS::DOMDocument; friend class KJS::DOMDocument;
friend class KJS::SourceFile; friend class KJS::SourceFile;
friend class KJSProxy; friend class KJSProxy;
friend class KHTMLPartBrowserExtension; friend class TDEHTMLPartBrowserExtension;
friend class DOM::DocumentImpl; friend class DOM::DocumentImpl;
friend class DOM::HTMLDocumentImpl; friend class DOM::HTMLDocumentImpl;
friend class KHTMLPartBrowserHostExtension; friend class TDEHTMLPartBrowserHostExtension;
friend class tdehtml::HTMLTokenizer; friend class tdehtml::HTMLTokenizer;
friend class tdehtml::XMLTokenizer; friend class tdehtml::XMLTokenizer;
friend class tdehtml::RenderWidget; friend class tdehtml::RenderWidget;
friend class tdehtml::CSSStyleSelector; friend class tdehtml::CSSStyleSelector;
friend class KHTMLPartIface; friend class TDEHTMLPartIface;
friend class KHTMLPartFunction; friend class TDEHTMLPartFunction;
friend class KHTMLPopupGUIClient; friend class TDEHTMLPopupGUIClient;
TQ_PROPERTY( bool javaScriptEnabled READ jScriptEnabled WRITE setJScriptEnabled ) TQ_PROPERTY( bool javaScriptEnabled READ jScriptEnabled WRITE setJScriptEnabled )
TQ_PROPERTY( bool javaEnabled READ javaEnabled WRITE setJavaEnabled ) TQ_PROPERTY( bool javaEnabled READ javaEnabled WRITE setJavaEnabled )
@ -235,26 +235,26 @@ public:
enum GUIProfile { DefaultGUI, BrowserViewGUI /* ... */ }; enum GUIProfile { DefaultGUI, BrowserViewGUI /* ... */ };
/** /**
* Constructs a new KHTMLPart. * Constructs a new TDEHTMLPart.
* *
* KHTML basically consists of two objects: The KHTMLPart itself, * TDEHTML basically consists of two objects: The TDEHTMLPart itself,
* holding the document data (DOM document), and the KHTMLView, * holding the document data (DOM document), and the TDEHTMLView,
* derived from TQScrollView, in which the document content is * derived from TQScrollView, in which the document content is
* rendered in. You can specify two different parent objects for a * rendered in. You can specify two different parent objects for a
* KHTMLPart, one parent for the KHTMLPart document and on parent * TDEHTMLPart, one parent for the TDEHTMLPart document and on parent
* for the KHTMLView. If the second @p parent argument is 0L, then * for the TDEHTMLView. If the second @p parent argument is 0L, then
* @p parentWidget is used as parent for both objects, the part and * @p parentWidget is used as parent for both objects, the part and
* the view. * 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 ); 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. * Destructor.
*/ */
virtual ~KHTMLPart(); virtual ~TDEHTMLPart();
/** /**
* Opens the specified URL @p url. * Opens the specified URL @p url.
@ -307,7 +307,7 @@ public:
/** /**
* Returns a pointer to the HTML document's view. * Returns a pointer to the HTML document's view.
*/ */
KHTMLView *view() const; TDEHTMLView *view() const;
/** /**
* Enable/disable Javascript support. Note that this will * Enable/disable Javascript support. Note that this will
@ -440,7 +440,7 @@ public:
* Security option. * Security option.
* *
* Specify whether only file:/ or data:/ urls are allowed to be loaded without * 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 ). * ( 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 * 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); // 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 ); void paint( TQPainter *, const TQRect &, int = 0, bool * = 0 );
@ -845,7 +845,7 @@ public:
KParts::PartManager *partManager(); 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. * objects) to the provided TQDataStream.
* *
* This is called from the saveState() method of the * This is called from the saveState() method of the
@ -853,7 +853,7 @@ public:
*/ */
virtual void saveState( TQDataStream &stream ); 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. * child frame objects) from the provided TQDataStream.
* *
* @see saveState() * @see saveState()
@ -884,15 +884,15 @@ public:
/** /**
* @internal * @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. * in an HTML frameset.
* *
* Returns 0L otherwise. * Returns 0L otherwise.
*/ */
KHTMLPart *parentPart(); TDEHTMLPart *parentPart();
/** /**
* Returns a list of names of all frame (including iframe) objects of * 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. * 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 * Recursively finds the part containing the frame with name @p f
@ -916,7 +916,7 @@ public:
* frame info in @p *childFrame * frame info in @p *childFrame
* @since 3.3 * @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) * Return the current frame (the one that has focus)
@ -1046,7 +1046,7 @@ public:
* Shows or hides the suppressed popup indicator * Shows or hides the suppressed popup indicator
* @since 3.5 * @since 3.5
*/ */
void setSuppressedPopupIndicator( bool enable, KHTMLPart *originPart ); void setSuppressedPopupIndicator( bool enable, TDEHTMLPart *originPart );
/** /**
* @internal * @internal
@ -1553,7 +1553,7 @@ private:
void resetFromScript(); void resetFromScript();
void emitSelectionChanged(); void emitSelectionChanged();
// Returns whether callingHtmlPart may access this part // 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 openURLInFrame( const KURL &url, const KParts::URLArgs &urlArgs );
bool urlSelectedIntern( const TQString &url, int button, int state, bool urlSelectedIntern( const TQString &url, int button, int state,
const TQString &_target, KParts::URLArgs args = KParts::URLArgs()); const TQString &_target, KParts::URLArgs args = KParts::URLArgs());
@ -1588,7 +1588,7 @@ private:
void popupMenu( const TQString &url ); void popupMenu( const TQString &url );
void init( KHTMLView *view, GUIProfile prof ); void init( TDEHTMLView *view, GUIProfile prof );
void clear(); void clear();
@ -1621,16 +1621,16 @@ private:
DOM::DocumentImpl *xmlDocImpl() const; DOM::DocumentImpl *xmlDocImpl() const;
tdehtml::ChildFrame *frame( const TQObject *obj ); 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 ); 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 ); TQVariant executeScript( const TQString& filename, int baseLine, const DOM::Node &n, const TQString& script );
KJSProxy *jScript(); KJSProxy *jScript();
KHTMLPart *opener(); TDEHTMLPart *opener();
long cacheId() const; long cacheId() const;
void setOpener( KHTMLPart *_opener ); void setOpener( TDEHTMLPart *_opener );
bool openedByJS(); bool openedByJS();
void setOpenedByJS( bool _openedByJS ); void setOpenedByJS( bool _openedByJS );
@ -1675,8 +1675,8 @@ private:
void runAdFilter(); void runAdFilter();
KHTMLPartPrivate *d; TDEHTMLPartPrivate *d;
friend class KHTMLPartPrivate; friend class TDEHTMLPartPrivate;
}; };

@ -24,7 +24,7 @@
#include <tqlayout.h> #include <tqlayout.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
KHTMLPrintSettings::KHTMLPrintSettings(TQWidget *parent, const char *name) TDEHTMLPrintSettings::TDEHTMLPrintSettings(TQWidget *parent, const char *name)
: KPrintDialogPage(parent, name) : KPrintDialogPage(parent, name)
{ {
//WhatsThis strings.... (added by pfeifle@kde.org) //WhatsThis strings.... (added by pfeifle@kde.org)
@ -87,18 +87,18 @@ KHTMLPrintSettings::KHTMLPrintSettings(TQWidget *parent, const char *name)
l0->addStretch(1); 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-printfriendly"] = (m_printfriendly->isChecked() ? "true" : "false");
opts["app-tdehtml-printimages"] = (m_printimages->isChecked() ? "true" : "false"); opts["app-tdehtml-printimages"] = (m_printimages->isChecked() ? "true" : "false");
opts["app-tdehtml-printheader"] = (m_printheader->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_printfriendly->setChecked(opts["app-tdehtml-printfriendly"] != "false");
m_printimages->setChecked(opts["app-tdehtml-printimages"] != "false"); m_printimages->setChecked(opts["app-tdehtml-printimages"] != "false");

@ -17,19 +17,19 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
**/ **/
#ifndef KHTML_PRINTSETTINGS_H #ifndef TDEHTML_PRINTSETTINGS_H
#define KHTML_PRINTSETTINGS_H #define TDEHTML_PRINTSETTINGS_H
#include <tdeprint/kprintdialogpage.h> #include <tdeprint/kprintdialogpage.h>
class TQCheckBox; class TQCheckBox;
class KHTMLPrintSettings : public KPrintDialogPage class TDEHTMLPrintSettings : public KPrintDialogPage
{ {
Q_OBJECT Q_OBJECT
public: public:
KHTMLPrintSettings(TQWidget *parent = 0, const char *name = 0); TDEHTMLPrintSettings(TQWidget *parent = 0, const char *name = 0);
~KHTMLPrintSettings(); ~TDEHTMLPrintSettings();
void getOptions(TQMap<TQString,TQString>& opts, bool incldef = false); void getOptions(TQMap<TQString,TQString>& opts, bool incldef = false);
void setOptions(const TQMap<TQString,TQString>& opts); void setOptions(const TQMap<TQString,TQString>& opts);

@ -28,7 +28,7 @@
#include "tdehtml_ext.h" #include "tdehtml_ext.h"
#include <tqwidget.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 ) const KParts::URLArgs &args, bool hideErrorDialog )
: KParts::BrowserRun( url, args, part, part->widget() ? part->widget()->topLevelWidget() : 0, : KParts::BrowserRun( url, args, part, part->widget() ? part->widget()->topLevelWidget() : 0,
false, false, hideErrorDialog ), false, false, hideErrorDialog ),
@ -41,14 +41,14 @@ KHTMLRun::KHTMLRun( KHTMLPart *part, tdehtml::ChildFrame *child, const KURL &url
part->started(0L); part->started(0L);
} }
//KHTMLPart *KHTMLRun::htmlPart() const //TDEHTMLPart *TDEHTMLRun::htmlPart() const
//{ return static_cast<KHTMLPart *>(m_part); } //{ return static_cast<TDEHTMLPart *>(m_part); }
void KHTMLRun::foundMimeType( const TQString &_type ) void TDEHTMLRun::foundMimeType( const TQString &_type )
{ {
Q_ASSERT(!m_bFinished); Q_ASSERT(!m_bFinished);
TQString mimeType = _type; // this ref comes from the job, we lose it when using KIO again 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; m_bFinished = true;
else { else {
if ( m_bFinished ) // abort was called (this happens with the activex fallback for instance) 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 ); m_bFinished = ( res == KParts::BrowserRun::Handled );
if ( m_bFinished ) { // saved or canceled -> flag completed if ( m_bFinished ) { // saved or canceled -> flag completed
m_child->m_bCompleted = true; 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; return;
} }
//kdDebug(6050) << "KHTMLRun::foundMimeType " << _type << " couldn't open" << endl; //kdDebug(6050) << "TDEHTMLRun::foundMimeType " << _type << " couldn't open" << endl;
KRun::foundMimeType( mimeType ); KRun::foundMimeType( mimeType );
// "open" is finished -> flag completed // "open" is finished -> flag completed
m_child->m_bCompleted = true; 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 // KDE4: remove
void KHTMLRun::handleError( TDEIO::Job *job ) void TDEHTMLRun::handleError( TDEIO::Job *job )
{ {
KParts::BrowserRun::handleError( job ); KParts::BrowserRun::handleError( job );
} }

@ -28,23 +28,23 @@
#include <kservice.h> #include <kservice.h>
#include <tdeparts/browserextension.h> #include <tdeparts/browserextension.h>
class KHTMLPart; class TDEHTMLPart;
namespace tdehtml namespace tdehtml
{ {
class ChildFrame; class ChildFrame;
} }
class KHTMLRun : public KParts::BrowserRun class TDEHTMLRun : public KParts::BrowserRun
{ {
Q_OBJECT Q_OBJECT
public: 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 ); const KParts::URLArgs &args, bool hideErrorDialog );
virtual void foundMimeType( const TQString &mimetype ); virtual void foundMimeType( const TQString &mimetype );
//KHTMLPart *htmlPart() const; //TDEHTMLPart *htmlPart() const;
protected: protected:
virtual void handleError( TDEIO::Job * job ); virtual void handleError( TDEIO::Job * job );

@ -39,11 +39,11 @@ struct KPerDomainSettings {
bool m_bEnableJavaScript : 1; bool m_bEnableJavaScript : 1;
bool m_bEnablePlugins : 1; bool m_bEnablePlugins : 1;
// don't forget to maintain the bitfields as the enums grow // don't forget to maintain the bitfields as the enums grow
KHTMLSettings::KJSWindowOpenPolicy m_windowOpenPolicy : 2; TDEHTMLSettings::KJSWindowOpenPolicy m_windowOpenPolicy : 2;
KHTMLSettings::KJSWindowStatusPolicy m_windowStatusPolicy : 1; TDEHTMLSettings::KJSWindowStatusPolicy m_windowStatusPolicy : 1;
KHTMLSettings::KJSWindowFocusPolicy m_windowFocusPolicy : 1; TDEHTMLSettings::KJSWindowFocusPolicy m_windowFocusPolicy : 1;
KHTMLSettings::KJSWindowMovePolicy m_windowMovePolicy : 1; TDEHTMLSettings::KJSWindowMovePolicy m_windowMovePolicy : 1;
KHTMLSettings::KJSWindowResizePolicy m_windowResizePolicy : 1; TDEHTMLSettings::KJSWindowResizePolicy m_windowResizePolicy : 1;
#ifdef DEBUG_SETTINGS #ifdef DEBUG_SETTINGS
void dump(const TQString &infix = TQString::null) const { void dump(const TQString &infix = TQString::null) const {
@ -62,7 +62,7 @@ struct KPerDomainSettings {
typedef TQMap<TQString,KPerDomainSettings> PolicyMap; typedef TQMap<TQString,KPerDomainSettings> PolicyMap;
class KHTMLSettingsPrivate class TDEHTMLSettingsPrivate
{ {
public: public:
bool m_bChangeCursor : 1; bool m_bChangeCursor : 1;
@ -92,7 +92,7 @@ public:
int m_fontSize; int m_fontSize;
int m_minFontSize; int m_minFontSize;
int m_maxFormCompletionItems; int m_maxFormCompletionItems;
KHTMLSettings::KAnimationAdvice m_showAnimations; TDEHTMLSettings::KAnimationAdvice m_showAnimations;
TQString m_encoding; TQString m_encoding;
TQString m_userSheet; TQString m_userSheet;
@ -115,7 +115,7 @@ public:
* or a deep copy of the global settings if not existent. * or a deep copy of the global settings if not existent.
*/ */
static KPerDomainSettings &setup_per_domain_policy( static KPerDomainSettings &setup_per_domain_policy(
KHTMLSettingsPrivate *d, TDEHTMLSettingsPrivate *d,
const TQString &domain) { const TQString &domain) {
if (domain.isEmpty()) { if (domain.isEmpty()) {
kdWarning() << "setup_per_domain_policy: domain is empty" << endl; 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; KJavaScriptAdvice ret = KJavaScriptDunno;
@ -146,7 +146,7 @@ KHTMLSettings::KJavaScriptAdvice KHTMLSettings::strToAdvice(const TQString& _str
return ret; return ret;
} }
const char* KHTMLSettings::adviceToStr(KJavaScriptAdvice _advice) const char* TDEHTMLSettings::adviceToStr(KJavaScriptAdvice _advice)
{ {
switch( _advice ) { switch( _advice ) {
case KJavaScriptAccept: return I18N_NOOP("Accept"); 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) KJavaScriptAdvice &javaAdvice, KJavaScriptAdvice& javaScriptAdvice)
{ {
TQString tmp(configStr); 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) { bool global, KPerDomainSettings &pd_settings) {
TQString jsPrefix = global ? TQString::null TQString jsPrefix = global ? TQString::null
: TQString::fromLatin1("javascript."); : 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(); init();
} }
KHTMLSettings::KHTMLSettings(const KHTMLSettings &other) TDEHTMLSettings::TDEHTMLSettings(const TDEHTMLSettings &other)
{ {
d = new KHTMLSettingsPrivate(); d = new TDEHTMLSettingsPrivate();
*d = *other.d; *d = *other.d;
} }
KHTMLSettings::~KHTMLSettings() TDEHTMLSettings::~TDEHTMLSettings()
{ {
delete d; delete d;
} }
bool KHTMLSettings::changeCursor() const bool TDEHTMLSettings::changeCursor() const
{ {
return d->m_bChangeCursor; return d->m_bChangeCursor;
} }
bool KHTMLSettings::underlineLink() const bool TDEHTMLSettings::underlineLink() const
{ {
return d->m_underlineLink; return d->m_underlineLink;
} }
bool KHTMLSettings::hoverLink() const bool TDEHTMLSettings::hoverLink() const
{ {
return d->m_hoverLink; return d->m_hoverLink;
} }
void KHTMLSettings::init() void TDEHTMLSettings::init()
{ {
TDEConfig global( "tdehtmlrc", true, false ); TDEConfig global( "tdehtmlrc", true, false );
init( &global, true ); init( &global, true );
@ -299,7 +299,7 @@ void KHTMLSettings::init()
init( local, false ); init( local, false );
} }
void KHTMLSettings::init( TDEConfig * config, bool reset ) void TDEHTMLSettings::init( TDEConfig * config, bool reset )
{ {
TQString group_save = config->group(); TQString group_save = config->group();
if (reset || config->hasGroup("MainView Settings")) 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. * In case of doubt, the global domain is returned.
*/ */
static const KPerDomainSettings &lookup_hostname_policy( static const KPerDomainSettings &lookup_hostname_policy(
const KHTMLSettingsPrivate *d, const TDEHTMLSettingsPrivate *d,
const TQString& hostname) const TQString& hostname)
{ {
#ifdef DEBUG_SETTINGS #ifdef DEBUG_SETTINGS
@ -693,32 +693,32 @@ static const KPerDomainSettings &lookup_hostname_policy(
return d->global; return d->global;
} }
bool KHTMLSettings::isOpenMiddleClickEnabled() bool TDEHTMLSettings::isOpenMiddleClickEnabled()
{ {
return d->m_bOpenMiddleClick; return d->m_bOpenMiddleClick;
} }
bool KHTMLSettings::isBackRightClickEnabled() bool TDEHTMLSettings::isBackRightClickEnabled()
{ {
return d->m_bBackRightClick; return d->m_bBackRightClick;
} }
bool KHTMLSettings::accessKeysEnabled() const bool TDEHTMLSettings::accessKeysEnabled() const
{ {
return d->m_accessKeysEnabled; return d->m_accessKeysEnabled;
} }
bool KHTMLSettings::isAdFilterEnabled() const bool TDEHTMLSettings::isAdFilterEnabled() const
{ {
return d->m_adFilterEnabled; return d->m_adFilterEnabled;
} }
bool KHTMLSettings::isHideAdsEnabled() const bool TDEHTMLSettings::isHideAdsEnabled() const
{ {
return d->m_hideAdsEnabled; return d->m_hideAdsEnabled;
} }
bool KHTMLSettings::isAdFiltered( const TQString &url ) const bool TDEHTMLSettings::isAdFiltered( const TQString &url ) const
{ {
if (d->m_adFilterEnabled) if (d->m_adFilterEnabled)
{ {
@ -739,7 +739,7 @@ bool KHTMLSettings::isAdFiltered( const TQString &url ) const
return false; return false;
} }
void KHTMLSettings::addAdFilter( const TQString &url ) void TDEHTMLSettings::addAdFilter( const TQString &url )
{ {
TDEConfig config( "tdehtmlrc", false, false ); TDEConfig config( "tdehtmlrc", false, false );
config.setGroup( "Filter Settings" ); 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; 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; 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 // debug setting is global for now, but could change in the future
return d->m_bEnableJavaScriptDebug; 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 // error reporting setting is global for now, but could change in the future
return d->m_bEnableJavaScriptErrorReporting; 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; return lookup_hostname_policy(d,hostname.lower()).m_bEnablePlugins;
} }
KHTMLSettings::KJSWindowOpenPolicy KHTMLSettings::windowOpenPolicy( TDEHTMLSettings::KJSWindowOpenPolicy TDEHTMLSettings::windowOpenPolicy(
const TQString& hostname) const { const TQString& hostname) const {
return lookup_hostname_policy(d,hostname.lower()).m_windowOpenPolicy; return lookup_hostname_policy(d,hostname.lower()).m_windowOpenPolicy;
} }
KHTMLSettings::KJSWindowMovePolicy KHTMLSettings::windowMovePolicy( TDEHTMLSettings::KJSWindowMovePolicy TDEHTMLSettings::windowMovePolicy(
const TQString& hostname) const { const TQString& hostname) const {
return lookup_hostname_policy(d,hostname.lower()).m_windowMovePolicy; return lookup_hostname_policy(d,hostname.lower()).m_windowMovePolicy;
} }
KHTMLSettings::KJSWindowResizePolicy KHTMLSettings::windowResizePolicy( TDEHTMLSettings::KJSWindowResizePolicy TDEHTMLSettings::windowResizePolicy(
const TQString& hostname) const { const TQString& hostname) const {
return lookup_hostname_policy(d,hostname.lower()).m_windowResizePolicy; return lookup_hostname_policy(d,hostname.lower()).m_windowResizePolicy;
} }
KHTMLSettings::KJSWindowStatusPolicy KHTMLSettings::windowStatusPolicy( TDEHTMLSettings::KJSWindowStatusPolicy TDEHTMLSettings::windowStatusPolicy(
const TQString& hostname) const { const TQString& hostname) const {
return lookup_hostname_policy(d,hostname.lower()).m_windowStatusPolicy; return lookup_hostname_policy(d,hostname.lower()).m_windowStatusPolicy;
} }
KHTMLSettings::KJSWindowFocusPolicy KHTMLSettings::windowFocusPolicy( TDEHTMLSettings::KJSWindowFocusPolicy TDEHTMLSettings::windowFocusPolicy(
const TQString& hostname) const { const TQString& hostname) const {
return lookup_hostname_policy(d,hostname.lower()).m_windowFocusPolicy; return lookup_hostname_policy(d,hostname.lower()).m_windowFocusPolicy;
} }
int KHTMLSettings::mediumFontSize() const int TDEHTMLSettings::mediumFontSize() const
{ {
return d->m_fontSize; return d->m_fontSize;
} }
int KHTMLSettings::minFontSize() const int TDEHTMLSettings::minFontSize() const
{ {
return d->m_minFontSize; return d->m_minFontSize;
} }
TQString KHTMLSettings::settingsToCSS() const TQString TDEHTMLSettings::settingsToCSS() const
{ {
// lets start with the link properties // lets start with the link properties
TQString str = "a:link {\ncolor: "; TQString str = "a:link {\ncolor: ";
@ -873,7 +873,7 @@ TQString KHTMLSettings::settingsToCSS() const
return str; return str;
} }
const TQString &KHTMLSettings::availableFamilies() const TQString &TDEHTMLSettings::availableFamilies()
{ {
if ( !avFamilies ) { if ( !avFamilies ) {
avFamilies = new TQString; avFamilies = new TQString;
@ -899,7 +899,7 @@ const TQString &KHTMLSettings::availableFamilies()
return *avFamilies; return *avFamilies;
} }
TQString KHTMLSettings::lookupFont(int i) const TQString TDEHTMLSettings::lookupFont(int i) const
{ {
TQString font; TQString font;
if (d->fonts.count() > (uint) i) if (d->fonts.count() > (uint) i)
@ -909,121 +909,121 @@ TQString KHTMLSettings::lookupFont(int i) const
return font; return font;
} }
TQString KHTMLSettings::stdFontName() const TQString TDEHTMLSettings::stdFontName() const
{ {
return lookupFont(0); return lookupFont(0);
} }
TQString KHTMLSettings::fixedFontName() const TQString TDEHTMLSettings::fixedFontName() const
{ {
return lookupFont(1); return lookupFont(1);
} }
TQString KHTMLSettings::serifFontName() const TQString TDEHTMLSettings::serifFontName() const
{ {
return lookupFont(2); return lookupFont(2);
} }
TQString KHTMLSettings::sansSerifFontName() const TQString TDEHTMLSettings::sansSerifFontName() const
{ {
return lookupFont(3); return lookupFont(3);
} }
TQString KHTMLSettings::cursiveFontName() const TQString TDEHTMLSettings::cursiveFontName() const
{ {
return lookupFont(4); return lookupFont(4);
} }
TQString KHTMLSettings::fantasyFontName() const TQString TDEHTMLSettings::fantasyFontName() const
{ {
return lookupFont(5); return lookupFont(5);
} }
void KHTMLSettings::setStdFontName(const TQString &n) void TDEHTMLSettings::setStdFontName(const TQString &n)
{ {
while(d->fonts.count() <= 0) while(d->fonts.count() <= 0)
d->fonts.append(TQString::null); d->fonts.append(TQString::null);
d->fonts[0] = n; d->fonts[0] = n;
} }
void KHTMLSettings::setFixedFontName(const TQString &n) void TDEHTMLSettings::setFixedFontName(const TQString &n)
{ {
while(d->fonts.count() <= 1) while(d->fonts.count() <= 1)
d->fonts.append(TQString::null); d->fonts.append(TQString::null);
d->fonts[1] = n; d->fonts[1] = n;
} }
TQString KHTMLSettings::userStyleSheet() const TQString TDEHTMLSettings::userStyleSheet() const
{ {
return d->m_userSheet; return d->m_userSheet;
} }
bool KHTMLSettings::isFormCompletionEnabled() const bool TDEHTMLSettings::isFormCompletionEnabled() const
{ {
return d->m_formCompletionEnabled; return d->m_formCompletionEnabled;
} }
int KHTMLSettings::maxFormCompletionItems() const int TDEHTMLSettings::maxFormCompletionItems() const
{ {
return d->m_maxFormCompletionItems; return d->m_maxFormCompletionItems;
} }
const TQString &KHTMLSettings::encoding() const const TQString &TDEHTMLSettings::encoding() const
{ {
return d->m_encoding; return d->m_encoding;
} }
bool KHTMLSettings::followSystemColors() const bool TDEHTMLSettings::followSystemColors() const
{ {
return d->m_follow_system_colors; return d->m_follow_system_colors;
} }
const TQColor& KHTMLSettings::textColor() const const TQColor& TDEHTMLSettings::textColor() const
{ {
return d->m_textColor; return d->m_textColor;
} }
const TQColor& KHTMLSettings::baseColor() const const TQColor& TDEHTMLSettings::baseColor() const
{ {
return d->m_baseColor; return d->m_baseColor;
} }
const TQColor& KHTMLSettings::linkColor() const const TQColor& TDEHTMLSettings::linkColor() const
{ {
return d->m_linkColor; return d->m_linkColor;
} }
const TQColor& KHTMLSettings::vLinkColor() const const TQColor& TDEHTMLSettings::vLinkColor() const
{ {
return d->m_vLinkColor; return d->m_vLinkColor;
} }
bool KHTMLSettings::autoLoadImages() const bool TDEHTMLSettings::autoLoadImages() const
{ {
return d->m_bAutoLoadImages; return d->m_bAutoLoadImages;
} }
bool KHTMLSettings::unfinishedImageFrame() const bool TDEHTMLSettings::unfinishedImageFrame() const
{ {
return d->m_bUnfinishedImageFrame; return d->m_bUnfinishedImageFrame;
} }
KHTMLSettings::KAnimationAdvice KHTMLSettings::showAnimations() const TDEHTMLSettings::KAnimationAdvice TDEHTMLSettings::showAnimations() const
{ {
return d->m_showAnimations; return d->m_showAnimations;
} }
bool KHTMLSettings::isAutoDelayedActionsEnabled() const bool TDEHTMLSettings::isAutoDelayedActionsEnabled() const
{ {
return d->m_autoDelayedActionsEnabled; return d->m_autoDelayedActionsEnabled;
} }
bool KHTMLSettings::jsErrorsEnabled() const bool TDEHTMLSettings::jsErrorsEnabled() const
{ {
return d->m_jsErrorsEnabled; return d->m_jsErrorsEnabled;
} }
void KHTMLSettings::setJSErrorsEnabled(bool enabled) void TDEHTMLSettings::setJSErrorsEnabled(bool enabled)
{ {
d->m_jsErrorsEnabled = enabled; d->m_jsErrorsEnabled = enabled;
// save it // save it
@ -1033,22 +1033,22 @@ void KHTMLSettings::setJSErrorsEnabled(bool enabled)
config->sync(); config->sync();
} }
bool KHTMLSettings::allowTabulation() const bool TDEHTMLSettings::allowTabulation() const
{ {
return d->m_allowTabulation; return d->m_allowTabulation;
} }
bool KHTMLSettings::autoSpellCheck() const bool TDEHTMLSettings::autoSpellCheck() const
{ {
return d->m_autoSpellCheck; return d->m_autoSpellCheck;
} }
TQValueList< TQPair< TQString, TQChar > > KHTMLSettings::fallbackAccessKeysAssignments() const TQValueList< TQPair< TQString, TQChar > > TDEHTMLSettings::fallbackAccessKeysAssignments() const
{ {
return d->m_fallbackAccessKeysAssignments; return d->m_fallbackAccessKeysAssignments;
} }
void KHTMLSettings::setJSPopupBlockerPassivePopup(bool enabled) void TDEHTMLSettings::setJSPopupBlockerPassivePopup(bool enabled)
{ {
d->m_jsPopupBlockerPassivePopup = enabled; d->m_jsPopupBlockerPassivePopup = enabled;
// save it // save it
@ -1058,7 +1058,7 @@ void KHTMLSettings::setJSPopupBlockerPassivePopup(bool enabled)
config->sync(); config->sync();
} }
bool KHTMLSettings::jsPopupBlockerPassivePopup() const bool TDEHTMLSettings::jsPopupBlockerPassivePopup() const
{ {
return d->m_jsPopupBlockerPassivePopup; return d->m_jsPopupBlockerPassivePopup;
} }

@ -30,12 +30,12 @@ class TDEConfig;
#include <tdelibs_export.h> #include <tdelibs_export.h>
struct KPerDomainSettings; struct KPerDomainSettings;
class KHTMLSettingsPrivate; class TDEHTMLSettingsPrivate;
/** /**
* Settings for the HTML view. * Settings for the HTML view.
*/ */
class KHTML_EXPORT KHTMLSettings class TDEHTML_EXPORT TDEHTMLSettings
{ {
public: public:
@ -99,8 +99,8 @@ public:
/** /**
* @internal Constructor * @internal Constructor
*/ */
KHTMLSettings(); TDEHTMLSettings();
KHTMLSettings(const KHTMLSettings &other); TDEHTMLSettings(const TDEHTMLSettings &other);
/** /**
* Called by constructor and reparseConfiguration * Called by constructor and reparseConfiguration
@ -117,7 +117,7 @@ public:
/** /**
* Destructor. Don't delete any instance by yourself. * Destructor. Don't delete any instance by yourself.
*/ */
virtual ~KHTMLSettings(); virtual ~TDEHTMLSettings();
// Behavior settings // Behavior settings
bool changeCursor() const; bool changeCursor() const;
@ -135,7 +135,7 @@ public:
TQString cursiveFontName() const; TQString cursiveFontName() const;
TQString fantasyFontName() 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 setStdFontName(const TQString &n);
void setFixedFontName(const TQString &n); void setFixedFontName(const TQString &n);
@ -222,10 +222,10 @@ public:
bool jsPopupBlockerPassivePopup() const; bool jsPopupBlockerPassivePopup() const;
private: private:
friend class KHTMLFactory; friend class TDEHTMLFactory;
TQString lookupFont(int i) const; TQString lookupFont(int i) const;
KHTMLSettingsPrivate *d; TDEHTMLSettingsPrivate *d;
static TQString *avFamilies; static TQString *avFamilies;
}; };

@ -34,40 +34,40 @@
#include <kmimetype.h> #include <kmimetype.h>
#include <klocale.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" ); s_instance = new TDEInstance( "tdehtmlimage" );
} }
KHTMLImageFactory::~KHTMLImageFactory() TDEHTMLImageFactory::~TDEHTMLImageFactory()
{ {
delete s_instance; 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, TQObject *parent, const char *name,
const char *className, const TQStringList & ) const char *className, const TQStringList & )
{ {
KHTMLPart::GUIProfile prof = KHTMLPart::DefaultGUI; TDEHTMLPart::GUIProfile prof = TDEHTMLPart::DefaultGUI;
if ( strcmp( className, "Browser/View" ) == 0 ) if ( strcmp( className, "Browser/View" ) == 0 )
prof = KHTMLPart::BrowserViewGUI; prof = TDEHTMLPart::BrowserViewGUI;
return new KHTMLImage( parentWidget, widgetName, parent, name, prof ); return new TDEHTMLImage( parentWidget, widgetName, parent, name, prof );
} }
KHTMLImage::KHTMLImage( TQWidget *parentWidget, const char *widgetName, TDEHTMLImage::TDEHTMLImage( TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name, KHTMLPart::GUIProfile prof ) TQObject *parent, const char *name, TDEHTMLPart::GUIProfile prof )
: KParts::ReadOnlyPart( parent, name ), m_image( 0 ) : KParts::ReadOnlyPart( parent, name ), m_image( 0 )
{ {
KHTMLPart* parentPart = ::tqqt_cast<KHTMLPart *>( parent ); TDEHTMLPart* parentPart = ::tqqt_cast<TDEHTMLPart *>( parent );
setInstance( KHTMLImageFactory::instance(), prof == KHTMLPart::BrowserViewGUI && !parentPart ); setInstance( TDEHTMLImageFactory::instance(), prof == TDEHTMLPart::BrowserViewGUI && !parentPart );
TQVBox *box = new TQVBox( parentWidget, widgetName ); 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->setAutoloadImages( true );
m_tdehtml->widget()->installEventFilter(this); m_tdehtml->widget()->installEventFilter(this);
connect( m_tdehtml->view(), TQT_SIGNAL( finishedLayout() ), this, TQT_SLOT( restoreScrollPosition() ) ); 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 // VBox can't take focus, so pass it on to sub-widget
box->setFocusProxy( m_tdehtml->widget() ); box->setFocusProxy( m_tdehtml->widget() );
m_ext = new KHTMLImageBrowserExtension( this, "be" ); m_ext = new TDEHTMLImageBrowserExtension( this, "be" );
// Remove unnecessary actions. // Remove unnecessary actions.
KAction *encodingAction = actionCollection()->action( "setEncoding" ); KAction *encodingAction = actionCollection()->action( "setEncoding" );
@ -103,7 +103,7 @@ KHTMLImage::KHTMLImage( TQWidget *parentWidget, const char *widgetName,
// forward important signals from the tdehtml part // forward important signals from the tdehtml part
// forward opening requests to parent frame (if existing) // 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; KParts::BrowserExtension *be = p ? p->browserExtension() : m_ext;
connect(m_tdehtml->browserExtension(), TQT_SIGNAL(openURLRequestDelayed(const KURL &, const KParts::URLArgs &)), connect(m_tdehtml->browserExtension(), TQT_SIGNAL(openURLRequestDelayed(const KURL &, const KParts::URLArgs &)),
be, 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 ); m_ext->setURLDropHandlingEnabled( true );
} }
KHTMLImage::~KHTMLImage() TDEHTMLImage::~TDEHTMLImage()
{ {
disposeImage(); disposeImage();
@ -130,10 +130,10 @@ KHTMLImage::~KHTMLImage()
// when we're in a html frameset and the view dies first, then it will also // when we're in a html frameset and the view dies first, then it will also
// kill the htmlpart // kill the htmlpart
if ( m_tdehtml ) 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>" ); 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; return true;
} }
bool KHTMLImage::closeURL() bool TDEHTMLImage::closeURL()
{ {
disposeImage(); disposeImage();
return m_tdehtml->closeURL(); return m_tdehtml->closeURL();
} }
// This can happen after openURL returns, or directly from m_image->ref() // 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 ) if ( !m_image || o != m_image )
return; return;
@ -214,14 +214,14 @@ void KHTMLImage::notifyFinished( tdehtml::CachedObject *o )
emit setStatusBarText(i18n("Done.")); emit setStatusBarText(i18n("Done."));
} }
void KHTMLImage::restoreScrollPosition() void TDEHTMLImage::restoreScrollPosition()
{ {
if ( m_tdehtml->view()->contentsY() == 0 ) { if ( m_tdehtml->view()->contentsY() == 0 ) {
m_tdehtml->view()->setContentsPos( m_xOffset, m_yOffset ); 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 // prevent the base implementation from emitting setWindowCaption with
// our url. It destroys our pretty, previously caption. Konq saves/restores // 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() ) if ( job->error() )
{ {
@ -246,7 +246,7 @@ void KHTMLImage::slotImageJobFinished( TDEIO::Job *job )
} }
} }
void KHTMLImage::updateWindowCaption() void TDEHTMLImage::updateWindowCaption()
{ {
if ( !m_tdehtml ) if ( !m_tdehtml )
return; return;
@ -287,7 +287,7 @@ void KHTMLImage::updateWindowCaption()
} }
*/ */
void KHTMLImage::disposeImage() void TDEHTMLImage::disposeImage()
{ {
if ( !m_image ) if ( !m_image )
return; return;
@ -296,7 +296,7 @@ void KHTMLImage::disposeImage()
m_image = 0; m_image = 0;
} }
bool KHTMLImage::eventFilter(TQObject *, TQEvent *e) { bool TDEHTMLImage::eventFilter(TQObject *, TQEvent *e) {
switch (e->type()) { switch (e->type()) {
case TQEvent::DragEnter: case TQEvent::DragEnter:
case TQEvent::DragMove: case TQEvent::DragMove:
@ -304,7 +304,7 @@ bool KHTMLImage::eventFilter(TQObject *, TQEvent *e) {
case TQEvent::Drop: { case TQEvent::Drop: {
// find out if this part is embedded in a frame, and send the // find out if this part is embedded in a frame, and send the
// event to its outside widget // event to its outside widget
KHTMLPart *p = ::tqqt_cast<KHTMLPart *>(parent()); TDEHTMLPart *p = ::tqqt_cast<TDEHTMLPart *>(parent());
if (p) if (p)
return TQApplication::sendEvent(p->widget(), e); return TQApplication::sendEvent(p->widget(), e);
// otherwise simply forward all dnd events to the part widget, // otherwise simply forward all dnd events to the part widget,
@ -316,37 +316,37 @@ bool KHTMLImage::eventFilter(TQObject *, TQEvent *e) {
return false; return false;
} }
KHTMLImageBrowserExtension::KHTMLImageBrowserExtension( KHTMLImage *parent, const char *name ) TDEHTMLImageBrowserExtension::TDEHTMLImageBrowserExtension( TDEHTMLImage *parent, const char *name )
: KParts::BrowserExtension( parent, name ) : KParts::BrowserExtension( parent, name )
{ {
m_imgPart = parent; m_imgPart = parent;
} }
int KHTMLImageBrowserExtension::xOffset() int TDEHTMLImageBrowserExtension::xOffset()
{ {
return m_imgPart->doc()->view()->contentsX(); return m_imgPart->doc()->view()->contentsX();
} }
int KHTMLImageBrowserExtension::yOffset() int TDEHTMLImageBrowserExtension::yOffset()
{ {
return m_imgPart->doc()->view()->contentsY(); 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 ); 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; using namespace KParts;

@ -26,7 +26,7 @@
#include "misc/loader_client.h" #include "misc/loader_client.h"
class KHTMLPart; class TDEHTMLPart;
class TDEInstance; class TDEInstance;
namespace tdehtml namespace tdehtml
@ -37,12 +37,12 @@ namespace tdehtml
/** /**
* @internal * @internal
*/ */
class KHTMLImageFactory : public KParts::Factory class TDEHTMLImageFactory : public KParts::Factory
{ {
Q_OBJECT Q_OBJECT
public: public:
KHTMLImageFactory(); TDEHTMLImageFactory();
virtual ~KHTMLImageFactory(); virtual ~TDEHTMLImageFactory();
virtual KParts::Part *createPartObject( TQWidget *parentWidget, const char *widgetName, virtual KParts::Part *createPartObject( TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name, TQObject *parent, const char *name,
@ -57,13 +57,13 @@ private:
/** /**
* @internal * @internal
*/ */
class KHTMLImage : public KParts::ReadOnlyPart, public tdehtml::CachedObjectClient class TDEHTMLImage : public KParts::ReadOnlyPart, public tdehtml::CachedObjectClient
{ {
Q_OBJECT Q_OBJECT
public: public:
KHTMLImage( TQWidget *parentWidget, const char *widgetName, TDEHTMLImage( TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name, KHTMLPart::GUIProfile prof ); TQObject *parent, const char *name, TDEHTMLPart::GUIProfile prof );
virtual ~KHTMLImage(); virtual ~TDEHTMLImage();
virtual bool openFile() { return true; } // grmbl, should be non-pure in part.h, IMHO virtual bool openFile() { return true; } // grmbl, should be non-pure in part.h, IMHO
@ -71,7 +71,7 @@ public:
virtual bool closeURL(); virtual bool closeURL();
KHTMLPart *doc() const { return m_tdehtml; } TDEHTMLPart *doc() const { return m_tdehtml; }
virtual void notifyFinished( tdehtml::CachedObject *o ); virtual void notifyFinished( tdehtml::CachedObject *o );
@ -88,7 +88,7 @@ private slots:
private: private:
void disposeImage(); void disposeImage();
TQGuardedPtr<KHTMLPart> m_tdehtml; TQGuardedPtr<TDEHTMLPart> m_tdehtml;
KParts::BrowserExtension *m_ext; KParts::BrowserExtension *m_ext;
TQString m_mimeType; TQString m_mimeType;
tdehtml::CachedImage *m_image; tdehtml::CachedImage *m_image;
@ -98,11 +98,11 @@ private:
/** /**
* @internal * @internal
*/ */
class KHTMLImageBrowserExtension : public KParts::BrowserExtension class TDEHTMLImageBrowserExtension : public KParts::BrowserExtension
{ {
Q_OBJECT Q_OBJECT
public: public:
KHTMLImageBrowserExtension( KHTMLImage *parent, const char *name = 0 ); TDEHTMLImageBrowserExtension( TDEHTMLImage *parent, const char *name = 0 );
virtual int xOffset(); virtual int xOffset();
virtual int yOffset(); virtual int yOffset();
@ -113,7 +113,7 @@ protected slots:
void disableScrolling(); void disableScrolling();
private: private:
KHTMLImage *m_imgPart; TDEHTMLImage *m_imgPart;
}; };
#endif #endif

@ -33,7 +33,7 @@
#include <tdeparts/partmanager.h> #include <tdeparts/partmanager.h>
#include <tdeparts/statusbarextension.h> #include <tdeparts/statusbarextension.h>
#include <tdeparts/browserextension.h> #include <tdeparts/browserextension.h>
#ifndef KHTML_NO_WALLET #ifndef TDEHTML_NO_WALLET
#include <tdewallet.h> #include <tdewallet.h>
#endif #endif
@ -103,7 +103,7 @@ namespace tdehtml
bool m_bCompleted; bool m_bCompleted;
TQString m_name; TQString m_name;
KParts::URLArgs m_args; KParts::URLArgs m_args;
TQGuardedPtr<KHTMLRun> m_run; TQGuardedPtr<TDEHTMLRun> m_run;
bool m_bPreloaded; bool m_bPreloaded;
KURL m_workingURL; KURL m_workingURL;
Type m_type; 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; Iterator find( const TQString &name ) KDE_NO_EXPORT;
}; };
typedef KHTMLFrameList::ConstIterator ConstFrameIt; typedef TDEHTMLFrameList::ConstIterator ConstFrameIt;
typedef KHTMLFrameList::Iterator FrameIt; typedef TDEHTMLFrameList::Iterator FrameIt;
static int tdehtml_part_dcop_counter = 0; static int tdehtml_part_dcop_counter = 0;
class KHTMLWalletQueue : public TQObject class TDEHTMLWalletQueue : public TQObject
{ {
Q_OBJECT Q_OBJECT
public: public:
KHTMLWalletQueue(TQObject *parent) : TQObject(parent) { TDEHTMLWalletQueue(TQObject *parent) : TQObject(parent) {
#ifndef KHTML_NO_WALLET #ifndef TDEHTML_NO_WALLET
wallet = 0L; wallet = 0L;
#endif // KHTML_NO_WALLET #endif // TDEHTML_NO_WALLET
} }
virtual ~KHTMLWalletQueue() { virtual ~TDEHTMLWalletQueue() {
#ifndef KHTML_NO_WALLET #ifndef TDEHTML_NO_WALLET
delete wallet; delete wallet;
wallet = 0L; wallet = 0L;
#endif // KHTML_NO_WALLET #endif // TDEHTML_NO_WALLET
} }
#ifndef KHTML_NO_WALLET #ifndef TDEHTML_NO_WALLET
KWallet::Wallet *wallet; KWallet::Wallet *wallet;
#endif // KHTML_NO_WALLET #endif // TDEHTML_NO_WALLET
typedef QPair<DOM::HTMLFormElementImpl*, TQGuardedPtr<DOM::DocumentImpl> > Caller; typedef QPair<DOM::HTMLFormElementImpl*, TQGuardedPtr<DOM::DocumentImpl> > Caller;
typedef TQValueList<Caller> CallerList; typedef TQValueList<Caller> CallerList;
CallerList callers; CallerList callers;
@ -156,7 +156,7 @@ class KHTMLWalletQueue : public TQObject
public slots: public slots:
void walletOpened(bool success) { void walletOpened(bool success) {
#ifndef KHTML_NO_WALLET #ifndef TDEHTML_NO_WALLET
if (!success) { if (!success) {
delete wallet; delete wallet;
wallet = 0L; wallet = 0L;
@ -179,16 +179,16 @@ class KHTMLWalletQueue : public TQObject
callers.clear(); callers.clear();
savers.clear(); savers.clear();
wallet = 0L; // gave it away wallet = 0L; // gave it away
#endif // KHTML_NO_WALLET #endif // TDEHTML_NO_WALLET
} }
}; };
class KHTMLPartPrivate class TDEHTMLPartPrivate
{ {
KHTMLPartPrivate(const KHTMLPartPrivate & other); TDEHTMLPartPrivate(const TDEHTMLPartPrivate & other);
KHTMLPartPrivate& operator=(const KHTMLPartPrivate&); TDEHTMLPartPrivate& operator=(const TDEHTMLPartPrivate&);
public: public:
KHTMLPartPrivate(TQObject* parent) TDEHTMLPartPrivate(TQObject* parent)
{ {
m_doc = 0L; m_doc = 0L;
m_decoder = 0L; m_decoder = 0L;
@ -200,7 +200,7 @@ public:
m_bLoadEventEmitted = true; m_bLoadEventEmitted = true;
m_cachePolicy = TDEIO::CC_Verify; m_cachePolicy = TDEIO::CC_Verify;
m_manager = 0L; m_manager = 0L;
m_settings = new KHTMLSettings(*KHTMLFactory::defaultHTMLSettings()); m_settings = new TDEHTMLSettings(*TDEHTMLFactory::defaultHTMLSettings());
m_bClearing = false; m_bClearing = false;
m_bCleared = false; m_bCleared = false;
m_zoomFactor = 100; m_zoomFactor = 100;
@ -218,7 +218,7 @@ public:
m_findDialog = 0; m_findDialog = 0;
m_ssl_in_use = false; m_ssl_in_use = false;
m_jsedlg = 0; m_jsedlg = 0;
m_formNotification = KHTMLPart::NoNotification; m_formNotification = TDEHTMLPart::NoNotification;
#ifndef Q_WS_QWS #ifndef Q_WS_QWS
m_javaContext = 0; m_javaContext = 0;
@ -252,9 +252,9 @@ public:
m_autoDetectLanguage = tdehtml::Decoder::SemiautomaticDetection; m_autoDetectLanguage = tdehtml::Decoder::SemiautomaticDetection;
// inherit settings from parent // 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) if(part->d)
{ {
m_bJScriptForce = part->d->m_bJScriptForce; m_bJScriptForce = part->d->m_bJScriptForce;
@ -289,13 +289,13 @@ public:
m_userStyleSheetLastModified = 0; m_userStyleSheetLastModified = 0;
m_wq = 0; m_wq = 0;
} }
~KHTMLPartPrivate() ~TDEHTMLPartPrivate()
{ {
delete m_dcopobject; delete m_dcopobject;
delete m_statusBarExtension; delete m_statusBarExtension;
delete m_extension; delete m_extension;
delete m_settings; delete m_settings;
#ifndef KHTML_NO_WALLET #ifndef TDEHTML_NO_WALLET
delete m_wallet; delete m_wallet;
#endif #endif
#ifndef Q_WS_QWS #ifndef Q_WS_QWS
@ -304,19 +304,19 @@ public:
} }
TQGuardedPtr<tdehtml::ChildFrame> m_frame; TQGuardedPtr<tdehtml::ChildFrame> m_frame;
KHTMLFrameList m_frames; TDEHTMLFrameList m_frames;
KHTMLFrameList m_objects; TDEHTMLFrameList m_objects;
TQGuardedPtr<KHTMLView> m_view; TQGuardedPtr<TDEHTMLView> m_view;
KHTMLPartBrowserExtension *m_extension; TDEHTMLPartBrowserExtension *m_extension;
KParts::StatusBarExtension *m_statusBarExtension; KParts::StatusBarExtension *m_statusBarExtension;
KHTMLPartBrowserHostExtension *m_hostExtension; TDEHTMLPartBrowserHostExtension *m_hostExtension;
KURLLabel* m_statusBarIconLabel; KURLLabel* m_statusBarIconLabel;
KURLLabel* m_statusBarWalletLabel; KURLLabel* m_statusBarWalletLabel;
KURLLabel* m_statusBarUALabel; KURLLabel* m_statusBarUALabel;
KURLLabel* m_statusBarJSErrorLabel; KURLLabel* m_statusBarJSErrorLabel;
KURLLabel* m_statusBarPopupLabel; KURLLabel* m_statusBarPopupLabel;
TQValueList<TQGuardedPtr<KHTMLPart> > m_suppressedPopupOriginParts; TQValueList<TQGuardedPtr<TDEHTMLPart> > m_suppressedPopupOriginParts;
int m_openableSuppressedPopups; int m_openableSuppressedPopups;
DOM::DocumentImpl *m_doc; DOM::DocumentImpl *m_doc;
tdehtml::Decoder *m_decoder; tdehtml::Decoder *m_decoder;
@ -354,7 +354,7 @@ public:
KJavaAppletContext *m_javaContext; KJavaAppletContext *m_javaContext;
#endif #endif
KHTMLSettings *m_settings; TDEHTMLSettings *m_settings;
TDEIO::TransferJob * m_job; TDEIO::TransferJob * m_job;
@ -402,8 +402,8 @@ public:
KAction *m_paSecurity; KAction *m_paSecurity;
KActionMenu *m_paSetEncoding; KActionMenu *m_paSetEncoding;
KSelectAction *m_paUseStylesheet; KSelectAction *m_paUseStylesheet;
KHTMLZoomFactorAction *m_paIncZoomFactor; TDEHTMLZoomFactorAction *m_paIncZoomFactor;
KHTMLZoomFactorAction *m_paDecZoomFactor; TDEHTMLZoomFactorAction *m_paDecZoomFactor;
KAction *m_paLoadImages; KAction *m_paLoadImages;
KAction *m_paFind; KAction *m_paFind;
KAction *m_paFindNext; KAction *m_paFindNext;
@ -421,7 +421,7 @@ public:
KParts::PartManager *m_manager; KParts::PartManager *m_manager;
TQString m_popupMenuXML; TQString m_popupMenuXML;
KHTMLPart::GUIProfile m_guiProfile; TDEHTMLPart::GUIProfile m_guiProfile;
int m_zoomFactor; int m_zoomFactor;
@ -476,7 +476,7 @@ public:
int m_focusNodeNumber; int m_focusNodeNumber;
TQPoint m_dragStartPos; TQPoint m_dragStartPos;
#ifdef KHTML_NO_SELECTION #ifdef TDEHTML_NO_SELECTION
TQPoint m_dragLastPos; TQPoint m_dragLastPos;
#endif #endif
@ -490,7 +490,7 @@ public:
unsigned long m_totalObjectCount; unsigned long m_totalObjectCount;
unsigned int m_jobPercent; unsigned int m_jobPercent;
KHTMLPart::FormNotification m_formNotification; TDEHTMLPart::FormNotification m_formNotification;
TQTimer m_progressUpdateTimer; TQTimer m_progressUpdateTimer;
TQStringList m_pluginPageQuestionAsked; TQStringList m_pluginPageQuestionAsked;
@ -543,7 +543,7 @@ public:
//TQGuardedPtr<KParts::Part> m_activeFrame; //TQGuardedPtr<KParts::Part> m_activeFrame;
KParts::Part * m_activeFrame; KParts::Part * m_activeFrame;
TQGuardedPtr<KHTMLPart> m_opener; TQGuardedPtr<TDEHTMLPart> m_opener;
bool m_openedByJS; bool m_openedByJS;
bool m_newJSInterpreterExists; // set to 1 by setOpenedByJS, for window.open bool m_newJSInterpreterExists; // set to 1 by setOpenedByJS, for window.open
@ -551,7 +551,7 @@ public:
KPopupMenu *m_automaticDetection; KPopupMenu *m_automaticDetection;
KSelectAction *m_manualDetection; KSelectAction *m_manualDetection;
void setFlagRecursively(bool KHTMLPartPrivate::*flag, bool value); void setFlagRecursively(bool TDEHTMLPartPrivate::*flag, bool value);
/** returns the caret node */ /** returns the caret node */
DOM::Node &caretNode() { DOM::Node &caretNode() {
return m_extendAtEnd ? m_selectionEnd : m_selectionStart; return m_extendAtEnd ? m_selectionEnd : m_selectionStart;
@ -563,7 +563,7 @@ public:
time_t m_userStyleSheetLastModified; time_t m_userStyleSheetLastModified;
KHTMLWalletQueue *m_wq; TDEHTMLWalletQueue *m_wq;
}; };
#endif #endif

File diff suppressed because it is too large Load Diff

@ -22,8 +22,8 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#ifndef KHTMLVIEW_H #ifndef TDEHTMLVIEW_H
#define KHTMLVIEW_H #define TDEHTMLVIEW_H
// qt includes and classes // qt includes and classes
#include <tqscrollview.h> #include <tqscrollview.h>
@ -67,15 +67,15 @@ namespace tdehtml {
void applyRule(DOM::CSSProperty *prop); void applyRule(DOM::CSSProperty *prop);
} }
class KHTMLPart; class TDEHTMLPart;
class KHTMLViewPrivate; class TDEHTMLViewPrivate;
/** /**
* Renders and displays HTML in a TQScrollView. * Renders and displays HTML in a TQScrollView.
* *
* Suitable for use as an application's main view. * Suitable for use as an application's main view.
**/ **/
class KHTML_EXPORT KHTMLView : public TQScrollView class TDEHTML_EXPORT TDEHTMLView : public TQScrollView
{ {
Q_OBJECT Q_OBJECT
@ -86,7 +86,7 @@ class KHTML_EXPORT KHTMLView : public TQScrollView
friend class DOM::HTMLAnchorElementImpl; friend class DOM::HTMLAnchorElementImpl;
friend class DOM::HTMLInputElementImpl; friend class DOM::HTMLInputElementImpl;
friend class DOM::DocumentImpl; friend class DOM::DocumentImpl;
friend class KHTMLPart; friend class TDEHTMLPart;
friend class tdehtml::RenderCanvas; friend class tdehtml::RenderCanvas;
friend class tdehtml::RenderObject; friend class tdehtml::RenderObject;
friend class tdehtml::RenderLineEdit; friend class tdehtml::RenderLineEdit;
@ -101,16 +101,16 @@ class KHTML_EXPORT KHTMLView : public TQScrollView
public: public:
/** /**
* Constructs a KHTMLView. * Constructs a TDEHTMLView.
*/ */
KHTMLView( KHTMLPart *part, TQWidget *parent, const char *name=0 ); TDEHTMLView( TDEHTMLPart *part, TQWidget *parent, const char *name=0 );
virtual ~KHTMLView(); virtual ~TDEHTMLView();
/** /**
* Returns a pointer to the KHTMLPart that is * Returns a pointer to the TDEHTMLPart that is
* rendering the page. * rendering the page.
**/ **/
KHTMLPart *part() const { return m_part; } TDEHTMLPart *part() const { return m_part; }
int frameWidth() const { return _width; } int frameWidth() const { return _width; }
@ -173,7 +173,7 @@ public:
signals: signals:
/** /**
* This signal is used for internal layouting. Don't use it to check if rendering finished. * 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 finishedLayout();
void cleared(); void cleared();
@ -296,9 +296,9 @@ private:
bool focusNextPrevNode(bool next); bool focusNextPrevNode(bool next);
bool handleAccessKey(const TQKeyEvent* ev); 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; 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(); void useSlowRepaints();
@ -328,13 +328,13 @@ private:
void complete( bool pendingAction ); void complete( bool pendingAction );
#ifndef KHTML_NO_TYPE_AHEAD_FIND #ifndef TDEHTML_NO_TYPE_AHEAD_FIND
void findAhead(bool increase); void findAhead(bool increase);
void updateFindAheadTimeout(); void updateFindAheadTimeout();
void startFindAhead( bool linksOnly ); 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) // -- caret-related member functions (for caretMode as well as designMode)
/** initializes the caret if it hasn't been initialized yet. /** 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. * Returns the current caret policy when the view is not focused.
* @return a KHTMLPart::CaretDisplay value * @return a TDEHTMLPart::CaretDisplay value
*/ */
int caretDisplayPolicyNonFocused() const; int caretDisplayPolicyNonFocused() const;
/** /**
* Sets the caret display policy when the view is not focused. * Sets the caret display policy when the view is not focused.
* @param policy new display policy as * @param policy new display policy as
* defined by KHTMLPart::CaretDisplayPolicy * defined by TDEHTMLPart::CaretDisplayPolicy
* @since 3.2 * @since 3.2
*/ */
void setCaretDisplayPolicyNonFocused(int policy); void setCaretDisplayPolicyNonFocused(int policy);
@ -601,7 +601,7 @@ private:
*/ */
void moveCaretToLineEnd(); void moveCaretToLineEnd();
#endif // KHTML_NO_CARET #endif // TDEHTML_NO_CARET
// ------------------------------------- member variables ------------------------------------ // ------------------------------------- member variables ------------------------------------
private: private:
@ -614,8 +614,8 @@ private:
int _marginWidth; int _marginWidth;
int _marginHeight; int _marginHeight;
KHTMLPart *m_part; TDEHTMLPart *m_part;
KHTMLViewPrivate *d; TDEHTMLViewPrivate *d;
TQString m_medium; // media type TQString m_medium; // media type
}; };

@ -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 it handles the multipart/mixed and multipart/x-mixed-replace
mimetype, embedding the appropriate component (part). mimetype, embedding the appropriate component (part).
@ -11,6 +11,6 @@ Testcases:
TODO: TODO:
* Use the new streaming API of KParts to pipe data into the part, * Use the new streaming API of KParts to pipe data into the part,
the current code does that for KHTML only. the current code does that for TDEHTML only.
* Change KHTML so that it embeds KMultiPart for images which send multipart/x-mixed-replace * Change TDEHTML so that it embeds KMultiPart for images which send multipart/x-mixed-replace
data. data.

@ -334,7 +334,7 @@ void KMultiPart::setPart( const TQString& mimeType )
{ {
// Forward signals from the part's browser extension // 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() ), connect( childExtension, TQT_SIGNAL( openURLNotify() ),
m_extension, TQT_SIGNAL( openURLNotify() ) ); m_extension, TQT_SIGNAL( openURLNotify() ) );
@ -396,7 +396,7 @@ void KMultiPart::setPart( const TQString& mimeType )
m_partIsLoading = false; m_partIsLoading = false;
// Load the part's plugins too. // 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". // if className != "Browser/View".
loadPlugins( this, m_part, m_part->instance() ); loadPlugins( this, m_part, m_part->instance() );
// Get the part's GUI to appear // Get the part's GUI to appear
@ -437,7 +437,7 @@ void KMultiPart::startOfData()
} }
if ( m_isHTMLPart ) 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() ); htmlPart->begin( url() );
} }
else else
@ -463,7 +463,7 @@ void KMultiPart::reallySendData( const TQByteArray& line )
{ {
if ( m_isHTMLPart ) 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() ); htmlPart->write( line.data(), line.size() );
} }
else if ( m_tempFile ) else if ( m_tempFile )
@ -477,7 +477,7 @@ void KMultiPart::endOfData()
Q_ASSERT( m_part ); Q_ASSERT( m_part );
if ( m_isHTMLPart ) 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(); htmlPart->end();
} else if ( m_tempFile ) } else if ( m_tempFile )
{ {
@ -600,12 +600,12 @@ int KMultiPartBrowserExtension::yOffset()
void KMultiPartBrowserExtension::print() void KMultiPartBrowserExtension::print()
{ {
static_cast<KHTMLPartBrowserExtension *>( m_imgPart->doc()->browserExtension() )->print(); static_cast<TDEHTMLPartBrowserExtension *>( m_imgPart->doc()->browserExtension() )->print();
} }
void KMultiPartBrowserExtension::reparseConfiguration() void KMultiPartBrowserExtension::reparseConfiguration()
{ {
static_cast<KHTMLPartBrowserExtension *>( m_imgPart->doc()->browserExtension() )->reparseConfiguration(); static_cast<TDEHTMLPartBrowserExtension *>( m_imgPart->doc()->browserExtension() )->reparseConfiguration();
m_imgPart->doc()->setAutoloadImages( true ); m_imgPart->doc()->setAutoloadImages( true );
} }
#endif #endif

@ -28,7 +28,7 @@
#include <kaboutdata.h> #include <kaboutdata.h>
#include <tqdatetime.h> #include <tqdatetime.h>
class KHTMLPart; class TDEHTMLPart;
class TDEInstance; class TDEInstance;
class KTempFile; class KTempFile;
class KLineParser; class KLineParser;

@ -114,7 +114,7 @@ static pid_t xvfb;
PartMonitor *PartMonitor::sm_highestMonitor = NULL; PartMonitor *PartMonitor::sm_highestMonitor = NULL;
PartMonitor::PartMonitor(KHTMLPart *_part) PartMonitor::PartMonitor(TDEHTMLPart *_part)
{ {
m_part = _part; m_part = _part;
m_completed = false; 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; m_part = _part;
putDirect("openPage", new KHTMLPartFunction(exec,m_part,KHTMLPartFunction::OpenPage,1), DontEnum); putDirect("openPage", new TDEHTMLPartFunction(exec,m_part,TDEHTMLPartFunction::OpenPage,1), DontEnum);
putDirect("openPageAsUrl", new KHTMLPartFunction(exec,m_part,KHTMLPartFunction::OpenPageAsUrl,1), DontEnum); putDirect("openPageAsUrl", new TDEHTMLPartFunction(exec,m_part,TDEHTMLPartFunction::OpenPageAsUrl,1), DontEnum);
putDirect("begin", new KHTMLPartFunction(exec,m_part,KHTMLPartFunction::Begin,1), DontEnum); putDirect("begin", new TDEHTMLPartFunction(exec,m_part,TDEHTMLPartFunction::Begin,1), DontEnum);
putDirect("write", new KHTMLPartFunction(exec,m_part,KHTMLPartFunction::Write,1), DontEnum); putDirect("write", new TDEHTMLPartFunction(exec,m_part,TDEHTMLPartFunction::Write,1), DontEnum);
putDirect("end", new KHTMLPartFunction(exec,m_part,KHTMLPartFunction::End,0), DontEnum); putDirect("end", new TDEHTMLPartFunction(exec,m_part,TDEHTMLPartFunction::End,0), DontEnum);
putDirect("executeScript", new KHTMLPartFunction(exec,m_part,KHTMLPartFunction::ExecuteScript,0), DontEnum); putDirect("executeScript", new TDEHTMLPartFunction(exec,m_part,TDEHTMLPartFunction::ExecuteScript,0), DontEnum);
putDirect("processEvents", new KHTMLPartFunction(exec,m_part,KHTMLPartFunction::ProcessEvents,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") if (propertyName == "document")
return getDOMNode(exec,m_part->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); 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; m_part = _part;
id = _id; id = _id;
putDirect("length",length); putDirect("length",length);
} }
bool KHTMLPartFunction::implementsCall() const bool TDEHTMLPartFunction::implementsCall() const
{ {
return true; 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(); Value result = Undefined();
@ -534,7 +534,7 @@ int main(int argc, char *argv[])
cfg.writeEntry( "Fonts", TQStringList() ); cfg.writeEntry( "Fonts", TQStringList() );
cfg.writeEntry( "DefaultEncoding", "" ); cfg.writeEntry( "DefaultEncoding", "" );
cfg.setGroup("Java/JavaScript Settings"); cfg.setGroup("Java/JavaScript Settings");
cfg.writeEntry( "WindowOpenPolicy", KHTMLSettings::KJSWindowOpenAllow); cfg.writeEntry( "WindowOpenPolicy", TDEHTMLSettings::KJSWindowOpenAllow);
cfg.sync(); cfg.sync();
@ -557,9 +557,9 @@ int main(int argc, char *argv[])
} }
// create widgets // create widgets
KHTMLFactory *fac = new KHTMLFactory(); TDEHTMLFactory *fac = new TDEHTMLFactory();
KMainWindow *toplevel = new KMainWindow(); 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() ); toplevel->setCentralWidget( part->widget() );
part->setJScriptEnabled(true); part->setJScriptEnabled(true);
@ -670,7 +670,7 @@ int main(int argc, char *argv[])
RegressionTest *RegressionTest::curr = 0; 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) bool _genOutput, bool runJS, bool runHTML)
: TQObject(part) : TQObject(part)
{ {
@ -820,7 +820,7 @@ bool RegressionTest::runTests(TQString relPath, bool mustExist, int known_failur
return true; return true;
} }
void RegressionTest::getPartDOMOutput( TQTextStream &outputStream, KHTMLPart* part, uint indent ) void RegressionTest::getPartDOMOutput( TQTextStream &outputStream, TDEHTMLPart* part, uint indent )
{ {
Node node = part->document(); Node node = part->document();
while (!node.isNull()) { while (!node.isNull()) {
@ -849,7 +849,7 @@ void RegressionTest::getPartDOMOutput( TQTextStream &outputStream, KHTMLPart* pa
if ( node.handle()->id() == ID_FRAME ) { if ( node.handle()->id() == ID_FRAME ) {
outputStream << endl; outputStream << endl;
TQString frameName = static_cast<DOM::HTMLFrameElementImpl *>( node.handle() )->name.string(); TQString frameName = static_cast<DOM::HTMLFrameElementImpl *>( node.handle() )->name.string();
KHTMLPart* frame = part->findFrame( frameName ); TDEHTMLPart* frame = part->findFrame( frameName );
Q_ASSERT( frame ); Q_ASSERT( frame );
if ( frame ) if ( frame )
getPartDOMOutput( outputStream, frame, indent ); 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() ); DOM::DocumentImpl* doc = static_cast<DocumentImpl*>( part->document().handle() );
if ( !doc || !doc->renderer() ) if ( !doc || !doc->renderer() )
@ -923,7 +923,7 @@ void RegressionTest::dumpRenderTree( TQTextStream &outputStream, KHTMLPart* part
names.sort(); names.sort();
for ( TQStringList::iterator it = names.begin(); it != names.end(); ++it ) { for ( TQStringList::iterator it = names.begin(); it != names.end(); ++it ) {
outputStream << "FRAME: " << (*it) << "\n"; outputStream << "FRAME: " << (*it) << "\n";
KHTMLPart* frame = part->findFrame( (*it) ); TDEHTMLPart* frame = part->findFrame( (*it) );
Q_ASSERT( frame ); Q_ASSERT( frame );
if ( frame ) if ( frame )
dumpRenderTree( outputStream, frame ); dumpRenderTree( outputStream, frame );
@ -1411,7 +1411,7 @@ void RegressionTest::testJSFile(const TQString & filename )
ScriptInterpreter interp(global,&frame); ScriptInterpreter interp(global,&frame);
ExecState *exec = interp.globalExec(); 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, "regtest", Object(new RegTestObject(exec,this)));
global.put(exec, "debug", Object(new RegTestFunction(exec,this,RegTestFunction::Print,1) ) ); global.put(exec, "debug", Object(new RegTestFunction(exec,this,RegTestFunction::Print,1) ) );
global.put(exec, "print", Object(new RegTestFunction(exec,this,RegTestFunction::Print,1) ) ); global.put(exec, "print", Object(new RegTestFunction(exec,this,RegTestFunction::Print,1) ) );

@ -40,12 +40,12 @@ class PartMonitor : public TQObject
{ {
Q_OBJECT Q_OBJECT
public: public:
PartMonitor(KHTMLPart *_part); PartMonitor(TDEHTMLPart *_part);
~PartMonitor(); ~PartMonitor();
void waitForCompletion(); void waitForCompletion();
static PartMonitor* sm_highestMonitor; static PartMonitor* sm_highestMonitor;
bool m_completed; bool m_completed;
KHTMLPart *m_part; TDEHTMLPart *m_part;
int m_timer_waits; int m_timer_waits;
TQTimer *m_timeout_timer; TQTimer *m_timeout_timer;
public slots: public slots:
@ -87,31 +87,31 @@ private:
/** /**
* @internal * @internal
*/ */
class KHTMLPartObject : public KJS::ObjectImp class TDEHTMLPartObject : public KJS::ObjectImp
{ {
public: 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; virtual KJS::Value get(KJS::ExecState *exec, const KJS::Identifier &propertyName) const;
private: private:
KHTMLPart *m_part; TDEHTMLPart *m_part;
}; };
/** /**
* @internal * @internal
*/ */
class KHTMLPartFunction : public KJS::ObjectImp class TDEHTMLPartFunction : public KJS::ObjectImp
{ {
public: public:
KHTMLPartFunction(KJS::ExecState *exec, KHTMLPart *_part, int _id, int length); TDEHTMLPartFunction(KJS::ExecState *exec, TDEHTMLPart *_part, int _id, int length);
bool implementsCall() const; bool implementsCall() const;
KJS::Value call(KJS::ExecState *exec, KJS::Object &thisObj, const KJS::List &args); KJS::Value call(KJS::ExecState *exec, KJS::Object &thisObj, const KJS::List &args);
enum { OpenPage, OpenPageAsUrl, Begin, Write, End, ExecuteScript, ProcessEvents }; enum { OpenPage, OpenPageAsUrl, Begin, Write, End, ExecuteScript, ProcessEvents };
private: private:
KHTMLPart *m_part; TDEHTMLPart *m_part;
int id; int id;
}; };
@ -127,14 +127,14 @@ class RegressionTest : public TQObject
Q_OBJECT Q_OBJECT
public: 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); bool _genOutput, bool runJS, bool runHTML);
~RegressionTest(); ~RegressionTest();
enum OutputType { DOMTree, RenderTree }; enum OutputType { DOMTree, RenderTree };
TQString getPartOutput( OutputType type ); TQString getPartOutput( OutputType type );
void getPartDOMOutput( TQTextStream &outputStream, KHTMLPart* part, uint indent ); void getPartDOMOutput( TQTextStream &outputStream, TDEHTMLPart* part, uint indent );
void dumpRenderTree( TQTextStream &outputStream, KHTMLPart* part ); void dumpRenderTree( TQTextStream &outputStream, TDEHTMLPart* part );
void testStaticFile(const TQString& filename); void testStaticFile(const TQString& filename);
void testJSFile(const TQString& filename); void testJSFile(const TQString& filename);
enum CheckResult { Failure = 0, Success = 1, Ignored = 2 }; enum CheckResult { Failure = 0, Success = 1, Ignored = 2 };
@ -152,7 +152,7 @@ public:
void doJavascriptReport( const TQString &test ); void doJavascriptReport( const TQString &test );
void doFailureReport( const TQString& test, int failures ); void doFailureReport( const TQString& test, int failures );
KHTMLPart *m_part; TDEHTMLPart *m_part;
TQString m_baseDir; TQString m_baseDir;
TQString m_outputDir; TQString m_outputDir;
bool m_genOutput; bool m_genOutput;

@ -265,7 +265,7 @@ KDE_EXPORT bool TQFontDatabase::isSmoothlyScalable( const TQString &,
return true; return true;
} }
const TQString &KHTMLSettings::availableFamilies() const TQString &TDEHTMLSettings::availableFamilies()
{ {
if ( !avFamilies ) { if ( !avFamilies ) {
avFamilies = new TQString; avFamilies = new TQString;
@ -275,7 +275,7 @@ const TQString &KHTMLSettings::availableFamilies()
return *avFamilies; return *avFamilies;
} }
bool KHTMLSettings::unfinishedImageFrame() const bool TDEHTMLSettings::unfinishedImageFrame() const
{ {
return false; return false;
} }

@ -38,7 +38,7 @@ int main(int argc, char *argv[])
{ {
TDECmdLineArgs::init(argc, argv, "testtdehtml", "Testtdehtml", 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); TDECmdLineArgs::addCmdLineOptions(options);
TDEApplication a; TDEApplication a;
@ -49,11 +49,11 @@ int main(int argc, char *argv[])
} }
#ifndef __KDE_HAVE_GCC_VISIBILITY #ifndef __KDE_HAVE_GCC_VISIBILITY
KHTMLFactory *fac = new KHTMLFactory(true); TDEHTMLFactory *fac = new TDEHTMLFactory(true);
#endif #endif
KMainWindow *toplevel = new KMainWindow(); 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 ); Dummy *dummy = new Dummy( doc );
TQObject::connect( doc->browserExtension(), TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ), TQObject::connect( doc->browserExtension(), TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ),

@ -1,5 +1,5 @@
#ifndef TESTKHTML_H #ifndef TESTTDEHTML_H
#define TESTKHTML_H #define TESTTDEHTML_H
#include <kdebug.h> #include <kdebug.h>
#include <tqvaluelist.h> #include <tqvaluelist.h>
@ -12,7 +12,7 @@ class Dummy : public TQObject
{ {
Q_OBJECT Q_OBJECT
public: public:
Dummy( KHTMLPart *part ) : TQObject( part ) { m_part = part; }; Dummy( TDEHTMLPart *part ) : TQObject( part ) { m_part = part; };
private slots: private slots:
void slotOpenURL( const KURL &url, const KParts::URLArgs &args ) void slotOpenURL( const KURL &url, const KParts::URLArgs &args )
@ -43,7 +43,7 @@ private slots:
void handleDone(); void handleDone();
private: private:
KHTMLPart *m_part; TDEHTMLPart *m_part;
TQValueList<TQString> filesToBenchmark; TQValueList<TQString> filesToBenchmark;
TQMap<TQString, TQValueList<int> > results; TQMap<TQString, TQValueList<int> > results;
int benchmarkRun; int benchmarkRun;

@ -179,11 +179,11 @@ EventImpl::EventId EventImpl::typeToId(DOMString type)
else if ( type == "keypress" ) else if ( type == "keypress" )
return KEYPRESS_EVENT; return KEYPRESS_EVENT;
else if ( type == "readystatechange" ) else if ( type == "readystatechange" )
return KHTML_READYSTATECHANGE_EVENT; return TDEHTML_READYSTATECHANGE_EVENT;
else if ( type == "dblclick" ) 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; 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 return "keypress"; //DOM3 ev. suggests textInput, but it's better for compat this way
//tdehtml extensions //tdehtml extensions
case KHTML_ECMA_DBLCLICK_EVENT: case TDEHTML_ECMA_DBLCLICK_EVENT:
return "dblclick"; return "dblclick";
case KHTML_ECMA_CLICK_EVENT: case TDEHTML_ECMA_CLICK_EVENT:
return "click"; return "click";
case KHTML_DRAGDROP_EVENT: case TDEHTML_DRAGDROP_EVENT:
return "tdehtml_dragdrop"; return "tdehtml_dragdrop";
case KHTML_MOVE_EVENT: case TDEHTML_MOVE_EVENT:
return "tdehtml_move"; return "tdehtml_move";
case KHTML_READYSTATECHANGE_EVENT: case TDEHTML_READYSTATECHANGE_EVENT:
return "readystatechange"; return "readystatechange";
default: default:
@ -454,7 +454,7 @@ void MouseEventImpl::initMouseEvent(const DOMString &typeArg,
m_clientY = clientYArg; m_clientY = clientYArg;
m_pageX = clientXArg; m_pageX = clientXArg;
m_pageY = clientYArg; m_pageY = clientYArg;
KHTMLView* v; TDEHTMLView* v;
if ( view() && view()->document() && ( v = view()->document()->view() ) ) { if ( view() && view()->document() && ( v = view()->document()->view() ) ) {
m_pageX += v->contentsX(); m_pageX += v->contentsX();
m_pageY += v->contentsY(); m_pageY += v->contentsY();

@ -28,7 +28,7 @@
#include "dom/dom2_events.h" #include "dom/dom2_events.h"
#include "xml/dom2_viewsimpl.h" #include "xml/dom2_viewsimpl.h"
class KHTMLPart; class TDEHTMLPart;
class TQMouseEvent; class TQMouseEvent;
namespace DOM { namespace DOM {
@ -81,12 +81,12 @@ public:
KEYUP_EVENT, KEYUP_EVENT,
KEYPRESS_EVENT, //Mostly corresponds to DOM3 textInput event. KEYPRESS_EVENT, //Mostly corresponds to DOM3 textInput event.
// tdehtml events (not part of DOM) // tdehtml events (not part of DOM)
KHTML_ECMA_DBLCLICK_EVENT, // for html ondblclick TDEHTML_ECMA_DBLCLICK_EVENT, // for html ondblclick
KHTML_ECMA_CLICK_EVENT, // for html onclick TDEHTML_ECMA_CLICK_EVENT, // for html onclick
KHTML_DRAGDROP_EVENT, TDEHTML_DRAGDROP_EVENT,
KHTML_MOVE_EVENT, TDEHTML_MOVE_EVENT,
// XMLHttpRequest events // XMLHttpRequest events
KHTML_READYSTATECHANGE_EVENT TDEHTML_READYSTATECHANGE_EVENT
}; };
EventImpl(); EventImpl();

@ -1139,7 +1139,7 @@ DOMString RangeImpl::toHTML( int &exceptioncode )
text = DOMString("<html xmlns=\"http://www.w3.org/1999/xhtml\">\n" text = DOMString("<html xmlns=\"http://www.w3.org/1999/xhtml\">\n"
"<head>\n" "<head>\n"
"<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\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") + "</head>\n") +
text + text +
"</html>"; "</html>";

@ -200,12 +200,12 @@ CSSStyleSheetImpl *DOMImplementationImpl::createCSSStyleSheet(DOMStringImpl* /*t
return sheet; return sheet;
} }
DocumentImpl *DOMImplementationImpl::createDocument( KHTMLView *v ) DocumentImpl *DOMImplementationImpl::createDocument( TDEHTMLView *v )
{ {
return new DocumentImpl(this, v); return new DocumentImpl(this, v);
} }
HTMLDocumentImpl *DOMImplementationImpl::createHTMLDocument( KHTMLView *v ) HTMLDocumentImpl *DOMImplementationImpl::createHTMLDocument( TDEHTMLView *v )
{ {
return new HTMLDocumentImpl(this, v); return new HTMLDocumentImpl(this, v);
} }
@ -288,8 +288,8 @@ ElementMappingCache::ItemInfo* ElementMappingCache::get(const TQString& id)
static KStaticDeleter< TQPtrList<DocumentImpl> > s_changedDocumentsDeleter; static KStaticDeleter< TQPtrList<DocumentImpl> > s_changedDocumentsDeleter;
TQPtrList<DocumentImpl> * DocumentImpl::changedDocuments; TQPtrList<DocumentImpl> * DocumentImpl::changedDocuments;
// KHTMLView might be 0 // TDEHTMLView might be 0
DocumentImpl::DocumentImpl(DOMImplementationImpl *_implementation, KHTMLView *v) DocumentImpl::DocumentImpl(DOMImplementationImpl *_implementation, TDEHTMLView *v)
: NodeBaseImpl( 0 ), m_domtree_version(0), m_counterDict(257), : NodeBaseImpl( 0 ), m_domtree_version(0), m_counterDict(257),
m_imageLoadEventTimer(0) m_imageLoadEventTimer(0)
{ {
@ -304,7 +304,7 @@ DocumentImpl::DocumentImpl(DOMImplementationImpl *_implementation, KHTMLView *v)
m_view = v; m_view = v;
m_renderArena.reset(); m_renderArena.reset();
KHTMLFactory::ref(); TDEHTMLFactory::ref();
if ( v ) { if ( v ) {
m_docLoader = new DocLoader(v->part(), this ); m_docLoader = new DocLoader(v->part(), this );
@ -459,7 +459,7 @@ DocumentImpl::~DocumentImpl()
m_renderArena.reset(); m_renderArena.reset();
KHTMLFactory::deref(); TDEHTMLFactory::deref();
} }
@ -1132,7 +1132,7 @@ void DocumentImpl::recalcStyle( StyleChange change )
fontDef.italic = f.italic(); fontDef.italic = f.italic();
fontDef.weight = f.weight(); fontDef.weight = f.weight();
if (m_view) { if (m_view) {
const KHTMLSettings *settings = m_view->part()->settings(); const TDEHTMLSettings *settings = m_view->part()->settings();
TQString stdfont = settings->stdFontName(); TQString stdfont = settings->stdFontName();
if ( !stdfont.isEmpty() ) if ( !stdfont.isEmpty() )
fontDef.family = stdfont; fontDef.family = stdfont;
@ -1317,7 +1317,7 @@ void DocumentImpl::open( bool clearEventListeners )
delete m_tokenizer; delete m_tokenizer;
m_tokenizer = 0; m_tokenizer = 0;
KHTMLView* view = m_view; TDEHTMLView* view = m_view;
bool was_attached = attached(); bool was_attached = attached();
if ( was_attached ) if ( was_attached )
detach(); detach();
@ -1662,7 +1662,7 @@ void DocumentImpl::processHttpEquiv(const DOMString &equiv, const DOMString &con
{ {
assert(!equiv.isNull() && !content.isNull()); assert(!equiv.isNull() && !content.isNull());
KHTMLView *v = getDocument()->view(); TDEHTMLView *v = getDocument()->view();
if(strcasecmp(equiv, "refresh") == 0 && v && v->part()->metaRefreshEnabled()) 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 bool DocumentImpl::isURLAllowed(const TQString& url) const
{ {
KHTMLPart *thisPart = part(); TDEHTMLPart *thisPart = part();
KURL newURL(completeURL(url)); KURL newURL(completeURL(url));
newURL.setRef(TQString::null); newURL.setRef(TQString::null);
if (KHTMLFactory::defaultHTMLSettings()->isAdFiltered( newURL.url() )) if (TDEHTMLFactory::defaultHTMLSettings()->isAdFiltered( newURL.url() ))
return false; return false;
// Prohibit non-file URLs if we are asked to. // 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. // We allow one level of self-reference because some sites depend on that.
// But we don't allow more than one. // But we don't allow more than one.
bool foundSelfReference = false; bool foundSelfReference = false;
for (KHTMLPart *part = thisPart; part; part = part->parentPart()) { for (TDEHTMLPart *part = thisPart; part; part = part->parentPart()) {
KURL partURL = part->url(); KURL partURL = part->url();
partURL.setRef(TQString::null); partURL.setRef(TQString::null);
if (partURL == newURL) { if (partURL == newURL) {
@ -2619,7 +2619,7 @@ void DocumentImpl::setDecoderCodec(const TQTextCodec *codec)
ElementImpl *DocumentImpl::ownerElement() const ElementImpl *DocumentImpl::ownerElement() const
{ {
KHTMLPart *childPart = part(); TDEHTMLPart *childPart = part();
if (!childPart) if (!childPart)
return 0; return 0;
ChildFrame *childFrame = childPart->d->m_frame; 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; return view() ? view()->part() : 0;
} }

@ -47,7 +47,7 @@
class TQPaintDevice; class TQPaintDevice;
class TQTextCodec; class TQTextCodec;
class TQPaintDeviceMetrics; class TQPaintDeviceMetrics;
class KHTMLView; class TDEHTMLView;
namespace tdehtml { namespace tdehtml {
class Tokenizer; class Tokenizer;
@ -115,8 +115,8 @@ public:
HTMLDocumentImpl* createHTMLDocument( const DOMString& title); HTMLDocumentImpl* createHTMLDocument( const DOMString& title);
// Other methods (not part of DOM) // Other methods (not part of DOM)
DocumentImpl *createDocument( KHTMLView *v = 0 ); DocumentImpl *createDocument( TDEHTMLView *v = 0 );
HTMLDocumentImpl *createHTMLDocument( KHTMLView *v = 0 ); HTMLDocumentImpl *createHTMLDocument( TDEHTMLView *v = 0 );
// Returns the static instance of this class - only one instance of this class should // 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 // 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 Q_OBJECT
public: public:
DocumentImpl(DOMImplementationImpl *_implementation, KHTMLView *v); DocumentImpl(DOMImplementationImpl *_implementation, TDEHTMLView *v);
~DocumentImpl(); ~DocumentImpl();
// DOM methods & attributes for Document // DOM methods & attributes for Document
@ -281,8 +281,8 @@ public:
// Set the state the document should restore to // Set the state the document should restore to
void setRestoreState( const TQStringList &s) { m_state = s; } void setRestoreState( const TQStringList &s) { m_state = s; }
KHTMLView *view() const { return m_view; } TDEHTMLView *view() const { return m_view; }
KHTMLPart* part() const; TDEHTMLPart* part() const;
RangeImpl *createRange(); RangeImpl *createRange();
@ -550,7 +550,7 @@ signals:
protected: protected:
tdehtml::CSSStyleSelector *m_styleSelector; tdehtml::CSSStyleSelector *m_styleSelector;
KHTMLView *m_view; TDEHTMLView *m_view;
TQStringList m_state; TQStringList m_state;
tdehtml::DocLoader *m_docLoader; tdehtml::DocLoader *m_docLoader;

@ -896,8 +896,8 @@ void ElementImpl::setContentEditable(bool enabled) {
// FIXME: reset caret if it is in this node or a child // FIXME: reset caret if it is in this node or a child
}/*end if*/ }/*end if*/
// FIXME: use addCSSProperty when I get permission to move it here // FIXME: use addCSSProperty when I get permission to move it here
// kdDebug(6000) << "CSS_PROP__KHTML_USER_INPUT: "<< value << endl; // kdDebug(6000) << "CSS_PROP__TDEHTML_USER_INPUT: "<< value << endl;
styleRules()->setProperty(CSS_PROP__KHTML_USER_INPUT, value, false, true); styleRules()->setProperty(CSS_PROP__TDEHTML_USER_INPUT, value, false, true);
setChanged(); setChanged();
} }

@ -337,7 +337,7 @@ void NodeImpl::dispatchEvent(EventImpl *evt, int &exceptioncode, bool tempEvent)
evt->setTarget(this); evt->setTarget(this);
// Since event handling code could cause this object to be deleted, grab a reference to the view now // 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 ); 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 // * use me->qEvent(), it's not available when using initMouseEvent/dispatchEvent
// So we currently store a bool in MouseEventImpl. If anyone needs to trigger // 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). // 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) || if ( ( !me->isDoubleClick() && current.id == EventImpl::TDEHTML_ECMA_CLICK_EVENT) ||
( me->isDoubleClick() && current.id == EventImpl::KHTML_ECMA_DBLCLICK_EVENT) ) ( me->isDoubleClick() && current.id == EventImpl::TDEHTML_ECMA_DBLCLICK_EVENT) )
current.listener->handleEvent(ev); current.listener->handleEvent(ev);
} }
} }

@ -37,7 +37,7 @@
class TQPainter; class TQPainter;
template <class type> class TQPtrList; template <class type> class TQPtrList;
template <class type> class TQValueList; template <class type> class TQValueList;
class KHTMLView; class TDEHTMLView;
class TQRect; class TQRect;
class TQMouseEvent; class TQMouseEvent;
class TQKeyEvent; class TQKeyEvent;
@ -283,7 +283,7 @@ public:
void dispatchUIEvent(int _id, int detail = 0); void dispatchUIEvent(int _id, int detail = 0);
void dispatchSubtreeModifiedEvent(); void dispatchSubtreeModifiedEvent();
// return true if defaultPrevented (i.e. event should be swallowed) // 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); bool dispatchKeyEvent(TQKeyEvent *key, bool keypress);
void handleLocalEvents(EventImpl *evt, bool useCapture); 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 * 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 * 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(); virtual void attach();

@ -91,7 +91,7 @@ void XMLIncrementalSource::setFinished( bool finished )
m_finished = finished; m_finished = finished;
} }
XMLHandler::XMLHandler(DocumentImpl *_doc, KHTMLView *_view) XMLHandler::XMLHandler(DocumentImpl *_doc, TDEHTMLView *_view)
: errorLine(0) : errorLine(0)
{ {
m_doc = _doc; 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_handler(_doc,_view)
{ {
m_doc = _doc; m_doc = _doc;

@ -31,7 +31,7 @@
#include "misc/loader_client.h" #include "misc/loader_client.h"
#include "misc/stringit.h" #include "misc/stringit.h"
class KHTMLView; class TDEHTMLView;
namespace tdehtml { namespace tdehtml {
class CachedObject; class CachedObject;
@ -51,7 +51,7 @@ namespace tdehtml {
class XMLHandler : public TQXmlDefaultHandler class XMLHandler : public TQXmlDefaultHandler
{ {
public: public:
XMLHandler(DOM::DocumentImpl *_doc, KHTMLView *_view); XMLHandler(DOM::DocumentImpl *_doc, TDEHTMLView *_view);
virtual ~XMLHandler(); virtual ~XMLHandler();
// return the error protocol if parsing failed // return the error protocol if parsing failed
@ -101,7 +101,7 @@ private:
private: private:
TQString errorProt; TQString errorProt;
DOM::DocumentImpl *m_doc; DOM::DocumentImpl *m_doc;
KHTMLView *m_view; TDEHTMLView *m_view;
TQPtrStack<DOM::NodeImpl> m_nodes; TQPtrStack<DOM::NodeImpl> m_nodes;
DOM::NodeImpl *m_rootNode; DOM::NodeImpl *m_rootNode;
@ -162,7 +162,7 @@ private:
class XMLTokenizer : public Tokenizer, public tdehtml::CachedObjectClient class XMLTokenizer : public Tokenizer, public tdehtml::CachedObjectClient
{ {
public: public:
XMLTokenizer(DOM::DocumentImpl *, KHTMLView * = 0); XMLTokenizer(DOM::DocumentImpl *, TDEHTMLView * = 0);
virtual ~XMLTokenizer(); virtual ~XMLTokenizer();
virtual void begin(); virtual void begin();
virtual void write( const TokenizerString &str, bool ); virtual void write( const TokenizerString &str, bool );
@ -178,7 +178,7 @@ public:
protected: protected:
DOM::DocumentImpl *m_doc; DOM::DocumentImpl *m_doc;
KHTMLView *m_view; TDEHTMLView *m_view;
void executeScripts(); void executeScripts();
void addScripts(DOM::NodeImpl *n); void addScripts(DOM::NodeImpl *n);

@ -72,7 +72,7 @@ KProtocolManagerPrivate::~KProtocolManagerPrivate()
// DEFAULT USERAGENT STRING // DEFAULT USERAGENT STRING
#define CFG_DEFAULT_UAGENT(X) \ #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) .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() void KProtocolManager::reparseConfiguration()

@ -391,7 +391,7 @@ KOfficeMainWindow (a tdeparts aware shell)
| |
|- KReportGeneratorView/Part (a koffice component) |- 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. Imagine all are added to one KPartManager.
Now the user clicks on the report generator and gets the 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) |- 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 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 called "HTMLSettings" to allow choosing the default font of the HTML Widget. Obviously this action

@ -65,7 +65,7 @@ struct KPARTS_EXPORT URLArgs
/** /**
* This buffer can be used by the part to save and restore its contents. * This buffer can be used by the part to save and restore its contents.
* See KHTMLPart for instance. * See TDEHTMLPart for instance.
*/ */
TQStringList docState; TQStringList docState;
@ -89,26 +89,26 @@ struct KPARTS_EXPORT URLArgs
TQString serviceType; TQString serviceType;
/** /**
* KHTML-specific field, contents of the HTTP POST data. * TDEHTML-specific field, contents of the HTTP POST data.
*/ */
TQByteArray postData; 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 ); 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; 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. * for the next openURL.
*/ */
void setDoPost( bool enable ); 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. * for the next openURL.
*/ */
bool doPost() const; bool doPost() const;
@ -134,7 +134,7 @@ struct KPARTS_EXPORT URLArgs
TQMap<TQString, TQString> &metaData(); 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; TQString frameName;
@ -719,7 +719,7 @@ private:
/** /**
* An extension class for container parts, i.e. parts that contain * An extension class for container parts, i.e. parts that contain
* other parts. * 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 class KPARTS_EXPORT BrowserHostExtension : public TQObject
{ {

@ -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 // 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 ) void BrowserRun::save( const KURL & url, const TQString & suggestedFilename )
{ {
simpleSave( url, suggestedFilename, m_window ); simpleSave( url, suggestedFilename, m_window );
@ -461,7 +461,7 @@ void BrowserRun::handleError( TDEIO::Job * job )
void BrowserRun::redirectToError( int error, const TQString& errorText ) 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 * we tell konq that the mimetype is text/html, and we redirect to
* an error:/ URL that sends the info to tdehtml. * an error:/ URL that sends the info to tdehtml.
* *

@ -123,7 +123,7 @@ namespace KParts {
*/ */
static AskSaveResult askEmbedOrSave( const KURL & url, const TQString& mimeType, const TQString & suggestedFilename = TQString::null, int flags = 0 ); 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 ); virtual void save( const KURL & url, const TQString & suggestedFilename );
// static so that it can be called from other classes // static so that it can be called from other classes

@ -149,7 +149,7 @@ Type=bool
[PropertyDef::X-TDE-BrowserView-Built-Into] [PropertyDef::X-TDE-BrowserView-Built-Into]
Type=TQString 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 # 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 # file path here. The path should be relative to TDE's data dir
# ($TDEDIR/share/apps) # ($TDEDIR/share/apps)

@ -31,7 +31,7 @@ const char *text = "Rationale \
========= \ ========= \
\ \
This code is intended to provide an implementation of the W3C's XPath \ 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 \ 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\ 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\ 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. \ reasonable to ask why there should be another one. \
\ \
It would certainly be possible to integrate one of these implementations into\ 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\ implementations mentioned with a view to using this approach before I decided\
to start from scratch.\ to start from scratch.\
\ \
@ -62,7 +62,7 @@ Xerces XPath (C++ version)\
\ \
The Xerces code seemed pretty clean and was reasonably understandable, however\ 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\ 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\ work. The main issue here being that Xerces is based around pointers to Nodes\
rather than implicitly shared Node objects.\ 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\ 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\ 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\ 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\ 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\ binding layer that parsed the XML twice and somehow maintained a mapping\
between the two DOM trees. Unfortunately the documentation of this library is\ 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\ using this library still requires some mechanism to integrate the two\
underlying DOM implementations.\ underlying DOM implementations.\
\ \
KHTML XPath\ TDEHTML XPath\
----------- \ ----------- \
\ \
There are some advantages to the XPath implementation Zack and I are working\ 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. \ - 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\ 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\ 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 \ 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\ to the XPath location steps, since we need to implement these facilities\

@ -234,7 +234,7 @@ TQStringList KSpellingHighlighter::personalWords()
l.append( "KMail" ); l.append( "KMail" );
l.append( "KOrganizer" ); l.append( "KOrganizer" );
l.append( "KAddressBook" ); l.append( "KAddressBook" );
l.append( "KHTML" ); l.append( "TDEHTML" );
l.append( "KIO" ); l.append( "KIO" );
l.append( "KJS" ); l.append( "KJS" );
l.append( "Konqueror" ); l.append( "Konqueror" );

@ -145,8 +145,8 @@
# define KATEPART_EXPORT KDE_IMPORT # define KATEPART_EXPORT KDE_IMPORT
#endif #endif
#ifdef MAKE_KHTML_LIB #ifdef MAKE_TDEHTML_LIB
# define KHTML_EXPORT KDE_EXPORT # define TDEHTML_EXPORT KDE_EXPORT
#else #else
# define KHTML_EXPORT KDE_IMPORT # define TDEHTML_EXPORT KDE_IMPORT
#endif #endif

Loading…
Cancel
Save