Browse Source

Rename KHTML and kiobuffer

tags/r14.0.0
Timothy Pearson 6 years ago
parent
commit
7427e43835
100 changed files with 701 additions and 701 deletions
  1. 6
    6
      KDE2PORTING.html
  2. 5
    5
      KDE3PORTING.html
  3. 1
    1
      TODO
  4. 1
    1
      configure.in.in
  5. 1
    1
      kjs/README
  6. 4
    4
      kstyles/keramik/keramik.cpp
  7. 0
    0
      tdecore/network/tdeiobuffer.h
  8. 1
    1
      tdecore/tdelibs_export.h
  9. 16
    16
      tdehtml/ChangeLog
  10. 7
    7
      tdehtml/DESIGN.html
  11. 6
    6
      tdehtml/Mainpage.dox
  12. 1
    1
      tdehtml/README.HTMLWidget
  13. 28
    28
      tdehtml/css/css_renderstyledeclarationimpl.cpp
  14. 1
    1
      tdehtml/css/css_valueimpl.cpp
  15. 1
    1
      tdehtml/css/csshelper.h
  16. 41
    41
      tdehtml/css/cssparser.cpp
  17. 15
    15
      tdehtml/css/cssproperties.c
  18. 15
    15
      tdehtml/css/cssproperties.h
  19. 36
    36
      tdehtml/css/cssstyleselector.cpp
  20. 9
    9
      tdehtml/css/cssstyleselector.h
  21. 27
    27
      tdehtml/css/cssvalues.c
  22. 27
    27
      tdehtml/css/cssvalues.h
  23. 3
    3
      tdehtml/css/cssvalues.in
  24. 7
    7
      tdehtml/css/parser.cpp
  25. 6
    6
      tdehtml/css/parser.h
  26. 6
    6
      tdehtml/css/parser.y
  27. 3
    3
      tdehtml/css/tokenizer.cpp
  28. 3
    3
      tdehtml/css/tokenizer.flex
  29. 1
    1
      tdehtml/design.h
  30. 10
    10
      tdehtml/dom/css_rule.h
  31. 7
    7
      tdehtml/dom/css_stylesheet.h
  32. 7
    7
      tdehtml/dom/css_value.h
  33. 7
    7
      tdehtml/dom/dom2_events.h
  34. 2
    2
      tdehtml/dom/dom2_range.h
  35. 4
    4
      tdehtml/dom/dom2_traversal.h
  36. 1
    1
      tdehtml/dom/dom2_views.h
  37. 1
    1
      tdehtml/dom/dom_doc.cpp
  38. 10
    10
      tdehtml/dom/dom_doc.h
  39. 3
    3
      tdehtml/dom/dom_element.h
  40. 1
    1
      tdehtml/dom/dom_exception.h
  41. 1
    1
      tdehtml/dom/dom_misc.h
  42. 4
    4
      tdehtml/dom/dom_node.h
  43. 7
    7
      tdehtml/dom/dom_string.h
  44. 3
    3
      tdehtml/dom/dom_text.h
  45. 5
    5
      tdehtml/dom/dom_xml.h
  46. 6
    6
      tdehtml/dom/html_base.h
  47. 7
    7
      tdehtml/dom/html_block.h
  48. 1
    1
      tdehtml/dom/html_document.cpp
  49. 6
    6
      tdehtml/dom/html_document.h
  50. 3
    3
      tdehtml/dom/html_element.h
  51. 11
    11
      tdehtml/dom/html_form.h
  52. 6
    6
      tdehtml/dom/html_head.h
  53. 3
    3
      tdehtml/dom/html_image.h
  54. 5
    5
      tdehtml/dom/html_inline.h
  55. 6
    6
      tdehtml/dom/html_list.h
  56. 4
    4
      tdehtml/dom/html_misc.h
  57. 3
    3
      tdehtml/dom/html_object.h
  58. 6
    6
      tdehtml/dom/html_table.h
  59. 1
    1
      tdehtml/domtreeview.cpp
  60. 2
    2
      tdehtml/domtreeview.h
  61. 2
    2
      tdehtml/ecma/README
  62. 1
    1
      tdehtml/ecma/kjs_binding.cpp
  63. 5
    5
      tdehtml/ecma/kjs_debugwin.cpp
  64. 13
    13
      tdehtml/ecma/kjs_dom.cpp
  65. 2
    2
      tdehtml/ecma/kjs_events.cpp
  66. 17
    17
      tdehtml/ecma/kjs_html.cpp
  67. 2
    2
      tdehtml/ecma/kjs_mozilla.cpp
  68. 4
    4
      tdehtml/ecma/kjs_mozilla.h
  69. 1
    1
      tdehtml/ecma/kjs_navigator.cpp
  70. 4
    4
      tdehtml/ecma/kjs_navigator.h
  71. 4
    4
      tdehtml/ecma/kjs_proxy.cpp
  72. 3
    3
      tdehtml/ecma/kjs_proxy.h
  73. 2
    2
      tdehtml/ecma/kjs_traversal.cpp
  74. 75
    75
      tdehtml/ecma/kjs_window.cpp
  75. 6
    6
      tdehtml/ecma/kjs_window.h
  76. 1
    1
      tdehtml/ecma/testecma.cpp
  77. 1
    1
      tdehtml/ecma/xmlhttprequest.cpp
  78. 12
    12
      tdehtml/html/html_baseimpl.cpp
  79. 3
    3
      tdehtml/html/html_baseimpl.h
  80. 14
    14
      tdehtml/html/html_blockimpl.cpp
  81. 6
    6
      tdehtml/html/html_documentimpl.cpp
  82. 2
    2
      tdehtml/html/html_documentimpl.h
  83. 3
    3
      tdehtml/html/html_elementimpl.cpp
  84. 18
    18
      tdehtml/html/html_formimpl.cpp
  85. 1
    1
      tdehtml/html/html_formimpl.h
  86. 2
    2
      tdehtml/html/html_headimpl.cpp
  87. 1
    1
      tdehtml/html/html_headimpl.h
  88. 2
    2
      tdehtml/html/html_inlineimpl.cpp
  89. 5
    5
      tdehtml/html/html_objectimpl.cpp
  90. 1
    1
      tdehtml/html/html_objectimpl.h
  91. 5
    5
      tdehtml/html/html_tableimpl.cpp
  92. 26
    26
      tdehtml/html/htmlparser.cpp
  93. 6
    6
      tdehtml/html/htmlparser.h
  94. 14
    14
      tdehtml/html/htmltokenizer.cpp
  95. 6
    6
      tdehtml/html/htmltokenizer.h
  96. 1
    1
      tdehtml/htmlpageinfo.ui
  97. 3
    3
      tdehtml/java/kjavaappletcontext.h
  98. 4
    4
      tdehtml/java/kjavaappletviewer.cpp
  99. 2
    2
      tdehtml/misc/decoder.h
  100. 0
    0
      tdehtml/misc/htmltags.h

+ 6
- 6
KDE2PORTING.html View File

@@ -351,13 +351,13 @@ This makes KRun the recommended way to run another program in KDE 2.

tdehtmlw has been replaced with tdehtml.<BR>
<UL>
<LI>KHTMLView has vanished. Just use KHTMLWidget, which does scrollbar
<LI>TDEHTMLView has vanished. Just use TDEHTMLWidget, which does scrollbar
managing for free.

<LI>A lot of the API has changed. If you just want to open a file/URL,
you just need to do:<P>
<PRE>
KHTMLWidget *w = new KHTMLWidget();
TDEHTMLWidget *w = new TDEHTMLWidget();
w-&gt;openURL(myURL);
</PRE>

@@ -367,18 +367,18 @@ tdehtmlw has been replaced with tdehtml.<BR>
const char * -&gt; QString
TQStrList -&gt; QStringList
</PRE>
The only exception for the moment is KHTMLWidget::write(), which does
The only exception for the moment is TDEHTMLWidget::write(), which does
also exist in a const char * version.<P>


<LI>you won't need the getKHTMLWiget function anymore. Just replace
getKHTMLWidget-&gt;xxx() with xxx()<P>
<LI>you won't need the getTDEHTMLWiget function anymore. Just replace
getTDEHTMLWidget-&gt;xxx() with xxx()<P>
<LI>xxx(TQString) -&gt; xxx(const TQString &amp;)<P>
<LI>consistent naming. All getXyz() functions are renamed to xyz()<P>
<LI>replaced/changed functions:<P>
<TABLE BORDER="1">
<TR>
<TD>KHTMLWidget::setDefaultFontBase()</TD>
<TD>TDEHTMLWidget::setDefaultFontBase()</TD>
<TD>-&gt; setFontSizes()</TD>
</TR>
<TR>

+ 5
- 5
KDE3PORTING.html View File

@@ -22,7 +22,7 @@ or <a href="http://doc.trolltech.com/3.0/porting.html">this page online</a>.<P>
<LI><A HREF="#kio">Changes in kio</A></LI>
<LI><A HREF="#tdeparts">Changes in tdeparts</A></LI>
<LI><A HREF="#tdespell">Changes in tdespell</A></LI>
<LI><A HREF="#tdehtmlpart">API-cleanup in KHTML</A></LI>
<LI><A HREF="#tdehtmlpart">API-cleanup in TDEHTML</A></LI>
<LI><A HREF="#tdefile">Changes in tdefile</A></LI>
<LI><A HREF="#kcontrol">TDE Control Center</A></LI>
<LI><A HREF="#kicker">Panel Applets and Extensions</A></LI>
@@ -495,9 +495,9 @@ The API has been cleaned up to be in line with the rest of tdelibs, in particula

<H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>

<H3><A NAME="tdehtmlpart">API-cleanups in KHTML</A></H3>
<H3><A NAME="tdehtmlpart">API-cleanups in TDEHTML</A></H3>

There were a few relatively minor API-adjustements in KHTMLPart. In particular:
There were a few relatively minor API-adjustements in TDEHTMLPart. In particular:
<ul><li>enableJScript(bool) has been replaced by setJScriptEnabled(bool)
<li>enableJava(bool) has been replaced by setJavaEnabled(bool)
<li>enablePlugins(bool) has been replaced by setPluginsEnabled(bool)
@@ -505,7 +505,7 @@ There were a few relatively minor API-adjustements in KHTMLPart. In particular:
<li>enableMetaRefresh(bool) has been replaced by setMetaRefreshEnabled(bool)
<li>setBaseURL and setBaseTarget have been removed. baseURL(), baseTarget() and
completeURL() are remained for compatibility reasons, but they're deprecated now. use the variants in DOM::HTMLDocument() instead.
<li>the second parameter of KHTMLPart::completeURL is removed. it didn't have
<li>the second parameter of TDEHTMLPart::completeURL is removed. it didn't have
any effect before either.
</ul>
Besides that, all methods previously marked as deprecated or were internal
@@ -513,7 +513,7 @@ but accidentally part of the public API are now private or removed.
As they were marked as becoming private already you should not experience
any problems. Backward compatibility exists for the common methods, to
disable this use a #define KDE_NO_COMPAT.
<p>In KHTMLView, the following changes were done:
<p>In TDEHTMLView, the following changes were done:
<ul>
<li>gotoNextLink has been replaced by gotoLink(true);
<li>gotoPrevLink has been replaced by gotoLink(false);

+ 1
- 1
TODO View File

@@ -223,7 +223,7 @@ an alternative help->contents action)

- Move KRichTextLabel into tdeui if still required with Qt 4.

- Add the concept of a session to KIO, in particular for KHTML so that it can
- Add the concept of a session to KIO, in particular for TDEHTML so that it can
have all of its jobs associated in some way (a unique key of sorts). Will
make SSL much easier to implement and allow removal of many hacks, mostly
involving metadata.

+ 1
- 1
configure.in.in View File

@@ -255,7 +255,7 @@ AC_SUBST(LIB_TDEUI, '$(top_builddir)/tdeui/libtdeui.la')
AC_SUBST(LIB_KIO, '$(top_builddir)/tdeio/libtdeio.la')
AC_SUBST(LIB_KFILE, '$(top_builddir)/tdeio/libtdeio.la')
AC_SUBST(LIB_KSYCOCA, '$(top_builddir)/tdeio/libtdeio.la')
AC_SUBST(LIB_KHTML, '$(top_builddir)/tdehtml/libtdehtml.la')
AC_SUBST(LIB_TDEHTML, '$(top_builddir)/tdehtml/libtdehtml.la')
AC_SUBST(LIB_TDEPRINT, '$(top_builddir)/tdeprint/libtdeprint.la')
AC_SUBST(LIB_KPARTS, '$(top_builddir)/tdeparts/libtdeparts.la')
AC_SUBST(LIB_KIMGIO, '$(top_builddir)/kimgio/libkimgio.la')

+ 1
- 1
kjs/README View File

@@ -13,7 +13,7 @@ for the standard page.
About 95% of the required features should be covered by now. Note that this
number covers the core language elements only. Features like the famous
roll-over buttons on the www are NOT part of the standard. Those extensions
are added via a module loaded dynamically by the KHTML Widget.
are added via a module loaded dynamically by the TDEHTML Widget.

I'll provide some examples of how to extend this library for various needs at
a later point in time. Feel free to contact me via mail if you have any

+ 4
- 4
kstyles/keramik/keramik.cpp View File

@@ -1357,7 +1357,7 @@ void KeramikStyle::drawKStylePrimitive( KStylePrimitive kpe,
bool KeramikStyle::isFormWidget(const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget* widget) const
{
if (widget) {
//Form widgets are in the KHTMLView, but that has 2 further inner levels
//Form widgets are in the TDEHTMLView, but that has 2 further inner levels
//of widgets - QClipperWidget, and outside of that, QViewportWidget
TQWidget* potentialClipPort = widget->parentWidget();
if ((ceData.parentWidgetData.widgetObjectTypes.isEmpty()) && (ceData.parentWidgetFlags & CEF_IsTopLevel)) {
@@ -1369,9 +1369,9 @@ bool KeramikStyle::isFormWidget(const TQStyleControlElementData &ceData, const C
qstrcmp(potentialViewPort->name(), "qt_viewport") )
return false;
TQWidget* potentialKHTML = potentialViewPort->parentWidget();
if (!potentialKHTML || potentialKHTML->isTopLevel() ||
qstrcmp(potentialKHTML->className(), "KHTMLView") )
TQWidget* potentialTDEHTML = potentialViewPort->parentWidget();
if (!potentialTDEHTML || potentialTDEHTML->isTopLevel() ||
qstrcmp(potentialTDEHTML->className(), "TDEHTMLView") )
return false;

tdecore/network/kiobuffer.h → tdecore/network/tdeiobuffer.h View File


+ 1
- 1
tdecore/tdelibs_export.h View File

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

+ 16
- 16
tdehtml/ChangeLog View File

@@ -243,7 +243,7 @@
stalled layout flags problems - #121653). (updateWidgetMasks): mask the content box, not the border box.
(enclosingStackingContext) new. Returns the layer defining current stacking context.

* rendering/render_replaced.{h,cpp} (isKHTMLWidget): new flag for KHTML-proxied widgets.
* rendering/render_replaced.{h,cpp} (isTDEHTMLWidget): new flag for TDEHTML-proxied widgets.
(detach/resizeWidget/setQWidget/layout/updateFromElement/slotWidgetDestructed/setStyle/paint): use the flag insead of strcmp's
Only allow !tdehtml widgets to register in the view (only those need masking).

@@ -473,7 +473,7 @@

2005-08-10 Dawit Alemayehu <adawit@kde.org>
* ecma/xmlhttprequest.cpp: Convert a 304 (Not Modified) HTTP response in
XMLHttpRequest to a 200 (OK) response to make KHTML conform to IE's and
XMLHttpRequest to a 200 (OK) response to make TDEHTML conform to IE's and
Mozilla's behavior. BUG: 110272

* ecma/xmlhttprequest.cpp: Factored out the HTTP status line parsing code
@@ -510,7 +510,7 @@
replace them with the "blocked" pixmap.)

* tdehtml_part.{cpp,h}: Added runAdFilters() function which is called from reparseConfiguration()
* tdehtml_ext.cpp: Call KHTMLPart::reparseConfiguration() after adding new filters.
* tdehtml_ext.cpp: Call TDEHTMLPart::reparseConfiguration() after adding new filters.
* misc/loader.cpp: Create blockedPixmap in Cache::init() instead of the CachedImage constructor.

2005-07-19 Allan Sandfeld Jensen <kde@carewolf.com>
@@ -528,7 +528,7 @@

* tdehtml_ext.{cpp,h}: Added "blockiframe" to context popup menu
* tdehtml_popupmenu.rc: Same
* tdehtml_part.h: added KHTMLPopupGUIClient to friend classes
* tdehtml_part.h: added TDEHTMLPopupGUIClient to friend classes

2005-07-08 Germain Garand <germain@ebooksfrance.org>

@@ -544,11 +544,11 @@

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.

* 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>

@@ -1969,7 +1969,7 @@

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.
(dispatchMouseEvent): Added parameter innerNonSharedNode.
* tdehtml_part.{cpp,h}: Added method nonSharedNodeUnderMouse.
@@ -1978,7 +1978,7 @@
* xml/dom_nodeimpl.h: Added innerNonSharedNode to
NodeImpl::MouseEvent.
* html/html_imageimpl.h: Added cachedRegion() for being able to
retrieve the region in KHTMLToolTip.
retrieve the region in TDEHTMLToolTip.

2004-07-20 Stephan Kulow <coolo@kde.org>

@@ -2297,7 +2297,7 @@

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.

2004-05-04 Leo Savernik <l.savernik@aon.at>
@@ -2370,8 +2370,8 @@
Added classes CaretBox, CaretBoxLine, CaretBoxIterator,
EditableCaretBoxIterator. Changed every other class.

* tdehtmlview.[cpp,h}: (class KHTMLView) Adapt to tdehtml_caret* changes.
(KHTMLToolTip::maybeTip) Save tooltip position instead of recalculating it.
* tdehtmlview.[cpp,h}: (class TDEHTMLView) Adapt to tdehtml_caret* changes.
(TDEHTMLToolTip::maybeTip) Save tooltip position instead of recalculating it.

* rendering/render_{inline,box}.{cpp,h}: (Render{Box,Inline}::caretPos)
Handle outside caret positions.
@@ -2508,7 +2508,7 @@
* ecma/xmlhttprequest.h/cpp: Implement asynchronous interface
enough to pass the tests on http://www.mozilla.org/xmlextras/tests.html

* xml/dom2_eventsimpl.h (EventImpl): rename KHTML_KEYUP/DOWN_EVENT
* xml/dom2_eventsimpl.h (EventImpl): rename TDEHTML_KEYUP/DOWN_EVENT
to KEYUP/DOWN_EVENT. Add events needed for XMLHttpRequest.

* rendering/render_object.h (class RenderObject): introduce a PaintInfo
@@ -2526,7 +2526,7 @@
* tdehtml_part.cpp/.h (openURL): In case the call is a reload, do a stat
on the user-defined stylesheet and reload it in case it changed in
the meanwhile (#39962).
* tdehtmlpart_p.h (class KHTMLPartPrivate): Added
* tdehtmlpart_p.h (class TDEHTMLPartPrivate): Added
m_userStyleSheetLastModified variable which keeps track of the
mtime of the user-defined sheet.

@@ -2825,7 +2825,7 @@

2004-01-18 Dirk Mueller <mueller@kde.org>

* tdehtmlpart_p.h (class KHTMLPartPrivate): experimental:
* tdehtmlpart_p.h (class TDEHTMLPartPrivate): experimental:
copy encoding information from parent frame. helps on
http://www.pfl.ru/ when manually setting the correct encoding.

@@ -3835,7 +3835,7 @@
to make the one call entering a local event loop the last, so that we can
cleanly exit when it the view is already deleted.

* tdehtml_ext.cpp (KHTMLPopupGUIClient): pass QObject parent
* tdehtml_ext.cpp (TDEHTMLPopupGUIClient): pass QObject parent

2003-10-05 Dirk Mueller <mueller@kde.org>

@@ -3852,7 +3852,7 @@

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.
#57020, testcase alja.html


+ 7
- 7
tdehtml/DESIGN.html View File

@@ -15,7 +15,7 @@ document, but it'll hopefully make it easier for you to read the source code.
</p>
<p>
The library is build up out of several different parts. Basically, when you use the lib, you
create an instance of a KHTMLPart, and feed data to it. That's more or less all you need to
create an instance of a TDEHTMLPart, and feed data to it. That's more or less all you need to
know if you want to use tdehtml for another application. If you want to start hacking tdehtml,
here's a sketch of the objects that will get constructed, when eg. running testtdehtml with
a url argument.
@@ -52,8 +52,8 @@ compatible to IE.
</blockquote>

<p>
<a href="tdehtml_part.h">KHTMLPart</a> creates one instance of a
<a href="tdehtmlview.h">KHTMLView</a> (derived from TQScrollView),
<a href="tdehtml_part.h">TDEHTMLPart</a> creates one instance of a
<a href="tdehtmlview.h">TDEHTMLView</a> (derived from TQScrollView),
the widget showing the whole thing. At the same time a DOM tree
is built up from the HTML or XML found in the specified file.
<p>
@@ -173,7 +173,7 @@ classes. In the implementation classes we have added a few more intermediate cla
not be seen from the outside for various reasons (make implementation of shared features easier
or to reduce memory consumption).
<p>
In C++, you can access the whole DOM tree from outside KHTML by using the interface classes.
In C++, you can access the whole DOM tree from outside TDEHTML by using the interface classes.
For a description see the <a href="http://developer.kde.org/documentation/library/kdeqt/trinityarch/tdehtml/index.html">introduction to tdehtml</a> on <a href="http://developer.kde.org/">developer.kde.org</a>.

One thing that has been omitted in the discussion above is the style sheet defined inside the
@@ -261,8 +261,8 @@ RenderRoot*
A call to of <a href="rendering/render_root.cpp">layout()</a> on the
<a href="rendering/render_root.h">RenderRoot </a> (the root of the rendering tree)
object causes the rendering tree to layout itself into the available space
(width) given by the the KHTMLView. After that, the drawContents() method of
KHTMLView can call RenderRoot->print() with appropriate parameters to actually
(width) given by the the TDEHTMLView. After that, the drawContents() method of
TDEHTMLView can call RenderRoot->print() with appropriate parameters to actually
paint the document. This is not 100% correct, when parsing incrementally, but
is exactly what happens when you resize the document.

@@ -301,7 +301,7 @@ the definition of the objects used in the rendering tree, the layouting code, an

<h2>Exception handling</h2>
To save on library size, C++-exceptions are only enabled in the dom/ subdirectory,
since exceptions are mandated by the DOM API. In the rest of KHTML's code,
since exceptions are mandated by the DOM API. In the rest of TDEHTML's code,
we pass an error flag (usually called "exceptionCode"), and the class that
is part of dom/* checks for this flag and throws the exception.

+ 6
- 6
tdehtml/Mainpage.dox View File

@@ -1,19 +1,19 @@
/** @mainpage Trinity HTML Parser and Widget

If you want a fully-fledged HTML browser widget in your application,
you can use KHTMLPart to do so.
you can use TDEHTMLPart to do so.

@code
KUrl url = "http://www.trinitydesktop.org";
KHTMLPart *w = new KHTMLPart();
TDEHTMLPart *w = new TDEHTMLPart();
w->openUrl(url);
w->view()->resize(500, 400);
w->show();
@endcode

For more information, see the documentation for KHTMLPart.
For more information, see the documentation for TDEHTMLPart.

Note that using KHTMLPart may introduce security vulnerabilities
Note that using TDEHTMLPart may introduce security vulnerabilities
and unnecessary bloat to your application. Qt's text widgets are
rich-text capable, and will interpret a limited subset of HTML.

@@ -30,7 +30,7 @@ George Staikos \<staikos@kde.org\><br>
Allan Sandfeld Jensen \<kde@carewolf.com\><br>
Germain Garand \<germain@ebooksfrance.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
Allan Sandfeld Jensen <br>
Germain Garand<br>
@@ -42,5 +42,5 @@ Maksim Orlovich
*/
// DOXYGEN_REFERENCES = tdecore tdeui kio tdeparts kjs
// DOXYGEN_EXCLUDE = test*.* html rendering xml misc ecma css imload pics test
// DOXYGEN_SET_PROJECT_NAME = KHTML
// DOXYGEN_SET_PROJECT_NAME = TDEHTML
// vim:ts=4:sw=4:expandtab:filetype=doxygen

+ 1
- 1
tdehtml/README.HTMLWidget View File

@@ -43,7 +43,7 @@ You can add the widget to your program by doing something like:
.
.

KHTMLWidget *view = new KHTMLWidget( parent, "Name" );
TDEHTMLWidget *view = new TDEHTMLWidget( parent, "Name" );
view->show();

view->begin( "file:/tmp/test.html" );

+ 28
- 28
tdehtml/css/css_renderstyledeclarationimpl.cpp View File

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

+ 1
- 1
tdehtml/css/css_valueimpl.cpp View File

@@ -891,7 +891,7 @@ FontFamilyValueImpl::FontFamilyValueImpl( const TQString &string)
parsedFontName.replace(braceReg, TQString());

#ifndef APPLE_CHANGES
const TQString &available = KHTMLSettings::availableFamilies();
const TQString &available = TDEHTMLSettings::availableFamilies();

parsedFontName = parsedFontName.lower();
// kdDebug(0) << "searching for face '" << parsedFontName << "'" << endl;

+ 1
- 1
tdehtml/css/csshelper.h View File

@@ -28,7 +28,7 @@
#include "dom/dom_string.h"

class TQPaintDeviceMetrics;
class KHTMLSettings;
class TDEHTMLSettings;

namespace DOM
{

+ 41
- 41
tdehtml/css/cssparser.cpp View File

@@ -533,7 +533,7 @@ bool CSSParser::parseValue( int propId, bool important )
* correctly and allows optimization in tdehtml::applyRule(..)
*/
case CSS_PROP_CAPTION_SIDE: // top | bottom | left | right | inherit
// Left and right were deprecated in CSS 2.1 and never supported by KHTML
// Left and right were deprecated in CSS 2.1 and never supported by TDEHTML
if ( /* id == CSS_VAL_LEFT || id == CSS_VAL_RIGHT || */
id == CSS_VAL_TOP || id == CSS_VAL_BOTTOM)
valid_primitive = true;
@@ -567,7 +567,7 @@ bool CSSParser::parseValue( int propId, bool important )
// upper-roman | lower-greek | lower-alpha | lower-latin | upper-alpha |
// upper-latin | hebrew | armenian | georgian | cjk-ideographic | hiragana |
// katakana | hiragana-iroha | katakana-iroha | none | inherit
if ((id >= CSS_VAL_DISC && id <= CSS_VAL__KHTML_CLOSE_QUOTE) || id == CSS_VAL_NONE)
if ((id >= CSS_VAL_DISC && id <= CSS_VAL__TDEHTML_CLOSE_QUOTE) || id == CSS_VAL_NONE)
valid_primitive = true;
break;

@@ -590,8 +590,8 @@ bool CSSParser::parseValue( int propId, bool important )
break;

case CSS_PROP_FLOAT: // left | right | none | tdehtml_left | tdehtml_right | inherit + center for buggy CSS
if ( id == CSS_VAL_LEFT || id == CSS_VAL_RIGHT || id == CSS_VAL__KHTML_LEFT ||
id == CSS_VAL__KHTML_RIGHT ||id == CSS_VAL_NONE || id == CSS_VAL_CENTER)
if ( id == CSS_VAL_LEFT || id == CSS_VAL_RIGHT || id == CSS_VAL__TDEHTML_LEFT ||
id == CSS_VAL__TDEHTML_RIGHT ||id == CSS_VAL_NONE || id == CSS_VAL_CENTER)
valid_primitive = true;
break;

@@ -603,7 +603,7 @@ bool CSSParser::parseValue( int propId, bool important )

case CSS_PROP_TEXT_ALIGN:
// left | right | center | justify | tdehtml_left | tdehtml_right | tdehtml_center | <string> | inherit
if ( ( id >= CSS_VAL__KHTML_AUTO && id <= CSS_VAL__KHTML_CENTER ) ||
if ( ( id >= CSS_VAL__TDEHTML_AUTO && id <= CSS_VAL__TDEHTML_CENTER ) ||
value->unit == CSSPrimitiveValue::CSS_STRING )
valid_primitive = true;
break;
@@ -613,7 +613,7 @@ bool CSSParser::parseValue( int propId, bool important )
case CSS_PROP_BORDER_RIGHT_STYLE: // Defined as: none | hidden | dotted | dashed |
case CSS_PROP_BORDER_BOTTOM_STYLE: // solid | double | groove | ridge | inset | outset | -tdehtml-native
case CSS_PROP_BORDER_LEFT_STYLE: ////
if (id >= CSS_VAL__KHTML_NATIVE && id <= CSS_VAL_DOUBLE)
if (id >= CSS_VAL__TDEHTML_NATIVE && id <= CSS_VAL_DOUBLE)
valid_primitive = true;
break;

@@ -636,8 +636,8 @@ bool CSSParser::parseValue( int propId, bool important )

case CSS_PROP_BORDER_SPACING:
{
const int properties[2] = { CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING,
CSS_PROP__KHTML_BORDER_VERTICAL_SPACING };
const int properties[2] = { CSS_PROP__TDEHTML_BORDER_HORIZONTAL_SPACING,
CSS_PROP__TDEHTML_BORDER_VERTICAL_SPACING };
if (num == 1) {
ShorthandScope scope(this, CSS_PROP_BORDER_SPACING);
if (!parseValue(properties[0], important)) return false;
@@ -653,8 +653,8 @@ bool CSSParser::parseValue( int propId, bool important )
}
return false;
}
case CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING:
case CSS_PROP__KHTML_BORDER_VERTICAL_SPACING:
case CSS_PROP__TDEHTML_BORDER_HORIZONTAL_SPACING:
case CSS_PROP__TDEHTML_BORDER_VERTICAL_SPACING:
valid_primitive = validUnit(value, FLength|FNonNeg, strict&(!nonCSSHint));
break;

@@ -682,10 +682,10 @@ bool CSSParser::parseValue( int propId, bool important )
case CSS_PROP_BORDER_BOTTOM_COLOR: // <color> | inherit
case CSS_PROP_BORDER_LEFT_COLOR: // <color> | inherit
case CSS_PROP_COLOR: // <color> | inherit
if ( id == CSS_VAL__KHTML_TEXT || id == CSS_VAL_MENU ||
if ( id == CSS_VAL__TDEHTML_TEXT || id == CSS_VAL_MENU ||
(id >= CSS_VAL_AQUA && id <= CSS_VAL_WINDOWTEXT ) ||
id == CSS_VAL_TRANSPARENT ||
(id >= CSS_VAL_GREY && id < CSS_VAL__KHTML_TEXT && (nonCSSHint|!strict) ) ) {
(id >= CSS_VAL_GREY && id < CSS_VAL__TDEHTML_TEXT && (nonCSSHint|!strict) ) ) {
valid_primitive = true;
} else {
parsedValue = parseColor();
@@ -707,13 +707,13 @@ bool CSSParser::parseValue( int propId, bool important )
break;

case CSS_PROP_BACKGROUND_ATTACHMENT:
case CSS_PROP__KHTML_BACKGROUND_CLIP:
case CSS_PROP__TDEHTML_BACKGROUND_CLIP:
case CSS_PROP_BACKGROUND_IMAGE:
case CSS_PROP__KHTML_BACKGROUND_ORIGIN:
case CSS_PROP__TDEHTML_BACKGROUND_ORIGIN:
case CSS_PROP_BACKGROUND_POSITION:
case CSS_PROP_BACKGROUND_POSITION_X:
case CSS_PROP_BACKGROUND_POSITION_Y:
case CSS_PROP__KHTML_BACKGROUND_SIZE:
case CSS_PROP__TDEHTML_BACKGROUND_SIZE:
case CSS_PROP_BACKGROUND_REPEAT: {
CSSValueImpl *val1 = 0, *val2 = 0;
int propId1, propId2;
@@ -769,7 +769,7 @@ bool CSSParser::parseValue( int propId, bool important )
case CSS_PROP_PADDING_RIGHT: // <padding-width> | inherit
case CSS_PROP_PADDING_BOTTOM: // Which is defined as
case CSS_PROP_PADDING_LEFT: // <length> | <percentage>
case CSS_PROP__KHTML_PADDING_START:
case CSS_PROP__TDEHTML_PADDING_START:
valid_primitive = ( !id && validUnit( value, FLength|FPercent|FNonNeg, strict&(!nonCSSHint) ) );
break;

@@ -807,7 +807,7 @@ bool CSSParser::parseValue( int propId, bool important )
// baseline | sub | super | top | text-top | middle | bottom | text-bottom |
// <percentage> | <length> | inherit

if ( id >= CSS_VAL_BASELINE && id <= CSS_VAL__KHTML_BASELINE_MIDDLE )
if ( id >= CSS_VAL_BASELINE && id <= CSS_VAL__TDEHTML_BASELINE_MIDDLE )
valid_primitive = true;
else
valid_primitive = ( !id && validUnit( value, FLength|FPercent, strict&(!nonCSSHint) ) );
@@ -830,7 +830,7 @@ bool CSSParser::parseValue( int propId, bool important )
case CSS_PROP_MARGIN_RIGHT: // Which is defined as
case CSS_PROP_MARGIN_BOTTOM: // <length> | <percentage> | auto | inherit
case CSS_PROP_MARGIN_LEFT: ////
case CSS_PROP__KHTML_MARGIN_START:
case CSS_PROP__TDEHTML_MARGIN_START:
if ( id == CSS_VAL_AUTO )
valid_primitive = true;
else
@@ -912,8 +912,8 @@ bool CSSParser::parseValue( int propId, bool important )
valid_primitive = true;
break;

case CSS_PROP__KHTML_FLOW_MODE:
if ( id == CSS_VAL__KHTML_NORMAL || id == CSS_VAL__KHTML_AROUND_FLOATS )
case CSS_PROP__TDEHTML_FLOW_MODE:
if ( id == CSS_VAL__TDEHTML_NORMAL || id == CSS_VAL__TDEHTML_AROUND_FLOATS )
valid_primitive = true;
break;

@@ -934,41 +934,41 @@ bool CSSParser::parseValue( int propId, bool important )
case CSS_PROP_OPACITY:
valid_primitive = validUnit(value, FNumber, strict);
break;
case CSS_PROP__KHTML_USER_INPUT: // none | enabled | disabled | inherit
case CSS_PROP__TDEHTML_USER_INPUT: // none | enabled | disabled | inherit
if ( id == CSS_VAL_NONE || id == CSS_VAL_ENABLED || id == CSS_VAL_DISABLED )
valid_primitive = true;
// kdDebug(6080) << "CSS_PROP__KHTML_USER_INPUT: " << valid_primitive << endl;
// kdDebug(6080) << "CSS_PROP__TDEHTML_USER_INPUT: " << valid_primitive << endl;
break;
case CSS_PROP__KHTML_MARQUEE: {
const int properties[5] = { CSS_PROP__KHTML_MARQUEE_DIRECTION, CSS_PROP__KHTML_MARQUEE_INCREMENT,
CSS_PROP__KHTML_MARQUEE_REPETITION,
CSS_PROP__KHTML_MARQUEE_STYLE, CSS_PROP__KHTML_MARQUEE_SPEED };
case CSS_PROP__TDEHTML_MARQUEE: {
const int properties[5] = { CSS_PROP__TDEHTML_MARQUEE_DIRECTION, CSS_PROP__TDEHTML_MARQUEE_INCREMENT,
CSS_PROP__TDEHTML_MARQUEE_REPETITION,
CSS_PROP__TDEHTML_MARQUEE_STYLE, CSS_PROP__TDEHTML_MARQUEE_SPEED };
return parseShortHand(propId, properties, 5, important);
}
case CSS_PROP__KHTML_MARQUEE_DIRECTION:
case CSS_PROP__TDEHTML_MARQUEE_DIRECTION:
if (id == CSS_VAL_FORWARDS || id == CSS_VAL_BACKWARDS || id == CSS_VAL_AHEAD ||
id == CSS_VAL_REVERSE || id == CSS_VAL_LEFT || id == CSS_VAL_RIGHT || id == CSS_VAL_DOWN ||
id == CSS_VAL_UP || id == CSS_VAL_AUTO)
valid_primitive = true;
break;
case CSS_PROP__KHTML_MARQUEE_INCREMENT:
case CSS_PROP__TDEHTML_MARQUEE_INCREMENT:
if (id == CSS_VAL_SMALL || id == CSS_VAL_LARGE || id == CSS_VAL_MEDIUM)
valid_primitive = true;
else
valid_primitive = validUnit(value, FLength|FPercent, strict&(!nonCSSHint));
break;
case CSS_PROP__KHTML_MARQUEE_STYLE:
case CSS_PROP__TDEHTML_MARQUEE_STYLE:
if (id == CSS_VAL_NONE || id == CSS_VAL_SLIDE || id == CSS_VAL_SCROLL || id == CSS_VAL_ALTERNATE ||
id == CSS_VAL_UNFURL)
valid_primitive = true;
break;
case CSS_PROP__KHTML_MARQUEE_REPETITION:
case CSS_PROP__TDEHTML_MARQUEE_REPETITION:
if (id == CSS_VAL_INFINITE)
valid_primitive = true;
else
valid_primitive = validUnit(value, FInteger|FNonNeg, strict&(!nonCSSHint));
break;
case CSS_PROP__KHTML_MARQUEE_SPEED:
case CSS_PROP__TDEHTML_MARQUEE_SPEED:
if (id == CSS_VAL_NORMAL || id == CSS_VAL_SLOW || id == CSS_VAL_FAST)
valid_primitive = true;
else
@@ -1137,11 +1137,11 @@ bool CSSParser::parseBackgroundShorthand(bool important)
{
// Position must come before color in this array because a plain old "0" is a legal color
// in quirks mode but it's usually the X coordinate of a position.
// FIXME: Add CSS_PROP__KHTML_BACKGROUND_SIZE to the shorthand.
// FIXME: Add CSS_PROP__TDEHTML_BACKGROUND_SIZE to the shorthand.
const int numProperties = 7;
const int properties[numProperties] = { CSS_PROP_BACKGROUND_IMAGE, CSS_PROP_BACKGROUND_REPEAT,
CSS_PROP_BACKGROUND_ATTACHMENT, CSS_PROP_BACKGROUND_POSITION, CSS_PROP__KHTML_BACKGROUND_CLIP,
CSS_PROP__KHTML_BACKGROUND_ORIGIN, CSS_PROP_BACKGROUND_COLOR };
CSS_PROP_BACKGROUND_ATTACHMENT, CSS_PROP_BACKGROUND_POSITION, CSS_PROP__TDEHTML_BACKGROUND_CLIP,
CSS_PROP__TDEHTML_BACKGROUND_ORIGIN, CSS_PROP_BACKGROUND_COLOR };

ShorthandScope scope(this, CSS_PROP_BACKGROUND);

@@ -1427,7 +1427,7 @@ CSSValueImpl* CSSParser::parseCounterContent(ValueList *args, bool counters)
if (i->unit != Value::Operator || i->iValue != ',') goto invalid;
i = args->next();
if (i->unit != CSSPrimitiveValue::CSS_IDENT) goto invalid;
if (i->id < CSS_VAL_DISC || i->id > CSS_VAL__KHTML_CLOSE_QUOTE) goto invalid;
if (i->id < CSS_VAL_DISC || i->id > CSS_VAL__TDEHTML_CLOSE_QUOTE) goto invalid;
counter->m_listStyle = i->id - CSS_VAL_DISC;
}
return new CSSPrimitiveValueImpl(counter);
@@ -1439,9 +1439,9 @@ invalid:
CSSValueImpl* CSSParser::parseBackgroundColor()
{
int id = valueList->current()->id;
if (id == CSS_VAL__KHTML_TEXT || id == CSS_VAL_TRANSPARENT ||
if (id == CSS_VAL__TDEHTML_TEXT || id == CSS_VAL_TRANSPARENT ||
(id >= CSS_VAL_AQUA && id <= CSS_VAL_WINDOWTEXT) || id == CSS_VAL_MENU ||
(id >= CSS_VAL_GREY && id < CSS_VAL__KHTML_TEXT && !strict))
(id >= CSS_VAL_GREY && id < CSS_VAL__TDEHTML_TEXT && !strict))
return new CSSPrimitiveValueImpl(id);
return parseColor();
}
@@ -1615,8 +1615,8 @@ bool CSSParser::parseBackgroundProperty(int propId, int& propId1, int& propId2,
if (currValue)
valueList->next();
break;
case CSS_PROP__KHTML_BACKGROUND_CLIP:
case CSS_PROP__KHTML_BACKGROUND_ORIGIN:
case CSS_PROP__TDEHTML_BACKGROUND_CLIP:
case CSS_PROP__TDEHTML_BACKGROUND_ORIGIN:
if (val->id == CSS_VAL_BORDER || val->id == CSS_VAL_PADDING || val->id == CSS_VAL_CONTENT) {
currValue = new CSSPrimitiveValueImpl(val->id);
valueList->next();
@@ -1646,7 +1646,7 @@ bool CSSParser::parseBackgroundProperty(int propId, int& propId1, int& propId2,
valueList->next();
}
break;
case CSS_PROP__KHTML_BACKGROUND_SIZE:
case CSS_PROP__TDEHTML_BACKGROUND_SIZE:
currValue = parseBackgroundSize();
if (currValue)
valueList->next();
@@ -2268,7 +2268,7 @@ bool CSSParser::parseShadow(int propId, bool important)
// The only other type of value that's ok is a color value.
CSSPrimitiveValueImpl* parsedColor = 0;
bool isColor = (val->id >= CSS_VAL_AQUA && val->id <= CSS_VAL_WINDOWTEXT || val->id == CSS_VAL_MENU ||
(val->id >= CSS_VAL_GREY && val->id <= CSS_VAL__KHTML_TEXT && !strict));
(val->id >= CSS_VAL_GREY && val->id <= CSS_VAL__TDEHTML_TEXT && !strict));
if (!context.allowColor)
return context.failed();


+ 15
- 15
tdehtml/css/cssproperties.c View File

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

+ 15
- 15
tdehtml/css/cssproperties.h View File

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

#define CSS_PROP_MAX CSS_PROP_Z_INDEX
#define CSS_PROP_TOTAL 130

+ 36
- 36
tdehtml/css/cssstyleselector.cpp View File

@@ -211,7 +211,7 @@ static PseudoState pseudoState;
CSSStyleSelector::CSSStyleSelector( DocumentImpl* doc, TQString userStyleSheet, StyleSheetListImpl *styleSheets,
const KURL &url, bool _strictParsing )
{
KHTMLView* view = doc->view();
TDEHTMLView* view = doc->view();

init(view ? view->part()->settings() : 0, doc);

@@ -273,14 +273,14 @@ CSSStyleSelector::CSSStyleSelector( CSSStyleSheetImpl *sheet )
{
init(0L, 0L);

KHTMLView *view = sheet->doc()->view();
TDEHTMLView *view = sheet->doc()->view();
m_medium = view ? view->mediaType() : "screen";

authorStyle = new CSSStyleSelectorList();
authorStyle->append( sheet, m_medium );
}

void CSSStyleSelector::init(const KHTMLSettings* _settings, DocumentImpl* doc)
void CSSStyleSelector::init(const TDEHTMLSettings* _settings, DocumentImpl* doc)
{
element = 0;
settings = _settings;
@@ -308,12 +308,12 @@ CSSStyleSelector::~CSSStyleSelector()

void CSSStyleSelector::addSheet( CSSStyleSheetImpl *sheet )
{
KHTMLView *view = sheet->doc()->view();
TDEHTMLView *view = sheet->doc()->view();
m_medium = view ? view->mediaType() : "screen";
authorStyle->append( sheet, m_medium );
}

void CSSStyleSelector::loadDefaultStyle(const KHTMLSettings *s, DocumentImpl *doc)
void CSSStyleSelector::loadDefaultStyle(const TDEHTMLSettings *s, DocumentImpl *doc)
{
if(s_defaultStyle) return;

@@ -883,9 +883,9 @@ static PseudoState checkPseudoState( const CSSStyleSelector::Encodedurl& encoded
cleanpath( u );
}
//completeURL( attr.string() );
bool contains = KHTMLFactory::vLinks()->contains( u );
bool contains = TDEHTMLFactory::vLinks()->contains( u );
if ( !contains && u.contains('/')==2 )
contains = KHTMLFactory::vLinks()->contains( u+'/' );
contains = TDEHTMLFactory::vLinks()->contains( u+'/' );
return contains ? PseudoVisited : PseudoLink;
}

@@ -2136,9 +2136,9 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
(!parentNode && value->cssValueType() == CSSValue::CSS_INHERIT);

// These properties are used to set the correct margins/padding on RTL lists.
if (id == CSS_PROP__KHTML_MARGIN_START)
if (id == CSS_PROP__TDEHTML_MARGIN_START)
id = style->direction() == LTR ? CSS_PROP_MARGIN_LEFT : CSS_PROP_MARGIN_RIGHT;
else if (id == CSS_PROP__KHTML_PADDING_START)
else if (id == CSS_PROP__TDEHTML_PADDING_START)
id = style->direction() == LTR ? CSS_PROP_PADDING_LEFT : CSS_PROP_PADDING_RIGHT;

// What follows is a list that maps the CSS properties into their corresponding front-end
@@ -2150,16 +2150,16 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
case CSS_PROP_BACKGROUND_ATTACHMENT:
HANDLE_BACKGROUND_VALUE(backgroundAttachment, BackgroundAttachment, value)
break;
case CSS_PROP__KHTML_BACKGROUND_CLIP:
case CSS_PROP__TDEHTML_BACKGROUND_CLIP:
HANDLE_BACKGROUND_VALUE(backgroundClip, BackgroundClip, value)
break;
case CSS_PROP__KHTML_BACKGROUND_ORIGIN:
case CSS_PROP__TDEHTML_BACKGROUND_ORIGIN:
HANDLE_BACKGROUND_VALUE(backgroundOrigin, BackgroundOrigin, value)
break;
case CSS_PROP_BACKGROUND_REPEAT:
HANDLE_BACKGROUND_VALUE(backgroundRepeat, BackgroundRepeat, value)
break;
case CSS_PROP__KHTML_BACKGROUND_SIZE:
case CSS_PROP__TDEHTML_BACKGROUND_SIZE:
HANDLE_BACKGROUND_VALUE(backgroundSize, BackgroundSize, value)
break;
case CSS_PROP_BORDER_COLLAPSE:
@@ -2181,27 +2181,27 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
case CSS_PROP_BORDER_TOP_STYLE:
HANDLE_INHERIT_AND_INITIAL_WITH_VALUE(borderTopStyle, BorderTopStyle, BorderStyle)
if (!primitiveValue) return;
style->setBorderTopStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__KHTML_NATIVE));
style->setBorderTopStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__TDEHTML_NATIVE));
break;
case CSS_PROP_BORDER_RIGHT_STYLE:
HANDLE_INHERIT_AND_INITIAL_WITH_VALUE(borderRightStyle, BorderRightStyle, BorderStyle)
if (!primitiveValue) return;
style->setBorderRightStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__KHTML_NATIVE));
style->setBorderRightStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__TDEHTML_NATIVE));
break;
case CSS_PROP_BORDER_BOTTOM_STYLE:
HANDLE_INHERIT_AND_INITIAL_WITH_VALUE(borderBottomStyle, BorderBottomStyle, BorderStyle)
if (!primitiveValue) return;
style->setBorderBottomStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__KHTML_NATIVE));
style->setBorderBottomStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__TDEHTML_NATIVE));
break;
case CSS_PROP_BORDER_LEFT_STYLE:
HANDLE_INHERIT_AND_INITIAL_WITH_VALUE(borderLeftStyle, BorderLeftStyle, BorderStyle)
if (!primitiveValue) return;
style->setBorderLeftStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__KHTML_NATIVE));
style->setBorderLeftStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__TDEHTML_NATIVE));
break;
case CSS_PROP_OUTLINE_STYLE:
HANDLE_INHERIT_AND_INITIAL_WITH_VALUE(outlineStyle, OutlineStyle, BorderStyle)
if (!primitiveValue) return;
style->setOutlineStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__KHTML_NATIVE));
style->setOutlineStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__TDEHTML_NATIVE));
break;
case CSS_PROP_CAPTION_SIDE:
{
@@ -2279,11 +2279,11 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
EFloat f;
switch(primitiveValue->getIdent())
{
case CSS_VAL__KHTML_LEFT:
case CSS_VAL__TDEHTML_LEFT:
f = FLEFT_ALIGN; break;
case CSS_VAL_LEFT:
f = FLEFT; break;
case CSS_VAL__KHTML_RIGHT:
case CSS_VAL__TDEHTML_RIGHT:
f = FRIGHT_ALIGN; break;
case CSS_VAL_RIGHT:
f = FRIGHT; break;
@@ -2659,8 +2659,8 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )

EWhiteSpace s;
switch(primitiveValue->getIdent()) {
case CSS_VAL__KHTML_NOWRAP:
s = KHTML_NOWRAP;
case CSS_VAL__TDEHTML_NOWRAP:
s = TDEHTML_NOWRAP;
break;
case CSS_VAL_NOWRAP:
s = NOWRAP;
@@ -2700,14 +2700,14 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
style->setBorderVerticalSpacing(parentStyle->borderVerticalSpacing());
break;
}
case CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING: {
case CSS_PROP__TDEHTML_BORDER_HORIZONTAL_SPACING: {
HANDLE_INHERIT_AND_INITIAL(borderHorizontalSpacing, BorderHorizontalSpacing)
if (!primitiveValue) break;
short spacing = primitiveValue->computeLength(style, paintDeviceMetrics);
style->setBorderHorizontalSpacing(spacing);
break;
}
case CSS_PROP__KHTML_BORDER_VERTICAL_SPACING: {
case CSS_PROP__TDEHTML_BORDER_VERTICAL_SPACING: {
HANDLE_INHERIT_AND_INITIAL(borderVerticalSpacing, BorderVerticalSpacing)
if (!primitiveValue) break;
short spacing = primitiveValue->computeLength(style, paintDeviceMetrics);
@@ -2759,7 +2759,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
return;
int ident = primitiveValue->getIdent();
if ( ident ) {
if ( ident == CSS_VAL__KHTML_TEXT )
if ( ident == CSS_VAL__TDEHTML_TEXT )
col = element->getDocument()->textColor();
// ### should be eliminated
else if ( ident == CSS_VAL_TRANSPARENT
@@ -3152,7 +3152,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
align = SUB; break;
case CSS_VAL_SUPER:
align = SUPER; break;
case CSS_VAL__KHTML_BASELINE_MIDDLE:
case CSS_VAL__TDEHTML_BASELINE_MIDDLE:
align = BASELINE_MIDDLE; break;
default:
return;
@@ -3210,7 +3210,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
case CSS_VAL_LARGE: size = int( fontSizes[4] ); break;
case CSS_VAL_X_LARGE: size = int( fontSizes[5] ); break;
case CSS_VAL_XX_LARGE: size = int( fontSizes[6] ); break;
case CSS_VAL__KHTML_XXX_LARGE: size = int( fontSizes[7] ); break;
case CSS_VAL__TDEHTML_XXX_LARGE: size = int( fontSizes[7] ); break;
case CSS_VAL_LARGER:
size = nextFontSize(fontSizes, oldSize, false);
break;
@@ -3326,7 +3326,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
HANDLE_INHERIT_AND_INITIAL(textAlign, TextAlign)
if (!primitiveValue) return;
if (primitiveValue->getIdent())
style->setTextAlign( (ETextAlign) (primitiveValue->getIdent() - CSS_VAL__KHTML_AUTO) );
style->setTextAlign( (ETextAlign) (primitiveValue->getIdent() - CSS_VAL__TDEHTML_AUTO) );
return;
}

@@ -3581,15 +3581,15 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
style->setTextDecoration(t);
break;
}
case CSS_PROP__KHTML_FLOW_MODE:
case CSS_PROP__TDEHTML_FLOW_MODE:
HANDLE_INHERIT_AND_INITIAL(flowAroundFloats, FlowAroundFloats)
if (!primitiveValue) return;
if (primitiveValue->getIdent()) {
style->setFlowAroundFloats( primitiveValue->getIdent() == CSS_VAL__KHTML_AROUND_FLOATS );
style->setFlowAroundFloats( primitiveValue->getIdent() == CSS_VAL__TDEHTML_AROUND_FLOATS );
return;
}
break;
case CSS_PROP__KHTML_USER_INPUT: {
case CSS_PROP__TDEHTML_USER_INPUT: {
if(value->cssValueType() == CSSValue::CSS_INHERIT)
{
if(!parentNode) return;
@@ -3843,7 +3843,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
// Clamp opacity to the range 0-1
style->setOpacity(kMin(1.0f, kMax(0.0f, (float)primitiveValue->floatValue(CSSPrimitiveValue::CSS_NUMBER))));
break;
case CSS_PROP__KHTML_MARQUEE:
case CSS_PROP__TDEHTML_MARQUEE:
if (value->cssValueType() != CSSValue::CSS_INHERIT || !parentNode) return;
style->setMarqueeDirection(parentStyle->marqueeDirection());
style->setMarqueeIncrement(parentStyle->marqueeIncrement());
@@ -3851,7 +3851,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
style->setMarqueeLoopCount(parentStyle->marqueeLoopCount());
style->setMarqueeBehavior(parentStyle->marqueeBehavior());
break;
case CSS_PROP__KHTML_MARQUEE_REPETITION: {
case CSS_PROP__TDEHTML_MARQUEE_REPETITION: {
HANDLE_INHERIT_AND_INITIAL(marqueeLoopCount, MarqueeLoopCount)
if (!primitiveValue) return;
if (primitiveValue->getIdent() == CSS_VAL_INFINITE)
@@ -3860,7 +3860,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
style->setMarqueeLoopCount((int)(primitiveValue->floatValue(CSSPrimitiveValue::CSS_NUMBER)));
break;
}
case CSS_PROP__KHTML_MARQUEE_SPEED: {
case CSS_PROP__TDEHTML_MARQUEE_SPEED: {
HANDLE_INHERIT_AND_INITIAL(marqueeSpeed, MarqueeSpeed)
if (!primitiveValue) return;
if (primitiveValue->getIdent()) {
@@ -3885,7 +3885,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
style->setMarqueeSpeed(int(primitiveValue->floatValue(CSSPrimitiveValue::CSS_NUMBER)));
break;
}
case CSS_PROP__KHTML_MARQUEE_INCREMENT: {
case CSS_PROP__TDEHTML_MARQUEE_INCREMENT: {
HANDLE_INHERIT_AND_INITIAL(marqueeIncrement, MarqueeIncrement)
if (!primitiveValue) return;
if (primitiveValue->getIdent()) {
@@ -3910,7 +3910,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
}
break;
}
case CSS_PROP__KHTML_MARQUEE_STYLE: {
case CSS_PROP__TDEHTML_MARQUEE_STYLE: {
HANDLE_INHERIT_AND_INITIAL(marqueeBehavior, MarqueeBehavior)
if (!primitiveValue || !primitiveValue->getIdent()) return;
switch (primitiveValue->getIdent())
@@ -3933,7 +3933,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
}
break;
}
case CSS_PROP__KHTML_MARQUEE_DIRECTION: {
case CSS_PROP__TDEHTML_MARQUEE_DIRECTION: {
HANDLE_INHERIT_AND_INITIAL(marqueeDirection, MarqueeDirection)
if (!primitiveValue || !primitiveValue->getIdent()) return;
switch (primitiveValue->getIdent())

+ 9
- 9
tdehtml/css/cssstyleselector.h View File

@@ -30,10 +30,10 @@
#include "dom/dom_string.h"
#include "xml/dom_restyler.h"

class KHTMLSettings;
class KHTMLView;
class KHTMLPart;
class KHTMLFactory;
class TDEHTMLSettings;
class TDEHTMLView;
class TDEHTMLPart;
class TDEHTMLFactory;
class KURL;

namespace DOM {
@@ -127,7 +127,7 @@ namespace tdehtml
KDE_EXPORT static void clear();
static void reparseConfiguration();

static void loadDefaultStyle(const KHTMLSettings *s, DOM::DocumentImpl *doc);
static void loadDefaultStyle(const TDEHTMLSettings *s, DOM::DocumentImpl *doc);

RenderStyle *styleForElement(DOM::ElementImpl *e);

@@ -189,7 +189,7 @@ namespace tdehtml
public:

private:
void init(const KHTMLSettings* settings, DOM::DocumentImpl* doc);
void init(const TDEHTMLSettings* settings, DOM::DocumentImpl* doc);

void mapBackgroundAttachment(BackgroundLayer* layer, DOM::CSSValueImpl* value);
void mapBackgroundClip(BackgroundLayer* layer, DOM::CSSValueImpl* value);
@@ -246,9 +246,9 @@ public:
RenderStyle *parentStyle;
DOM::ElementImpl *element;
DOM::NodeImpl *parentNode;
KHTMLView *view;
KHTMLPart *part;
const KHTMLSettings *settings;
TDEHTMLView *view;
TDEHTMLPart *part;
const TDEHTMLSettings *settings;
TQPaintDeviceMetrics *paintDeviceMetrics;
TQValueVector<int> m_fontSizes;
TQValueVector<int> m_fixedFontSizes;

+ 27
- 27
tdehtml/css/cssvalues.c View File

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

static const short lookup[] =

+ 27
- 27
tdehtml/css/cssvalues.h View File

@@ -11,7 +11,7 @@ DOM::DOMString getValueName(unsigned short id) KDE_NO_EXPORT;
#define CSS_VAL_MIN 1
#define CSS_VAL_INHERIT 1
#define CSS_VAL_INITIAL 2
#define CSS_VAL__KHTML_NATIVE 3
#define CSS_VAL__TDEHTML_NATIVE 3
#define CSS_VAL_NONE 4
#define CSS_VAL_HIDDEN 5
#define CSS_VAL_INSET 6
@@ -51,7 +51,7 @@ DOM::DOMString getValueName(unsigned short id) KDE_NO_EXPORT;
#define CSS_VAL_LARGE 40
#define CSS_VAL_X_LARGE 41
#define CSS_VAL_XX_LARGE 42
#define CSS_VAL__KHTML_XXX_LARGE 43
#define CSS_VAL__TDEHTML_XXX_LARGE 43
#define CSS_VAL_SMALLER 44
#define CSS_VAL_LARGER 45
#define CSS_VAL_WIDER 46
@@ -117,7 +117,7 @@ DOM::DOMString getValueName(unsigned short id) KDE_NO_EXPORT;
#define CSS_VAL_WINDOWFRAME 106
#define CSS_VAL_WINDOWTEXT 107
#define CSS_VAL_GREY 108
#define CSS_VAL__KHTML_TEXT 109
#define CSS_VAL__TDEHTML_TEXT 109
#define CSS_VAL_REPEAT 110
#define CSS_VAL_REPEAT_X 111
#define CSS_VAL_REPEAT_Y 112
@@ -130,44 +130,44 @@ DOM::DOMString getValueName(unsigned short id) KDE_NO_EXPORT;
#define CSS_VAL_TEXT_BOTTOM 119
#define CSS_VAL_TOP 120
#define CSS_VAL_BOTTOM 121
#define CSS_VAL__KHTML_BASELINE_MIDDLE 122
#define CSS_VAL__KHTML_AUTO 123
#define CSS_VAL__TDEHTML_BASELINE_MIDDLE 122
#define CSS_VAL__TDEHTML_AUTO 123
#define CSS_VAL_LEFT 124
#define CSS_VAL_RIGHT 125
#define CSS_VAL_CENTER 126
#define CSS_VAL_JUSTIFY 127
#define CSS_VAL__KHTML_LEFT 128
#define CSS_VAL__KHTML_RIGHT 129
#define CSS_VAL__KHTML_CENTER 130
#define CSS_VAL__TDEHTML_LEFT 128
#define CSS_VAL__TDEHTML_RIGHT 129
#define CSS_VAL__TDEHTML_CENTER 130
#define CSS_VAL_OUTSIDE 131
#define CSS_VAL_INSIDE 132
#define CSS_VAL_DISC 133
#define CSS_VAL_CIRCLE 134
#define CSS_VAL_SQUARE 135
#define CSS_VAL_BOX 136
#define CSS_VAL__KHTML_DIAMOND 137
#define CSS_VAL__TDEHTML_DIAMOND 137
#define CSS_VAL_DECIMAL 138
#define CSS_VAL_DECIMAL_LEADING_ZERO 139
#define CSS_VAL__KHTML_ARABIC_INDIC 140
#define CSS_VAL__KHTML_LAO 141
#define CSS_VAL__KHTML_PERSIAN 142
#define CSS_VAL__KHTML_URDU 143
#define CSS_VAL__KHTML_THAI 144
#define CSS_VAL__KHTML_TIBETAN 145
#define CSS_VAL__TDEHTML_ARABIC_INDIC 140
#define CSS_VAL__TDEHTML_LAO 141
#define CSS_VAL__TDEHTML_PERSIAN 142
#define CSS_VAL__TDEHTML_URDU 143
#define CSS_VAL__TDEHTML_THAI 144
#define CSS_VAL__TDEHTML_TIBETAN 145
#define CSS_VAL_LOWER_ROMAN 146
#define CSS_VAL_UPPER_ROMAN 147
#define CSS_VAL_HEBREW 148
#define CSS_VAL_ARMENIAN 149
#define CSS_VAL_GEORGIAN 150
#define CSS_VAL_CJK_IDEOGRAPHIC 151
#define CSS_VAL__KHTML_JAPANESE_FORMAL 152
#define CSS_VAL__KHTML_JAPANESE_INFORMAL 153
#define CSS_VAL__KHTML_SIMP_CHINESE_FORMAL 154
#define CSS_VAL__KHTML_SIMP_CHINESE_INFORMAL 155
#define CSS_VAL__KHTML_TRAD_CHINESE_FORMAL 156
#define CSS_VAL__KHTML_TRAD_CHINESE_INFORMAL 157
#define CSS_VAL__TDEHTML_JAPANESE_FORMAL 152
#define CSS_VAL__TDEHTML_JAPANESE_INFORMAL 153
#define CSS_VAL__TDEHTML_SIMP_CHINESE_FORMAL 154
#define CSS_VAL__TDEHTML_SIMP_CHINESE_INFORMAL 155
#define CSS_VAL__TDEHTML_TRAD_CHINESE_FORMAL 156
#define CSS_VAL__TDEHTML_TRAD_CHINESE_INFORMAL 157
#define CSS_VAL_LOWER_GREEK 158
#define CSS_VAL__KHTML_UPPER_GREEK 159
#define CSS_VAL__TDEHTML_UPPER_GREEK 159
#define CSS_VAL_LOWER_ALPHA 160
#define CSS_VAL_LOWER_LATIN 161
#define CSS_VAL_UPPER_ALPHA 162
@@ -176,8 +176,8 @@ DOM::DOMString getValueName(unsigned short id) KDE_NO_EXPORT;
#define CSS_VAL_KATAKANA 165
#define CSS_VAL_HIRAGANA_IROHA 166
#define CSS_VAL_KATAKANA_IROHA 167
#define CSS_VAL__KHTML_OPEN_QUOTE 168
#define CSS_VAL__KHTML_CLOSE_QUOTE 169
#define CSS_VAL__TDEHTML_OPEN_QUOTE 168
#define CSS_VAL__TDEHTML_CLOSE_QUOTE 169
#define CSS_VAL_INLINE 170
#define CSS_VAL_BLOCK 171
#define CSS_VAL_LIST_ITEM 172
@@ -226,7 +226,7 @@ DOM::DOMString getValueName(unsigned short id) KDE_NO_EXPORT;
#define CSS_VAL_PRE 215
#define CSS_VAL_PRE_WRAP 216
#define CSS_VAL_PRE_LINE 217
#define CSS_VAL__KHTML_NOWRAP 218
#define CSS_VAL__TDEHTML_NOWRAP 218
#define CSS_VAL_BREAK_WORD 219
#define CSS_VAL_ABOVE 220
#define CSS_VAL_ABSOLUTE 221
@@ -261,8 +261,8 @@ DOM::DOMString getValueName(unsigned short id) KDE_NO_EXPORT;
#define CSS_VAL_THICK 250
#define CSS_VAL_THIN 251
#define CSS_VAL_UNDERLINE 252
#define CSS_VAL__KHTML_NORMAL 253
#define CSS_VAL__KHTML_AROUND_FLOATS 254
#define CSS_VAL__TDEHTML_NORMAL 253
#define CSS_VAL__TDEHTML_AROUND_FLOATS 254
#define CSS_VAL_BORDER_BOX 255
#define CSS_VAL_CONTENT_BOX 256
#define CSS_VAL_ENABLED 257

+ 3
- 3
tdehtml/css/cssvalues.in View File

@@ -350,16 +350,16 @@ thick
thin
underline
#
# CSS_PROP__KHTML_FLOW_MODE
# CSS_PROP__TDEHTML_FLOW_MODE
-tdehtml-normal
-tdehtml-around-floats

# CSS3 Values
# CSS_PROP__KHTML_BOX_SIZING
# CSS_PROP__TDEHTML_BOX_SIZING
border-box
content-box

# CSS_PROP__KHTML_USER_INPUT
# CSS_PROP__TDEHTML_USER_INPUT
enabled
disabled
#none

+ 7
- 7
tdehtml/css/parser.cpp View File

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

+ 6
- 6
tdehtml/css/parser.h View File

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

+ 6
- 6
tdehtml/css/parser.y View File

@@ -164,9 +164,9 @@ static int cssyylex( YYSTYPE *yylval ) {
%token FONT_FACE_SYM
%token CHARSET_SYM
%token NAMESPACE_SYM
%token KHTML_RULE_SYM
%token KHTML_DECLS_SYM
%token KHTML_VALUE_SYM
%token TDEHTML_RULE_SYM
%token TDEHTML_DECLS_SYM
%token TDEHTML_VALUE_SYM

%token IMPORTANT_SYM

@@ -261,20 +261,20 @@ stylesheet:
;

tdehtml_rule:
KHTML_RULE_SYM '{' maybe_space ruleset maybe_space '}' {
TDEHTML_RULE_SYM '{' maybe_space ruleset maybe_space '}' {
CSSParser *p = static_cast<CSSParser *>(parser);
p->rule = $4;
}
;

tdehtml_decls:
KHTML_DECLS_SYM declaration_block {
TDEHTML_DECLS_SYM declaration_block {
/* can be empty */
}
;

tdehtml_value:
KHTML_VALUE_SYM '{' maybe_space expr '}' {
TDEHTML_VALUE_SYM '{' maybe_space expr '}' {
CSSParser *p = static_cast<CSSParser *>(parser);
if ( $4 ) {
p->valueList = $4;

+ 3
- 3
tdehtml/css/tokenizer.cpp View File

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

+ 3
- 3
tdehtml/css/tokenizer.flex View File

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

"!"{w}"important" {yyTok = IMPORTANT_SYM; return yyTok;}


+ 1
- 1
tdehtml/design.h View File

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

+ 10
- 10
tdehtml/dom/css_rule.h View File

@@ -49,7 +49,7 @@ class CSSRuleImpl;
* interface.
*
*/
class KHTML_EXPORT CSSRule
class TDEHTML_EXPORT CSSRule
{
public:
CSSRule();
@@ -72,7 +72,7 @@ public:
MEDIA_RULE = 4,
FONT_FACE_RULE = 5,
PAGE_RULE = 6,
QUIRKS_RULE = 100 // KHTML CSS Extension
QUIRKS_RULE = 100 // TDEHTML CSS Extension
};

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

+ 7
- 7
tdehtml/dom/css_stylesheet.h View File

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

class LinkStyleImpl;

class KHTML_EXPORT LinkStyle
class TDEHTML_EXPORT LinkStyle
{
public:
LinkStyle();
@@ -466,7 +466,7 @@ protected:

class DocumentStyleImpl;

class KHTML_EXPORT DocumentStyle
class TDEHTML_EXPORT DocumentStyle
{
public:
DocumentStyle();

+ 7
- 7
tdehtml/dom/css_value.h View File

@@ -57,7 +57,7 @@ class CSSValue;
* interface.