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.
351 351
 
352 352
 tdehtmlw has been replaced with tdehtml.<BR>
353 353
 <UL>
354
-	<LI>KHTMLView has vanished. Just use KHTMLWidget, which does scrollbar
354
+	<LI>TDEHTMLView has vanished. Just use TDEHTMLWidget, which does scrollbar
355 355
   managing for free.
356 356
 
357 357
 	<LI>A lot of the API has changed. If you just want to open a file/URL,
358 358
   you just need to do:<P>
359 359
   <PRE>
360
-	KHTMLWidget *w = new KHTMLWidget();
360
+	TDEHTMLWidget *w = new TDEHTMLWidget();
361 361
 	w-&gt;openURL(myURL);
362 362
   </PRE>
363 363
 
@@ -367,18 +367,18 @@ tdehtmlw has been replaced with tdehtml.<BR>
367 367
      const char * -&gt; QString
368 368
      TQStrList -&gt; QStringList
369 369
   </PRE>
370
-  The only exception for the moment is KHTMLWidget::write(), which does
370
+  The only exception for the moment is TDEHTMLWidget::write(), which does
371 371
   also exist in a const char * version.<P>
372 372
 
373 373
 
374
-<LI>you won't need the getKHTMLWiget function anymore. Just replace
375
-	getKHTMLWidget-&gt;xxx() with xxx()<P>
374
+<LI>you won't need the getTDEHTMLWiget function anymore. Just replace
375
+	getTDEHTMLWidget-&gt;xxx() with xxx()<P>
376 376
 <LI>xxx(TQString) -&gt; xxx(const TQString &amp;)<P>
377 377
 <LI>consistent naming. All getXyz() functions are renamed to xyz()<P>
378 378
 <LI>replaced/changed functions:<P>
379 379
 <TABLE BORDER="1">
380 380
 <TR>
381
-<TD>KHTMLWidget::setDefaultFontBase()</TD>
381
+<TD>TDEHTMLWidget::setDefaultFontBase()</TD>
382 382
 <TD>-&gt; setFontSizes()</TD>
383 383
 </TR>
384 384
 <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>
22 22
 <LI><A HREF="#kio">Changes in kio</A></LI>
23 23
 <LI><A HREF="#tdeparts">Changes in tdeparts</A></LI>
24 24
 <LI><A HREF="#tdespell">Changes in tdespell</A></LI>
25
-<LI><A HREF="#tdehtmlpart">API-cleanup in KHTML</A></LI>
25
+<LI><A HREF="#tdehtmlpart">API-cleanup in TDEHTML</A></LI>
26 26
 <LI><A HREF="#tdefile">Changes in tdefile</A></LI>
27 27
 <LI><A HREF="#kcontrol">TDE Control Center</A></LI>
28 28
 <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
495 495
 
496 496
 <H4><P ALIGN="RIGHT"><A HREF="#TOC">Return to the Table of Contents</A></P></H4>
497 497
 
498
-<H3><A NAME="tdehtmlpart">API-cleanups in KHTML</A></H3>
498
+<H3><A NAME="tdehtmlpart">API-cleanups in TDEHTML</A></H3>
499 499
 
500
-There were a few relatively minor API-adjustements in KHTMLPart. In particular:
500
+There were a few relatively minor API-adjustements in TDEHTMLPart. In particular:
501 501
 <ul><li>enableJScript(bool) has been replaced by setJScriptEnabled(bool)
502 502
 <li>enableJava(bool) has been replaced by setJavaEnabled(bool)
503 503
 <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:
505 505
 <li>enableMetaRefresh(bool) has been replaced by setMetaRefreshEnabled(bool)
506 506
 <li>setBaseURL and setBaseTarget have been removed. baseURL(), baseTarget() and
507 507
 completeURL() are remained for compatibility reasons, but they're deprecated now. use the variants in DOM::HTMLDocument() instead.
508
-<li>the second parameter of KHTMLPart::completeURL is removed. it didn't have
508
+<li>the second parameter of TDEHTMLPart::completeURL is removed. it didn't have
509 509
    any effect before either.
510 510
 </ul>
511 511
 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.
513 513
 As they were marked as becoming private already you should not experience
514 514
 any problems. Backward compatibility exists for the common methods, to
515 515
 disable this use a #define KDE_NO_COMPAT.
516
-<p>In KHTMLView, the following changes were done:
516
+<p>In TDEHTMLView, the following changes were done:
517 517
 <ul>
518 518
 <li>gotoNextLink has been replaced by gotoLink(true);
519 519
 <li>gotoPrevLink has been replaced by gotoLink(false);

+ 1
- 1
TODO View File

@@ -223,7 +223,7 @@ an alternative help->contents action)
223 223
 
224 224
 - Move KRichTextLabel into tdeui if still required with Qt 4.
225 225
 
226
-- Add the concept of a session to KIO, in particular for KHTML so that it can
226
+- Add the concept of a session to KIO, in particular for TDEHTML so that it can
227 227
   have all of its jobs associated in some way (a unique key of sorts).  Will
228 228
   make SSL much easier to implement and allow removal of many hacks, mostly
229 229
   involving metadata.

+ 1
- 1
configure.in.in View File

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

+ 1
- 1
kjs/README View File

@@ -13,7 +13,7 @@ for the standard page.
13 13
 About 95% of the required features should be covered by now. Note that this
14 14
 number covers the core language elements only. Features like the famous
15 15
 roll-over buttons on the www are NOT part of the standard. Those extensions
16
-are added via a module loaded dynamically by the KHTML Widget.
16
+are added via a module loaded dynamically by the TDEHTML Widget.
17 17
 
18 18
 I'll provide some examples of how to extend this library for various needs at
19 19
 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,
1357 1357
 bool KeramikStyle::isFormWidget(const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget* widget) const
1358 1358
 {
1359 1359
 	if (widget) {
1360
-		//Form widgets are in the KHTMLView, but that has 2 further inner levels
1360
+		//Form widgets are in the TDEHTMLView, but that has 2 further inner levels
1361 1361
 		//of widgets - QClipperWidget, and outside of that, QViewportWidget
1362 1362
 		TQWidget* potentialClipPort = widget->parentWidget();
1363 1363
 		if ((ceData.parentWidgetData.widgetObjectTypes.isEmpty()) && (ceData.parentWidgetFlags & CEF_IsTopLevel)) {
@@ -1369,9 +1369,9 @@ bool KeramikStyle::isFormWidget(const TQStyleControlElementData &ceData, const C
1369 1369
 				qstrcmp(potentialViewPort->name(), "qt_viewport") )
1370 1370
 			return false;
1371 1371
 	
1372
-		TQWidget* potentialKHTML  = potentialViewPort->parentWidget();
1373
-		if (!potentialKHTML || potentialKHTML->isTopLevel() ||
1374
-				qstrcmp(potentialKHTML->className(), "KHTMLView") )
1372
+		TQWidget* potentialTDEHTML  = potentialViewPort->parentWidget();
1373
+		if (!potentialTDEHTML || potentialTDEHTML->isTopLevel() ||
1374
+				qstrcmp(potentialTDEHTML->className(), "TDEHTMLView") )
1375 1375
 			return false;
1376 1376
 	
1377 1377
 	

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


+ 1
- 1
tdecore/tdelibs_export.h View File

@@ -46,7 +46,7 @@
46 46
 #define KVCARD_EXPORT KDE_EXPORT
47 47
 #define KRESOURCES_EXPORT KDE_EXPORT
48 48
 #define KSTYLE_EXPORT KDE_EXPORT
49
-#define KHTML_EXPORT KDE_EXPORT
49
+#define TDEHTML_EXPORT KDE_EXPORT
50 50
 #define KMDI_EXPORT KDE_EXPORT
51 51
 #define KUTILS_EXPORT KDE_EXPORT
52 52
 #define KATEPARTINTERFACES_EXPORT KDE_EXPORT

+ 16
- 16
tdehtml/ChangeLog View File

@@ -243,7 +243,7 @@
243 243
         stalled layout flags problems - #121653). (updateWidgetMasks): mask the content box, not the border box.
244 244
         (enclosingStackingContext) new. Returns the layer defining current stacking context.
245 245
 
246
-        * rendering/render_replaced.{h,cpp} (isKHTMLWidget): new flag for KHTML-proxied widgets.
246
+        * rendering/render_replaced.{h,cpp} (isTDEHTMLWidget): new flag for TDEHTML-proxied widgets.
247 247
         (detach/resizeWidget/setQWidget/layout/updateFromElement/slotWidgetDestructed/setStyle/paint): use the flag insead of strcmp's
248 248
         Only allow !tdehtml widgets to register in the view (only those need masking).
249 249
 
@@ -473,7 +473,7 @@
473 473
 
474 474
 2005-08-10  Dawit Alemayehu <adawit@kde.org>
475 475
         * ecma/xmlhttprequest.cpp: Convert a 304 (Not Modified) HTTP response in
476
-          XMLHttpRequest to a 200 (OK) response to make KHTML conform to IE's and
476
+          XMLHttpRequest to a 200 (OK) response to make TDEHTML conform to IE's and
477 477
           Mozilla's behavior. BUG: 110272
478 478
 
479 479
         * ecma/xmlhttprequest.cpp: Factored out the HTTP status line parsing code
@@ -510,7 +510,7 @@
510 510
         replace them with the "blocked" pixmap.)
511 511
 
512 512
         * tdehtml_part.{cpp,h}: Added runAdFilters() function which is called from reparseConfiguration()
513
-        * tdehtml_ext.cpp: Call KHTMLPart::reparseConfiguration() after adding new filters.
513
+        * tdehtml_ext.cpp: Call TDEHTMLPart::reparseConfiguration() after adding new filters.
514 514
         * misc/loader.cpp: Create blockedPixmap in Cache::init() instead of the CachedImage constructor.
515 515
 
516 516
 2005-07-19  Allan Sandfeld Jensen <kde@carewolf.com>
@@ -528,7 +528,7 @@
528 528
 
529 529
         * tdehtml_ext.{cpp,h}: Added "blockiframe" to context popup menu
530 530
         * tdehtml_popupmenu.rc: Same
531
-        * tdehtml_part.h: added KHTMLPopupGUIClient to friend classes
531
+        * tdehtml_part.h: added TDEHTMLPopupGUIClient to friend classes
532 532
 
533 533
 2005-07-08  Germain Garand  <germain@ebooksfrance.org>
534 534
 
@@ -544,11 +544,11 @@
544 544
 
545 545
 2005-07-07  Allan Sandfeld Jensen <kde@carewolf.com>
546 546
 
547
-        There is nothing KHTML specific about keypress events. They might not be DOM2 or 3,
547
+        There is nothing TDEHTML specific about keypress events. They might not be DOM2 or 3,
548 548
         but MSIE, Mozilla and Safari all handles them as a valid event class.
549 549
 
550 550
         * xml/dom2_eventsimpl.{h,cpp}: Allow KEYPRESS as a valid event type
551
-        * ./.: Rename KHTML_KEYPRESS_EVENT to KEYPRESS_EVENT
551
+        * ./.: Rename TDEHTML_KEYPRESS_EVENT to KEYPRESS_EVENT
552 552
 
553 553
 2005-07-05  Allan Sandfeld Jensen <kde@carewolf.com>
554 554
 
@@ -1969,7 +1969,7 @@
1969 1969
 
1970 1970
 2004-07-28  Leo Savernik  <l.savernik@aon.at>
1971 1971
 
1972
-	* tdehtmlview.{cpp,h} (KHTMLToolTip::maybeTip): Query <area> elements
1972
+	* tdehtmlview.{cpp,h} (TDEHTMLToolTip::maybeTip): Query <area> elements
1973 1973
 	of image maps.
1974 1974
 	(dispatchMouseEvent): Added parameter innerNonSharedNode.
1975 1975
 	* tdehtml_part.{cpp,h}: Added method nonSharedNodeUnderMouse.
@@ -1978,7 +1978,7 @@
1978 1978
 	* xml/dom_nodeimpl.h: Added innerNonSharedNode to
1979 1979
 	NodeImpl::MouseEvent.
1980 1980
 	* html/html_imageimpl.h: Added cachedRegion() for being able to
1981
-	retrieve the region in KHTMLToolTip.
1981
+	retrieve the region in TDEHTMLToolTip.
1982 1982
 
1983 1983
 2004-07-20  Stephan Kulow  <coolo@kde.org>
1984 1984
 
@@ -2297,7 +2297,7 @@
2297 2297
 
2298 2298
 2004-05-06  Tobias Anton  <anton@stud.fbi.fh-darmstadt.de>
2299 2299
 
2300
-	* html/htmlparser.cpp (class KHTMLParser): use setCurrent() after reset()
2300
+	* html/htmlparser.cpp (class TDEHTMLParser): use setCurrent() after reset()
2301 2301
 	to avoid a memleak whenever the parser is used on a DocumentFragment.
2302 2302
 
2303 2303
 2004-05-04  Leo Savernik  <l.savernik@aon.at>
@@ -2370,8 +2370,8 @@
2370 2370
 	Added classes CaretBox, CaretBoxLine, CaretBoxIterator,
2371 2371
 	EditableCaretBoxIterator. Changed every other class.
2372 2372
 
2373
-	* tdehtmlview.[cpp,h}: (class KHTMLView) Adapt to tdehtml_caret* changes.
2374
-	(KHTMLToolTip::maybeTip) Save tooltip position instead of recalculating it.
2373
+	* tdehtmlview.[cpp,h}: (class TDEHTMLView) Adapt to tdehtml_caret* changes.
2374
+	(TDEHTMLToolTip::maybeTip) Save tooltip position instead of recalculating it.
2375 2375
 
2376 2376
 	* rendering/render_{inline,box}.{cpp,h}: (Render{Box,Inline}::caretPos)
2377 2377
 	Handle outside caret positions.
@@ -2508,7 +2508,7 @@
2508 2508
 	* ecma/xmlhttprequest.h/cpp: Implement asynchronous interface
2509 2509
 	enough to pass the tests on http://www.mozilla.org/xmlextras/tests.html
2510 2510
 
2511
-	* xml/dom2_eventsimpl.h (EventImpl): rename KHTML_KEYUP/DOWN_EVENT
2511
+	* xml/dom2_eventsimpl.h (EventImpl): rename TDEHTML_KEYUP/DOWN_EVENT
2512 2512
 	to KEYUP/DOWN_EVENT. Add events needed for XMLHttpRequest.
2513 2513
 
2514 2514
 	* rendering/render_object.h (class RenderObject): introduce a PaintInfo
@@ -2526,7 +2526,7 @@
2526 2526
 	* tdehtml_part.cpp/.h (openURL): In case the call is a reload, do a stat
2527 2527
 	on the user-defined stylesheet and reload it in case it changed in
2528 2528
 	the meanwhile (#39962).
2529
-	* tdehtmlpart_p.h (class KHTMLPartPrivate): Added
2529
+	* tdehtmlpart_p.h (class TDEHTMLPartPrivate): Added
2530 2530
 	m_userStyleSheetLastModified variable which keeps track of the
2531 2531
 	mtime of the user-defined sheet.
2532 2532
 
@@ -2825,7 +2825,7 @@
2825 2825
 
2826 2826
 2004-01-18  Dirk Mueller  <mueller@kde.org>
2827 2827
 
2828
-	* tdehtmlpart_p.h (class KHTMLPartPrivate): experimental:
2828
+	* tdehtmlpart_p.h (class TDEHTMLPartPrivate): experimental:
2829 2829
 	copy encoding information from parent frame. helps on
2830 2830
 	http://www.pfl.ru/ when manually setting the correct encoding.
2831 2831
 
@@ -3835,7 +3835,7 @@
3835 3835
 	to make the one call entering a local event loop the last, so that we can
3836 3836
 	cleanly exit when it the view is already deleted.
3837 3837
 
3838
-	* tdehtml_ext.cpp (KHTMLPopupGUIClient): pass QObject parent
3838
+	* tdehtml_ext.cpp (TDEHTMLPopupGUIClient): pass QObject parent
3839 3839
 
3840 3840
 2003-10-05  Dirk Mueller  <mueller@kde.org>
3841 3841
 
@@ -3852,7 +3852,7 @@
3852 3852
 
3853 3853
 2003-10-04  Dirk Mueller  <mueller@kde.org>
3854 3854
 
3855
-	* html/htmlparser.h (class KHTMLParser): keep "current" NodeImpl referenced
3855
+	* html/htmlparser.h (class TDEHTMLParser): keep "current" NodeImpl referenced
3856 3856
 	to avoid ugly crashes when DHTML deletes the node while we're still parsing.
3857 3857
 	#57020, testcase alja.html
3858 3858
 

+ 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.
15 15
 </p>
16 16
 <p>
17 17
 The library is build up out of several different parts. Basically, when you use the lib, you
18
-create an instance of a KHTMLPart, and feed data to it. That's more or less all you need to 
18
+create an instance of a TDEHTMLPart, and feed data to it. That's more or less all you need to 
19 19
 know if you want to use tdehtml for another application. If you want to start hacking tdehtml,
20 20
 here's a sketch of the objects that will get constructed, when eg. running testtdehtml with
21 21
 a url argument.
@@ -52,8 +52,8 @@ compatible to IE.
52 52
 </blockquote>
53 53
 
54 54
 <p>
55
-<a href="tdehtml_part.h">KHTMLPart</a> creates one instance of a
56
-<a href="tdehtmlview.h">KHTMLView</a> (derived from TQScrollView),
55
+<a href="tdehtml_part.h">TDEHTMLPart</a> creates one instance of a
56
+<a href="tdehtmlview.h">TDEHTMLView</a> (derived from TQScrollView),
57 57
 the widget showing the whole thing.  At the same time a DOM tree
58 58
 is built up from the HTML or XML found in the specified file.
59 59
 <p>
@@ -173,7 +173,7 @@ classes. In the implementation classes we have added a few more intermediate cla
173 173
 not be seen from the outside for various reasons (make implementation of shared features easier
174 174
 or to reduce memory consumption).
175 175
 <p>
176
-In C++, you can access the whole DOM tree from outside KHTML by using the interface classes. 
176
+In C++, you can access the whole DOM tree from outside TDEHTML by using the interface classes. 
177 177
 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>.
178 178
 
179 179
 One thing that has been omitted in the discussion above is the style sheet defined inside the 
@@ -261,8 +261,8 @@ RenderRoot*
261 261
 A call to of <a href="rendering/render_root.cpp">layout()</a> on the
262 262
 <a href="rendering/render_root.h">RenderRoot </a> (the root of the rendering tree)
263 263
 object causes the rendering tree to layout itself into the available space
264
-(width) given by the the KHTMLView. After that, the drawContents() method of
265
-KHTMLView can call RenderRoot->print() with appropriate parameters to actually
264
+(width) given by the the TDEHTMLView. After that, the drawContents() method of
265
+TDEHTMLView can call RenderRoot->print() with appropriate parameters to actually
266 266
 paint the document. This is not 100% correct, when parsing incrementally, but
267 267
 is exactly what happens when you resize the document.
268 268
 
@@ -301,7 +301,7 @@ the definition of the objects used in the rendering tree, the layouting code, an
301 301
 
302 302
 <h2>Exception handling</h2>
303 303
 To save on library size, C++-exceptions are only enabled in the dom/ subdirectory,
304
-since exceptions are mandated by the DOM API. In the rest of KHTML's code,
304
+since exceptions are mandated by the DOM API. In the rest of TDEHTML's code,
305 305
 we pass an error flag (usually called "exceptionCode"), and the class that
306 306
 is part of dom/* checks for this flag and throws the exception.
307 307
   

+ 6
- 6
tdehtml/Mainpage.dox View File

@@ -1,19 +1,19 @@
1 1
 /** @mainpage Trinity HTML Parser and Widget
2 2
 
3 3
 If you want a fully-fledged HTML browser widget in your application,
4
-you can use KHTMLPart to do so.
4
+you can use TDEHTMLPart to do so.
5 5
 
6 6
 @code
7 7
 KUrl url = "http://www.trinitydesktop.org";
8
-KHTMLPart *w = new KHTMLPart();
8
+TDEHTMLPart *w = new TDEHTMLPart();
9 9
 w->openUrl(url);
10 10
 w->view()->resize(500, 400);
11 11
 w->show();
12 12
 @endcode
13 13
 
14
-For more information, see the documentation for KHTMLPart.
14
+For more information, see the documentation for TDEHTMLPart.
15 15
 
16
-Note that using KHTMLPart may introduce security vulnerabilities
16
+Note that using TDEHTMLPart may introduce security vulnerabilities
17 17
 and unnecessary bloat to your application.  Qt's text widgets are
18 18
 rich-text capable, and will interpret a limited subset of HTML.
19 19
 
@@ -30,7 +30,7 @@ George Staikos \<staikos@kde.org\><br>
30 30
 Allan Sandfeld Jensen \<kde@carewolf.com\><br>
31 31
 Germain Garand \<germain@ebooksfrance.org\><br>
32 32
 Maksim Orlovich \<maksim@kde.org\><br>
33
-KHTML has also heavily benefited from the work of Apple Computer, Inc.
33
+TDEHTML has also heavily benefited from the work of Apple Computer, Inc.
34 34
 @maintainers
35 35
 Allan Sandfeld Jensen <br>
36 36
 Germain Garand<br>
@@ -42,5 +42,5 @@ Maksim Orlovich
42 42
 */
43 43
 // DOXYGEN_REFERENCES = tdecore tdeui kio tdeparts kjs
44 44
 // DOXYGEN_EXCLUDE =  test*.* html rendering xml misc ecma css imload pics test 
45
-// DOXYGEN_SET_PROJECT_NAME = KHTML
45
+// DOXYGEN_SET_PROJECT_NAME = TDEHTML
46 46
 // 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:
43 43
    .
44 44
    .
45 45
 
46
-    KHTMLWidget *view = new KHTMLWidget( parent, "Name" );
46
+    TDEHTMLWidget *view = new TDEHTMLWidget( parent, "Name" );
47 47
 	view->show();
48 48
 
49 49
 	view->begin( "file:/tmp/test.html" );

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

@@ -41,8 +41,8 @@ static const int computedProperties[] = {
41 41
     CSS_PROP_BACKGROUND_POSITION_Y,
42 42
     CSS_PROP_BORDER_COLLAPSE,
43 43
     CSS_PROP_BORDER_SPACING,
44
-    CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING,
45
-    CSS_PROP__KHTML_BORDER_VERTICAL_SPACING,
44
+    CSS_PROP__TDEHTML_BORDER_HORIZONTAL_SPACING,
45
+    CSS_PROP__TDEHTML_BORDER_VERTICAL_SPACING,
46 46
     CSS_PROP_BORDER_TOP_COLOR,
47 47
     CSS_PROP_BORDER_RIGHT_COLOR,
48 48
     CSS_PROP_BORDER_BOTTOM_COLOR,
@@ -80,10 +80,10 @@ static const int computedProperties[] = {
80 80
     CSS_PROP_MARGIN_RIGHT,
81 81
     CSS_PROP_MARGIN_BOTTOM,
82 82
     CSS_PROP_MARGIN_LEFT,
83
-    CSS_PROP__KHTML_MARQUEE_DIRECTION,
84
-    CSS_PROP__KHTML_MARQUEE_INCREMENT,
85
-    CSS_PROP__KHTML_MARQUEE_REPETITION,
86
-    CSS_PROP__KHTML_MARQUEE_STYLE,
83
+    CSS_PROP__TDEHTML_MARQUEE_DIRECTION,
84
+    CSS_PROP__TDEHTML_MARQUEE_INCREMENT,
85
+    CSS_PROP__TDEHTML_MARQUEE_REPETITION,
86
+    CSS_PROP__TDEHTML_MARQUEE_STYLE,
87 87
     CSS_PROP_MAX_HEIGHT,
88 88
     CSS_PROP_MAX_WIDTH,
89 89
     CSS_PROP_MIN_HEIGHT,
@@ -137,7 +137,7 @@ static CSSValueImpl *valueForBorderStyle(EBorderStyle style)
137 137
 {
138 138
     switch (style) {
139 139
     case tdehtml::BNATIVE:
140
-        return new CSSPrimitiveValueImpl(CSS_VAL__KHTML_NATIVE);
140
+        return new CSSPrimitiveValueImpl(CSS_VAL__TDEHTML_NATIVE);
141 141
     case tdehtml::BNONE:
142 142
         return new CSSPrimitiveValueImpl(CSS_VAL_NONE);
143 143
     case tdehtml::BHIDDEN:
@@ -176,12 +176,12 @@ static CSSValueImpl *valueForTextAlign(ETextAlign align)
176 176
         return new CSSPrimitiveValueImpl(CSS_VAL_CENTER);
177 177
     case tdehtml::JUSTIFY:
178 178
         return new CSSPrimitiveValueImpl(CSS_VAL_JUSTIFY);
179
-    case tdehtml::KHTML_LEFT:
180
-        return new CSSPrimitiveValueImpl(CSS_VAL__KHTML_LEFT);
181
-    case tdehtml::KHTML_RIGHT:
182
-        return new CSSPrimitiveValueImpl(CSS_VAL__KHTML_RIGHT);
183
-    case tdehtml::KHTML_CENTER:
184
-        return new CSSPrimitiveValueImpl(CSS_VAL__KHTML_CENTER);
179
+    case tdehtml::TDEHTML_LEFT:
180
+        return new CSSPrimitiveValueImpl(CSS_VAL__TDEHTML_LEFT);
181
+    case tdehtml::TDEHTML_RIGHT:
182
+        return new CSSPrimitiveValueImpl(CSS_VAL__TDEHTML_RIGHT);
183
+    case tdehtml::TDEHTML_CENTER:
184
+        return new CSSPrimitiveValueImpl(CSS_VAL__TDEHTML_CENTER);
185 185
     }
186 186
     Q_ASSERT( 0 );
187 187
     return 0;
@@ -440,10 +440,10 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID )
440 440
                        "px");
441 441
         return new CSSPrimitiveValueImpl(string, CSSPrimitiveValue::CSS_STRING);
442 442
     }
443
-    case CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING:
443
+    case CSS_PROP__TDEHTML_BORDER_HORIZONTAL_SPACING:
444 444
         return new CSSPrimitiveValueImpl(style->borderHorizontalSpacing(),
445 445
                                          CSSPrimitiveValue::CSS_PX);
446
-    case CSS_PROP__KHTML_BORDER_VERTICAL_SPACING:
446
+    case CSS_PROP__TDEHTML_BORDER_VERTICAL_SPACING:
447 447
         return new CSSPrimitiveValueImpl(style->borderVerticalSpacing(),
448 448
                                          CSSPrimitiveValue::CSS_PX);
449 449
     case CSS_PROP_BORDER_TOP_COLOR:
@@ -614,9 +614,9 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID )
614 614
         case FRIGHT:
615 615
             return new CSSPrimitiveValueImpl(CSS_VAL_RIGHT);
616 616
         case FLEFT_ALIGN:
617
-            return new CSSPrimitiveValueImpl(CSS_VAL__KHTML_LEFT);
617
+            return new CSSPrimitiveValueImpl(CSS_VAL__TDEHTML_LEFT);
618 618
         case FRIGHT_ALIGN:
619
-            return new CSSPrimitiveValueImpl(CSS_VAL__KHTML_RIGHT);
619
+            return new CSSPrimitiveValueImpl(CSS_VAL__TDEHTML_RIGHT);
620 620
         }
621 621
     }
622 622
     case CSS_PROP_FONT_FAMILY:
@@ -706,10 +706,10 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID )
706 706
         return valueForLength(style->marginBottom(), renderer->contentHeight());
707 707
     case CSS_PROP_MARGIN_LEFT:
708 708
         return valueForLength(style->marginLeft(), renderer->contentWidth());
709
-    case CSS_PROP__KHTML_MARQUEE:
709
+    case CSS_PROP__TDEHTML_MARQUEE:
710 710
         // FIXME: unimplemented
711 711
         break;
712
-    case CSS_PROP__KHTML_MARQUEE_DIRECTION:
712
+    case CSS_PROP__TDEHTML_MARQUEE_DIRECTION:
713 713
         switch (style->marqueeDirection()) {
714 714
         case MFORWARD:
715 715
             return new CSSPrimitiveValueImpl(CSS_VAL_FORWARDS);
@@ -728,16 +728,16 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID )
728 728
         }
729 729
         Q_ASSERT(0);
730 730
         return 0;
731
-    case CSS_PROP__KHTML_MARQUEE_INCREMENT:
731
+    case CSS_PROP__TDEHTML_MARQUEE_INCREMENT:
732 732
         return valueForLength(style->marqueeIncrement(), renderer->contentWidth());
733
-    case CSS_PROP__KHTML_MARQUEE_REPETITION:
733
+    case CSS_PROP__TDEHTML_MARQUEE_REPETITION:
734 734
         if (style->marqueeLoopCount() < 0)
735 735
             return new CSSPrimitiveValueImpl(CSS_VAL_INFINITE);
736 736
         return new CSSPrimitiveValueImpl(style->marqueeLoopCount(), CSSPrimitiveValue::CSS_NUMBER);
737
-    case CSS_PROP__KHTML_MARQUEE_SPEED:
737
+    case CSS_PROP__TDEHTML_MARQUEE_SPEED:
738 738
         // FIXME: unimplemented
739 739
         break;
740
-    case CSS_PROP__KHTML_MARQUEE_STYLE:
740
+    case CSS_PROP__TDEHTML_MARQUEE_STYLE:
741 741
         switch (style->marqueeBehavior()) {
742 742
         case MNONE:
743 743
             return new CSSPrimitiveValueImpl(CSS_VAL_NONE);
@@ -960,7 +960,7 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID )
960 960
         case BOTTOM:
961 961
             return new CSSPrimitiveValueImpl(CSS_VAL_BOTTOM);
962 962
         case BASELINE_MIDDLE:
963
-            return new CSSPrimitiveValueImpl(CSS_VAL__KHTML_BASELINE_MIDDLE);
963
+            return new CSSPrimitiveValueImpl(CSS_VAL__TDEHTML_BASELINE_MIDDLE);
964 964
         case LENGTH:
965 965
             return valueForLength(style->verticalAlignLength(), renderer->contentWidth());
966 966
         }
@@ -991,8 +991,8 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID )
991 991
             return new CSSPrimitiveValueImpl(CSS_VAL_PRE_LINE);
992 992
         case NOWRAP:
993 993
             return new CSSPrimitiveValueImpl(CSS_VAL_NOWRAP);
994
-        case KHTML_NOWRAP:
995
-            return new CSSPrimitiveValueImpl(CSS_VAL__KHTML_NOWRAP);
994
+        case TDEHTML_NOWRAP:
995
+            return new CSSPrimitiveValueImpl(CSS_VAL__TDEHTML_NOWRAP);
996 996
         }
997 997
         Q_ASSERT(0);
998 998
         break;
@@ -1060,9 +1060,9 @@ CSSValueImpl *RenderStyleDeclarationImpl::getPropertyCSSValue( int propertyID )
1060 1060
         break;
1061 1061
     case CSS_PROP_SCROLLBAR_ARROW_COLOR:
1062 1062
         break;
1063
-    case CSS_PROP__KHTML_FLOW_MODE:
1063
+    case CSS_PROP__TDEHTML_FLOW_MODE:
1064 1064
         break;
1065
-    case CSS_PROP__KHTML_USER_INPUT:
1065
+    case CSS_PROP__TDEHTML_USER_INPUT:
1066 1066
         break;
1067 1067
     default:
1068 1068
         Q_ASSERT( 0 );

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

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

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

@@ -28,7 +28,7 @@
28 28
 #include "dom/dom_string.h"
29 29
 
30 30
 class TQPaintDeviceMetrics;
31
-class KHTMLSettings;
31
+class TDEHTMLSettings;
32 32
 
33 33
 namespace DOM
34 34
 {

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

@@ -533,7 +533,7 @@ bool CSSParser::parseValue( int propId, bool important )
533 533
      * correctly and allows optimization in tdehtml::applyRule(..)
534 534
      */
535 535
     case CSS_PROP_CAPTION_SIDE:         // top | bottom | left | right | inherit
536
-        // Left and right were deprecated in CSS 2.1 and never supported by KHTML
536
+        // Left and right were deprecated in CSS 2.1 and never supported by TDEHTML
537 537
         if ( /* id == CSS_VAL_LEFT || id == CSS_VAL_RIGHT || */
538 538
             id == CSS_VAL_TOP || id == CSS_VAL_BOTTOM)
539 539
             valid_primitive = true;
@@ -567,7 +567,7 @@ bool CSSParser::parseValue( int propId, bool important )
567 567
         // upper-roman | lower-greek | lower-alpha | lower-latin | upper-alpha |
568 568
         // upper-latin | hebrew | armenian | georgian | cjk-ideographic | hiragana |
569 569
         // katakana | hiragana-iroha | katakana-iroha | none | inherit
570
-        if ((id >= CSS_VAL_DISC && id <= CSS_VAL__KHTML_CLOSE_QUOTE) || id == CSS_VAL_NONE)
570
+        if ((id >= CSS_VAL_DISC && id <= CSS_VAL__TDEHTML_CLOSE_QUOTE) || id == CSS_VAL_NONE)
571 571
             valid_primitive = true;
572 572
         break;
573 573
 
@@ -590,8 +590,8 @@ bool CSSParser::parseValue( int propId, bool important )
590 590
         break;
591 591
 
592 592
     case CSS_PROP_FLOAT:                // left | right | none | tdehtml_left | tdehtml_right | inherit + center for buggy CSS
593
-        if ( id == CSS_VAL_LEFT || id == CSS_VAL_RIGHT || id == CSS_VAL__KHTML_LEFT ||
594
-             id == CSS_VAL__KHTML_RIGHT ||id == CSS_VAL_NONE || id == CSS_VAL_CENTER)
593
+        if ( id == CSS_VAL_LEFT || id == CSS_VAL_RIGHT || id == CSS_VAL__TDEHTML_LEFT ||
594
+             id == CSS_VAL__TDEHTML_RIGHT ||id == CSS_VAL_NONE || id == CSS_VAL_CENTER)
595 595
             valid_primitive = true;
596 596
         break;
597 597
 
@@ -603,7 +603,7 @@ bool CSSParser::parseValue( int propId, bool important )
603 603
 
604 604
     case CSS_PROP_TEXT_ALIGN:
605 605
         // left | right | center | justify | tdehtml_left | tdehtml_right | tdehtml_center | <string> | inherit
606
-        if ( ( id >= CSS_VAL__KHTML_AUTO && id <= CSS_VAL__KHTML_CENTER ) ||
606
+        if ( ( id >= CSS_VAL__TDEHTML_AUTO && id <= CSS_VAL__TDEHTML_CENTER ) ||
607 607
              value->unit == CSSPrimitiveValue::CSS_STRING )
608 608
             valid_primitive = true;
609 609
         break;
@@ -613,7 +613,7 @@ bool CSSParser::parseValue( int propId, bool important )
613 613
     case CSS_PROP_BORDER_RIGHT_STYLE:   //   Defined as:    none | hidden | dotted | dashed |
614 614
     case CSS_PROP_BORDER_BOTTOM_STYLE:  //   solid | double | groove | ridge | inset | outset | -tdehtml-native
615 615
     case CSS_PROP_BORDER_LEFT_STYLE:    ////
616
-        if (id >= CSS_VAL__KHTML_NATIVE && id <= CSS_VAL_DOUBLE)
616
+        if (id >= CSS_VAL__TDEHTML_NATIVE && id <= CSS_VAL_DOUBLE)
617 617
             valid_primitive = true;
618 618
         break;
619 619
 
@@ -636,8 +636,8 @@ bool CSSParser::parseValue( int propId, bool important )
636 636
 
637 637
     case CSS_PROP_BORDER_SPACING:
638 638
     {
639
-        const int properties[2] = { CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING,
640
-                                    CSS_PROP__KHTML_BORDER_VERTICAL_SPACING };
639
+        const int properties[2] = { CSS_PROP__TDEHTML_BORDER_HORIZONTAL_SPACING,
640
+                                    CSS_PROP__TDEHTML_BORDER_VERTICAL_SPACING };
641 641
         if (num == 1) {
642 642
             ShorthandScope scope(this, CSS_PROP_BORDER_SPACING);
643 643
             if (!parseValue(properties[0], important)) return false;
@@ -653,8 +653,8 @@ bool CSSParser::parseValue( int propId, bool important )
653 653
         }
654 654
         return false;
655 655
     }
656
-    case CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING:
657
-    case CSS_PROP__KHTML_BORDER_VERTICAL_SPACING:
656
+    case CSS_PROP__TDEHTML_BORDER_HORIZONTAL_SPACING:
657
+    case CSS_PROP__TDEHTML_BORDER_VERTICAL_SPACING:
658 658
         valid_primitive = validUnit(value, FLength|FNonNeg, strict&(!nonCSSHint));
659 659
         break;
660 660
 
@@ -682,10 +682,10 @@ bool CSSParser::parseValue( int propId, bool important )
682 682
     case CSS_PROP_BORDER_BOTTOM_COLOR:  // <color> | inherit
683 683
     case CSS_PROP_BORDER_LEFT_COLOR:    // <color> | inherit
684 684
     case CSS_PROP_COLOR:                // <color> | inherit
685
-        if ( id == CSS_VAL__KHTML_TEXT || id == CSS_VAL_MENU ||
685
+        if ( id == CSS_VAL__TDEHTML_TEXT || id == CSS_VAL_MENU ||
686 686
              (id >= CSS_VAL_AQUA && id <= CSS_VAL_WINDOWTEXT ) ||
687 687
              id == CSS_VAL_TRANSPARENT ||
688
-             (id >= CSS_VAL_GREY && id < CSS_VAL__KHTML_TEXT && (nonCSSHint|!strict) ) ) {
688
+             (id >= CSS_VAL_GREY && id < CSS_VAL__TDEHTML_TEXT && (nonCSSHint|!strict) ) ) {
689 689
             valid_primitive = true;
690 690
         } else {
691 691
             parsedValue = parseColor();
@@ -707,13 +707,13 @@ bool CSSParser::parseValue( int propId, bool important )
707 707
         break;
708 708
 
709 709
     case CSS_PROP_BACKGROUND_ATTACHMENT:
710
-    case CSS_PROP__KHTML_BACKGROUND_CLIP:
710
+    case CSS_PROP__TDEHTML_BACKGROUND_CLIP:
711 711
     case CSS_PROP_BACKGROUND_IMAGE:
712
-    case CSS_PROP__KHTML_BACKGROUND_ORIGIN:
712
+    case CSS_PROP__TDEHTML_BACKGROUND_ORIGIN:
713 713
     case CSS_PROP_BACKGROUND_POSITION:
714 714
     case CSS_PROP_BACKGROUND_POSITION_X:
715 715
     case CSS_PROP_BACKGROUND_POSITION_Y:
716
-    case CSS_PROP__KHTML_BACKGROUND_SIZE:
716
+    case CSS_PROP__TDEHTML_BACKGROUND_SIZE:
717 717
     case CSS_PROP_BACKGROUND_REPEAT: {
718 718
         CSSValueImpl *val1 = 0, *val2 = 0;
719 719
         int propId1, propId2;
@@ -769,7 +769,7 @@ bool CSSParser::parseValue( int propId, bool important )
769 769
     case CSS_PROP_PADDING_RIGHT:        //  <padding-width> | inherit
770 770
     case CSS_PROP_PADDING_BOTTOM:       //   Which is defined as
771 771
     case CSS_PROP_PADDING_LEFT:         //   <length> | <percentage>
772
-    case CSS_PROP__KHTML_PADDING_START:
772
+    case CSS_PROP__TDEHTML_PADDING_START:
773 773
         valid_primitive = ( !id && validUnit( value, FLength|FPercent|FNonNeg, strict&(!nonCSSHint) ) );
774 774
         break;
775 775
 
@@ -807,7 +807,7 @@ bool CSSParser::parseValue( int propId, bool important )
807 807
             // baseline | sub | super | top | text-top | middle | bottom | text-bottom |
808 808
         // <percentage> | <length> | inherit
809 809
 
810
-        if ( id >= CSS_VAL_BASELINE && id <= CSS_VAL__KHTML_BASELINE_MIDDLE )
810
+        if ( id >= CSS_VAL_BASELINE && id <= CSS_VAL__TDEHTML_BASELINE_MIDDLE )
811 811
             valid_primitive = true;
812 812
         else
813 813
             valid_primitive = ( !id && validUnit( value, FLength|FPercent, strict&(!nonCSSHint) ) );
@@ -830,7 +830,7 @@ bool CSSParser::parseValue( int propId, bool important )
830 830
     case CSS_PROP_MARGIN_RIGHT:         //   Which is defined as
831 831
     case CSS_PROP_MARGIN_BOTTOM:        //   <length> | <percentage> | auto | inherit
832 832
     case CSS_PROP_MARGIN_LEFT:          ////
833
-    case CSS_PROP__KHTML_MARGIN_START:
833
+    case CSS_PROP__TDEHTML_MARGIN_START:
834 834
         if ( id == CSS_VAL_AUTO )
835 835
             valid_primitive = true;
836 836
         else
@@ -912,8 +912,8 @@ bool CSSParser::parseValue( int propId, bool important )
912 912
             valid_primitive = true;
913 913
         break;
914 914
 
915
-    case CSS_PROP__KHTML_FLOW_MODE:
916
-        if ( id == CSS_VAL__KHTML_NORMAL || id == CSS_VAL__KHTML_AROUND_FLOATS )
915
+    case CSS_PROP__TDEHTML_FLOW_MODE:
916
+        if ( id == CSS_VAL__TDEHTML_NORMAL || id == CSS_VAL__TDEHTML_AROUND_FLOATS )
917 917
             valid_primitive = true;
918 918
         break;
919 919
 
@@ -934,41 +934,41 @@ bool CSSParser::parseValue( int propId, bool important )
934 934
     case CSS_PROP_OPACITY:
935 935
         valid_primitive = validUnit(value, FNumber, strict);
936 936
         break;
937
-    case CSS_PROP__KHTML_USER_INPUT:        // none | enabled | disabled | inherit
937
+    case CSS_PROP__TDEHTML_USER_INPUT:        // none | enabled | disabled | inherit
938 938
         if ( id == CSS_VAL_NONE || id == CSS_VAL_ENABLED || id == CSS_VAL_DISABLED )
939 939
             valid_primitive = true;
940
-//        kdDebug(6080) << "CSS_PROP__KHTML_USER_INPUT: " << valid_primitive << endl;
940
+//        kdDebug(6080) << "CSS_PROP__TDEHTML_USER_INPUT: " << valid_primitive << endl;
941 941
         break;
942
-    case CSS_PROP__KHTML_MARQUEE: {
943
-        const int properties[5] = { CSS_PROP__KHTML_MARQUEE_DIRECTION, CSS_PROP__KHTML_MARQUEE_INCREMENT,
944
-                                    CSS_PROP__KHTML_MARQUEE_REPETITION,
945
-                                    CSS_PROP__KHTML_MARQUEE_STYLE, CSS_PROP__KHTML_MARQUEE_SPEED };
942
+    case CSS_PROP__TDEHTML_MARQUEE: {
943
+        const int properties[5] = { CSS_PROP__TDEHTML_MARQUEE_DIRECTION, CSS_PROP__TDEHTML_MARQUEE_INCREMENT,
944
+                                    CSS_PROP__TDEHTML_MARQUEE_REPETITION,
945
+                                    CSS_PROP__TDEHTML_MARQUEE_STYLE, CSS_PROP__TDEHTML_MARQUEE_SPEED };
946 946
         return parseShortHand(propId, properties, 5, important);
947 947
     }
948
-    case CSS_PROP__KHTML_MARQUEE_DIRECTION:
948
+    case CSS_PROP__TDEHTML_MARQUEE_DIRECTION:
949 949
         if (id == CSS_VAL_FORWARDS || id == CSS_VAL_BACKWARDS || id == CSS_VAL_AHEAD ||
950 950
             id == CSS_VAL_REVERSE || id == CSS_VAL_LEFT || id == CSS_VAL_RIGHT || id == CSS_VAL_DOWN ||
951 951
             id == CSS_VAL_UP || id == CSS_VAL_AUTO)
952 952
             valid_primitive = true;
953 953
         break;
954
-    case CSS_PROP__KHTML_MARQUEE_INCREMENT:
954
+    case CSS_PROP__TDEHTML_MARQUEE_INCREMENT:
955 955
         if (id == CSS_VAL_SMALL || id == CSS_VAL_LARGE || id == CSS_VAL_MEDIUM)
956 956
             valid_primitive = true;
957 957
         else
958 958
             valid_primitive = validUnit(value, FLength|FPercent, strict&(!nonCSSHint));
959 959
         break;
960
-    case CSS_PROP__KHTML_MARQUEE_STYLE:
960
+    case CSS_PROP__TDEHTML_MARQUEE_STYLE:
961 961
         if (id == CSS_VAL_NONE || id == CSS_VAL_SLIDE || id == CSS_VAL_SCROLL || id == CSS_VAL_ALTERNATE ||
962 962
             id == CSS_VAL_UNFURL)
963 963
             valid_primitive = true;
964 964
         break;
965
-    case CSS_PROP__KHTML_MARQUEE_REPETITION:
965
+    case CSS_PROP__TDEHTML_MARQUEE_REPETITION:
966 966
         if (id == CSS_VAL_INFINITE)
967 967
             valid_primitive = true;
968 968
         else
969 969
             valid_primitive = validUnit(value, FInteger|FNonNeg, strict&(!nonCSSHint));
970 970
         break;
971
-    case CSS_PROP__KHTML_MARQUEE_SPEED:
971
+    case CSS_PROP__TDEHTML_MARQUEE_SPEED:
972 972
         if (id == CSS_VAL_NORMAL || id == CSS_VAL_SLOW || id == CSS_VAL_FAST)
973 973
             valid_primitive = true;
974 974
         else
@@ -1137,11 +1137,11 @@ bool CSSParser::parseBackgroundShorthand(bool important)
1137 1137
 {
1138 1138
     // Position must come before color in this array because a plain old "0" is a legal color
1139 1139
     // in quirks mode but it's usually the X coordinate of a position.
1140
-    // FIXME: Add CSS_PROP__KHTML_BACKGROUND_SIZE to the shorthand.
1140
+    // FIXME: Add CSS_PROP__TDEHTML_BACKGROUND_SIZE to the shorthand.
1141 1141
     const int numProperties = 7;
1142 1142
     const int properties[numProperties] = { CSS_PROP_BACKGROUND_IMAGE, CSS_PROP_BACKGROUND_REPEAT,
1143
-        CSS_PROP_BACKGROUND_ATTACHMENT, CSS_PROP_BACKGROUND_POSITION,  CSS_PROP__KHTML_BACKGROUND_CLIP,
1144
-        CSS_PROP__KHTML_BACKGROUND_ORIGIN, CSS_PROP_BACKGROUND_COLOR };
1143
+        CSS_PROP_BACKGROUND_ATTACHMENT, CSS_PROP_BACKGROUND_POSITION,  CSS_PROP__TDEHTML_BACKGROUND_CLIP,
1144
+        CSS_PROP__TDEHTML_BACKGROUND_ORIGIN, CSS_PROP_BACKGROUND_COLOR };
1145 1145
 
1146 1146
     ShorthandScope scope(this, CSS_PROP_BACKGROUND);
1147 1147
 
@@ -1427,7 +1427,7 @@ CSSValueImpl* CSSParser::parseCounterContent(ValueList *args, bool counters)
1427 1427
         if (i->unit != Value::Operator || i->iValue != ',') goto invalid;
1428 1428
         i = args->next();
1429 1429
         if (i->unit != CSSPrimitiveValue::CSS_IDENT) goto invalid;
1430
-        if (i->id < CSS_VAL_DISC || i->id > CSS_VAL__KHTML_CLOSE_QUOTE) goto invalid;
1430
+        if (i->id < CSS_VAL_DISC || i->id > CSS_VAL__TDEHTML_CLOSE_QUOTE) goto invalid;
1431 1431
         counter->m_listStyle = i->id - CSS_VAL_DISC;
1432 1432
     }
1433 1433
     return new CSSPrimitiveValueImpl(counter);
@@ -1439,9 +1439,9 @@ invalid:
1439 1439
 CSSValueImpl* CSSParser::parseBackgroundColor()
1440 1440
 {
1441 1441
     int id = valueList->current()->id;
1442
-    if (id == CSS_VAL__KHTML_TEXT || id == CSS_VAL_TRANSPARENT ||
1442
+    if (id == CSS_VAL__TDEHTML_TEXT || id == CSS_VAL_TRANSPARENT ||
1443 1443
         (id >= CSS_VAL_AQUA && id <= CSS_VAL_WINDOWTEXT) || id == CSS_VAL_MENU ||
1444
-        (id >= CSS_VAL_GREY && id < CSS_VAL__KHTML_TEXT && !strict))
1444
+        (id >= CSS_VAL_GREY && id < CSS_VAL__TDEHTML_TEXT && !strict))
1445 1445
        return new CSSPrimitiveValueImpl(id);
1446 1446
     return parseColor();
1447 1447
 }
@@ -1615,8 +1615,8 @@ bool CSSParser::parseBackgroundProperty(int propId, int& propId1, int& propId2,
1615 1615
                     if (currValue)
1616 1616
                         valueList->next();
1617 1617
                     break;
1618
-                case CSS_PROP__KHTML_BACKGROUND_CLIP:
1619
-                case CSS_PROP__KHTML_BACKGROUND_ORIGIN:
1618
+                case CSS_PROP__TDEHTML_BACKGROUND_CLIP:
1619
+                case CSS_PROP__TDEHTML_BACKGROUND_ORIGIN:
1620 1620
                     if (val->id == CSS_VAL_BORDER || val->id == CSS_VAL_PADDING || val->id == CSS_VAL_CONTENT) {
1621 1621
                         currValue = new CSSPrimitiveValueImpl(val->id);
1622 1622
                         valueList->next();
@@ -1646,7 +1646,7 @@ bool CSSParser::parseBackgroundProperty(int propId, int& propId1, int& propId2,
1646 1646
                         valueList->next();
1647 1647
                     }
1648 1648
                     break;
1649
-                case CSS_PROP__KHTML_BACKGROUND_SIZE:
1649
+                case CSS_PROP__TDEHTML_BACKGROUND_SIZE:
1650 1650
                     currValue = parseBackgroundSize();
1651 1651
                     if (currValue)
1652 1652
                         valueList->next();
@@ -2268,7 +2268,7 @@ bool CSSParser::parseShadow(int propId, bool important)
2268 2268
             // The only other type of value that's ok is a color value.
2269 2269
             CSSPrimitiveValueImpl* parsedColor = 0;
2270 2270
             bool isColor = (val->id >= CSS_VAL_AQUA && val->id <= CSS_VAL_WINDOWTEXT || val->id == CSS_VAL_MENU ||
2271
-                           (val->id >= CSS_VAL_GREY && val->id <= CSS_VAL__KHTML_TEXT && !strict));
2271
+                           (val->id >= CSS_VAL_GREY && val->id <= CSS_VAL__TDEHTML_TEXT && !strict));
2272 2272
 	    if (!context.allowColor)
2273 2273
                 return context.failed();
2274 2274
 

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

@@ -295,7 +295,7 @@ findProp (register const char *str, register unsigned int len)
295 295
 #line 104 "cssproperties.gperf"
296 296
       {"text-indent", CSS_PROP_TEXT_INDENT},
297 297
 #line 69 "cssproperties.gperf"
298
-      {"-tdehtml-margin-start", CSS_PROP__KHTML_MARGIN_START},
298
+      {"-tdehtml-margin-start", CSS_PROP__TDEHTML_MARGIN_START},
299 299
 #line 14 "cssproperties.gperf"
300 300
       {"background-color", CSS_PROP_BACKGROUND_COLOR},
301 301
 #line 100 "cssproperties.gperf"
@@ -305,7 +305,7 @@ findProp (register const char *str, register unsigned int len)
305 305
 #line 47 "cssproperties.gperf"
306 306
       {"counter-reset", CSS_PROP_COUNTER_RESET},
307 307
 #line 93 "cssproperties.gperf"
308
-      {"-tdehtml-padding-start", CSS_PROP__KHTML_PADDING_START},
308
+      {"-tdehtml-padding-start", CSS_PROP__TDEHTML_PADDING_START},
309 309
 #line 15 "cssproperties.gperf"
310 310
       {"background-image", CSS_PROP_BACKGROUND_IMAGE},
311 311
 #line 96 "cssproperties.gperf"
@@ -319,11 +319,11 @@ findProp (register const char *str, register unsigned int len)
319 319
 #line 52 "cssproperties.gperf"
320 320
       {"float", CSS_PROP_FLOAT},
321 321
 #line 21 "cssproperties.gperf"
322
-      {"-tdehtml-background-clip", CSS_PROP__KHTML_BACKGROUND_CLIP},
322
+      {"-tdehtml-background-clip", CSS_PROP__TDEHTML_BACKGROUND_CLIP},
323 323
 #line 70 "cssproperties.gperf"
324
-      {"-tdehtml-marquee", CSS_PROP__KHTML_MARQUEE},
324
+      {"-tdehtml-marquee", CSS_PROP__TDEHTML_MARQUEE},
325 325
 #line 27 "cssproperties.gperf"
326
-      {"-tdehtml-border-vertical-spacing", CSS_PROP__KHTML_BORDER_VERTICAL_SPACING},
326
+      {"-tdehtml-border-vertical-spacing", CSS_PROP__TDEHTML_BORDER_VERTICAL_SPACING},
327 327
 #line 46 "cssproperties.gperf"
328 328
       {"counter-increment", CSS_PROP_COUNTER_INCREMENT},
329 329
 #line 128 "cssproperties.gperf"
@@ -337,7 +337,7 @@ findProp (register const char *str, register unsigned int len)
337 337
 #line 31 "cssproperties.gperf"
338 338
       {"border-left-color", CSS_PROP_BORDER_LEFT_COLOR},
339 339
 #line 22 "cssproperties.gperf"
340
-      {"-tdehtml-background-origin", CSS_PROP__KHTML_BACKGROUND_ORIGIN},
340
+      {"-tdehtml-background-origin", CSS_PROP__TDEHTML_BACKGROUND_ORIGIN},
341 341
 #line 17 "cssproperties.gperf"
342 342
       {"background-attachment", CSS_PROP_BACKGROUND_ATTACHMENT},
343 343
 #line 126 "cssproperties.gperf"
@@ -353,7 +353,7 @@ findProp (register const char *str, register unsigned int len)
353 353
 #line 68 "cssproperties.gperf"
354 354
       {"margin-left", CSS_PROP_MARGIN_LEFT},
355 355
 #line 142 "cssproperties.gperf"
356
-      {"-tdehtml-user-input", CSS_PROP__KHTML_USER_INPUT},
356
+      {"-tdehtml-user-input", CSS_PROP__TDEHTML_USER_INPUT},
357 357
 #line 79 "cssproperties.gperf"
358 358
       {"min-width", CSS_PROP_MIN_WIDTH},
359 359
 #line 127 "cssproperties.gperf"
@@ -361,13 +361,13 @@ findProp (register const char *str, register unsigned int len)
361 361
 #line 92 "cssproperties.gperf"
362 362
       {"padding-left", CSS_PROP_PADDING_LEFT},
363 363
 #line 71 "cssproperties.gperf"
364
-      {"-tdehtml-marquee-direction", CSS_PROP__KHTML_MARQUEE_DIRECTION},
364
+      {"-tdehtml-marquee-direction", CSS_PROP__TDEHTML_MARQUEE_DIRECTION},
365 365
 #line 73 "cssproperties.gperf"
366
-      {"-tdehtml-marquee-repetition", CSS_PROP__KHTML_MARQUEE_REPETITION},
366
+      {"-tdehtml-marquee-repetition", CSS_PROP__TDEHTML_MARQUEE_REPETITION},
367 367
 #line 95 "cssproperties.gperf"
368 368
       {"page-break-before", CSS_PROP_PAGE_BREAK_BEFORE},
369 369
 #line 74 "cssproperties.gperf"
370
-      {"-tdehtml-marquee-speed", CSS_PROP__KHTML_MARQUEE_SPEED},
370
+      {"-tdehtml-marquee-speed", CSS_PROP__TDEHTML_MARQUEE_SPEED},
371 371
 #line 94 "cssproperties.gperf"
372 372
       {"page-break-after", CSS_PROP_PAGE_BREAK_AFTER},
373 373
 #line 81 "cssproperties.gperf"
@@ -383,7 +383,7 @@ findProp (register const char *str, register unsigned int len)
383 383
 #line 134 "cssproperties.gperf"
384 384
       {"scrollbar-face-color", CSS_PROP_SCROLLBAR_FACE_COLOR},
385 385
 #line 72 "cssproperties.gperf"
386
-      {"-tdehtml-marquee-increment", CSS_PROP__KHTML_MARQUEE_INCREMENT},
386
+      {"-tdehtml-marquee-increment", CSS_PROP__TDEHTML_MARQUEE_INCREMENT},
387 387
 #line 116 "cssproperties.gperf"
388 388
       {"word-spacing", CSS_PROP_WORD_SPACING},
389 389
 #line 111 "cssproperties.gperf"
@@ -405,13 +405,13 @@ findProp (register const char *str, register unsigned int len)
405 405
 #line 32 "cssproperties.gperf"
406 406
       {"border-top-style", CSS_PROP_BORDER_TOP_STYLE},
407 407
 #line 26 "cssproperties.gperf"
408
-      {"-tdehtml-border-horizontal-spacing", CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING},
408
+      {"-tdehtml-border-horizontal-spacing", CSS_PROP__TDEHTML_BORDER_HORIZONTAL_SPACING},
409 409
 #line 33 "cssproperties.gperf"
410 410
       {"border-right-style", CSS_PROP_BORDER_RIGHT_STYLE},
411 411
 #line 34 "cssproperties.gperf"
412 412
       {"border-bottom-style", CSS_PROP_BORDER_BOTTOM_STYLE},
413 413
 #line 23 "cssproperties.gperf"
414
-      {"-tdehtml-background-size", CSS_PROP__KHTML_BACKGROUND_SIZE},
414
+      {"-tdehtml-background-size", CSS_PROP__TDEHTML_BACKGROUND_SIZE},
415 415
 #line 135 "cssproperties.gperf"
416 416
       {"scrollbar-shadow-color", CSS_PROP_SCROLLBAR_SHADOW_COLOR},
417 417
 #line 129 "cssproperties.gperf"
@@ -435,7 +435,7 @@ findProp (register const char *str, register unsigned int len)
435 435
 #line 84 "cssproperties.gperf"
436 436
       {"outline-style", CSS_PROP_OUTLINE_STYLE},
437 437
 #line 141 "cssproperties.gperf"
438
-      {"-tdehtml-flow-mode", CSS_PROP__KHTML_FLOW_MODE},
438
+      {"-tdehtml-flow-mode", CSS_PROP__TDEHTML_FLOW_MODE},
439 439
 #line 87 "cssproperties.gperf"
440 440
       {"overflow-x", CSS_PROP_OVERFLOW_X},
441 441
 #line 113 "cssproperties.gperf"
@@ -449,7 +449,7 @@ findProp (register const char *str, register unsigned int len)
449 449
 #line 83 "cssproperties.gperf"
450 450
       {"outline-offset", CSS_PROP_OUTLINE_OFFSET},
451 451
 #line 75 "cssproperties.gperf"
452
-      {"-tdehtml-marquee-style", CSS_PROP__KHTML_MARQUEE_STYLE},
452
+      {"-tdehtml-marquee-style", CSS_PROP__TDEHTML_MARQUEE_STYLE},
453 453
 #line 55 "cssproperties.gperf"
454 454
       {"font-style", CSS_PROP_FONT_STYLE},
455 455
 #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;
15 15
 #define CSS_PROP_BACKGROUND_POSITION 5
16 16
 #define CSS_PROP_BACKGROUND_POSITION_X 6
17 17
 #define CSS_PROP_BACKGROUND_POSITION_Y 7
18
-#define CSS_PROP__KHTML_BACKGROUND_CLIP 8
19
-#define CSS_PROP__KHTML_BACKGROUND_ORIGIN 9
20
-#define CSS_PROP__KHTML_BACKGROUND_SIZE 10
18
+#define CSS_PROP__TDEHTML_BACKGROUND_CLIP 8
19
+#define CSS_PROP__TDEHTML_BACKGROUND_ORIGIN 9
20
+#define CSS_PROP__TDEHTML_BACKGROUND_SIZE 10
21 21
 #define CSS_PROP_BORDER_COLLAPSE 11
22 22
 #define CSS_PROP_BORDER_SPACING 12
23
-#define CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING 13
24
-#define CSS_PROP__KHTML_BORDER_VERTICAL_SPACING 14
23
+#define CSS_PROP__TDEHTML_BORDER_HORIZONTAL_SPACING 13
24
+#define CSS_PROP__TDEHTML_BORDER_VERTICAL_SPACING 14
25 25
 #define CSS_PROP_BORDER_TOP_COLOR 15
26 26
 #define CSS_PROP_BORDER_RIGHT_COLOR 16
27 27
 #define CSS_PROP_BORDER_BOTTOM_COLOR 17
@@ -63,13 +63,13 @@ DOM::DOMString getPropertyName(unsigned short id) KDE_NO_EXPORT;
63 63
 #define CSS_PROP_MARGIN_RIGHT 53
64 64
 #define CSS_PROP_MARGIN_BOTTOM 54
65 65
 #define CSS_PROP_MARGIN_LEFT 55
66
-#define CSS_PROP__KHTML_MARGIN_START 56
67
-#define CSS_PROP__KHTML_MARQUEE 57
68
-#define CSS_PROP__KHTML_MARQUEE_DIRECTION 58
69
-#define CSS_PROP__KHTML_MARQUEE_INCREMENT 59
70
-#define CSS_PROP__KHTML_MARQUEE_REPETITION 60
71
-#define CSS_PROP__KHTML_MARQUEE_SPEED 61
72
-#define CSS_PROP__KHTML_MARQUEE_STYLE 62
66
+#define CSS_PROP__TDEHTML_MARGIN_START 56
67
+#define CSS_PROP__TDEHTML_MARQUEE 57
68
+#define CSS_PROP__TDEHTML_MARQUEE_DIRECTION 58
69
+#define CSS_PROP__TDEHTML_MARQUEE_INCREMENT 59
70
+#define CSS_PROP__TDEHTML_MARQUEE_REPETITION 60
71
+#define CSS_PROP__TDEHTML_MARQUEE_SPEED 61
72
+#define CSS_PROP__TDEHTML_MARQUEE_STYLE 62
73 73
 #define CSS_PROP_MAX_HEIGHT 63
74 74
 #define CSS_PROP_MAX_WIDTH 64
75 75
 #define CSS_PROP_MIN_HEIGHT 65
@@ -87,7 +87,7 @@ DOM::DOMString getPropertyName(unsigned short id) KDE_NO_EXPORT;
87 87
 #define CSS_PROP_PADDING_RIGHT 77
88 88
 #define CSS_PROP_PADDING_BOTTOM 78
89 89
 #define CSS_PROP_PADDING_LEFT 79
90
-#define CSS_PROP__KHTML_PADDING_START 80
90
+#define CSS_PROP__TDEHTML_PADDING_START 80
91 91
 #define CSS_PROP_PAGE_BREAK_AFTER 81
92 92
 #define CSS_PROP_PAGE_BREAK_BEFORE 82
93 93
 #define CSS_PROP_PAGE_BREAK_INSIDE 83
@@ -135,8 +135,8 @@ DOM::DOMString getPropertyName(unsigned short id) KDE_NO_EXPORT;
135 135
 #define CSS_PROP_SCROLLBAR_DARKSHADOW_COLOR 125
136 136
 #define CSS_PROP_SCROLLBAR_TRACK_COLOR 126
137 137
 #define CSS_PROP_SCROLLBAR_ARROW_COLOR 127
138
-#define CSS_PROP__KHTML_FLOW_MODE 128
139
-#define CSS_PROP__KHTML_USER_INPUT 129
138
+#define CSS_PROP__TDEHTML_FLOW_MODE 128
139
+#define CSS_PROP__TDEHTML_USER_INPUT 129
140 140
 
141 141
 #define CSS_PROP_MAX CSS_PROP_Z_INDEX
142 142
 #define CSS_PROP_TOTAL 130

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

@@ -211,7 +211,7 @@ static PseudoState pseudoState;
211 211
 CSSStyleSelector::CSSStyleSelector( DocumentImpl* doc, TQString userStyleSheet, StyleSheetListImpl *styleSheets,
212 212
                                     const KURL &url, bool _strictParsing )
213 213
 {
214
-    KHTMLView* view = doc->view();
214
+    TDEHTMLView* view = doc->view();
215 215
 
216 216
     init(view ? view->part()->settings() : 0, doc);
217 217
 
@@ -273,14 +273,14 @@ CSSStyleSelector::CSSStyleSelector( CSSStyleSheetImpl *sheet )
273 273
 {
274 274
     init(0L, 0L);
275 275
 
276
-    KHTMLView *view = sheet->doc()->view();
276
+    TDEHTMLView *view = sheet->doc()->view();
277 277
     m_medium = view ? view->mediaType() : "screen";
278 278
 
279 279
     authorStyle = new CSSStyleSelectorList();
280 280
     authorStyle->append( sheet, m_medium );
281 281
 }
282 282
 
283
-void CSSStyleSelector::init(const KHTMLSettings* _settings, DocumentImpl* doc)
283
+void CSSStyleSelector::init(const TDEHTMLSettings* _settings, DocumentImpl* doc)
284 284
 {
285 285
     element = 0;
286 286
     settings = _settings;
@@ -308,12 +308,12 @@ CSSStyleSelector::~CSSStyleSelector()
308 308
 
309 309
 void CSSStyleSelector::addSheet( CSSStyleSheetImpl *sheet )
310 310
 {
311
-    KHTMLView *view = sheet->doc()->view();
311
+    TDEHTMLView *view = sheet->doc()->view();
312 312
     m_medium = view ? view->mediaType() : "screen";
313 313
     authorStyle->append( sheet, m_medium );
314 314
 }
315 315
 
316
-void CSSStyleSelector::loadDefaultStyle(const KHTMLSettings *s, DocumentImpl *doc)
316
+void CSSStyleSelector::loadDefaultStyle(const TDEHTMLSettings *s, DocumentImpl *doc)
317 317
 {
318 318
     if(s_defaultStyle) return;
319 319
 
@@ -883,9 +883,9 @@ static PseudoState checkPseudoState( const CSSStyleSelector::Encodedurl& encoded
883 883
         cleanpath( u );
884 884
     }
885 885
     //completeURL( attr.string() );
886
-    bool contains = KHTMLFactory::vLinks()->contains( u );
886
+    bool contains = TDEHTMLFactory::vLinks()->contains( u );
887 887
     if ( !contains && u.contains('/')==2 )
888
-      contains = KHTMLFactory::vLinks()->contains( u+'/' );
888
+      contains = TDEHTMLFactory::vLinks()->contains( u+'/' );
889 889
     return contains ? PseudoVisited : PseudoLink;
890 890
 }
891 891
 
@@ -2136,9 +2136,9 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
2136 2136
                      (!parentNode && value->cssValueType() == CSSValue::CSS_INHERIT);
2137 2137
 
2138 2138
     // These properties are used to set the correct margins/padding on RTL lists.
2139
-    if (id == CSS_PROP__KHTML_MARGIN_START)
2139
+    if (id == CSS_PROP__TDEHTML_MARGIN_START)
2140 2140
         id = style->direction() == LTR ? CSS_PROP_MARGIN_LEFT : CSS_PROP_MARGIN_RIGHT;
2141
-    else if (id == CSS_PROP__KHTML_PADDING_START)
2141
+    else if (id == CSS_PROP__TDEHTML_PADDING_START)
2142 2142
         id = style->direction() == LTR ? CSS_PROP_PADDING_LEFT : CSS_PROP_PADDING_RIGHT;
2143 2143
 
2144 2144
     // 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 )
2150 2150
     case CSS_PROP_BACKGROUND_ATTACHMENT:
2151 2151
         HANDLE_BACKGROUND_VALUE(backgroundAttachment, BackgroundAttachment, value)
2152 2152
         break;
2153
-    case CSS_PROP__KHTML_BACKGROUND_CLIP:
2153
+    case CSS_PROP__TDEHTML_BACKGROUND_CLIP:
2154 2154
         HANDLE_BACKGROUND_VALUE(backgroundClip, BackgroundClip, value)
2155 2155
         break;
2156
-    case CSS_PROP__KHTML_BACKGROUND_ORIGIN:
2156
+    case CSS_PROP__TDEHTML_BACKGROUND_ORIGIN:
2157 2157
         HANDLE_BACKGROUND_VALUE(backgroundOrigin, BackgroundOrigin, value)
2158 2158
         break;
2159 2159
     case CSS_PROP_BACKGROUND_REPEAT:
2160 2160
         HANDLE_BACKGROUND_VALUE(backgroundRepeat, BackgroundRepeat, value)
2161 2161
         break;
2162
-    case CSS_PROP__KHTML_BACKGROUND_SIZE:
2162
+    case CSS_PROP__TDEHTML_BACKGROUND_SIZE:
2163 2163
         HANDLE_BACKGROUND_VALUE(backgroundSize, BackgroundSize, value)
2164 2164
         break;
2165 2165
     case CSS_PROP_BORDER_COLLAPSE:
@@ -2181,27 +2181,27 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
2181 2181
     case CSS_PROP_BORDER_TOP_STYLE:
2182 2182
         HANDLE_INHERIT_AND_INITIAL_WITH_VALUE(borderTopStyle, BorderTopStyle, BorderStyle)
2183 2183
         if (!primitiveValue) return;
2184
-        style->setBorderTopStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__KHTML_NATIVE));
2184
+        style->setBorderTopStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__TDEHTML_NATIVE));
2185 2185
         break;
2186 2186
     case CSS_PROP_BORDER_RIGHT_STYLE:
2187 2187
         HANDLE_INHERIT_AND_INITIAL_WITH_VALUE(borderRightStyle, BorderRightStyle, BorderStyle)
2188 2188
         if (!primitiveValue) return;
2189
-        style->setBorderRightStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__KHTML_NATIVE));
2189
+        style->setBorderRightStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__TDEHTML_NATIVE));
2190 2190
         break;
2191 2191
     case CSS_PROP_BORDER_BOTTOM_STYLE:
2192 2192
         HANDLE_INHERIT_AND_INITIAL_WITH_VALUE(borderBottomStyle, BorderBottomStyle, BorderStyle)
2193 2193
         if (!primitiveValue) return;
2194
-        style->setBorderBottomStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__KHTML_NATIVE));
2194
+        style->setBorderBottomStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__TDEHTML_NATIVE));
2195 2195
         break;
2196 2196
     case CSS_PROP_BORDER_LEFT_STYLE:
2197 2197
         HANDLE_INHERIT_AND_INITIAL_WITH_VALUE(borderLeftStyle, BorderLeftStyle, BorderStyle)
2198 2198
         if (!primitiveValue) return;
2199
-        style->setBorderLeftStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__KHTML_NATIVE));
2199
+        style->setBorderLeftStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__TDEHTML_NATIVE));
2200 2200
         break;
2201 2201
     case CSS_PROP_OUTLINE_STYLE:
2202 2202
         HANDLE_INHERIT_AND_INITIAL_WITH_VALUE(outlineStyle, OutlineStyle, BorderStyle)
2203 2203
         if (!primitiveValue) return;
2204
-        style->setOutlineStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__KHTML_NATIVE));
2204
+        style->setOutlineStyle((EBorderStyle)(primitiveValue->getIdent() - CSS_VAL__TDEHTML_NATIVE));
2205 2205
         break;
2206 2206
     case CSS_PROP_CAPTION_SIDE:
2207 2207
     {
@@ -2279,11 +2279,11 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
2279 2279
         EFloat f;
2280 2280
         switch(primitiveValue->getIdent())
2281 2281
         {
2282
-        case CSS_VAL__KHTML_LEFT:
2282
+        case CSS_VAL__TDEHTML_LEFT:
2283 2283
             f = FLEFT_ALIGN; break;
2284 2284
         case CSS_VAL_LEFT:
2285 2285
             f = FLEFT; break;
2286
-        case CSS_VAL__KHTML_RIGHT:
2286
+        case CSS_VAL__TDEHTML_RIGHT:
2287 2287
             f = FRIGHT_ALIGN; break;
2288 2288
         case CSS_VAL_RIGHT:
2289 2289
             f = FRIGHT; break;
@@ -2659,8 +2659,8 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
2659 2659
 
2660 2660
         EWhiteSpace s;
2661 2661
         switch(primitiveValue->getIdent()) {
2662
-        case CSS_VAL__KHTML_NOWRAP:
2663
-            s = KHTML_NOWRAP;
2662
+        case CSS_VAL__TDEHTML_NOWRAP:
2663
+            s = TDEHTML_NOWRAP;
2664 2664
             break;
2665 2665
         case CSS_VAL_NOWRAP:
2666 2666
             s = NOWRAP;
@@ -2700,14 +2700,14 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
2700 2700
         style->setBorderVerticalSpacing(parentStyle->borderVerticalSpacing());
2701 2701
         break;
2702 2702
     }
2703
-    case CSS_PROP__KHTML_BORDER_HORIZONTAL_SPACING: {
2703
+    case CSS_PROP__TDEHTML_BORDER_HORIZONTAL_SPACING: {
2704 2704
         HANDLE_INHERIT_AND_INITIAL(borderHorizontalSpacing, BorderHorizontalSpacing)
2705 2705
         if (!primitiveValue) break;
2706 2706
         short spacing =  primitiveValue->computeLength(style, paintDeviceMetrics);
2707 2707
         style->setBorderHorizontalSpacing(spacing);
2708 2708
         break;
2709 2709
     }
2710
-    case CSS_PROP__KHTML_BORDER_VERTICAL_SPACING: {
2710
+    case CSS_PROP__TDEHTML_BORDER_VERTICAL_SPACING: {
2711 2711
         HANDLE_INHERIT_AND_INITIAL(borderVerticalSpacing, BorderVerticalSpacing)
2712 2712
         if (!primitiveValue) break;
2713 2713
         short spacing =  primitiveValue->computeLength(style, paintDeviceMetrics);
@@ -2759,7 +2759,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
2759 2759
 		return;
2760 2760
 	    int ident = primitiveValue->getIdent();
2761 2761
 	    if ( ident ) {
2762
-		if ( ident == CSS_VAL__KHTML_TEXT )
2762
+		if ( ident == CSS_VAL__TDEHTML_TEXT )
2763 2763
 		    col = element->getDocument()->textColor();
2764 2764
   		// ### should be eliminated
2765 2765
 		else if ( ident == CSS_VAL_TRANSPARENT
@@ -3152,7 +3152,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
3152 3152
 		    align = SUB; break;
3153 3153
 		case CSS_VAL_SUPER:
3154 3154
 		    align = SUPER; break;
3155
-		case CSS_VAL__KHTML_BASELINE_MIDDLE:
3155
+		case CSS_VAL__TDEHTML_BASELINE_MIDDLE:
3156 3156
 		    align = BASELINE_MIDDLE; break;
3157 3157
 		default:
3158 3158
 		    return;
@@ -3210,7 +3210,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
3210 3210
             case CSS_VAL_LARGE:    size = int( fontSizes[4] ); break;
3211 3211
             case CSS_VAL_X_LARGE:  size = int( fontSizes[5] ); break;
3212 3212
             case CSS_VAL_XX_LARGE: size = int( fontSizes[6] ); break;
3213
-            case CSS_VAL__KHTML_XXX_LARGE: size = int( fontSizes[7] ); break;
3213
+            case CSS_VAL__TDEHTML_XXX_LARGE: size = int( fontSizes[7] ); break;
3214 3214
             case CSS_VAL_LARGER:
3215 3215
                 size = nextFontSize(fontSizes, oldSize, false);
3216 3216
                 break;
@@ -3326,7 +3326,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
3326 3326
         HANDLE_INHERIT_AND_INITIAL(textAlign, TextAlign)
3327 3327
         if (!primitiveValue) return;
3328 3328
         if (primitiveValue->getIdent())
3329
-            style->setTextAlign( (ETextAlign) (primitiveValue->getIdent() - CSS_VAL__KHTML_AUTO) );
3329
+            style->setTextAlign( (ETextAlign) (primitiveValue->getIdent() - CSS_VAL__TDEHTML_AUTO) );
3330 3330
 	return;
3331 3331
     }
3332 3332
 
@@ -3581,15 +3581,15 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
3581 3581
 	style->setTextDecoration(t);
3582 3582
         break;
3583 3583
     }
3584
-    case CSS_PROP__KHTML_FLOW_MODE:
3584
+    case CSS_PROP__TDEHTML_FLOW_MODE:
3585 3585
         HANDLE_INHERIT_AND_INITIAL(flowAroundFloats, FlowAroundFloats)
3586 3586
         if (!primitiveValue) return;
3587 3587
         if (primitiveValue->getIdent()) {
3588
-            style->setFlowAroundFloats( primitiveValue->getIdent() == CSS_VAL__KHTML_AROUND_FLOATS );
3588
+            style->setFlowAroundFloats( primitiveValue->getIdent() == CSS_VAL__TDEHTML_AROUND_FLOATS );
3589 3589
             return;
3590 3590
         }
3591 3591
         break;
3592
-    case CSS_PROP__KHTML_USER_INPUT: {
3592
+    case CSS_PROP__TDEHTML_USER_INPUT: {
3593 3593
         if(value->cssValueType() == CSSValue::CSS_INHERIT)
3594 3594
         {
3595 3595
             if(!parentNode) return;
@@ -3843,7 +3843,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
3843 3843
         // Clamp opacity to the range 0-1
3844 3844
         style->setOpacity(kMin(1.0f, kMax(0.0f, (float)primitiveValue->floatValue(CSSPrimitiveValue::CSS_NUMBER))));
3845 3845
         break;
3846
-    case CSS_PROP__KHTML_MARQUEE:
3846
+    case CSS_PROP__TDEHTML_MARQUEE:
3847 3847
         if (value->cssValueType() != CSSValue::CSS_INHERIT || !parentNode) return;
3848 3848
         style->setMarqueeDirection(parentStyle->marqueeDirection());
3849 3849
         style->setMarqueeIncrement(parentStyle->marqueeIncrement());
@@ -3851,7 +3851,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
3851 3851
         style->setMarqueeLoopCount(parentStyle->marqueeLoopCount());
3852 3852
         style->setMarqueeBehavior(parentStyle->marqueeBehavior());
3853 3853
         break;
3854
-    case CSS_PROP__KHTML_MARQUEE_REPETITION: {
3854
+    case CSS_PROP__TDEHTML_MARQUEE_REPETITION: {
3855 3855
         HANDLE_INHERIT_AND_INITIAL(marqueeLoopCount, MarqueeLoopCount)
3856 3856
         if (!primitiveValue) return;
3857 3857
         if (primitiveValue->getIdent() == CSS_VAL_INFINITE)
@@ -3860,7 +3860,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
3860 3860
             style->setMarqueeLoopCount((int)(primitiveValue->floatValue(CSSPrimitiveValue::CSS_NUMBER)));
3861 3861
         break;
3862 3862
     }
3863
-    case CSS_PROP__KHTML_MARQUEE_SPEED: {
3863
+    case CSS_PROP__TDEHTML_MARQUEE_SPEED: {
3864 3864
         HANDLE_INHERIT_AND_INITIAL(marqueeSpeed, MarqueeSpeed)
3865 3865
         if (!primitiveValue) return;
3866 3866
         if (primitiveValue->getIdent()) {
@@ -3885,7 +3885,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
3885 3885
             style->setMarqueeSpeed(int(primitiveValue->floatValue(CSSPrimitiveValue::CSS_NUMBER)));
3886 3886
         break;
3887 3887
     }
3888
-    case CSS_PROP__KHTML_MARQUEE_INCREMENT: {
3888
+    case CSS_PROP__TDEHTML_MARQUEE_INCREMENT: {
3889 3889
         HANDLE_INHERIT_AND_INITIAL(marqueeIncrement, MarqueeIncrement)
3890 3890
         if (!primitiveValue) return;
3891 3891
         if (primitiveValue->getIdent()) {
@@ -3910,7 +3910,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
3910 3910
         }
3911 3911
         break;
3912 3912
     }
3913
-    case CSS_PROP__KHTML_MARQUEE_STYLE: {
3913
+    case CSS_PROP__TDEHTML_MARQUEE_STYLE: {
3914 3914
         HANDLE_INHERIT_AND_INITIAL(marqueeBehavior, MarqueeBehavior)
3915 3915
         if (!primitiveValue || !primitiveValue->getIdent()) return;
3916 3916
         switch (primitiveValue->getIdent())
@@ -3933,7 +3933,7 @@ void CSSStyleSelector::applyRule( int id, DOM::CSSValueImpl *value )
3933 3933
         }
3934 3934
         break;
3935 3935
     }
3936
-    case CSS_PROP__KHTML_MARQUEE_DIRECTION: {
3936
+    case CSS_PROP__TDEHTML_MARQUEE_DIRECTION: {
3937 3937
         HANDLE_INHERIT_AND_INITIAL(marqueeDirection, MarqueeDirection)
3938 3938
         if (!primitiveValue || !primitiveValue->getIdent()) return;
3939 3939
         switch (primitiveValue->getIdent())

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

@@ -30,10 +30,10 @@
30 30
 #include "dom/dom_string.h"
31 31
 #include "xml/dom_restyler.h"
32 32
 
33
-class KHTMLSettings;
34
-class KHTMLView;
35
-class KHTMLPart;
36
-class KHTMLFactory;
33
+class TDEHTMLSettings;
34
+class TDEHTMLView;
35
+class TDEHTMLPart;
36
+class TDEHTMLFactory;
37 37
 class KURL;
38 38
 
39 39
 namespace DOM {
@@ -127,7 +127,7 @@ namespace tdehtml
127 127
         KDE_EXPORT static void clear();
128 128
         static void reparseConfiguration();
129 129
 
130
-	static void loadDefaultStyle(const KHTMLSettings *s, DOM::DocumentImpl *doc);
130
+	static void loadDefaultStyle(const TDEHTMLSettings *s, DOM::DocumentImpl *doc);
131 131
 
132 132
 	RenderStyle *styleForElement(DOM::ElementImpl *e);
133 133
 
@@ -189,7 +189,7 @@ namespace tdehtml
189 189
 public:
190 190
 
191 191
     private:
192
-        void init(const KHTMLSettings* settings, DOM::DocumentImpl* doc);
192
+        void init(const TDEHTMLSettings* settings, DOM::DocumentImpl* doc);
193 193
 
194 194
         void mapBackgroundAttachment(BackgroundLayer* layer, DOM::CSSValueImpl* value);
195 195
         void mapBackgroundClip(BackgroundLayer* layer, DOM::CSSValueImpl* value);
@@ -246,9 +246,9 @@ public:
246 246
 	RenderStyle *parentStyle;
247 247
 	DOM::ElementImpl *element;
248 248
 	DOM::NodeImpl *parentNode;
249
-	KHTMLView *view;
250
-	KHTMLPart *part;
251
-	const KHTMLSettings *settings;
249
+	TDEHTMLView *view;
250
+	TDEHTMLPart *part;
251
+	const TDEHTMLSettings *settings;
252 252
 	TQPaintDeviceMetrics *paintDeviceMetrics;
253 253
         TQValueVector<int>     m_fontSizes;
254 254
 	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)
597 597
 #line 35 "cssvalues.gperf"
598 598
       {"small-caps", CSS_VAL_SMALL_CAPS},
599 599
 #line 122 "cssvalues.gperf"
600
-      {"-tdehtml-text", CSS_VAL__KHTML_TEXT},
600
+      {"-tdehtml-text", CSS_VAL__TDEHTML_TEXT},
601 601
 #line 141 "cssvalues.gperf"
602
-      {"-tdehtml-left", CSS_VAL__KHTML_LEFT},
602
+      {"-tdehtml-left", CSS_VAL__TDEHTML_LEFT},
603 603
 #line 97 "cssvalues.gperf"
604 604
       {"background", CSS_VAL_BACKGROUND},
605 605
 #line 178 "cssvalues.gperf"
@@ -615,9 +615,9 @@ findValue (register const char *str, register unsigned int len)
615 615
 #line 198 "cssvalues.gperf"
616 616
       {"table-caption", CSS_VAL_TABLE_CAPTION},
617 617
 #line 154 "cssvalues.gperf"
618
-      {"-tdehtml-lao", CSS_VAL__KHTML_LAO},
618
+      {"-tdehtml-lao", CSS_VAL__TDEHTML_LAO},
619 619
 #line 143 "cssvalues.gperf"
620
-      {"-tdehtml-center", CSS_VAL__KHTML_CENTER},
620
+      {"-tdehtml-center", CSS_VAL__TDEHTML_CENTER},
621 621
 #line 54 "cssvalues.gperf"
622 622
       {"x-large", CSS_VAL_X_LARGE},
623 623
 #line 30 "cssvalues.gperf"
@@ -625,29 +625,29 @@ findValue (register const char *str, register unsigned int len)
625 625
 #line 203 "cssvalues.gperf"
626 626
       {"progress", CSS_VAL_PROGRESS},
627 627
 #line 16 "cssvalues.gperf"
628
-      {"-tdehtml-native", CSS_VAL__KHTML_NATIVE},
628
+      {"-tdehtml-native", CSS_VAL__TDEHTML_NATIVE},
629 629
 #line 177 "cssvalues.gperf"
630 630
       {"hiragana", CSS_VAL_HIRAGANA},
631 631
 #line 171 "cssvalues.gperf"
632 632
       {"lower-greek", CSS_VAL_LOWER_GREEK},
633 633
 #line 150 "cssvalues.gperf"
634
-      {"-tdehtml-diamond", CSS_VAL__KHTML_DIAMOND},
634
+      {"-tdehtml-diamond", CSS_VAL__TDEHTML_DIAMOND},
635 635
 #line 224 "cssvalues.gperf"
636 636
       {"no-close-quote", CSS_VAL_NO_CLOSE_QUOTE},
637 637
 #line 61 "cssvalues.gperf"
638 638
       {"ultra-condensed", CSS_VAL_ULTRA_CONDENSED},
639 639
 #line 158 "cssvalues.gperf"
640
-      {"-tdehtml-tibetan", CSS_VAL__KHTML_TIBETAN},
640
+      {"-tdehtml-tibetan", CSS_VAL__TDEHTML_TIBETAN},
641 641
 #line 124 "cssvalues.gperf"
642 642
       {"repeat-x", CSS_VAL_REPEAT_X},
643 643
 #line 266 "cssvalues.gperf"
644
-      {"-tdehtml-normal", CSS_VAL__KHTML_NORMAL},
644
+      {"-tdehtml-normal", CSS_VAL__TDEHTML_NORMAL},
645 645
 #line 113 "cssvalues.gperf"
646 646
       {"threeddarkshadow", CSS_VAL_THREEDDARKSHADOW},
647 647
 #line 219 "cssvalues.gperf"
648 648
       {"uppercase", CSS_VAL_UPPERCASE},
649 649
 #line 136 "cssvalues.gperf"
650
-      {"-tdehtml-auto", CSS_VAL__KHTML_AUTO},
650
+      {"-tdehtml-auto", CSS_VAL__TDEHTML_AUTO},
651 651
 #line 163 "cssvalues.gperf"
652 652
       {"georgian", CSS_VAL_GEORGIAN},
653 653
 #line 229 "cssvalues.gperf"
@@ -657,13 +657,13 @@ findValue (register const char *str, register unsigned int len)
657 657
 #line 109 "cssvalues.gperf"
658 658
       {"infobackground", CSS_VAL_INFOBACKGROUND},
659 659
 #line 157 "cssvalues.gperf"
660
-      {"-tdehtml-thai", CSS_VAL__KHTML_THAI},
660
+      {"-tdehtml-thai", CSS_VAL__TDEHTML_THAI},
661 661
 #line 226 "cssvalues.gperf"
662 662
       {"open-quote", CSS_VAL_OPEN_QUOTE},
663 663
 #line 173 "cssvalues.gperf"
664 664
       {"lower-alpha", CSS_VAL_LOWER_ALPHA},
665 665
 #line 156 "cssvalues.gperf"
666
-      {"-tdehtml-urdu", CSS_VAL__KHTML_URDU},
666
+      {"-tdehtml-urdu", CSS_VAL__TDEHTML_URDU},
667 667
 #line 223 "cssvalues.gperf"
668 668
       {"close-quote", CSS_VAL_CLOSE_QUOTE},
669 669
 #line 104 "cssvalues.gperf"
@@ -671,13 +671,13 @@ findValue (register const char *str, register unsigned int len)
671 671
 #line 225 "cssvalues.gperf"
672 672
       {"no-open-quote", CSS_VAL_NO_OPEN_QUOTE},
673 673
 #line 231 "cssvalues.gperf"
674
-      {"-tdehtml-nowrap", CSS_VAL__KHTML_NOWRAP},
674
+      {"-tdehtml-nowrap", CSS_VAL__TDEHTML_NOWRAP},
675 675
 #line 67 "cssvalues.gperf"
676 676
       {"extra-expanded", CSS_VAL_EXTRA_EXPANDED},
677 677
 #line 105 "cssvalues.gperf"
678 678
       {"highlighttext", CSS_VAL_HIGHLIGHTTEXT},
679 679
 #line 155 "cssvalues.gperf"
680
-      {"-tdehtml-persian", CSS_VAL__KHTML_PERSIAN},
680
+      {"-tdehtml-persian", CSS_VAL__TDEHTML_PERSIAN},
681 681
 #line 116 "cssvalues.gperf"
682 682
       {"threedlightshadow", CSS_VAL_THREEDLIGHTSHADOW},
683 683
 #line 96 "cssvalues.gperf"
@@ -691,13 +691,13 @@ findValue (register const char *str, register unsigned int len)
691 691
 #line 251 "cssvalues.gperf"
692 692
       {"line-through", CSS_VAL_LINE_THROUGH},
693 693
 #line 142 "cssvalues.gperf"
694
-      {"-tdehtml-right", CSS_VAL__KHTML_RIGHT},
694
+      {"-tdehtml-right", CSS_VAL__TDEHTML_RIGHT},
695 695
 #line 160 "cssvalues.gperf"
696 696
       {"upper-roman", CSS_VAL_UPPER_ROMAN},
697 697
 #line 135 "cssvalues.gperf"
698
-      {"-tdehtml-baseline-middle", CSS_VAL__KHTML_BASELINE_MIDDLE},
698
+      {"-tdehtml-baseline-middle", CSS_VAL__TDEHTML_BASELINE_MIDDLE},
699 699
 #line 153 "cssvalues.gperf"
700
-      {"-tdehtml-arabic-indic", CSS_VAL__KHTML_ARABIC_INDIC},
700
+      {"-tdehtml-arabic-indic", CSS_VAL__TDEHTML_ARABIC_INDIC},
701 701
 #line 152 "cssvalues.gperf"
702 702
       {"decimal-leading-zero", CSS_VAL_DECIMAL_LEADING_ZERO},
703 703
 #line 115 "cssvalues.gperf"
@@ -707,13 +707,13 @@ findValue (register const char *str, register unsigned int len)
707 707
 #line 99 "cssvalues.gperf"
708 708
       {"buttonhighlight", CSS_VAL_BUTTONHIGHLIGHT},
709 709
 #line 56 "cssvalues.gperf"
710
-      {"-tdehtml-xxx-large", CSS_VAL__KHTML_XXX_LARGE},
710
+      {"-tdehtml-xxx-large", CSS_VAL__TDEHTML_XXX_LARGE},
711 711
 #line 267 "cssvalues.gperf"
712
-      {"-tdehtml-around-floats", CSS_VAL__KHTML_AROUND_FLOATS},
712
+      {"-tdehtml-around-floats", CSS_VAL__TDEHTML_AROUND_FLOATS},
713 713
 #line 191 "cssvalues.gperf"
714 714
       {"table-row-group", CSS_VAL_TABLE_ROW_GROUP},
715 715
 #line 182 "cssvalues.gperf"
716
-      {"-tdehtml-close-quote", CSS_VAL__KHTML_CLOSE_QUOTE},
716
+      {"-tdehtml-close-quote", CSS_VAL__TDEHTML_CLOSE_QUOTE},
717 717
 #line 179 "cssvalues.gperf"
718 718
       {"hiragana-iroha", CSS_VAL_HIRAGANA_IROHA},
719 719
 #line 193 "cssvalues.gperf"
@@ -723,23 +723,23 @@ findValue (register const char *str, register unsigned int len)
723 723
 #line 175 "cssvalues.gperf"
724 724
       {"upper-alpha", CSS_VAL_UPPER_ALPHA},
725 725
 #line 181 "cssvalues.gperf"
726
-      {"-tdehtml-open-quote", CSS_VAL__KHTML_OPEN_QUOTE},
726
+      {"-tdehtml-open-quote", CSS_VAL__TDEHTML_OPEN_QUOTE},
727 727
 #line 165 "cssvalues.gperf"
728
-      {"-tdehtml-japanese-formal", CSS_VAL__KHTML_JAPANESE_FORMAL},
728
+      {"-tdehtml-japanese-formal", CSS_VAL__TDEHTML_JAPANESE_FORMAL},
729 729
 #line 166 "cssvalues.gperf"
730
-      {"-tdehtml-japanese-informal", CSS_VAL__KHTML_JAPANESE_INFORMAL},
730
+      {"-tdehtml-japanese-informal", CSS_VAL__TDEHTML_JAPANESE_INFORMAL},
731 731
 #line 192 "cssvalues.gperf"
732 732
       {"table-header-group", CSS_VAL_TABLE_HEADER_GROUP},
733 733
 #line 169 "cssvalues.gperf"
734
-      {"-tdehtml-trad-chinese-formal", CSS_VAL__KHTML_TRAD_CHINESE_FORMAL},
734
+      {"-tdehtml-trad-chinese-formal", CSS_VAL__TDEHTML_TRAD_CHINESE_FORMAL},
735 735
 #line 170 "cssvalues.gperf"
736
-      {"-tdehtml-trad-chinese-informal", CSS_VAL__KHTML_TRAD_CHINESE_INFORMAL},
736
+      {"-tdehtml-trad-chinese-informal", CSS_VAL__TDEHTML_TRAD_CHINESE_INFORMAL},
737 737
 #line 167 "cssvalues.gperf"
738
-      {"-tdehtml-simp-chinese-formal", CSS_VAL__KHTML_SIMP_CHINESE_FORMAL},
738
+      {"-tdehtml-simp-chinese-formal", CSS_VAL__TDEHTML_SIMP_CHINESE_FORMAL},
739 739
 #line 168 "cssvalues.gperf"
740
-      {"-tdehtml-simp-chinese-informal", CSS_VAL__KHTML_SIMP_CHINESE_INFORMAL},
740
+      {"-tdehtml-simp-chinese-informal", CSS_VAL__TDEHTML_SIMP_CHINESE_INFORMAL},
741 741
 #line 172 "cssvalues.gperf"
742
-      {"-tdehtml-upper-greek", CSS_VAL__KHTML_UPPER_GREEK}
742
+      {"-tdehtml-upper-greek", CSS_VAL__TDEHTML_UPPER_GREEK}
743 743
     };
744 744
 
745 745
   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;
11 11
 #define CSS_VAL_MIN 1
12 12
 #define CSS_VAL_INHERIT 1
13 13
 #define CSS_VAL_INITIAL 2
14
-#define CSS_VAL__KHTML_NATIVE 3
14
+#define CSS_VAL__TDEHTML_NATIVE 3
15 15
 #define CSS_VAL_NONE 4
16 16
 #define CSS_VAL_HIDDEN 5
17 17
 #define CSS_VAL_INSET 6
@@ -51,7 +51,7 @@ DOM::DOMString getValueName(unsigned short id) KDE_NO_EXPORT;
51 51
 #define CSS_VAL_LARGE 40
52 52
 #define CSS_VAL_X_LARGE 41
53 53
 #define CSS_VAL_XX_LARGE 42
54
-#define CSS_VAL__KHTML_XXX_LARGE 43
54
+#define CSS_VAL__TDEHTML_XXX_LARGE 43
55 55
 #define CSS_VAL_SMALLER 44
56 56
 #define CSS_VAL_LARGER 45
57 57
 #define CSS_VAL_WIDER 46
@@ -117,7 +117,7 @@ DOM::DOMString getValueName(unsigned short id) KDE_NO_EXPORT;
117 117
 #define CSS_VAL_WINDOWFRAME 106
118 118
 #define CSS_VAL_WINDOWTEXT 107
119 119
 #define CSS_VAL_GREY 108
120
-#define CSS_VAL__KHTML_TEXT 109
120
+#define CSS_VAL__TDEHTML_TEXT 109
121 121
 #define CSS_VAL_REPEAT 110
122 122
 #define CSS_VAL_REPEAT_X 111
123 123
 #define CSS_VAL_REPEAT_Y 112
@@ -130,44 +130,44 @@ DOM::DOMString getValueName(unsigned short id) KDE_NO_EXPORT;
130 130
 #define CSS_VAL_TEXT_BOTTOM 119
131 131
 #define CSS_VAL_TOP 120
132 132
 #define CSS_VAL_BOTTOM 121
133
-#define CSS_VAL__KHTML_BASELINE_MIDDLE 122
134
-#define CSS_VAL__KHTML_AUTO 123
133
+#define CSS_VAL__TDEHTML_BASELINE_MIDDLE 122
134
+#define CSS_VAL__TDEHTML_AUTO 123
135 135
 #define CSS_VAL_LEFT 124
136 136
 #define CSS_VAL_RIGHT 125
137 137
 #define CSS_VAL_CENTER 126
138 138
 #define CSS_VAL_JUSTIFY 127
139
-#define CSS_VAL__KHTML_LEFT 128
140
-#define CSS_VAL__KHTML_RIGHT 129
141
-#define CSS_VAL__KHTML_CENTER 130
139
+#define CSS_VAL__TDEHTML_LEFT 128
140
+#define CSS_VAL__TDEHTML_RIGHT 129
141
+#define CSS_VAL__TDEHTML_CENTER 130
142 142
 #define CSS_VAL_OUTSIDE 131
143 143
 #define CSS_VAL_INSIDE 132
144 144
 #define CSS_VAL_DISC 133
145 145
 #define CSS_VAL_CIRCLE 134
146 146
 #define CSS_VAL_SQUARE 135
147 147
 #define CSS_VAL_BOX 136
148
-#define CSS_VAL__KHTML_DIAMOND 137
148
+#define CSS_VAL__TDEHTML_DIAMOND 137
149 149
 #define CSS_VAL_DECIMAL 138
150 150
 #define CSS_VAL_DECIMAL_LEADING_ZERO 139
151
-#define CSS_VAL__KHTML_ARABIC_INDIC 140
152
-#define CSS_VAL__KHTML_LAO 141
153
-#define CSS_VAL__KHTML_PERSIAN 142
154
-#define CSS_VAL__KHTML_URDU 143
155
-#define CSS_VAL__KHTML_THAI 144
156
-#define CSS_VAL__KHTML_TIBETAN 145
151
+#define CSS_VAL__TDEHTML_ARABIC_INDIC 140
152
+#define CSS_VAL__TDEHTML_LAO 141
153
+#define CSS_VAL__TDEHTML_PERSIAN 142
154
+#define CSS_VAL__TDEHTML_URDU 143
155
+#define CSS_VAL__TDEHTML_THAI 144
156
+#define CSS_VAL__TDEHTML_TIBETAN 145
157 157
 #define CSS_VAL_LOWER_ROMAN 146
158 158
 #define CSS_VAL_UPPER_ROMAN 147
159 159
 #define CSS_VAL_HEBREW 148
160 160
 #define CSS_VAL_ARMENIAN 149
161 161
 #define CSS_VAL_GEORGIAN 150
162 162
 #define CSS_VAL_CJK_IDEOGRAPHIC 151
163
-#define CSS_VAL__KHTML_JAPANESE_FORMAL 152
164
-#define CSS_VAL__KHTML_JAPANESE_INFORMAL 153
165
-#define CSS_VAL__KHTML_SIMP_CHINESE_FORMAL 154
166
-#define CSS_VAL__KHTML_SIMP_CHINESE_INFORMAL 155
167
-#define CSS_VAL__KHTML_TRAD_CHINESE_FORMAL 156
168
-#define CSS_VAL__KHTML_TRAD_CHINESE_INFORMAL 157
163
+#define CSS_VAL__TDEHTML_JAPANESE_FORMAL 152
164
+#define CSS_VAL__TDEHTML_JAPANESE_INFORMAL 153
165
+#define CSS_VAL__TDEHTML_SIMP_CHINESE_FORMAL 154
166
+#define CSS_VAL__TDEHTML_SIMP_CHINESE_INFORMAL 155
167
+#define CSS_VAL__TDEHTML_TRAD_CHINESE_FORMAL 156
168
+#define CSS_VAL__TDEHTML_TRAD_CHINESE_INFORMAL 157
169 169
 #define CSS_VAL_LOWER_GREEK 158
170
-#define CSS_VAL__KHTML_UPPER_GREEK 159
170
+#define CSS_VAL__TDEHTML_UPPER_GREEK 159
171 171
 #define CSS_VAL_LOWER_ALPHA 160
172 172
 #define CSS_VAL_LOWER_LATIN 161
173 173
 #define CSS_VAL_UPPER_ALPHA 162
@@ -176,8 +176,8 @@ DOM::DOMString getValueName(unsigned short id) KDE_NO_EXPORT;
176 176
 #define CSS_VAL_KATAKANA 165
177 177
 #define CSS_VAL_HIRAGANA_IROHA 166
178 178
 #define CSS_VAL_KATAKANA_IROHA 167
179
-#define CSS_VAL__KHTML_OPEN_QUOTE 168
180
-#define CSS_VAL__KHTML_CLOSE_QUOTE 169
179
+#define CSS_VAL__TDEHTML_OPEN_QUOTE 168
180
+#define CSS_VAL__TDEHTML_CLOSE_QUOTE 169
181 181
 #define CSS_VAL_INLINE 170
182 182
 #define CSS_VAL_BLOCK 171
183 183
 #define CSS_VAL_LIST_ITEM 172
@@ -226,7 +226,7 @@ DOM::DOMString getValueName(unsigned short id) KDE_NO_EXPORT;
226 226
 #define CSS_VAL_PRE 215
227 227
 #define CSS_VAL_PRE_WRAP 216
228 228
 #define CSS_VAL_PRE_LINE 217
229
-#define CSS_VAL__KHTML_NOWRAP 218
229
+#define CSS_VAL__TDEHTML_NOWRAP 218
230 230
 #define CSS_VAL_BREAK_WORD 219
231 231
 #define CSS_VAL_ABOVE 220
232 232
 #define CSS_VAL_ABSOLUTE 221
@@ -261,8 +261,8 @@ DOM::DOMString getValueName(unsigned short id) KDE_NO_EXPORT;
261 261
 #define CSS_VAL_THICK 250
262 262
 #define CSS_VAL_THIN 251
263 263
 #define CSS_VAL_UNDERLINE 252
264
-#define CSS_VAL__KHTML_NORMAL 253
265
-#define CSS_VAL__KHTML_AROUND_FLOATS 254
264
+#define CSS_VAL__TDEHTML_NORMAL 253
265
+#define CSS_VAL__TDEHTML_AROUND_FLOATS 254
266 266
 #define CSS_VAL_BORDER_BOX 255
267 267
 #define CSS_VAL_CONTENT_BOX 256
268 268
 #define CSS_VAL_ENABLED 257

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

@@ -350,16 +350,16 @@ thick
350 350
 thin
351 351
 underline
352 352
 #
353
-# CSS_PROP__KHTML_FLOW_MODE
353
+# CSS_PROP__TDEHTML_FLOW_MODE
354 354
 -tdehtml-normal
355 355
 -tdehtml-around-floats
356 356
 
357 357
 # CSS3 Values
358
-# CSS_PROP__KHTML_BOX_SIZING
358
+# CSS_PROP__TDEHTML_BOX_SIZING
359 359
 border-box
360 360
 content-box
361 361
 
362
-# CSS_PROP__KHTML_USER_INPUT
362
+# CSS_PROP__TDEHTML_USER_INPUT
363 363
 enabled
364 364
 disabled
365 365
 #none

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

@@ -81,9 +81,9 @@
81 81
      FONT_FACE_SYM = 273,
82 82
      CHARSET_SYM = 274,
83 83
      NAMESPACE_SYM = 275,
84
-     KHTML_RULE_SYM = 276,
85
-     KHTML_DECLS_SYM = 277,
86
-     KHTML_VALUE_SYM = 278,
84
+     TDEHTML_RULE_SYM = 276,
85
+     TDEHTML_DECLS_SYM = 277,
86
+     TDEHTML_VALUE_SYM = 278,
87 87
      IMPORTANT_SYM = 279,
88 88
      QEMS = 280,
89 89
      EMS = 281,
@@ -129,9 +129,9 @@
129 129
 #define FONT_FACE_SYM 273
130 130
 #define CHARSET_SYM 274
131 131
 #define NAMESPACE_SYM 275
132
-#define KHTML_RULE_SYM 276
133
-#define KHTML_DECLS_SYM 277
134
-#define KHTML_VALUE_SYM 278
132
+#define TDEHTML_RULE_SYM 276
133
+#define TDEHTML_DECLS_SYM 277
134
+#define TDEHTML_VALUE_SYM 278
135 135
 #define IMPORTANT_SYM 279
136 136
 #define QEMS 280
137 137
 #define EMS 281
@@ -589,7 +589,7 @@ static const char *const yytname[] =
589 589
   "INCLUDES", "DASHMATCH", "BEGINSWITH", "ENDSWITH", "CONTAINS", "STRING",
590 590
   "IDENT", "NTH", "HASH", "':'", "'.'", "'['", "'*'", "'|'", "IMPORT_SYM",
591 591
   "PAGE_SYM", "MEDIA_SYM", "FONT_FACE_SYM", "CHARSET_SYM", "NAMESPACE_SYM",
592
-  "KHTML_RULE_SYM", "KHTML_DECLS_SYM", "KHTML_VALUE_SYM", "IMPORTANT_SYM",
592
+  "TDEHTML_RULE_SYM", "TDEHTML_DECLS_SYM", "TDEHTML_VALUE_SYM", "IMPORTANT_SYM",
593 593
   "QEMS", "EMS", "EXS", "PXS", "CMS", "MMS", "INS", "PTS", "PCS", "DEGS",
594 594
   "RADS", "GRADS", "MSECS", "SECS", "HERZ", "KHERZ", "DIMEN", "PERCENTAGE",
595 595
   "FLOAT", "INTEGER", "URI", "FUNCTION", "NOTFUNCTION", "UNICODERANGE",

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

@@ -48,9 +48,9 @@
48 48
      FONT_FACE_SYM = 273,
49 49
      CHARSET_SYM = 274,
50 50
      NAMESPACE_SYM = 275,
51
-     KHTML_RULE_SYM = 276,
52
-     KHTML_DECLS_SYM = 277,
53
-     KHTML_VALUE_SYM = 278,
51
+     TDEHTML_RULE_SYM = 276,
52
+     TDEHTML_DECLS_SYM = 277,
53
+     TDEHTML_VALUE_SYM = 278,
54 54
      IMPORTANT_SYM = 279,
55 55
      QEMS = 280,
56 56
      EMS = 281,
@@ -96,9 +96,9 @@
96 96
 #define FONT_FACE_SYM 273
97 97
 #define CHARSET_SYM 274
98 98
 #define NAMESPACE_SYM 275
99
-#define KHTML_RULE_SYM 276
100
-#define KHTML_DECLS_SYM 277
101
-#define KHTML_VALUE_SYM 278
99
+#define TDEHTML_RULE_SYM 276
100
+#define TDEHTML_DECLS_SYM 277
101
+#define TDEHTML_VALUE_SYM 278
102 102
 #define IMPORTANT_SYM 279
103 103
 #define QEMS 280
104 104
 #define EMS 281

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

@@ -164,9 +164,9 @@ static int cssyylex( YYSTYPE *yylval ) {
164 164
 %token FONT_FACE_SYM
165 165
 %token CHARSET_SYM
166 166
 %token NAMESPACE_SYM
167
-%token KHTML_RULE_SYM
168
-%token KHTML_DECLS_SYM
169
-%token KHTML_VALUE_SYM
167
+%token TDEHTML_RULE_SYM
168
+%token TDEHTML_DECLS_SYM
169
+%token TDEHTML_VALUE_SYM
170 170
 
171 171
 %token IMPORTANT_SYM
172 172
 
@@ -261,20 +261,20 @@ stylesheet:
261 261
   ;
262 262
 
263 263
 tdehtml_rule:
264
-    KHTML_RULE_SYM '{' maybe_space ruleset maybe_space '}' {
264
+    TDEHTML_RULE_SYM '{' maybe_space ruleset maybe_space '}' {
265 265
         CSSParser *p = static_cast<CSSParser *>(parser);
266 266
 	p->rule = $4;
267 267
     }
268 268
 ;
269 269
 
270 270
 tdehtml_decls:
271
-    KHTML_DECLS_SYM declaration_block {
271
+    TDEHTML_DECLS_SYM declaration_block {
272 272
 	/* can be empty */
273 273
     }
274 274
 ;
275 275
 
276 276
 tdehtml_value:
277
-    KHTML_VALUE_SYM '{' maybe_space expr '}' {
277
+    TDEHTML_VALUE_SYM '{' maybe_space expr '}' {
278 278
 	CSSParser *p = static_cast<CSSParser *>(parser);
279 279
 	if ( $4 ) {
280 280
 	    p->valueList = $4;

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

@@ -756,17 +756,17 @@ YY_RULE_SETUP
756 756
 case 20:
757 757
 YY_RULE_SETUP
758 758
 #line 53 "tokenizer.flex"
759
-{yyTok = KHTML_RULE_SYM; return yyTok; }
759
+{yyTok = TDEHTML_RULE_SYM; return yyTok; }
760 760
 	YY_BREAK
761 761
 case 21:
762 762
 YY_RULE_SETUP
763 763
 #line 54 "tokenizer.flex"
764
-{yyTok = KHTML_DECLS_SYM; return yyTok; }
764
+{yyTok = TDEHTML_DECLS_SYM; return yyTok; }
765 765
 	YY_BREAK
766 766
 case 22:
767 767
 YY_RULE_SETUP
768 768
 #line 55 "tokenizer.flex"
769
-{yyTok = KHTML_VALUE_SYM; return yyTok; }
769
+{yyTok = TDEHTML_VALUE_SYM; return yyTok; }
770 770
 	YY_BREAK
771 771
 case 23:
772 772
 YY_RULE_SETUP

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

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

+ 1
- 1
tdehtml/design.h View File

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

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

@@ -49,7 +49,7 @@ class CSSRuleImpl;
49 49
  * interface.
50 50
  *
51 51
  */
52
-class KHTML_EXPORT CSSRule
52
+class TDEHTML_EXPORT CSSRule
53 53
 {
54 54
 public:
55 55
     CSSRule();
@@ -72,7 +72,7 @@ public:
72 72
         MEDIA_RULE = 4,
73 73
         FONT_FACE_RULE = 5,
74 74
         PAGE_RULE = 6,
75
-	QUIRKS_RULE = 100 // KHTML CSS Extension
75
+	QUIRKS_RULE = 100 // TDEHTML CSS Extension
76 76
     };
77 77
 
78 78
     /**
@@ -146,7 +146,7 @@ class CSSCharsetRuleImpl;
146 146
  * be used to define the encoding of the style sheet.
147 147
  *
148 148
  */
149
-class KHTML_EXPORT CSSCharsetRule : public CSSRule
149
+class TDEHTML_EXPORT CSSCharsetRule : public CSSRule
150 150
 {
151 151
 public:
152 152
     CSSCharsetRule();
@@ -190,7 +190,7 @@ class CSSFontFaceRuleImpl;
190 190
  * rule is used to hold a set of font descriptions.
191 191
  *
192 192
  */
193
-class KHTML_EXPORT CSSFontFaceRule : public CSSRule
193
+class TDEHTML_EXPORT CSSFontFaceRule : public CSSRule
194 194
 {
195 195
 public:
196 196
     CSSFontFaceRule();
@@ -220,7 +220,7 @@ class CSSImportRuleImpl;
220 220
  * rule is used to import style rules from other style sheets.
221 221
  *
222 222
  */
223
-class KHTML_EXPORT CSSImportRule : public CSSRule
223
+class TDEHTML_EXPORT CSSImportRule : public CSSRule
224 224
 {
225 225
 public:
226 226
     CSSImportRule();
@@ -267,7 +267,7 @@ class CSSMediaRuleImpl;
267 267
  * can be used to delimit style rules for specific media types.
268 268
  *
269 269
  */
270
-class KHTML_EXPORT CSSMediaRule : public CSSRule
270
+class TDEHTML_EXPORT CSSMediaRule : public CSSRule
271 271
 {
272 272
 public:
273 273
     CSSMediaRule();
@@ -359,7 +359,7 @@ class CSSPageRuleImpl;
359 359
  * page box for paged media.
360 360
  *
361 361
  */
362
-class KHTML_EXPORT CSSPageRule : public CSSRule
362
+class TDEHTML_EXPORT CSSPageRule : public CSSRule
363 363
 {
364 364
 public:
365 365
     CSSPageRule();
@@ -408,7 +408,7 @@ class CSSStyleRuleImpl;
408 408
  * in a CSS style sheet.
409 409
  *
410 410
  */
411
-class KHTML_EXPORT CSSStyleRule : public CSSRule
411
+class TDEHTML_EXPORT CSSStyleRule : public CSSRule
412 412
 {
413 413
 public:
414 414
     CSSStyleRule();
@@ -458,7 +458,7 @@ class CSSUnknownRuleImpl;
458 458
  * not supported by this user agent.
459 459
  *
460 460
  */
461
-class KHTML_EXPORT CSSUnknownRule : public CSSRule
461
+class TDEHTML_EXPORT CSSUnknownRule : public CSSRule
462 462
 {
463 463
 public:
464 464
     CSSUnknownRule();
@@ -481,7 +481,7 @@ class StyleListImpl;
481 481
  * of an ordered collection of CSS rules.
482 482
  *
483 483
  */
484
-class KHTML_EXPORT CSSRuleList
484
+class TDEHTML_EXPORT CSSRuleList
485 485
 {
486 486
 public:
487 487
     CSSRuleList();

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

@@ -55,7 +55,7 @@ class DocumentImpl;
55 55
  * instruction </a> .
56 56
  *
57 57
  */
58
-class KHTML_EXPORT StyleSheet
58
+class TDEHTML_EXPORT StyleSheet
59 59
 {
60 60
 public:
61 61
     StyleSheet();
@@ -170,7 +170,7 @@ protected:
170 170
  * This exception is raised when a specific CSS operation is impossible
171 171
  * to perform.
172 172
  */
173
-class KHTML_EXPORT CSSException
173
+class TDEHTML_EXPORT CSSException
174 174
 {
175 175
 public:
176 176
     CSSException(unsigned short _code) { code = _code; }
@@ -204,7 +204,7 @@ class CSSRuleList;
204 204
  * content type is "text/css".
205 205
  *
206 206
  */
207
-class KHTML_EXPORT CSSStyleSheet : public StyleSheet
207
+class TDEHTML_EXPORT CSSStyleSheet : public StyleSheet
208 208
 {
209 209
 public:
210 210
     CSSStyleSheet();
@@ -306,7 +306,7 @@ class StyleSheet;
306 306
  * abstraction of an ordered collection of style sheets.
307 307
  *
308 308
  */
309
-class KHTML_EXPORT StyleSheetList
309
+class TDEHTML_EXPORT StyleSheetList
310 310
 {
311 311
 public:
312 312
     StyleSheetList();
@@ -360,7 +360,7 @@ class CSSStyleSheet;
360 360
  * strings.
361 361
  *
362 362
  */
363
-class KHTML_EXPORT MediaList
363
+class TDEHTML_EXPORT MediaList
364 364
 {
365 365
 public:
366 366
     MediaList();
@@ -444,7 +444,7 @@ protected:
444 444
 
445 445
 class LinkStyleImpl;
446 446
 
447
-class KHTML_EXPORT LinkStyle
447
+class TDEHTML_EXPORT LinkStyle
448 448
 {
449 449
 public:
450 450
     LinkStyle();
@@ -466,7 +466,7 @@ protected:
466 466
 
467 467
 class DocumentStyleImpl;
468 468
 
469
-class KHTML_EXPORT DocumentStyle
469
+class TDEHTML_EXPORT DocumentStyle
470 470
 {
471 471
 public:
472 472
     DocumentStyle();

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

@@ -57,7 +57,7 @@ class CSSValue;
57 57
  * interface.
58 58
  *
59 59
  */
60
-class KHTML_EXPORT CSSStyleDeclaration
60
+class TDEHTML_EXPORT CSSStyleDeclaration
61 61
 {
62 62
 public:
63 63
     CSSStyleDeclaration();
@@ -240,7 +240,7 @@ class CSSValueImpl;
240 240
  * complexe value.
241 241
  *
242 242
  */
243
-class KHTML_EXPORT CSSValue
243
+class TDEHTML_EXPORT CSSValue
244 244
 {
245 245
 public:
246 246
     CSSValue();
@@ -313,7 +313,7 @@ class CSSValue;
313 313
  * of an ordered collection of CSS values.
314 314
  *
315 315
  */
316
-class KHTML_EXPORT CSSValueList : public CSSValue
316
+class TDEHTML_EXPORT CSSValueList : public CSSValue
317 317
 {
318 318
 public:
319 319
     CSSValueList();
@@ -370,7 +370,7 @@ class Rect;
370 370
  * \c CSSStyleDeclaration interface.
371 371
  *
372 372
  */
373
-class KHTML_EXPORT CSSPrimitiveValue : public CSSValue
373
+class TDEHTML_EXPORT CSSPrimitiveValue : public CSSValue
374 374
 {
375 375
 public:
376 376
     CSSPrimitiveValue();
@@ -588,7 +588,7 @@ public:
588 588
  * interface modify the style property.
589 589
  *
590 590
  */
591
-class KHTML_EXPORT RGBColor
591
+class TDEHTML_EXPORT RGBColor
592 592
 {
593 593
 public:
594 594
     RGBColor();
@@ -639,7 +639,7 @@ class RectImpl;
639 639
  * interface modify the style property.
640 640
  *
641 641
  */
642
-class KHTML_EXPORT Rect
642
+class TDEHTML_EXPORT Rect
643 643
 {
644 644
     friend class CSSPrimitiveValue;
645 645
 public:
@@ -696,7 +696,7 @@ class CounterImpl;
696 696
  * made through this interface modify the style property.
697 697
  *
698 698
  */
699
-class KHTML_EXPORT Counter
699
+class TDEHTML_EXPORT Counter
700 700
 {
701 701
     friend class CSSPrimitiveValue;
702 702
 public:

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

@@ -61,7 +61,7 @@ class MutationEventImpl;
61 61
  * add them manually.
62 62
  *
63 63
  */
64
-class KHTML_EXPORT EventListener : public DomShared {
64
+class TDEHTML_EXPORT EventListener : public DomShared {
65 65
 public:
66 66
     EventListener();
67 67
     virtual ~EventListener();
@@ -108,7 +108,7 @@ protected:
108 108
  * implemented by the object passed to the event listener.
109 109
  *
110 110
  */
111
-class KHTML_EXPORT Event {
111
+class TDEHTML_EXPORT Event {
112 112
     friend class Document;
113 113
     friend class NodeImpl;
114 114
     friend class DocumentImpl;
@@ -259,7 +259,7 @@ protected:
259 259
  * descriptions.
260 260
  *
261 261
  */
262
-class KHTML_EXPORT EventException
262
+class TDEHTML_EXPORT EventException
263 263
 {
264 264
 public:
265 265
     EventException(unsigned short _code);
@@ -291,7 +291,7 @@ public:
291 291
  * with User Interface events.
292 292
  *
293 293
  */
294
-class KHTML_EXPORT UIEvent : public Event {
294
+class TDEHTML_EXPORT UIEvent : public Event {
295 295
 public:
296 296
     UIEvent();
297 297
     UIEvent(const UIEvent &other);
@@ -396,7 +396,7 @@ protected:
396 396
  * obtain notification of mouse events which occur within its descendent elements.
397 397
  *
398 398
  */
399
-class KHTML_EXPORT MouseEvent : public UIEvent {
399
+class TDEHTML_EXPORT MouseEvent : public UIEvent {
400 400
 public:
401 401
     MouseEvent();
402 402
     MouseEvent(const MouseEvent &other);
@@ -552,7 +552,7 @@ protected:
552 552
  * as specified in current DOM3 Events revision. This is doing heavy emulation
553 553
  * at the moment
554 554
  */
555
-class KHTML_EXPORT TextEvent : public UIEvent {
555
+class TDEHTML_EXPORT TextEvent : public UIEvent {
556 556
 public:
557 557
     TextEvent();
558 558
     TextEvent(const TextEvent &other);
@@ -735,7 +735,7 @@ protected:
735 735
  * associated with Mutation events.
736 736
  *
737 737
  */
738
-class KHTML_EXPORT MutationEvent : public Event {
738
+class TDEHTML_EXPORT MutationEvent : public Event {
739 739
 public:
740 740
     MutationEvent();
741 741
     MutationEvent(const MutationEvent &other);

+ 2
- 2
tdehtml/dom/dom2_range.h View File

@@ -44,7 +44,7 @@ class RangeImpl;
44 44
 class DOMException;
45 45
 
46 46
 // Introduced in DOM Level 2:
47
-class KHTML_EXPORT RangeException {
47
+class TDEHTML_EXPORT RangeException {
48 48
 public:
49 49
     RangeException(unsigned short _code) { code = _code; }
50 50
     RangeException(const RangeException &other) { code = other.code; }
@@ -67,7 +67,7 @@ public:
67 67
 };
68 68
 
69 69
 
70
-class KHTML_EXPORT Range
70
+class TDEHTML_EXPORT Range
71 71
 {
72 72
     friend class DocumentImpl;
73 73
     friend class Document;

+ 4
- 4
tdehtml/dom/dom2_traversal.h View File

@@ -57,7 +57,7 @@ class CustomNodeFilterImpl;
57 57
  * interface.
58 58
  *
59 59
  */
60
-class KHTML_EXPORT NodeIterator
60
+class TDEHTML_EXPORT NodeIterator
61 61
 {
62 62
     friend class NodeIteratorImpl;
63 63
     friend class Document;
@@ -181,7 +181,7 @@ protected:
181 181
  * an instance of it to the NodeFilter. For more details see the
182 182
  * CustomNodeFilter class
183 183
  */
184
-class KHTML_EXPORT NodeFilter
184
+class TDEHTML_EXPORT NodeFilter
185 185
 {
186 186
     friend class NodeIterator;
187 187
     friend class NodeIteratorImpl;
@@ -292,7 +292,7 @@ protected:
292 292
  *
293 293
  */
294 294
 
295
-class KHTML_EXPORT CustomNodeFilter : public DomShared {
295
+class TDEHTML_EXPORT CustomNodeFilter : public DomShared {
296 296
 public:
297 297
     CustomNodeFilter();
298 298
     virtual ~CustomNodeFilter();
@@ -336,7 +336,7 @@ protected:
336 336
  * how deeply nested the structure of the original document.
337 337
  *
338 338
  */
339
-class KHTML_EXPORT TreeWalker
339
+class TDEHTML_EXPORT TreeWalker
340 340
 {
341 341
     friend class Document;
342 342
     friend class TreeWalkerImpl;

+ 1
- 1
tdehtml/dom/dom2_views.h View File

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

+ 1
- 1
tdehtml/dom/dom_doc.cpp View File

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

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

@@ -32,8 +32,8 @@
32 32
 #include <dom/dom_node.h>
33 33
 #include <dom/css_stylesheet.h>
34 34
 
35
-class KHTMLView;
36
-class KHTMLPart;
35
+class TDEHTMLView;
36
+class TDEHTMLPart;
37 37
 
38 38
 namespace DOM {
39 39
 
@@ -74,7 +74,7 @@ class HTMLDocument;
74 74
  * DOM Level 2 and newer provide means for creating documents directly,
75 75
  * which was not possible with DOM Level 1.
76 76
  */
77
-class KHTML_EXPORT DOMImplementation
77
+class TDEHTML_EXPORT DOMImplementation
78 78
 {
79 79
    friend class Document;
80 80
 public:
@@ -242,10 +242,10 @@ protected:
242 242
  * context they were created.
243 243
  *
244 244
  */
245
-class KHTML_EXPORT Document : public Node
245
+class TDEHTML_EXPORT Document : public Node
246 246
 {
247
-    friend class ::KHTMLView;
248
-    friend class ::KHTMLPart;
247
+    friend class ::TDEHTMLView;
248
+    friend class ::TDEHTMLPart;
249 249
     friend class AbstractView;
250 250
     friend class DOMImplementation;
251 251
     friend class HTMLFrameElement;
@@ -786,9 +786,9 @@ public:
786 786
     void removeStyleSheet(const StyleSheet &sheet);
787 787
     
788 788
     /**
789
-     * @return The KHTML view widget of this document.
789
+     * @return The TDEHTML view widget of this document.
790 790
      */
791
-    KHTMLView *view() const;
791
+    TDEHTMLView *view() const;
792 792
 
793 793
     /**
794 794
      * Introduced in DOM Level 2
@@ -988,7 +988,7 @@ class DocumentFragmentImpl;
988 988
  * \c insertBefore() and \c appendChild() .
989 989
  *
990 990
  */
991
-class KHTML_EXPORT DocumentFragment : public Node
991
+class TDEHTML_EXPORT DocumentFragment : public Node
992 992
 {
993 993
     friend class Document;
994 994
     friend class HTMLElementImpl;
@@ -1025,7 +1025,7 @@ class DOMString;
1025 1025
  * nodes.
1026 1026
  *
1027 1027
  */
1028
-class KHTML_EXPORT DocumentType : public Node
1028
+class TDEHTML_EXPORT DocumentType : public Node
1029 1029
 {
1030 1030
     friend class Document;
1031 1031
     friend class DOMImplementation;

+ 3
- 3
tdehtml/dom/dom_element.h View File

@@ -86,7 +86,7 @@ class DocumentImpl;
86 86
  * unknown, there are no tokenized attribute values.
87 87
  *
88 88
  */
89
-class KHTML_EXPORT Attr : public Node
89
+class TDEHTML_EXPORT Attr : public Node
90 90
 {
91 91
     friend class Element;
92 92
     friend class Document;
@@ -207,7 +207,7 @@ class DOMString;
207 207
  * access an attribute value can safely be used as a convenience.
208 208
  *
209 209
  */
210
-class KHTML_EXPORT Element : public Node
210
+class TDEHTML_EXPORT Element : public Node
211 211
 {
212 212
     friend class Document;
213 213
     friend class HTMLDocument;
@@ -579,7 +579,7 @@ public:
579 579
     bool isHTMLElement() const;
580 580
 
581 581
     /**
582
-     * KHTML extension to DOM
582
+     * TDEHTML extension to DOM
583 583
      * This method returns the associated form element.
584 584
      * returns null if this element is not a form-like element
585 585
      * or if this elment is not in the scope of a form element.

+ 1
- 1
tdehtml/dom/dom_exception.h View File

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

+ 1
- 1
tdehtml/dom/dom_misc.h View File

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

+ 4
- 4
tdehtml/dom/dom_node.h View File

@@ -63,7 +63,7 @@ class Event;
63 63
  * imply that the DOM specifies an order to these Nodes.
64 64
  *
65 65
  */
66
-class KHTML_EXPORT NamedNodeMap
66
+class TDEHTML_EXPORT NamedNodeMap
67 67
 {
68 68
 public:
69 69
     NamedNodeMap();
@@ -271,7 +271,7 @@ class NodeImpl;
271 271
  * mechanisms to get and set the relevant information.
272 272
  *
273 273
  */
274
-class KHTML_EXPORT Node
274
+class TDEHTML_EXPORT Node
275 275
 {
276 276
     friend class NamedNodeMap;
277 277
     friend class NodeList;
@@ -775,7 +775,7 @@ public:
775 775
      *
776 776
      * @exception DOMException
777 777
      * NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
778
-     * Note: KHTML will also raise this if setContent is called on things
778
+     * Note: TDEHTML will also raise this if setContent is called on things
779 779
      * that do not have child nodes.
780 780
      *
781 781
      * @since 3.5.7
@@ -928,7 +928,7 @@ class NodeListImpl;
928 928
  * integral index, starting from 0.
929 929
  *
930 930
  */
931
-class KHTML_EXPORT NodeList
931
+class TDEHTML_EXPORT NodeList
932 932
 {
933 933
     friend class Element;
934 934
     friend class Node;

+ 7
- 7
tdehtml/dom/dom_string.h